Skip to content

Commit 67d4eed

Browse files
erickzhaoClaude
andauthored
fix: replace extract-zip with @electron-internal/extract-zip (#120)
* fix: replace extract-zip with @electron-internal/extract-zip Swap the extract-zip dependency for the @electron-internal/extract-zip drop-in replacement, switch to its named { extract } export, update import specifiers, and allowlist the @electron-internal/* scope in the npm age gate. Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> * bump --------- Co-authored-by: Claude <svc-devxp-claude@slack-corp.com>
1 parent abf5e3d commit 67d4eed

4 files changed

Lines changed: 13 additions & 108 deletions

File tree

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ npmMinimalAgeGate: 10080
66

77
npmPreapprovedPackages:
88
- "@electron/*"
9+
- "@electron-internal/*"
910

1011
yarnPath: .yarn/releases/yarn-4.10.3.cjs

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"prepare": "husky"
2424
},
2525
"devDependencies": {
26+
"@electron-internal/extract-zip": "^1.0.2",
2627
"@electron/get": "^4.0.2",
2728
"@electron/universal": "^3.0.1",
2829
"@tsconfig/node22": "^22.0.2",
2930
"@types/node": "~22.10.7",
30-
"extract-zip": "^2.0.1",
3131
"husky": "^9.1.7",
3232
"lint-staged": "^16.1.2",
3333
"oxfmt": "^0.44.0",

test/helpers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { downloadArtifact } from '@electron/get';
2-
import extractZip from 'extract-zip';
2+
import { extract } from '@electron-internal/extract-zip';
33
import { promises as fs } from 'node:fs';
44
import os from 'node:os';
55
import path from 'node:path';
@@ -33,7 +33,7 @@ export async function getElectronLocally(version: string, platform: string, arch
3333
artifactName: 'electron',
3434
});
3535
const tmpDir = await getTmpDir();
36-
await extractZip(electronZip, {
36+
await extract(electronZip, {
3737
dir: tmpDir,
3838
});
3939

yarn.lock

Lines changed: 9 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ __metadata:
55
version: 8
66
cacheKey: 10c0
77

8+
"@electron-internal/extract-zip@npm:^1.0.2":
9+
version: 1.0.2
10+
resolution: "@electron-internal/extract-zip@npm:1.0.2"
11+
checksum: 10c0/278455b486a6be7e04c4113fc19a5cc696151a19c32c62c63cf9e03ec2db95dcd32aafeaf3deac1d4e152442da9ff8e86914de9f17431f11071d62e171dc17a4
12+
languageName: node
13+
linkType: hard
14+
815
"@electron/asar@npm:^4.0.0":
916
version: 4.0.0
1017
resolution: "@electron/asar@npm:4.0.0"
@@ -22,11 +29,11 @@ __metadata:
2229
version: 0.0.0-use.local
2330
resolution: "@electron/fuses@workspace:."
2431
dependencies:
32+
"@electron-internal/extract-zip": "npm:^1.0.2"
2533
"@electron/get": "npm:^4.0.2"
2634
"@electron/universal": "npm:^3.0.1"
2735
"@tsconfig/node22": "npm:^22.0.2"
2836
"@types/node": "npm:~22.10.7"
29-
extract-zip: "npm:^2.0.1"
3037
husky: "npm:^9.1.7"
3138
lint-staged: "npm:^16.1.2"
3239
oxfmt: "npm:^0.44.0"
@@ -724,7 +731,7 @@ __metadata:
724731
languageName: node
725732
linkType: hard
726733

727-
"@types/node@npm:*, @types/node@npm:~22.10.7":
734+
"@types/node@npm:~22.10.7":
728735
version: 22.10.10
729736
resolution: "@types/node@npm:22.10.10"
730737
dependencies:
@@ -740,15 +747,6 @@ __metadata:
740747
languageName: node
741748
linkType: hard
742749

743-
"@types/yauzl@npm:^2.9.1":
744-
version: 2.10.0
745-
resolution: "@types/yauzl@npm:2.10.0"
746-
dependencies:
747-
"@types/node": "npm:*"
748-
checksum: 10c0/e917cf11c78e9ca7d037d0e6e0d6d5d99443d9d7201f8f1a556f02a2bc57ae457487e9bfec89dfa848d16979b35de6e5b34840d4d0bb9e5f33849d077ac15154
749-
languageName: node
750-
linkType: hard
751-
752750
"@vitest/expect@npm:4.1.2":
753751
version: 4.1.2
754752
resolution: "@vitest/expect@npm:4.1.2"
@@ -950,13 +948,6 @@ __metadata:
950948
languageName: node
951949
linkType: hard
952950

953-
"buffer-crc32@npm:~0.2.3":
954-
version: 0.2.13
955-
resolution: "buffer-crc32@npm:0.2.13"
956-
checksum: 10c0/cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150
957-
languageName: node
958-
linkType: hard
959-
960951
"cacheable-lookup@npm:^7.0.0":
961952
version: 7.0.0
962953
resolution: "cacheable-lookup@npm:7.0.0"
@@ -1164,15 +1155,6 @@ __metadata:
11641155
languageName: node
11651156
linkType: hard
11661157

1167-
"end-of-stream@npm:^1.1.0":
1168-
version: 1.4.4
1169-
resolution: "end-of-stream@npm:1.4.4"
1170-
dependencies:
1171-
once: "npm:^1.4.0"
1172-
checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975
1173-
languageName: node
1174-
linkType: hard
1175-
11761158
"entities@npm:^4.4.0":
11771159
version: 4.5.0
11781160
resolution: "entities@npm:4.5.0"
@@ -1238,32 +1220,6 @@ __metadata:
12381220
languageName: node
12391221
linkType: hard
12401222

1241-
"extract-zip@npm:^2.0.1":
1242-
version: 2.0.1
1243-
resolution: "extract-zip@npm:2.0.1"
1244-
dependencies:
1245-
"@types/yauzl": "npm:^2.9.1"
1246-
debug: "npm:^4.1.1"
1247-
get-stream: "npm:^5.1.0"
1248-
yauzl: "npm:^2.10.0"
1249-
dependenciesMeta:
1250-
"@types/yauzl":
1251-
optional: true
1252-
bin:
1253-
extract-zip: cli.js
1254-
checksum: 10c0/9afbd46854aa15a857ae0341a63a92743a7b89c8779102c3b4ffc207516b2019337353962309f85c66ee3d9092202a83cdc26dbf449a11981272038443974aee
1255-
languageName: node
1256-
linkType: hard
1257-
1258-
"fd-slicer@npm:~1.1.0":
1259-
version: 1.1.0
1260-
resolution: "fd-slicer@npm:1.1.0"
1261-
dependencies:
1262-
pend: "npm:~1.2.0"
1263-
checksum: 10c0/304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e
1264-
languageName: node
1265-
linkType: hard
1266-
12671223
"fdir@npm:^6.5.0":
12681224
version: 6.5.0
12691225
resolution: "fdir@npm:6.5.0"
@@ -1342,15 +1298,6 @@ __metadata:
13421298
languageName: node
13431299
linkType: hard
13441300

1345-
"get-stream@npm:^5.1.0":
1346-
version: 5.2.0
1347-
resolution: "get-stream@npm:5.2.0"
1348-
dependencies:
1349-
pump: "npm:^3.0.0"
1350-
checksum: 10c0/43797ffd815fbb26685bf188c8cfebecb8af87b3925091dd7b9a9c915993293d78e3c9e1bce125928ff92f2d0796f3889b92b5ec6d58d1041b574682132e0a80
1351-
languageName: node
1352-
linkType: hard
1353-
13541301
"get-stream@npm:^9.0.1":
13551302
version: 9.0.1
13561303
resolution: "get-stream@npm:9.0.1"
@@ -1907,15 +1854,6 @@ __metadata:
19071854
languageName: node
19081855
linkType: hard
19091856

1910-
"once@npm:^1.3.1, once@npm:^1.4.0":
1911-
version: 1.4.0
1912-
resolution: "once@npm:1.4.0"
1913-
dependencies:
1914-
wrappy: "npm:1"
1915-
checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0
1916-
languageName: node
1917-
linkType: hard
1918-
19191857
"onetime@npm:^7.0.0":
19201858
version: 7.0.0
19211859
resolution: "onetime@npm:7.0.0"
@@ -2143,13 +2081,6 @@ __metadata:
21432081
languageName: node
21442082
linkType: hard
21452083

2146-
"pend@npm:~1.2.0":
2147-
version: 1.2.0
2148-
resolution: "pend@npm:1.2.0"
2149-
checksum: 10c0/8a87e63f7a4afcfb0f9f77b39bb92374afc723418b9cb716ee4257689224171002e07768eeade4ecd0e86f1fa3d8f022994219fb45634f2dbd78c6803e452458
2150-
languageName: node
2151-
linkType: hard
2152-
21532084
"picocolors@npm:^1.1.1":
21542085
version: 1.1.1
21552086
resolution: "picocolors@npm:1.1.1"
@@ -2209,16 +2140,6 @@ __metadata:
22092140
languageName: node
22102141
linkType: hard
22112142

2212-
"pump@npm:^3.0.0":
2213-
version: 3.0.0
2214-
resolution: "pump@npm:3.0.0"
2215-
dependencies:
2216-
end-of-stream: "npm:^1.1.0"
2217-
once: "npm:^1.3.1"
2218-
checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
2219-
languageName: node
2220-
linkType: hard
2221-
22222143
"punycode.js@npm:^2.3.1":
22232144
version: 2.3.1
22242145
resolution: "punycode.js@npm:2.3.1"
@@ -2813,13 +2734,6 @@ __metadata:
28132734
languageName: node
28142735
linkType: hard
28152736

2816-
"wrappy@npm:1":
2817-
version: 1.0.2
2818-
resolution: "wrappy@npm:1.0.2"
2819-
checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0
2820-
languageName: node
2821-
linkType: hard
2822-
28232737
"xmlbuilder@npm:^15.1.1":
28242738
version: 15.1.1
28252739
resolution: "xmlbuilder@npm:15.1.1"
@@ -2836,16 +2750,6 @@ __metadata:
28362750
languageName: node
28372751
linkType: hard
28382752

2839-
"yauzl@npm:^2.10.0":
2840-
version: 2.10.0
2841-
resolution: "yauzl@npm:2.10.0"
2842-
dependencies:
2843-
buffer-crc32: "npm:~0.2.3"
2844-
fd-slicer: "npm:~1.1.0"
2845-
checksum: 10c0/f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422
2846-
languageName: node
2847-
linkType: hard
2848-
28492753
"yocto-queue@npm:^0.1.0":
28502754
version: 0.1.0
28512755
resolution: "yocto-queue@npm:0.1.0"

0 commit comments

Comments
 (0)