Commit 4b0982c

authored

fix: safer electron version parsing for electron-builder command (#2673)

1 parent 9b15695 commit 4b0982cCopy full SHA for 4b0982c

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,14 @@ const { isNightly, isRelease } = require('./utils');`
`6`	`6`
`7`	`7`	`async function run() {`
`8`	`8`	`/** @type {string} */`
`9`		`- const electronVersion =`
	`9`	`+ const rawElectronVersion =`
`10`	`10`	`require('../package.json').devDependencies['electron'];`
	`11`	`+ const electronVersion = semver.clean(rawElectronVersion.replace(/^\^/, ''));`
	`12`	`+ if (!electronVersion) {`
	`13`	`+ throw new Error(`
	`14`	+ `Electron semver validation failed for version: '${rawElectronVersion}'.`
	`15`	`+ );`
	`16`	`+ }`
`11`	`17`	`const platform = electronPlatform();`
`12`	`18`	`const version = await getVersion();`
`13`	`19`	`/** @type {string\|unknown} */`
`@@ -18,7 +24,7 @@ async function run() {`
`18`	`24`	`'--publish',`
`19`	`25`	`'never',`
`20`	`26`	`'-c.electronVersion',`
`21`		`- semver.clean(electronVersion.replace(/^\^/,'')),`
	`27`	`+ electronVersion,`
`22`	`28`	`'-c.extraMetadata.version',`
`23`	`29`	`version,`
`24`	`30`	// overrides the `name` in the `package.json` to keep the `localStorage` location. (https://github.com/arduino/arduino-ide/pull/2144#pullrequestreview-1554005028)

Comments

(0)