diff --git a/apps/server/pnpm-workspace.yaml b/apps/server/pnpm-workspace.yaml deleted file mode 100644 index 281a35cf0..000000000 --- a/apps/server/pnpm-workspace.yaml +++ /dev/null @@ -1,3 +0,0 @@ -nodeLinker: isolated -onlyBuiltDependencies: - - better-sqlite3 diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs index f98f1a0cd..bf11995ae 100644 --- a/apps/server/webpack.config.cjs +++ b/apps/server/webpack.config.cjs @@ -36,7 +36,7 @@ function buildFilesToCopy() { for (const nodePath of nodePaths) { files.push({ - from: join("..", "..", "node_modules", nodePath), + from: join("node_modules", nodePath), to: join(outputDir, "node_modules", nodePath) }) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index efa2194e3..bd7a80b1e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -288,6 +288,9 @@ importers: '@electron/remote': specifier: 2.1.2 version: 2.1.2(electron@35.1.5) + '@highlightjs/cdn-assets': + specifier: 11.11.1 + version: 11.11.1 better-sqlite3: specifier: ^11.9.1 version: 11.9.1 @@ -300,6 +303,12 @@ importers: electron-squirrel-startup: specifier: 1.0.1 version: 1.0.1 + jquery-hotkeys: + specifier: 0.2.2 + version: 0.2.2 + jquery.fancytree: + specifier: 2.38.5 + version: 2.38.5(jquery@3.7.1) devDependencies: '@electron-forge/cli': specifier: 7.8.0 @@ -348,9 +357,18 @@ importers: apps/server: dependencies: + '@highlightjs/cdn-assets': + specifier: 11.11.1 + version: 11.11.1 better-sqlite3: specifier: 11.9.1 version: 11.9.1 + jquery-hotkeys: + specifier: 0.2.2 + version: 0.2.2 + jquery.fancytree: + specifier: 2.38.5 + version: 2.38.5(jquery@3.7.1) devDependencies: '@anthropic-ai/sdk': specifier: 0.39.0 @@ -364,9 +382,6 @@ importers: '@excalidraw/excalidraw': specifier: 0.18.0 version: 0.18.0(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@16.14.0))(react@16.14.0) - '@highlightjs/cdn-assets': - specifier: 11.11.1 - version: 11.11.1 '@triliumnext/commons': specifier: workspace:* version: link:../../packages/commons @@ -598,12 +613,6 @@ importers: jquery: specifier: 3.7.1 version: 3.7.1 - jquery-hotkeys: - specifier: 0.2.2 - version: 0.2.2 - jquery.fancytree: - specifier: 2.38.5 - version: 2.38.5(jquery@3.7.1) js-yaml: specifier: 4.1.0 version: 4.1.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 811cc3805..dd6bc24aa 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -14,6 +14,3 @@ onlyBuiltDependencies: - better-sqlite3 - electron - electron-winstaller - -nodeLinker: hoisted -symlink: false \ No newline at end of file