mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-07-27 18:12:29 +08:00
chore(nx/forge): fix prebuilds and build from dist
This commit is contained in:
parent
aa388e0509
commit
e266b50198
@ -92,7 +92,7 @@ module.exports = {
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
rebuildConfig: {
|
rebuildConfig: {
|
||||||
force: true
|
force: false
|
||||||
},
|
},
|
||||||
makers: [
|
makers: [
|
||||||
{
|
{
|
@ -2,7 +2,7 @@
|
|||||||
"name": "@triliumnext/desktop",
|
"name": "@triliumnext/desktop",
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"main": "dist/main.js",
|
"main": "main.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electron/remote": "2.1.2",
|
"@electron/remote": "2.1.2",
|
||||||
"better-sqlite3": "^11.9.1",
|
"better-sqlite3": "^11.9.1",
|
||||||
@ -23,8 +23,13 @@
|
|||||||
"@electron-forge/maker-rpm": "7.8.0",
|
"@electron-forge/maker-rpm": "7.8.0",
|
||||||
"@electron-forge/maker-squirrel": "7.8.0",
|
"@electron-forge/maker-squirrel": "7.8.0",
|
||||||
"@electron-forge/maker-zip": "7.8.0",
|
"@electron-forge/maker-zip": "7.8.0",
|
||||||
"@electron-forge/plugin-auto-unpack-natives": "7.8.0"
|
"@electron-forge/plugin-auto-unpack-natives": "7.8.0",
|
||||||
|
"prebuild-install": "^7.1.1"
|
||||||
},
|
},
|
||||||
|
"config": {
|
||||||
|
"forge": "../electron-forge/forge.config.cjs"
|
||||||
|
},
|
||||||
|
"packageManager": "pnpm@10.9.0+sha512.0486e394640d3c1fb3c9d43d49cf92879ff74f8516959c235308f5a8f62e2e19528a65cdc2a3058f587cde71eba3d5b56327c8c33a97e4c4051ca48a10ca2d5f",
|
||||||
"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",
|
||||||
"rebuild": "electron-rebuild"
|
"rebuild": "electron-rebuild"
|
||||||
@ -73,7 +78,7 @@
|
|||||||
},
|
},
|
||||||
"electron-forge:package": {
|
"electron-forge:package": {
|
||||||
"dependsOn": [ "build" ],
|
"dependsOn": [ "build" ],
|
||||||
"command": "pnpm exec electron-forge package apps/desktop"
|
"command": "pnpm exec cross-env DEBUG=electron-rebuild electron-forge package apps/desktop/dist"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ module.exports = {
|
|||||||
assets: ["./src/assets"],
|
assets: ["./src/assets"],
|
||||||
optimization: false,
|
optimization: false,
|
||||||
outputHashing: 'none',
|
outputHashing: 'none',
|
||||||
generatePackageJson: true,
|
generatePackageJson: false,
|
||||||
externalDependencies: [
|
externalDependencies: [
|
||||||
"electron/main",
|
"electron/main",
|
||||||
"@electron/remote/main",
|
"@electron/remote/main",
|
||||||
@ -44,6 +44,14 @@ module.exports = {
|
|||||||
{
|
{
|
||||||
from: "../../node_modules/@electron/remote",
|
from: "../../node_modules/@electron/remote",
|
||||||
to: join(outputDir, "node_modules/@electron/remote")
|
to: join(outputDir, "node_modules/@electron/remote")
|
||||||
|
},
|
||||||
|
{
|
||||||
|
from: "../../node_modules/prebuild-install",
|
||||||
|
to: join(outputDir, "node_modules/better-sqlite3/node_modules/prebuild-install")
|
||||||
|
},
|
||||||
|
{
|
||||||
|
from: "package.json",
|
||||||
|
to: join(outputDir, "package.json")
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
3
pnpm-lock.yaml
generated
3
pnpm-lock.yaml
generated
@ -340,6 +340,9 @@ importers:
|
|||||||
electron:
|
electron:
|
||||||
specifier: 35.1.5
|
specifier: 35.1.5
|
||||||
version: 35.1.5
|
version: 35.1.5
|
||||||
|
prebuild-install:
|
||||||
|
specifier: ^7.1.1
|
||||||
|
version: 7.1.3
|
||||||
|
|
||||||
apps/desktop-e2e: {}
|
apps/desktop-e2e: {}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user