1846 Commits

Author SHA1 Message Date
Panagiotis Papadopoulos
3b8c645cca Merge branch 'develop' into build_improve-electron-forge_v3 2025-03-15 12:09:52 +01:00
renovate[bot]
9136f07968
fix(deps): update dependency better-sqlite3 to v11.9.0 2025-03-15 02:52:57 +00:00
Elian Doran
ae3f0e0e4b
fix(types): add missing dependency 2025-03-14 21:43:37 +02:00
Elian Doran
56d3cd038c
fix(deps): add missing dependency 2025-03-14 21:42:59 +02:00
Elian Doran
a50b8c7f0a
Merge pull request #1425 from TriliumNext/renovate/mermaid-11.x
fix(deps): update dependency mermaid to v11.5.0
2025-03-14 11:15:51 +02:00
Elian Doran
5efb5fd303
Merge pull request #1424 from TriliumNext/renovate/i18next-24.x
fix(deps): update dependency i18next to v24.2.3
2025-03-14 11:15:12 +02:00
renovate[bot]
2e436cdd46
chore(deps): update dependency electron to v35 2025-03-14 09:14:49 +00:00
Elian Doran
3656b1e0eb
Merge pull request #1423 from TriliumNext/renovate/force-graph-1.x
fix(deps): update dependency force-graph to v1.49.4
2025-03-14 11:14:47 +02:00
Elian Doran
b2060799c4
Merge pull request #1422 from TriliumNext/renovate/axios-1.x
fix(deps): update dependency axios to v1.8.3
2025-03-14 11:14:13 +02:00
Elian Doran
b18e5a34c4
Merge pull request #1421 from TriliumNext/renovate/electron-34.x
chore(deps): update dependency electron to v34.3.3
2025-03-14 11:13:57 +02:00
Elian Doran
2578c2d4f6
Merge pull request #1398 from TriliumNext/renovate/happy-dom-monorepo
chore(deps): update dependency happy-dom to v17.4.4
2025-03-14 11:13:17 +02:00
renovate[bot]
618bba71da
fix(deps): update dependency mermaid to v11.5.0 2025-03-14 02:53:05 +00:00
renovate[bot]
8bff71fed4
fix(deps): update dependency i18next to v24.2.3 2025-03-14 02:52:56 +00:00
renovate[bot]
839cfac2ac
fix(deps): update dependency force-graph to v1.49.4 2025-03-14 02:52:45 +00:00
renovate[bot]
ded979b6ff
fix(deps): update dependency axios to v1.8.3 2025-03-14 02:52:32 +00:00
renovate[bot]
948c60277d
chore(deps): update dependency electron to v34.3.3 2025-03-14 02:52:20 +00:00
Panagiotis Papadopoulos
1877d26296 chore(scripts): electron-forge:prepare -> copy node_modules folder as is
electron-forge does not like, if we get rid of devDeps ourselves already it seems.
It *wants* to do it itself, otherwise build fails…

It does seem to correctly strip all the devDeps though, at least there's that.
2025-03-13 07:59:12 +01:00
Panagiotis Papadopoulos
6b9d8f0d67 build(electron-forge): execute electron-forge commands in our "build" output context
since we build TS and webpack ourselves and are not using any electron-forge plugins (at least at the moment) -> we should use the "build" folder as build context for electron-forge:

in comparison to running electron-forge in the root folder of the project, this avoids electron-forge from packing the source code multiple times (e.g. once as uncompiled TS, then as compiled JS, and then (partially) a third time as webpack bundled JS files), same as some of the assets.

to achieve this, we run our usual TS/Webpack build process, but then install the npm dependencies *inside* the build folder (as otherwise electron-forge would choke on the missing node_modules it and abort building).

In theory we could avoid cd-ing into the build folder, by providing the "dir" as argument to electron-forge's CLI -- BUT that wouldn't play well with our CI, where we are passing --arch and --platform options to it, which need to come *before* the dir argument.

since we now cd into the "build" folder, we also need to adjust the path in package.json "main" again
2025-03-13 07:59:12 +01:00
Elian Doran
2463e44bf8
chore(deps): downgrade to react 18 2025-03-12 09:15:37 +02:00
renovate[bot]
b600b51fe8
chore(deps): update dependency happy-dom to v17.4.4 2025-03-12 02:59:14 +00:00
Elian Doran
3ae48bba00
chore(deps): update react to latest 2025-03-12 00:06:11 +02:00
Elian Doran
c2cb48a25c
chore(deps): update to excalidraw 0.18.0 2025-03-11 22:59:16 +02:00
Elian Doran
39f3cb47fa
Merge pull request #1393 from TriliumNext/build_hotfix-electron
fix(build/electron): hotfix for failing nightly electron builds
2025-03-11 22:20:17 +02:00
Elian Doran
3723824246
chore(scripts): downgrade Electron to 33 for Nix 2025-03-11 22:02:05 +02:00
Panagiotis Papadopoulos
4494662d2a fix(build/electron): hot fix for failing nightly electron builds
this is caused by recently reverting the output of "build:prepare-dist" from "dist" to "build"

