Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 10:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(nx/forge): add strange workaround to solve node modules

Browse Source 
Here we need to ensure that there is no `node_modules` in
`apps/desktop` since electron-forge will pick it up and use only that,
meaning that all the hoisted dependencies available in the project root
will not be accessible and it will error out.

See https://github.com/pnpm/pnpm/issues/7880 for more information.
This commit is contained in:
Elian Doran 2025-04-26 00:42:43 +03:00
parent 997ed22b86
commit b6b9ca1ab5
No known key found for this signature in database
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/package.json
View File

@ -5,7 +5,6 @@
"main": "dist/main.js", "main": "dist/main.js",
"dependencies": { "dependencies": {
"@electron/remote": "2.1.2", "@electron/remote": "2.1.2",
"@triliumnext/server": "workspace:*",
"better-sqlite3": "^11.9.1", "better-sqlite3": "^11.9.1",
"electron-debug": "4.1.0", "electron-debug": "4.1.0",
"electron-dl": "4.0.0", "electron-dl": "4.0.0",
@ -13,6 +12,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/electron-squirrel-startup": "1.0.2", "@types/electron-squirrel-startup": "1.0.2",
"@triliumnext/server": "workspace:*",
"copy-webpack-plugin": "13.0.0", "copy-webpack-plugin": "13.0.0",
"electron": "35.1.5", "electron": "35.1.5",
"@electron/rebuild": "3.7.2", "@electron/rebuild": "3.7.2",

3
package.json
View File

@ -53,7 +53,8 @@
"typescript-eslint": "^8.19.0", "typescript-eslint": "^8.19.0",
"vite": "^6.0.0", "vite": "^6.0.0",
"vitest": "^3.0.0", "vitest": "^3.0.0",
"webpack-cli": "^5.1.4" "webpack-cli": "^5.1.4",
"@triliumnext/server": "workspace:*"
}, },
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"author": { "author": {

9
pnpm-lock.yaml generated
View File

@ -72,6 +72,9 @@ importers:
'@swc/helpers': '@swc/helpers':
specifier: ~0.5.11 specifier: ~0.5.11
version: 0.5.17 version: 0.5.17
'@triliumnext/server':
specifier: workspace:*
version: link:apps/server
'@types/express': '@types/express':
specifier: ^4.17.21 specifier: ^4.17.21
version: 4.17.21 version: 4.17.21
@ -285,9 +288,6 @@ importers:
'@electron/remote': '@electron/remote':
specifier: 2.1.2 specifier: 2.1.2
version: 2.1.2(electron@35.1.5) version: 2.1.2(electron@35.1.5)
'@triliumnext/server':
specifier: workspace:*
version: link:../server
better-sqlite3: better-sqlite3:
specifier: ^11.9.1 specifier: ^11.9.1
version: 11.9.1 version: 11.9.1
@ -328,6 +328,9 @@ importers:
'@electron/rebuild': '@electron/rebuild':
specifier: 3.7.2 specifier: 3.7.2
version: 3.7.2 version: 3.7.2
'@triliumnext/server':
specifier: workspace:*
version: link:../server
'@types/electron-squirrel-startup': '@types/electron-squirrel-startup':
specifier: 1.0.2 specifier: 1.0.2
version: 1.0.2 version: 1.0.2

2
pnpm-workspace.yaml
View File

@ -16,4 +16,4 @@ onlyBuiltDependencies:
- electron-winstaller - electron-winstaller
nodeLinker: hoisted nodeLinker: hoisted
linkWorkspacePackages: true symlink: false