diff --git a/.yarnrc.yml b/.yarnrc.yml index fdb215c911..410a0f6f98 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -12,3 +12,4 @@ npmPreapprovedPackages: - '@electron/*' - '@electron-forge/*' - 'electron' + - update-electron-app diff --git a/forge.config.ts b/forge.config.ts index 9deff6e69a..ec9a8bee6b 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -1,6 +1,7 @@ import * as path from 'node:path'; import { FuseV1Options, FuseVersion } from '@electron/fuses'; +import { MakerMSIX } from '@electron-forge/maker-msix'; import { FusesPlugin } from '@electron-forge/plugin-fuses'; import type { ForgeConfig } from '@electron-forge/shared-types'; @@ -141,6 +142,23 @@ const config: ForgeConfig = { : undefined, }), }, + new MakerMSIX({ + manifestVariables: { + publisher: + 'CN=OpenJS Foundation, OU=Electron, O=OpenJS Foundation, L=San Francisco, S=California, C=US, SERIALNUMBER=5579593, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.2=Delaware, OID.1.3.6.1.4.1.311.60.2.1.3=US', + publisherDisplayName: 'OpenJS Foundation', + packageIdentity: 'ElectronCommunity.ElectronFiddle', + appExecutable: 'electron-fiddle.exe', + packageDisplayName: 'Electron Fiddle', + appDisplayName: 'Electron Fiddle', + packageDescription: packageJson.description, + }, + windowsSignOptions: process.env.CERT_FINGERPRINT + ? { + signWithParams: `/sha1 ${process.env.CERT_FINGERPRINT} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256`, + } + : undefined, + }), { name: '@electron-forge/maker-zip', platforms: ['darwin'], diff --git a/package.json b/package.json index 4c8c381b43..614dcc2dde 100644 --- a/package.json +++ b/package.json @@ -70,11 +70,12 @@ "semver": "^7.3.4", "sfw": "^2.0.4", "shell-env": "^4.0.3", - "update-electron-app": "^3.0.0" + "update-electron-app": "^3.2.0" }, "devDependencies": { "@electron-forge/cli": "8.0.0-alpha.9", "@electron-forge/maker-deb": "8.0.0-alpha.9", + "@electron-forge/maker-msix": "8.0.0-alpha.9", "@electron-forge/maker-rpm": "8.0.0-alpha.9", "@electron-forge/maker-squirrel": "8.0.0-alpha.9", "@electron-forge/maker-zip": "8.0.0-alpha.9", diff --git a/yarn.lock b/yarn.lock index 794e2512f9..a7b503cf89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -483,6 +483,19 @@ __metadata: languageName: node linkType: hard +"@electron-forge/maker-msix@npm:8.0.0-alpha.9": + version: 8.0.0-alpha.9 + resolution: "@electron-forge/maker-msix@npm:8.0.0-alpha.9" + dependencies: + "@electron-forge/core-utils": "npm:8.0.0-alpha.9" + "@electron-forge/maker-base": "npm:8.0.0-alpha.9" + "@electron-forge/shared-types": "npm:8.0.0-alpha.9" + electron-windows-msix: "npm:^2.0.4" + fs-extra: "npm:^10.0.0" + checksum: 10c0/1b7cce03fb81990a6755a907d00499827091312e376c56401bae861d6eedf59712cc6986a7b19d00d1ef8ebcee296e1e5e71115c3eeba4f1d29e64ba53f6fa85 + languageName: node + linkType: hard + "@electron-forge/maker-rpm@npm:8.0.0-alpha.9": version: 8.0.0-alpha.9 resolution: "@electron-forge/maker-rpm@npm:8.0.0-alpha.9" @@ -836,7 +849,7 @@ __metadata: languageName: node linkType: hard -"@electron/windows-sign@npm:^1.1.2": +"@electron/windows-sign@npm:^1.1.2, @electron/windows-sign@npm:^1.2.2": version: 1.2.2 resolution: "@electron/windows-sign@npm:1.2.2" dependencies: @@ -4101,11 +4114,11 @@ __metadata: linkType: hard "brace-expansion@npm:^5.0.5": - version: 5.0.6 - resolution: "brace-expansion@npm:5.0.6" + version: 5.0.5 + resolution: "brace-expansion@npm:5.0.5" dependencies: balanced-match: "npm:^4.0.2" - checksum: 10c0/8c919869b90f61d533b341d3340be5ee4413232ea89b8246cbc2f38eb014f1d8182785c98a006eaf6111d02dc9eeffefdc240d5ac158625b2ed084dccd4bbf9b + checksum: 10c0/4d238e14ed4f5cc9c07285550a41cef23121ca08ba99fa9eb5b55b580dcb6bf868b8210aa10526bdc9f8dc97f33ca2a7259039c4cc131a93042beddb424c48e3 languageName: node linkType: hard @@ -5294,6 +5307,7 @@ __metadata: "@blueprintjs/select": "npm:^3.15.0" "@electron-forge/cli": "npm:8.0.0-alpha.9" "@electron-forge/maker-deb": "npm:8.0.0-alpha.9" + "@electron-forge/maker-msix": "npm:8.0.0-alpha.9" "@electron-forge/maker-rpm": "npm:8.0.0-alpha.9" "@electron-forge/maker-squirrel": "npm:8.0.0-alpha.9" "@electron-forge/maker-zip": "npm:8.0.0-alpha.9" @@ -5376,7 +5390,7 @@ __metadata: ts-loader: "npm:^9.4.4" tsx: "npm:^4.20.3" typescript: "npm:^5.8.3" - update-electron-app: "npm:^3.0.0" + update-electron-app: "npm:^3.2.0" vitest: "npm:^4.1.0" webpack: "npm:^5.104.1" dependenciesMeta: @@ -5459,6 +5473,20 @@ __metadata: languageName: node linkType: hard +"electron-windows-msix@npm:^2.0.4": + version: 2.0.4 + resolution: "electron-windows-msix@npm:2.0.4" + dependencies: + "@electron/windows-sign": "npm:^1.2.2" + "@malept/cross-spawn-promise": "npm:^2.0.0" + chalk: "npm:^3.0.0" + debug: "npm:^4.4.1" + fs-extra: "npm:^11.2.0" + xml-escape: "npm:^1.1.0" + checksum: 10c0/2fe28f34920534c45ad9e8424ce3c687862f332190df241101c72f87ea438eff7c71f313bc96f5961d2adee62ef06874d61ab8b71d044de4aaed216665f6965c + languageName: node + linkType: hard + "electron-winstaller@npm:^5.3.0": version: 5.3.1 resolution: "electron-winstaller@npm:5.3.1" @@ -5477,8 +5505,8 @@ __metadata: linkType: hard "electron@npm:^42.1.0": - version: 42.1.0 - resolution: "electron@npm:42.1.0" + version: 42.3.2 + resolution: "electron@npm:42.3.2" dependencies: "@electron/get": "npm:^5.0.0" "@types/node": "npm:^24.9.0" @@ -5486,7 +5514,7 @@ __metadata: bin: electron: cli.js install-electron: install.js - checksum: 10c0/26f3eac756714bec0a1dfe72659dcc182d9ff3b6efb4abbefea392bad41f5569af8622d426a88598d24d46bddc78d6ca86a7ed7948739ef31962fa531f0620a3 + checksum: 10c0/04d261772430bf4abad04254df372a50b86bd99ebf588e1c654be00eb2cb560079101d35b6d58f80a68fde933e0f15908d1e764464796936a8a7ff78facaf0f3 languageName: node linkType: hard @@ -6369,9 +6397,9 @@ __metadata: linkType: hard "fast-uri@npm:^3.0.1": - version: 3.1.2 - resolution: "fast-uri@npm:3.1.2" - checksum: 10c0/5b35641895959f3f7ab7a7b1b5542bded159346f25ec9f256817b206d50b64eda5828e90d605a2e2fc645c90519a7259c2bab2c942ee728c88b88e5be21b090d + version: 3.0.6 + resolution: "fast-uri@npm:3.0.6" + checksum: 10c0/74a513c2af0584448aee71ce56005185f81239eab7a2343110e5bad50c39ad4fb19c5a6f99783ead1cac7ccaf3461a6034fda89fffa2b30b6d99b9f21c2f9d29 languageName: node linkType: hard @@ -6610,6 +6638,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^11.2.0": + version: 11.3.4 + resolution: "fs-extra@npm:11.3.4" + dependencies: + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 10c0/e08276f767a62496ae97d711aaa692c6a478177f24a85979b6a2881c9db9c68b8c2ad5da0bcf92c0b2a474cea6e935ec245656441527958fd8372cb647087df0 + languageName: node + linkType: hard + "fs-extra@npm:^7.0.1": version: 7.0.1 resolution: "fs-extra@npm:7.0.1" @@ -7901,7 +7940,7 @@ __metadata: languageName: node linkType: hard -"is-url@npm:^1.1.0, is-url@npm:^1.2.4": +"is-url@npm:^1.1.0": version: 1.2.4 resolution: "is-url@npm:1.2.4" checksum: 10c0/0157a79874f8f95fdd63540e3f38c8583c2ef572661cd0693cda80ae3e42dfe8e9a4a972ec1b827f861d9a9acf75b37f7d58a37f94a8a053259642912c252bc3 @@ -12965,14 +13004,13 @@ __metadata: languageName: node linkType: hard -"update-electron-app@npm:^3.0.0": - version: 3.0.0 - resolution: "update-electron-app@npm:3.0.0" +"update-electron-app@npm:^3.2.0": + version: 3.2.0 + resolution: "update-electron-app@npm:3.2.0" dependencies: github-url-to-object: "npm:^4.0.4" - is-url: "npm:^1.2.4" ms: "npm:^2.1.1" - checksum: 10c0/5e0b9ce8fd2cbcf6ea64d8029f90d90394facf05d86c8dceda5dba79af6e21522ef4f37f212982be781f488d497882529d9b11b91174159f6567a24039c76e6a + checksum: 10c0/b8e29d384d5ae5c65705879863afe662fb5853c4350ebd8f7dab1a0c1db6413096b43d9b27a1f6215ce93d8424a8945be0b6b527f9e51cdf5201ff2b33541f90 languageName: node linkType: hard @@ -13684,6 +13722,13 @@ __metadata: languageName: node linkType: hard +"xml-escape@npm:^1.1.0": + version: 1.1.0 + resolution: "xml-escape@npm:1.1.0" + checksum: 10c0/973cef0e383c373d1ccbacbba33ac49e7f2afd60d2710ed1308e153d2aa3b3189477f79315eb10eed43b7221add040a5eab18107170b658559e4d29ce7653a76 + languageName: node + linkType: hard + "xml-name-validator@npm:^5.0.0": version: 5.0.0 resolution: "xml-name-validator@npm:5.0.0"