Skip to content

Commit 335c388

Browse files
erikianerikian
authored
chore: update Packager (#3419)
* chore: update import * chore: update `@electron/packager` and fix types
1 parent 5fa7ff5 commit 335c388

File tree

7 files changed

+60
-48
lines changed

7 files changed

+60
-48
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@doyensec/electronegativity": "^1.9.1",
3939
"@electron/get": "^3.0.0",
4040
"@electron/osx-sign": "^1.0.5",
41-
"@electron/packager": "^18.0.0",
41+
"@electron/packager": "^18.1.2",
4242
"@electron/rebuild": "^3.2.10",
4343
"@google-cloud/storage": "^7.5.0",
4444
"@malept/cross-spawn-promise": "^2.0.0",

‎packages/api/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@electron-forge/template-webpack-typescript": "7.2.0",
5353
"@electron-forge/tracer": "7.2.0",
5454
"@electron/get": "^3.0.0",
55-
"@electron/packager": "^18.0.0",
55+
"@electron/packager": "^18.1.2",
5656
"@electron/rebuild": "^3.2.10",
5757
"@malept/cross-spawn-promise": "^2.0.0",
5858
"chalk": "^4.0.0",

‎packages/api/core/src/api/package.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { getElectronVersion, listrCompatibleRebuildHook } from '@electron-forge/
55
import { ForgeArch, ForgeListrTask, ForgeListrTaskDefinition, ForgeListrTaskFn, ForgePlatform, ResolvedForgeConfig } from '@electron-forge/shared-types';
66
import { autoTrace, delayTraceTillSignal } from '@electron-forge/tracer';
77
import { getHostArch } from '@electron/get';
8-
import packager, { FinalizePackageTargetsHookFunction, HookFunction, TargetDefinition } from '@electron/packager';
8+
import { FinalizePackageTargetsHookFunction, HookFunction, Options, packager, TargetDefinition } from '@electron/packager';
99
import chalk from 'chalk';
1010
import debug from 'debug';
1111
import glob from 'fast-glob';
@@ -297,7 +297,7 @@ export const listrPackage = (
297297

298298
type PackagerArch = Exclude<ForgeArch, 'arm'>;
299299

300-
const packageOpts: packager.Options = {
300+
const packageOpts: Options = {
301301
asar: false,
302302
overwrite: true,
303303
ignore: [/^\/out\//g],

‎packages/api/core/src/util/parse-archs.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import { ForgeArch, ForgePlatform } from '@electron-forge/shared-types';
2-
3-
// TODO: convert to an import statement when this is a public API
4-
// eslint-disable-next-line @typescript-eslint/no-var-requires
5-
const { allOfficialArchsForPlatformAndVersion } = require('@electron/packager/src/targets');
2+
import { allOfficialArchsForPlatformAndVersion, SupportedPlatform } from '@electron/packager';
63

74
export default function parseArchs(platform: ForgePlatform | string, declaredArch: ForgeArch | 'all' | string, electronVersion: string): ForgeArch[] {
85
if (declaredArch === 'all') {
9-
return allOfficialArchsForPlatformAndVersion(platform, electronVersion) || ['x64'];
6+
return allOfficialArchsForPlatformAndVersion(platform as SupportedPlatform, electronVersion) || ['x64'];
107
}
118

129
return declaredArch.split(',') as ForgeArch[];

‎packages/plugin/webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"test": "xvfb-maybe mocha --config ../../../.mocharc.js test/**/*_spec.ts test/*_spec.ts"
1212
},
1313
"devDependencies": {
14-
"@electron/packager": "^18.0.0",
14+
"@electron/packager": "^18.1.2",
1515
"@malept/cross-spawn-promise": "^2.0.0",
1616
"@types/node": "^18.0.3",
1717
"chai": "^4.3.3",

‎packages/utils/types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"typings": "dist/index.d.ts",
1010
"dependencies": {
1111
"@electron-forge/tracer": "7.2.0",
12-
"@electron/packager": "^18.0.0",
12+
"@electron/packager": "^18.1.2",
1313
"@electron/rebuild": "^3.2.10",
1414
"listr2": "^5.0.3"
1515
},

‎yarn.lock

+52-37
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,15 @@
969969
optionalDependencies:
970970
"@types/glob" "^7.1.1"
971971

972+
"@electron/asar@^3.2.7":
973+
version "3.2.8"
974+
resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.8.tgz#2ea722f3452583dbd4ffdcc4b4f5dc903f1d8178"
975+
integrity sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==
976+
dependencies:
977+
commander "^5.0.0"
978+
glob "^7.1.6"
979+
minimatch "^3.0.4"
980+
972981
"@electron/fuses@>=1.0.0":
973982
version "1.6.1"
974983
resolved "https://registry.yarnpkg.com/@electron/fuses/-/fuses-1.6.1.tgz#c639e018202a59e3cd8911fa943e22c63dd3e6fc"
@@ -1034,16 +1043,17 @@
10341043
minimist "^1.2.6"
10351044
plist "^3.0.5"
10361045

1037-
"@electron/packager@^18.0.0":
1038-
version "18.0.0"
1039-
resolved "https://registry.yarnpkg.com/@electron/packager/-/packager-18.0.0.tgz#073e2b82be44b1bd5e186992ad92f9e41461aad4"
1040-
integrity sha512-OihHRTSkMiAuiZISN8h6azFRXgWqLWY/S1OpGru3sBB9Q4lQ0gD3WbqP7MSpFKEFcOozDvIB4LZUyAsfJIRQBg==
1046+
"@electron/packager@^18.1.2":
1047+
version "18.1.2"
1048+
resolved "https://registry.yarnpkg.com/@electron/packager/-/packager-18.1.2.tgz#8d7d4f8918deea2bda833a6b5ac1ecea283080be"
1049+
integrity sha512-2W5TBNnY+AAx1SMxcawNk1h3blCb8zCmOsatruBCaCYmU+HHzugZ6WgyKXdaaywnLE6OMRQN11Qp5xVpZCgppg==
10411050
dependencies:
10421051
"@electron/asar" "^3.2.1"
10431052
"@electron/get" "^3.0.0"
10441053
"@electron/notarize" "^2.1.0"
10451054
"@electron/osx-sign" "^1.0.5"
1046-
"@electron/universal" "^1.3.2"
1055+
"@electron/universal" "^2.0.1"
1056+
"@electron/windows-sign" "^1.0.0"
10471057
cross-spawn-windows-exe "^1.2.0"
10481058
debug "^4.0.1"
10491059
extract-zip "^2.0.0"
@@ -1079,18 +1089,27 @@
10791089
tar "^6.0.5"
10801090
yargs "^17.0.1"
10811091

1082-
"@electron/universal@^1.3.2":
1083-
version "1.3.4"
1084-
resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777"
1085-
integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==
1092+
"@electron/universal@^2.0.1":
1093+
version "2.0.1"
1094+
resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-2.0.1.tgz#7b070ab355e02957388f3dbd68e2c3cd08c448ae"
1095+
integrity sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==
10861096
dependencies:
1087-
"@electron/asar" "^3.2.1"
1088-
"@malept/cross-spawn-promise" "^1.1.0"
1097+
"@electron/asar" "^3.2.7"
1098+
"@malept/cross-spawn-promise" "^2.0.0"
10891099
debug "^4.3.1"
1090-
dir-compare "^3.0.0"
1091-
fs-extra "^9.0.1"
1092-
minimatch "^3.0.4"
1093-
plist "^3.0.4"
1100+
dir-compare "^4.2.0"
1101+
fs-extra "^11.1.1"
1102+
minimatch "^9.0.3"
1103+
plist "^3.1.0"
1104+
1105+
"@electron/windows-sign@^1.0.0":
1106+
version "1.0.0"
1107+
resolved "https://registry.yarnpkg.com/@electron/windows-sign/-/windows-sign-1.0.0.tgz#f08a0a5d4b96840ab637ce11228a59ee8b665287"
1108+
integrity sha512-sdkQYAR/TQCEyYgz2jMbusL/ljdj6qA7vyIm/S9HICMAitXhXROFHUOLLgiORj1uiaf2EOB2U33DatGubUuZaQ==
1109+
dependencies:
1110+
debug "^4.3.4"
1111+
fs-extra "^11.1.1"
1112+
minimist "^1.2.8"
10941113

10951114
"@esbuild/[email protected]":
10961115
version "0.16.17"
@@ -4121,11 +4140,6 @@ [email protected]:
41214140
resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
41224141
integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
41234142

4124-
buffer-equal@^1.0.0:
4125-
version "1.0.1"
4126-
resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
4127-
integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
4128-
41294143
buffer-from@^1.0.0:
41304144
version "1.1.2"
41314145
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -5166,13 +5180,13 @@ diff@^4.0.1:
51665180
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
51675181
integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
51685182

5169-
dir-compare@^3.0.0:
5170-
version "3.3.0"
5171-
resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416"
5172-
integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==
5183+
dir-compare@^4.2.0:
5184+
version "4.2.0"
5185+
resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-4.2.0.tgz#d1d4999c14fbf55281071fdae4293b3b9ce86f19"
5186+
integrity sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==
51735187
dependencies:
5174-
buffer-equal "^1.0.0"
5175-
minimatch "^3.0.4"
5188+
minimatch "^3.0.5"
5189+
p-limit "^3.1.0 "
51765190

51775191
dir-glob@^3.0.1:
51785192
version "3.0.1"
@@ -6760,6 +6774,15 @@ fs-extra@^11.1.0:
67606774
jsonfile "^6.0.1"
67616775
universalify "^2.0.0"
67626776

6777+
fs-extra@^11.1.1:
6778+
version "11.2.0"
6779+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
6780+
integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
6781+
dependencies:
6782+
graceful-fs "^4.2.0"
6783+
jsonfile "^6.0.1"
6784+
universalify "^2.0.0"
6785+
67636786
fs-extra@^7.0.0, fs-extra@^7.0.1:
67646787
version "7.0.1"
67656788
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -9393,7 +9416,7 @@ minimatch@^8.0.2:
93939416
dependencies:
93949417
brace-expansion "^2.0.1"
93959418

9396-
minimatch@^9.0.0, minimatch@^9.0.1:
9419+
minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3:
93979420
version "9.0.3"
93989421
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
93999422
integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
@@ -10329,7 +10352,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
1032910352
dependencies:
1033010353
p-try "^2.0.0"
1033110354

10332-
p-limit@^3.0.1, p-limit@^3.0.2:
10355+
p-limit@^3.0.1, p-limit@^3.0.2, "p-limit@^3.1.0 ":
1033310356
version "3.1.0"
1033410357
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
1033510358
integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -10751,15 +10774,7 @@ plist@^3.0.0:
1075110774
base64-js "^1.5.1"
1075210775
xmlbuilder "^9.0.7"
1075310776

10754-
plist@^3.0.4:
10755-
version "3.0.6"
10756-
resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
10757-
integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==
10758-
dependencies:
10759-
base64-js "^1.5.1"
10760-
xmlbuilder "^15.1.1"
10761-
10762-
plist@^3.0.5:
10777+
plist@^3.0.5, plist@^3.1.0:
1076310778
version "3.1.0"
1076410779
resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
1076510780
integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==

0 commit comments

Comments
 (0)