diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 5ddbcf214..0eadb498f 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -17,7 +17,7 @@ "@electron/rebuild": "3.7.2" }, "scripts": { - "start-prod": "electron dist/main.js", + "start-prod": "nx build desktop && cross-env TRILIUM_DATA_DIR=data electron dist/main.js", "rebuild": "electron-rebuild" }, "nx": { diff --git a/apps/server/package.json b/apps/server/package.json index 2fe312fdf..eab4f025e 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -12,7 +12,6 @@ "async-mutex": "0.5.0", "axios": "1.8.4", "better-sqlite3": "11.9.1", - "bufferutil": "4.0.9", "chardet": "2.1.0", "cheerio": "1.0.0", "chokidar": "4.0.3", @@ -70,7 +69,6 @@ "tmp": "0.2.3", "turndown": "7.2.0", "unescape": "1.0.1", - "utf-8-validate": "6.0.5", "webpack": "5.99.6", "ws": "8.18.1", "xml2js": "0.6.2", diff --git a/package.json b/package.json index ad33c5742..ef10c4fa9 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "scripts": { "client:build": "nx build client", "server:build": "nx build server", - "server:start-prod": "pnpm server:build && cross-env TRILIUM_DATA_DIR=apps/server/dist/data node apps/server/dist/main.js", + "server:start-prod": "pnpm server:build && cross-env TRILIUM_DATA_DIR=apps/server/data node apps/server/dist/main.js", "electron:build": "nx build desktop" }, "private": true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f216d2859..a0165001f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -312,7 +312,7 @@ importers: version: 1.0.2 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) + version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) apps/desktop-e2e: {} @@ -345,9 +345,6 @@ importers: better-sqlite3: specifier: 11.9.1 version: 11.9.1 - bufferutil: - specifier: 4.0.9 - version: 4.0.9 chardet: specifier: 2.1.0 version: 2.1.0 @@ -519,12 +516,9 @@ importers: unescape: specifier: 1.0.1 version: 1.0.1 - utf-8-validate: - specifier: 6.0.5 - version: 6.0.5 webpack: specifier: 5.99.6 - version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) + version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) ws: specifier: 8.18.1 version: 8.18.1(bufferutil@4.0.9)(utf-8-validate@6.0.5) @@ -13858,6 +13852,7 @@ snapshots: bufferutil@4.0.9: dependencies: node-gyp-build: 4.8.4 + optional: true bundle-name@4.1.0: dependencies: @@ -14215,14 +14210,14 @@ snapshots: serialize-javascript: 6.0.2 webpack: 5.98.0(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) - copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))): + copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)): dependencies: glob-parent: 6.0.2 normalize-path: 3.0.0 schema-utils: 4.3.2 serialize-javascript: 6.0.2 tinyglobby: 0.2.13 - webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) + webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) core-js-compat@3.41.0: dependencies: @@ -17273,7 +17268,8 @@ snapshots: node-forge@1.3.1: {} - node-gyp-build@4.8.4: {} + node-gyp-build@4.8.4: + optional: true node-int64@0.4.0: {} @@ -19040,14 +19036,14 @@ snapshots: '@swc/core': 1.5.29(@swc/helpers@0.5.17) esbuild: 0.19.12 - terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))): + terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.2 serialize-javascript: 6.0.2 terser: 5.39.0 - webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) + webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.5.29(@swc/helpers@0.5.17) esbuild: 0.19.12 @@ -19383,6 +19379,7 @@ snapshots: utf-8-validate@6.0.5: dependencies: node-gyp-build: 4.8.4 + optional: true utf8-byte-length@1.0.5: {} @@ -19677,7 +19674,7 @@ snapshots: - esbuild - uglify-js - webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)): + webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -19699,7 +19696,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) + terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1940149c5..66a1595e7 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,11 +6,9 @@ ignoredBuiltDependencies: - '@parcel/watcher' - '@scarf/scarf' - '@swc/core' -- bufferutil - core-js-pure - esbuild - nx -- utf-8-validate onlyBuiltDependencies: - electron