@@ -5,6 +5,7 @@ import { fileURLToPath } from 'node:url'
5
5
import util from 'node:util'
6
6
import { packager } from '@electron/packager'
7
7
import { rebuild } from '@electron/rebuild'
8
+ import { findWorkspacePackages } from '@pnpm/workspace.find-packages'
8
9
import chalk from 'chalk'
9
10
import * as dotenv from 'dotenv'
10
11
import png2icons from 'png2icons'
@@ -70,18 +71,17 @@ async function generateAppIcon(input, icon, suffix) {
70
71
}
71
72
72
73
async function resolveWorkspacePackages ( ) {
73
- const workspacePkgs = pkg . workspaces
74
- . map ( dir => requireCommonJS ( import . meta, path . join ( path . dirname ( pkgPath ) , dir , 'package.json' ) ) )
74
+ const workspacePkgs = await findWorkspacePackages ( path . dirname ( pkgPath ) )
75
75
const prunePkg = {
76
76
...pkg ,
77
77
devDependencies : Object . assign (
78
78
{ } ,
79
- ...workspacePkgs . map ( workspace => workspace . devDependencies ) ,
79
+ ...workspacePkgs . map ( workspace => workspace . manifest . devDependencies ) ,
80
80
pkg . devDependencies ,
81
81
) ,
82
82
dependencies : Object . assign (
83
83
{ } ,
84
- ...workspacePkgs . map ( workspace => workspace . dependencies ) ,
84
+ ...workspacePkgs . map ( workspace => workspace . manifest . dependencies ) ,
85
85
pkg . dependencies ,
86
86
) ,
87
87
}
@@ -257,6 +257,6 @@ pack().then(
257
257
} ,
258
258
err => {
259
259
process . exitCode = 1
260
- logger . error ( err )
260
+ logger . error ( err . stack )
261
261
} ,
262
262
)
0 commit comments