From a97e1108200e7ab8a6c20b072447bdd86a5ef83a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 2 May 2025 12:53:10 +0300 Subject: [PATCH] Revert "chore(monorepo): use hoisted pattern as it might help signing" This reverts commit 762da51183c85c2608d2defa5ece720f6a349091. --- apps/desktop/webpack.config.cjs | 4 ++-- apps/server/webpack.config.cjs | 2 +- pnpm-workspace.yaml | 32 ++++++++++++++++---------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs index 90b9d03ce..5ee7194db 100644 --- a/apps/desktop/webpack.config.cjs +++ b/apps/desktop/webpack.config.cjs @@ -42,11 +42,11 @@ module.exports = { to: join(outputDir, "assets") }, { - from: "../../node_modules/@electron/remote", + from: "node_modules/@electron/remote", to: join(outputDir, "node_modules/@electron/remote") }, { - from: "../../node_modules/prebuild-install", + from: "node_modules/prebuild-install", to: join(outputDir, "node_modules/better-sqlite3/node_modules/prebuild-install") }, { diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs index 52b68568b..1b68537b8 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-workspace.yaml b/pnpm-workspace.yaml index 96d373b37..4ce2e4d5a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,22 +1,22 @@ packages: -- packages/* -- apps/* + - packages/* + - apps/* ignoredBuiltDependencies: -- '@parcel/watcher' -- '@scarf/scarf' -- '@swc/core' -- bufferutil -- core-js-pure -- esbuild -- nx -- utf-8-validate + - '@parcel/watcher' + - '@scarf/scarf' + - '@swc/core' + - bufferutil + - core-js-pure + - esbuild + - nx + - utf-8-validate onlyBuiltDependencies: -- better-sqlite3 -- electron -- electron-winstaller -- fs-xattr -- macos-alias + - better-sqlite3 + - electron + - electron-winstaller + - fs-xattr + - macos-alias -nodeLinker: hoisted +nodeLinker: isolated