From e819facf63a70de35e99be5605baa2816baf1f2f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 24 Apr 2025 21:45:13 +0300 Subject: [PATCH] fix(monorepo/server): missing dependencies to bettersqlite --- apps/desktop/webpack.config.cjs | 6 +----- apps/server/package.json | 2 ++ apps/server/tsconfig.app.json | 2 +- apps/server/webpack.config.cjs | 12 +++++++----- pnpm-lock.yaml | 12 ++++++++++++ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs index de4f922d2..87db2ea4b 100644 --- a/apps/desktop/webpack.config.cjs +++ b/apps/desktop/webpack.config.cjs @@ -42,11 +42,7 @@ module.exports = { { from: "../server/dist/assets", to: join(outputDir, "assets") - }, - { - from: "node_modules/better-sqlite3", - to: join(outputDir, "node_modules/better-sqlite3") - }, + } ] }) ] diff --git a/apps/server/package.json b/apps/server/package.json index eab4f025e..ad03b10cf 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -12,6 +12,7 @@ "async-mutex": "0.5.0", "axios": "1.8.4", "better-sqlite3": "11.9.1", + "bindings": "1.5.0", "chardet": "2.1.0", "cheerio": "1.0.0", "chokidar": "4.0.3", @@ -31,6 +32,7 @@ "express-openid-connect": "^2.17.1", "express-rate-limit": "7.5.0", "express-session": "1.18.1", + "file-uri-to-path": "2.0.0", "fs-extra": "11.3.0", "helmet": "8.1.0", "html": "1.0.0", diff --git a/apps/server/tsconfig.app.json b/apps/server/tsconfig.app.json index a468dfc28..33d4b2474 100644 --- a/apps/server/tsconfig.app.json +++ b/apps/server/tsconfig.app.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "module": "ESNext", - "moduleResolution": "nodenext", + "moduleResolution": "bundler", "target": "ES2020", "outDir": "dist", "types": [ diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs index afe9292e8..f476ebe83 100644 --- a/apps/server/webpack.config.cjs +++ b/apps/server/webpack.config.cjs @@ -5,10 +5,7 @@ const { join, default: path } = require('path'); const outputDir = join(__dirname, 'dist'); function buildFilesToCopy() { - const files = [{ - from: "node_modules/better-sqlite3/build/Release", - to: join(outputDir, "Release") - }]; + const files = []; files.push({ from: "../client/dist", @@ -29,7 +26,12 @@ function buildFilesToCopy() { "codemirror/addon", "codemirror/mode", "codemirror/keymap", - "@highlightjs/cdn-assets" + "@highlightjs/cdn-assets", + + // Required as they are native dependencies and cannot be well bundled. + "better-sqlite3", + "bindings", + "file-uri-to-path" ]; for (const nodePath of nodePaths) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a0165001f..cc697a16e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -345,6 +345,9 @@ importers: better-sqlite3: specifier: 11.9.1 version: 11.9.1 + bindings: + specifier: 1.5.0 + version: 1.5.0 chardet: specifier: 2.1.0 version: 2.1.0 @@ -402,6 +405,9 @@ importers: express-session: specifier: 1.18.1 version: 1.18.1 + file-uri-to-path: + specifier: 2.0.0 + version: 2.0.0 fs-extra: specifier: 11.3.0 version: 11.3.0 @@ -5466,6 +5472,10 @@ packages: file-uri-to-path@1.0.0: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} + file-uri-to-path@2.0.0: + resolution: {integrity: sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==} + engines: {node: '>= 6'} + filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} @@ -15352,6 +15362,8 @@ snapshots: file-uri-to-path@1.0.0: {} + file-uri-to-path@2.0.0: {} + filelist@1.0.4: dependencies: minimatch: 5.1.6