diff --git a/.yarnrc.yml b/.yarnrc.yml index 410a0f6f98..47d78b2acf 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -10,6 +10,7 @@ npmMinimalAgeGate: 10080 npmPreapprovedPackages: - '@electron/*' + - '@electron-internal/*' - '@electron-forge/*' - 'electron' - update-electron-app diff --git a/package.json b/package.json index 44621376b1..9fb61709d3 100644 --- a/package.json +++ b/package.json @@ -47,13 +47,13 @@ "@blueprintjs/core": "^3.36.0", "@blueprintjs/popover2": "^0.12.2", "@blueprintjs/select": "^3.15.0", + "@electron-internal/extract-zip": "^1.0.5", "@electron/fiddle-core": "^2.2.0", "@octokit/rest": "^22.0.1", "@sentry/electron": "^7.12.0", "algoliasearch": "^4.12.0", "classnames": "^2.2.6", "electron-squirrel-startup": "^1.0.0", - "extract-zip": "^2.0.1", "fs-extra": "^9.1.0", "mobx": "^6.5.0", "mobx-react": "^7.3.0", diff --git a/src/main/content.ts b/src/main/content.ts index 9ace6c78d5..aceeee32ce 100644 --- a/src/main/content.ts +++ b/src/main/content.ts @@ -52,7 +52,7 @@ async function prepareTemplate(branch: string): Promise { // unzip it from the tempfile console.log(`Content: ${branch} unzipping template`); await fs.ensureDir(TEMPLATES_DIR); - const { default: extract } = await import('extract-zip'); + const { extract } = await import('@electron-internal/extract-zip'); await extract(tempfile, { dir: TEMPLATES_DIR }); // cleanup diff --git a/yarn.lock b/yarn.lock index 35b4cd3a87..95269179da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -638,6 +638,13 @@ __metadata: languageName: node linkType: hard +"@electron-internal/extract-zip@npm:^1.0.5": + version: 1.0.5 + resolution: "@electron-internal/extract-zip@npm:1.0.5" + checksum: 10c0/d3341937dcb37097fd4927b7e5dfb7cb6b1ba56a42b00d62a55a7a9bbd093545dd8c6711ab39b321b2696d968b2cc32c29ed9d60a1fa6aa1665588e03e60d4e1 + languageName: node + linkType: hard + "@electron/asar@npm:^3.2.1": version: 3.2.17 resolution: "@electron/asar@npm:3.2.17" @@ -5316,6 +5323,7 @@ __metadata: "@electron-forge/plugin-fuses": "npm:8.0.0-alpha.9" "@electron-forge/plugin-webpack": "npm:8.0.0-alpha.9" "@electron-forge/publisher-github": "npm:8.0.0-alpha.9" + "@electron-internal/extract-zip": "npm:^1.0.5" "@electron/devtron": "npm:^2.1.1" "@electron/fiddle-core": "npm:^2.2.0" "@electron/fuses": "npm:^2.1.1" @@ -5353,7 +5361,6 @@ __metadata: eslint-plugin-import: "npm:^2.27.5" eslint-plugin-react: "npm:^7.32.2" eslint-plugin-tsdoc: "npm:^0.3.0" - extract-zip: "npm:^2.0.1" fork-ts-checker-webpack-plugin: "npm:^8.0.0" fs-extra: "npm:^9.1.0" husky: "npm:^9.0.11"