Commit Graph

1880 Commits (cd00c89dfe53342f90d41bcecd159d2d69eec8fe)

Author SHA1 Message Date
Panagiotis Papadopoulos 3e3344b329 chore(scripts): remove now unneeded electron-forge:prepare 2025-03-26 08:12:48 +07:00
Jin d010e6cc73 Merge branch 'develop' into feature/MFA 2025-03-26 03:56:53 +07:00
renovate[bot] e0522fcd48
fix(deps): update dependency mermaid to v11.6.0 2025-03-26 02:11:39 +07:00
Jin 924044ae52 feat: 🎸 Remove dotenv dep 2025-03-25 22:31:07 +07:00
Elian Doran 73fc7304c7
Merge branch 'develop' into renovate/electron-forge-monorepo 2025-03-25 19:08:50 +07:00
Elian Doran 90ab31329e
Merge pull request #1507 from TriliumNext/feature/windows_signing_v3
Windows Signing
2025-03-25 17:51:12 +07:00
Elian Doran ec7b645d36
Merge pull request #1516 from TriliumNext/renovate/node-22.x
chore(deps): update dependency @types/node to v22.13.13
2025-03-25 11:53:07 +07:00
renovate[bot] 4aa834b23a
chore(deps): update dependency @types/node to v22.13.13 2025-03-25 08:51:39 +07:00
Elian Doran efb0bf9e21
Merge branch 'develop' into renovate/typescript-eslint-monorepo 2025-03-25 10:50:24 +07:00
Elian Doran 19287f6474
Merge pull request #1517 from TriliumNext/renovate/react-monorepo
chore(deps): update dependency @types/react to v18.3.20
2025-03-25 10:49:45 +07:00
Elian Doran d0549ebdf9
Merge branch 'develop' into feature/windows_signing_v3 2025-03-25 10:40:48 +07:00
renovate[bot] 9b96cb61cc
chore(deps): update electron-forge monorepo to v7.8.0 2025-03-25 02:59:03 +07:00
renovate[bot] 220bcbd12c
chore(deps): update dependency typescript-eslint to v8.28.0 2025-03-25 02:58:48 +07:00
renovate[bot] 042172cd53
chore(deps): update dependency @types/supertest to v6.0.3 2025-03-25 02:58:33 +07:00
renovate[bot] 19389e4ea0
chore(deps): update dependency @types/react to v18.3.20 2025-03-25 02:58:22 +07:00
Elian Doran c25d42cf5d
chore(ci): solve issues after review 2025-03-24 17:30:37 +07:00
Elian Doran 308632ea51
chore(ci): re-enable Windows signing logs 2025-03-24 13:30:37 +07:00
Elian Doran 18a5a55384
chore(ci): remove debug logs 2025-03-24 12:42:01 +07:00
Elian Doran 10d8cd95a6
chore(ci): enable windows installer logs 2025-03-24 12:05:34 +07:00
renovate[bot] cb7de2430d
chore(deps): update dependency @types/leaflet to v1.9.17 2025-03-24 01:55:27 +07:00
Elian Doran a709f68af9
chore(ci): set up node modules 2025-03-23 22:47:59 +07:00
Elian Doran 8e2a95b5c4
chore(ci): use different way of specifying app dir pt. 2 2025-03-23 22:41:26 +07:00
Elian Doran b4dc493a5f
chore(ci): use different way of specifying app dir 2025-03-23 22:12:31 +07:00
Elian Doran ab927ad885
chore(ci): set up npm ci again 2025-03-23 21:55:48 +07:00
Elian Doran d128e9df25
chore(ci): run with debug 2025-03-23 21:48:40 +07:00
Elian Doran 9358f90b48
chore(ci): revert change 2025-03-23 21:41:27 +07:00
Elian Doran a13c9790bd
chore(ci): try running npm i at build step 2025-03-23 21:35:11 +07:00
Elian Doran f815420d1f
Merge pull request #1493 from TriliumNext/renovate/eslint-monorepo
chore(deps): update eslint monorepo to v9.23.0
2025-03-23 09:31:10 +07:00
Elian Doran 4af586e237
Merge branch 'develop' into renovate/eslint-monorepo 2025-03-23 00:28:03 +07:00
Elian Doran d2406a7574
Merge branch 'develop' into renovate/eslint-linter-browserify-9.x 2025-03-23 00:27:51 +07:00
Jin 8df1e3263b Merge branch 'develop' into feature/MFA 2025-03-22 12:35:00 +07:00
renovate[bot] 88e0aec3d6
fix(deps): update dependency eslint-linter-browserify to v9.23.0 2025-03-22 01:59:08 +07:00
renovate[bot] cc9b0987b2
chore(deps): update eslint monorepo to v9.23.0 2025-03-22 01:58:58 +07:00
renovate[bot] e8242e87fb
chore(deps): update dependency @types/node to v22.13.11 2025-03-22 01:58:47 +07:00
Elian Doran 08df7e6484
Merge pull request #1481 from TriliumNext/renovate/electron-35.x
chore(deps): update dependency electron to v35.0.3
2025-03-21 13:43:30 +07:00
Elian Doran 7277c10f38
Merge pull request #1482 from TriliumNext/renovate/typedoc-0.x
chore(deps): update dependency typedoc to v0.28.1
2025-03-21 13:43:06 +07:00
Elian Doran 6569a72bc4
Merge pull request #1483 from TriliumNext/renovate/codemirror-5.x
fix(deps): update dependency codemirror to v5.65.19
2025-03-21 13:42:49 +07:00
Elian Doran cb630337ca
Merge pull request #1484 from TriliumNext/renovate/force-graph-1.x
fix(deps): update dependency force-graph to v1.49.5
2025-03-21 13:42:24 +07:00
Elian Doran 60d5497a6c
Merge pull request #1485 from TriliumNext/renovate/multer-1.x
fix(deps): update dependency multer to v1.4.5-lts.2
2025-03-21 13:41:48 +07:00
renovate[bot] 90cdb5d641
chore(deps): update dependency supertest to v7.1.0 2025-03-21 02:40:58 +07:00
renovate[bot] 0e8cd3b4ba
fix(deps): update dependency multer to v1.4.5-lts.2 2025-03-21 02:40:48 +07:00
renovate[bot] 1b5d665fbc
fix(deps): update dependency force-graph to v1.49.5 2025-03-21 02:40:38 +07:00
renovate[bot] 8755c84dea
fix(deps): update dependency codemirror to v5.65.19 2025-03-21 02:40:27 +07:00
renovate[bot] f9878962b8
chore(deps): update dependency typedoc to v0.28.1 2025-03-21 02:40:17 +07:00
renovate[bot] cf70dd0b4f
chore(deps): update dependency electron to v35.0.3 2025-03-21 02:40:05 +07:00
JYC333 d70cf14947
Merge branch 'develop' into renovate/electron-35.x 2025-03-20 10:56:49 +07:00
Elian Doran 911e112964
Merge pull request #1470 from TriliumNext/renovate/react-monorepo
chore(deps): update dependency @types/react to v18.3.19
2025-03-20 10:21:57 +07:00
Elian Doran 7fe594d4ad
chore(deps): update mind-elixir to latest (closes #1464) 2025-03-20 09:03:30 +07:00
Elian Doran 6d9c41f524
Merge pull request #1467 from TriliumNext/deps_move-mind-elixir_webpack
deps: bundle mind-elixir with webpack
2025-03-20 08:59:30 +07:00
Elian Doran 3e7d41c738
Merge pull request #1469 from TriliumNext/renovate/express-5.x
chore(deps): update dependency @types/express to v5.0.1
2025-03-20 08:56:36 +07:00
Elian Doran 7fda0dd572
Merge pull request #1474 from TriliumNext/renovate/typescript-eslint-monorepo
chore(deps): update dependency typescript-eslint to v8.27.0
2025-03-20 08:56:02 +07:00
Elian Doran 60a33d8279
Merge pull request #1475 from TriliumNext/renovate/sanitize-html-2.x
fix(deps): update dependency sanitize-html to v2.15.0
2025-03-20 08:55:29 +07:00
renovate[bot] b26555604c
fix(deps): update dependency sanitize-html to v2.15.0 2025-03-20 02:13:24 +07:00
renovate[bot] 1e5f7ef6dd
chore(deps): update dependency typescript-eslint to v8.27.0 2025-03-20 02:13:14 +07:00
renovate[bot] 3b9fcede0d
fix(deps): update dependency axios to v1.8.4 2025-03-20 02:12:59 +07:00
renovate[bot] 0ae705b925
chore(deps): update dependency @types/react to v18.3.19 2025-03-20 02:11:14 +07:00
renovate[bot] 49a77790f2
chore(deps): update dependency @types/express to v5.0.1 2025-03-20 02:11:03 +07:00
Panagiotis Papadopoulos feb9fa03c3 chore(deps): move mind-elixir related packages to devDependencies
webpack takes care of bundling these, so we don't need the modules at runtime anymore
2025-03-19 20:03:24 +07:00
Elian Doran 0408b3d260
chore(deps): remove @joplin/turndown-plugin-gfm 2025-03-19 19:24:06 +07:00
Panagiotis Papadopoulos 20bbb80805 chore(deps): move @fullcalendar related to devDependencies
webpack takes care of bundling these, so we don't need the modules at runtime anymore
2025-03-19 14:47:51 +07:00
Elian Doran 6f15169b18
feat(mermaid): better zoom mechanism (closes #474) 2025-03-18 18:31:22 +07:00
Elian Doran 165b5ad251
Merge branch 'develop' into renovate/helmet-8.x 2025-03-18 09:06:13 +07:00
Elian Doran 71188ab98d
Merge pull request #1440 from TriliumNext/renovate/better-sqlite3-11.x
fix(deps): update dependency better-sqlite3 to v11.9.1
2025-03-18 09:04:13 +07:00
Elian Doran ab38005817
Merge pull request #1450 from TriliumNext/renovate/playwright-monorepo
chore(deps): update dependency @playwright/test to v1.51.1
2025-03-18 09:03:45 +07:00
Elian Doran a07b734a91
Merge pull request #1451 from TriliumNext/renovate/vitest-monorepo
chore(deps): update vitest monorepo to v3.0.9
2025-03-18 09:03:20 +07:00
Elian Doran 1e3d7ce5df
Merge pull request #1453 from TriliumNext/renovate/sass-1.x
chore(deps): update dependency sass to v1.86.0
2025-03-18 09:02:57 +07:00
Elian Doran 48d987d25d
chore(package): get rid of tsyncserver (closes #1455) 2025-03-18 09:01:14 +07:00
renovate[bot] 0cfeeac4e3
fix(deps): update dependency helmet to v8.1.0 2025-03-18 02:55:36 +07:00
renovate[bot] 5ed25cbce7
fix(deps): update dependency better-sqlite3 to v11.9.1 2025-03-18 02:55:29 +07:00
renovate[bot] ce97d36500
chore(deps): update dependency sass to v1.86.0 2025-03-18 02:55:20 +07:00
renovate[bot] 611d93cf20
chore(deps): update vitest monorepo to v3.0.9 2025-03-18 02:54:58 +07:00
renovate[bot] a5fe3788a4
chore(deps): update dependency @playwright/test to v1.51.1 2025-03-18 02:54:43 +07:00
Elian Doran e4bb8cb233
feat(calendar): add year view 2025-03-16 20:57:57 +07:00
Elian Doran d67dd27568
feat(calendar): add list view & improve styling 2025-03-16 20:53:54 +07:00
Elian Doran 7570205059
feat(calendar): set up time grid 2025-03-16 19:46:39 +07:00
Elian Doran 62706a6af2
chore(release): 0.92.4 2025-03-16 16:04:21 +07:00
Elian Doran dd8818f0ac
Merge pull request #1438 from TriliumNext/renovate/typedoc-0.x
chore(deps): update dependency typedoc to v0.28.0
2025-03-16 12:26:22 +07:00
renovate[bot] 09a1227b63
chore(deps): update dependency typedoc to v0.28.0 2025-03-16 02:48:13 +07:00
renovate[bot] 511c69bdb0
fix(deps): update dependency mind-elixir to v4.4.2 2025-03-16 02:48:00 +07:00
Elian Doran c1acaa0159
Merge branch 'develop' into build_improve-electron-forge_v3 2025-03-15 23:42:43 +07:00
Elian Doran 40d233dccc
chore(deps): remove no longer necessary html-minifier 2025-03-15 22:20:43 +07:00
Elian Doran 2b1bbd4ad3
fix(build): node ABI 2025-03-15 18:37:29 +07:00
Elian Doran 3734f81752
Merge pull request #1433 from TriliumNext/renovate/better-sqlite3-11.x
fix(deps): update dependency better-sqlite3 to v11.9.0
2025-03-15 18:25:56 +07:00
Elian Doran bd9fce0a50
Merge branch 'develop' into renovate/electron-35.x 2025-03-15 18:24:10 +07:00
Panagiotis Papadopoulos 3b8c645cca Merge branch 'develop' into build_improve-electron-forge_v3 2025-03-15 12:09:52 +07:00
renovate[bot] 9136f07968
fix(deps): update dependency better-sqlite3 to v11.9.0 2025-03-15 02:52:57 +07:00
Elian Doran ae3f0e0e4b
fix(types): add missing dependency 2025-03-14 21:43:37 +07:00
Elian Doran 56d3cd038c
fix(deps): add missing dependency 2025-03-14 21:42:59 +07: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 +07: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 +07:00
renovate[bot] 2e436cdd46
chore(deps): update dependency electron to v35 2025-03-14 09:14:49 +07: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 +07: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 +07: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 +07: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 +07:00
renovate[bot] 618bba71da
fix(deps): update dependency mermaid to v11.5.0 2025-03-14 02:53:05 +07:00
renovate[bot] 8bff71fed4
fix(deps): update dependency i18next to v24.2.3 2025-03-14 02:52:56 +07:00
renovate[bot] 839cfac2ac
fix(deps): update dependency force-graph to v1.49.4 2025-03-14 02:52:45 +07:00
renovate[bot] ded979b6ff
fix(deps): update dependency axios to v1.8.3 2025-03-14 02:52:32 +07:00
renovate[bot] 948c60277d
chore(deps): update dependency electron to v34.3.3 2025-03-14 02:52:20 +07: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 +07: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 +07:00
Elian Doran 2463e44bf8
chore(deps): downgrade to react 18 2025-03-12 09:15:37 +07:00
renovate[bot] b600b51fe8
chore(deps): update dependency happy-dom to v17.4.4 2025-03-12 02:59:14 +07:00
Elian Doran 3ae48bba00
chore(deps): update react to latest 2025-03-12 00:06:11 +07:00
Elian Doran c2cb48a25c
chore(deps): update to excalidraw 0.18.0 2025-03-11 22:59:16 +07: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 +07:00
Elian Doran 3723824246
chore(scripts): downgrade Electron to 33 for Nix 2025-03-11 22:02:05 +07: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 +07: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 +07: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 +07: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 +07:00
Elian Doran 6b3bf1151a
Merge branch 'develop' into renovate/happy-dom-monorepo 2025-03-11 13:27:41 +07:00
Elian Doran c16f240f31
Merge branch 'develop' into renovate/autoprefixer-10.x 2025-03-11 13:27:38 +07:00
renovate[bot] 5299da6525
chore(deps): update dependency typescript-eslint to v8.26.1 2025-03-11 02:37:37 +07:00
renovate[bot] ca6253f3bb
chore(deps): update dependency electron to v34.3.2 2025-03-11 02:37:19 +07:00
Elian Doran b9c409ec33
chore(scripts): edit documentation with Nix 2025-03-10 10:53:49 +07:00
renovate[bot] 9dcfae56a1
chore(deps): update dependency happy-dom to v17.4.3 2025-03-10 02:33:38 +07:00
renovate[bot] 05b2f8c097
chore(deps): update dependency autoprefixer to v10.4.21 2025-03-10 02:33:29 +07: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 +07:00
renovate[bot] 4ef1c5d4e2
chore(deps): update dependency happy-dom to v17.4.2 2025-03-09 01:53:34 +07:00
renovate[bot] 56c575cec2
chore(deps): update dependency @types/node to v22.13.10 2025-03-09 01:53:24 +07: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 +07: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 +07: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 +07:00
Elian Doran 2ff7d7bc6d
Merge branch 'develop' into renovate/eslint-monorepo 2025-03-08 03:03:00 +07:00
renovate[bot] e530df8645
fix(deps): update dependency eslint-linter-browserify to v9.22.0 2025-03-08 00:46:50 +07:00
renovate[bot] 9d6adef5bf
chore(deps): update dependency happy-dom to v17.4.0 2025-03-08 00:46:41 +07:00
Elian Doran 79adb0b20e
feat(client): add recommended rules 2025-03-08 02:45:40 +07:00
renovate[bot] 7d21bcd611
chore(deps): update eslint monorepo to v9.22.0 2025-03-08 00:37:21 +07:00
Elian Doran c4f8e9605f
fix(client): update ESLint to latest 2025-03-08 02:20:56 +07:00
Panagiotis Papadopoulos 3e307f4711 build(scripts): add "build:clean" script for removing dist and build folders 2025-03-07 23:14:56 +07:00
Panagiotis Papadopoulos d0bb5f9768 build(scripts): add webpack progress flag 2025-03-07 23:14:56 +07: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 +07:00
Panagiotis Papadopoulos cefc402263 build: add separate tsconfig.build.json
this prevents tsc from unnecessarily transpiling the frontend part as well:
previously it was transpiled by tsc, but the files got discarded and replaced by the files built by webpack.

speeds up tsc command a bit as well:
from 14 seconds to ~8 secs
2025-03-07 23:14:56 +07:00
Elian Doran a6e7f98f69
chore(release): 0.92.3-beta 2025-03-07 23:59:10 +07:00
Elian Doran eb19e31fc3
fix(e2e): tests failing when run locally 2025-03-07 20:34:01 +07:00
Elian Doran 9d05fedc69
Merge pull request #1355 from TriliumNext/renovate/npm-axios-vulnerability
fix(deps): update dependency axios to v1.8.2 [security]
2025-03-07 20:25:21 +07:00
Elian Doran cbd6278a0b
Merge pull request #1348 from TriliumNext/renovate/electron-34.x
chore(deps): update dependency electron to v34.3.1
2025-03-07 20:14:30 +07:00
Elian Doran f6b52f5ce9
Merge pull request #1349 from TriliumNext/renovate/vitest-monorepo
chore(deps): update vitest monorepo to v3.0.8
2025-03-07 20:14:17 +07:00
renovate[bot] efc57e383c
fix(deps): update dependency axios to v1.8.2 [security] 2025-03-07 18:13:51 +07:00
Elian Doran 40d6a28751
Merge pull request #1350 from TriliumNext/renovate/force-graph-1.x
fix(deps): update dependency force-graph to v1.49.3
2025-03-07 20:13:43 +07:00
Elian Doran b0f86af57e
Merge branch 'develop' into renovate/playwright-monorepo 2025-03-07 20:13:10 +07:00
renovate[bot] 633369b5bd
chore(deps): update dependency happy-dom to v17.3.0 2025-03-07 01:27:34 +07:00
renovate[bot] 06d5abded4
chore(deps): update dependency @playwright/test to v1.51.0 2025-03-07 01:27:24 +07:00
renovate[bot] 41368db8b6
fix(deps): update dependency force-graph to v1.49.3 2025-03-07 01:27:12 +07:00
renovate[bot] 4ff3b87f23
chore(deps): update vitest monorepo to v3.0.8 2025-03-07 01:27:02 +07:00
renovate[bot] a40dc2047b
chore(deps): update dependency electron to v34.3.1 2025-03-07 01:26:47 +07:00
Elian Doran 7c5430ba49
Merge pull request #1341 from TriliumNext/renovate/node-22.x
chore(deps): update dependency @types/node to v22.13.9
2025-03-06 08:22:03 +07:00
renovate[bot] ab578f9379
chore(deps): update dependency @types/ws to v8.18.0 2025-03-06 02:50:55 +07:00