fix(nx/forge): get forge command to execute

This commit is contained in:
Elian Doran 2025-04-25 17:13:01 +03:00
parent 8f26d4cf63
commit 506935b365
No known key found for this signature in database
6 changed files with 1541 additions and 29 deletions

View File

@ -24,8 +24,7 @@
"test": "vitest" "test": "vitest"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "10.4.21", "autoprefixer": "10.4.21",
"copy-webpack-plugin": "13.0.0",
"mini-css-extract-plugin": "2.9.2", "mini-css-extract-plugin": "2.9.2",
"ts-loader": "9.5.2", "ts-loader": "9.5.2",
"tsx": "4.19.3", "tsx": "4.19.3",

View File

@ -35,14 +35,6 @@
"@triliumnext/server": "0.0.1" "@triliumnext/server": "0.0.1"
}, },
"devDependencies": { "devDependencies": {
"tsx": "4.19.3", "tsx": "4.19.3"
"@electron-forge/cli": "7.8.0",
"@electron-forge/maker-deb": "7.8.0",
"@electron-forge/maker-dmg": "7.8.0",
"@electron-forge/maker-flatpak": "7.8.0",
"@electron-forge/maker-rpm": "7.8.0",
"@electron-forge/maker-squirrel": "7.8.0",
"@electron-forge/maker-zip": "7.8.0",
"@electron-forge/plugin-auto-unpack-natives": "7.8.0"
} }
} }

View File

@ -13,8 +13,16 @@
}, },
"devDependencies": { "devDependencies": {
"@types/electron-squirrel-startup": "1.0.2", "@types/electron-squirrel-startup": "1.0.2",
"copy-webpack-plugin": "13.0.0", "copy-webpack-plugin": "13.0.0",
"@electron/rebuild": "3.7.2" "@electron/rebuild": "3.7.2",
"@electron-forge/cli": "7.8.0",
"@electron-forge/maker-deb": "7.8.0",
"@electron-forge/maker-dmg": "7.8.0",
"@electron-forge/maker-flatpak": "7.8.0",
"@electron-forge/maker-rpm": "7.8.0",
"@electron-forge/maker-squirrel": "7.8.0",
"@electron-forge/maker-zip": "7.8.0",
"@electron-forge/plugin-auto-unpack-natives": "7.8.0"
}, },
"scripts": { "scripts": {
"start-prod": "nx build desktop && cross-env TRILIUM_DATA_DIR=data TRILIUM_RESOURCE_DIR=dist TRILIUM_PORT=37841 electron dist/main.js", "start-prod": "nx build desktop && cross-env TRILIUM_DATA_DIR=data TRILIUM_RESOURCE_DIR=dist TRILIUM_PORT=37841 electron dist/main.js",
@ -51,6 +59,10 @@
] ]
} }
] ]
},
"make": {
"dependsOn": [ "build" ],
"command": "pnpm --filter @triliumnext/desktop exec electron-forge make apps/desktop/dist"
} }
} }
} }

View File

@ -119,7 +119,8 @@
"webpack": "5.99.6", "webpack": "5.99.6",
"ws": "8.18.1", "ws": "8.18.1",
"xml2js": "0.6.2", "xml2js": "0.6.2",
"yauzl": "3.2.0" "yauzl": "3.2.0",
"copy-webpack-plugin": "13.0.0"
}, },
"nx": { "nx": {
"targets": { "targets": {

1517
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -1,15 +1,16 @@
packages: packages:
- packages/* - packages/*
- apps/* - apps/*
ignoredBuiltDependencies: ignoredBuiltDependencies:
- '@parcel/watcher' - '@parcel/watcher'
- '@scarf/scarf' - '@scarf/scarf'
- '@swc/core' - '@swc/core'
- core-js-pure - core-js-pure
- esbuild - esbuild
- nx - nx
onlyBuiltDependencies: onlyBuiltDependencies:
- electron - better-sqlite3
- better-sqlite3 - electron
- electron-winstaller