Skip to content

Commit f0b895d

Browse files
committed
fix: pnpm workspaces
1 parent 868d533 commit f0b895d

File tree

3 files changed

+824
-5
lines changed

3 files changed

+824
-5
lines changed

build/pack.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { fileURLToPath } from 'node:url'
55
import util from 'node:util'
66
import { packager } from '@electron/packager'
77
import { rebuild } from '@electron/rebuild'
8+
import { findWorkspacePackages } from '@pnpm/workspace.find-packages'
89
import chalk from 'chalk'
910
import * as dotenv from 'dotenv'
1011
import png2icons from 'png2icons'
@@ -70,18 +71,17 @@ async function generateAppIcon(input, icon, suffix) {
7071
}
7172

7273
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))
7575
const prunePkg = {
7676
...pkg,
7777
devDependencies: Object.assign(
7878
{},
79-
...workspacePkgs.map(workspace => workspace.devDependencies),
79+
...workspacePkgs.map(workspace => workspace.manifest.devDependencies),
8080
pkg.devDependencies,
8181
),
8282
dependencies: Object.assign(
8383
{},
84-
...workspacePkgs.map(workspace => workspace.dependencies),
84+
...workspacePkgs.map(workspace => workspace.manifest.dependencies),
8585
pkg.dependencies,
8686
),
8787
}
@@ -257,6 +257,6 @@ pack().then(
257257
},
258258
err => {
259259
process.exitCode = 1
260-
logger.error(err)
260+
logger.error(err.stack)
261261
},
262262
)

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"@cyansalt/tsconfig": "^2.2.1",
4747
"@electron/packager": "^18.3.4",
4848
"@electron/rebuild": "^3.6.0",
49+
"@pnpm/workspace.find-packages": "^4.0.10",
4950
"@release-it/conventional-changelog": "^8.0.1",
5051
"@types/fuzzaldrin-plus": "^0.6.5",
5152
"@types/lodash": "^4.17.7",

0 commit comments

Comments
 (0)