Skip to content

Commit 3d0a795

Browse files
authored
fix(msix): don't generate devcert (#1963)
* fix(msix): don't generate devcert * lockfile
1 parent 1fa89a9 commit 3d0a795

3 files changed

Lines changed: 30 additions & 2 deletions

File tree

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/lib/utils.js b/lib/utils.js
2+
index 4a88a7ea32cf4191261149d5fe98dcfd638eaa25..d37f22356a8e7480e81b4a003168ca52932b1a63 100644
3+
--- a/lib/utils.js
4+
+++ b/lib/utils.js
5+
@@ -251,7 +251,7 @@ const makeProgramOptions = async (options, manifestVars) => {
6+
let cert_pfx = windowsSignOptions?.certificateFile || '';
7+
let cert_cer = '';
8+
let cert_pass = '';
9+
- const createDevCert = sign && !options.windowsSignOptions?.certificateFile && !process.env.WINDOWS_CERTIFICATE_FILE;
10+
+ const createDevCert = sign && !options.windowsSignOptions && !process.env.WINDOWS_CERTIFICATE_FILE;
11+
if (sign) {
12+
windowsSignOptions = options.windowsSignOptions || { files: [msix], certificateFile: '', certificatePassword: '', hashes: ["sha256"] };
13+
cert_pass = windowsSignOptions?.certificatePassword || process.env.WINDOWS_CERTIFICATE_PASSWORD || generatePassword();

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@
157157
},
158158
"resolutions": {
159159
"@electron-forge/maker-base": "8.0.0-alpha.9",
160-
"@electron-forge/shared-types": "8.0.0-alpha.9"
160+
"@electron-forge/shared-types": "8.0.0-alpha.9",
161+
"electron-windows-msix@npm:^2.0.4": "patch:electron-windows-msix@npm%3A2.0.4#~/.yarn/patches/electron-windows-msix-npm-2.0.4-954aec946e.patch"
161162
},
162163
"packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
163164
"dependenciesMeta": {

yarn.lock

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5473,7 +5473,7 @@ __metadata:
54735473
languageName: node
54745474
linkType: hard
54755475

5476-
"electron-windows-msix@npm:^2.0.4":
5476+
"electron-windows-msix@npm:2.0.4":
54775477
version: 2.0.4
54785478
resolution: "electron-windows-msix@npm:2.0.4"
54795479
dependencies:
@@ -5487,6 +5487,20 @@ __metadata:
54875487
languageName: node
54885488
linkType: hard
54895489

5490+
"electron-windows-msix@patch:electron-windows-msix@npm%3A2.0.4#~/.yarn/patches/electron-windows-msix-npm-2.0.4-954aec946e.patch":
5491+
version: 2.0.4
5492+
resolution: "electron-windows-msix@patch:electron-windows-msix@npm%3A2.0.4#~/.yarn/patches/electron-windows-msix-npm-2.0.4-954aec946e.patch::version=2.0.4&hash=377b6a"
5493+
dependencies:
5494+
"@electron/windows-sign": "npm:^1.2.2"
5495+
"@malept/cross-spawn-promise": "npm:^2.0.0"
5496+
chalk: "npm:^3.0.0"
5497+
debug: "npm:^4.4.1"
5498+
fs-extra: "npm:^11.2.0"
5499+
xml-escape: "npm:^1.1.0"
5500+
checksum: 10c0/3368a134b228b747e683a5b014641959e857b8d6c88f34ab0d3737d38f87af4524c9fdb37a70e7334b9c6f0dbe62c61d279cd9265178e9710f09e62c36ab736b
5501+
languageName: node
5502+
linkType: hard
5503+
54905504
"electron-winstaller@npm:^5.3.0":
54915505
version: 5.3.1
54925506
resolution: "electron-winstaller@npm:5.3.1"

0 commit comments

Comments
 (0)