-> this is just a temporary fix -> I am working in parallel already on an improved electron-forge build process, whihc will be ready by end of the week
2025-03-11 20:24:11 +01:00
Elian Doran
a33d532958
Merge pull request #1382 from TriliumNext/renovate/happy-dom-monorepo
chore(deps): update dependency happy-dom to v17.4.3
2025-03-11 13:38:25 +02:00
Elian Doran
80d1985882
Merge pull request #1381 from TriliumNext/renovate/autoprefixer-10.x
chore(deps): update dependency autoprefixer to v10.4.21
2025-03-11 13:38:05 +02:00
Elian Doran
5252fe3d1e
Merge pull request #1390 from TriliumNext/renovate/typescript-eslint-monorepo
chore(deps): update dependency typescript-eslint to v8.26.1
2025-03-11 13:34:45 +02:00
Elian Doran
6b3bf1151a
Merge branch 'develop' into renovate/happy-dom-monorepo 2025-03-11 13:27:41 +02:00
Elian Doran
c16f240f31
Merge branch 'develop' into renovate/autoprefixer-10.x 2025-03-11 13:27:38 +02:00
renovate[bot]
5299da6525
chore(deps): update dependency typescript-eslint to v8.26.1 2025-03-11 02:37:37 +00:00
renovate[bot]
ca6253f3bb
chore(deps): update dependency electron to v34.3.2 2025-03-11 02:37:19 +00:00
Elian Doran
b9c409ec33
chore(scripts): edit documentation with Nix 2025-03-10 10:53:49 +02:00
renovate[bot]
9dcfae56a1
chore(deps): update dependency happy-dom to v17.4.3 2025-03-10 02:33:38 +00:00
renovate[bot]
05b2f8c097
chore(deps): update dependency autoprefixer to v10.4.21 2025-03-10 02:33:29 +00:00
Elian Doran
b00224c63c
Merge pull request #1367 from TriliumNext/renovate/node-22.x
chore(deps): update dependency @types/node to v22.13.10
2025-03-09 09:41:29 +02:00
renovate[bot]
4ef1c5d4e2
chore(deps): update dependency happy-dom to v17.4.2 2025-03-09 01:53:34 +00:00
renovate[bot]
56c575cec2
chore(deps): update dependency @types/node to v22.13.10 2025-03-09 01:53:24 +00:00
Elian Doran
9db5557cc1
Merge pull request #1359 from TriliumNext/renovate/eslint-monorepo
chore(deps): update eslint monorepo to v9.22.0
2025-03-08 03:10:33 +02:00
Elian Doran
acedb0e94c
Merge pull request #1225 from TriliumNext/build_improve-ts-webpack
build: improvements for TS & Webpack & Docker
2025-03-08 03:08:30 +02:00
Elian Doran
d2ffd4a8cd
Merge pull request #1358 from TriliumNext/renovate/happy-dom-monorepo
chore(deps): update dependency happy-dom to v17.4.0
2025-03-08 03:05:41 +02:00
Elian Doran
2ff7d7bc6d
Merge branch 'develop' into renovate/eslint-monorepo 2025-03-08 03:03:00 +02:00
renovate[bot]
e530df8645
fix(deps): update dependency eslint-linter-browserify to v9.22.0 2025-03-08 00:46:50 +00:00
renovate[bot]
9d6adef5bf
chore(deps): update dependency happy-dom to v17.4.0 2025-03-08 00:46:41 +00:00
Elian Doran
79adb0b20e
feat(client): add recommended rules 2025-03-08 02:45:40 +02:00
renovate[bot]
7d21bcd611
chore(deps): update eslint monorepo to v9.22.0 2025-03-08 00:37:21 +00:00
Elian Doran
c4f8e9605f
fix(client): update ESLint to latest 2025-03-08 02:20:56 +02:00
Panagiotis Papadopoulos
3e307f4711 build(scripts): add "build:clean" script for removing dist and build folders 2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
d0bb5f9768 build(scripts): add webpack progress flag 2025-03-07 23:14:56 +01:00
Panagiotis Papadopoulos
3a87d71073 build(scripts): add build:ts and update build:prepare-dist
since we build into the build folder -> we should also clean the folder before building as well

also it makes sense to run tsc first, as it runs faster, so if there's any TS errors, we will have a faster failing build
2025-03-07 23:14:56 +01:00