fix: pnpm workspaces

CyanSalt · CyanSalt · commit f0b895da794d · 2024-09-10T14:31:52.000+08:00
diff --git a/build/pack.mjs b/build/pack.mjs
@@ -5,6 +5,7 @@ import { fileURLToPath } from 'node:url'
 import util from 'node:util'
 import { packager } from '@electron/packager'
 import { rebuild } from '@electron/rebuild'
+import { findWorkspacePackages } from '@pnpm/workspace.find-packages'
 import chalk from 'chalk'
 import * as dotenv from 'dotenv'
 import png2icons from 'png2icons'
@@ -70,18 +71,17 @@ async function generateAppIcon(input, icon, suffix) {
 }
 
 async function resolveWorkspacePackages() {
-  const workspacePkgs = pkg.workspaces
-    .map(dir => requireCommonJS(import.meta, path.join(path.dirname(pkgPath), dir, 'package.json')))
+  const workspacePkgs = await findWorkspacePackages(path.dirname(pkgPath))
   const prunePkg = {
     ...pkg,
     devDependencies: Object.assign(
       {},
-      ...workspacePkgs.map(workspace => workspace.devDependencies),
+      ...workspacePkgs.map(workspace => workspace.manifest.devDependencies),
       pkg.devDependencies,
     ),
     dependencies: Object.assign(
       {},
-      ...workspacePkgs.map(workspace => workspace.dependencies),
+      ...workspacePkgs.map(workspace => workspace.manifest.dependencies),
       pkg.dependencies,
     ),
   }
@@ -257,6 +257,6 @@ pack().then(
   },
   err => {
     process.exitCode = 1
-    logger.error(err)
+    logger.error(err.stack)
   },
 )
diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "@cyansalt/tsconfig": "^2.2.1",
     "@electron/packager": "^18.3.4",
     "@electron/rebuild": "^3.6.0",
+    "@pnpm/workspace.find-packages": "^4.0.10",
     "@release-it/conventional-changelog": "^8.0.1",
     "@types/fuzzaldrin-plus": "^0.6.5",
     "@types/lodash": "^4.17.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
