feat(deps): upgrade to electron-rebuild@^3.1.1 (#2434)

* build(deps): pin electron-notarize version due to TypeScript definition breaking change * test(core): more accurate test name
electron · Aug 10, 2021 · 6077899 · maccman · Sep 2, 2021 · malept
1 parent 81b2e37
commit 6077899
Show file tree

Hide file tree

Showing 7 changed files with 302 additions and 193 deletions.
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "debug": "^4.3.1",
     "electron-osx-sign": "^0.5.0",
     "electron-packager": "^15.0.0",
-    "electron-rebuild": "^2.3.2",
+    "electron-rebuild": "^3.1.1",
     "express": "^4.17.1",
     "express-ws": "^5.0.2",
     "fast-glob": "^3.2.7",
@@ -151,6 +151,9 @@
     "electron-winstaller": "^5.0.0",
     "electron-wix-msi": "^3.0.6"
   },
+  "resolutions": {
+    "electron-packager/electron-notarize": "<1.1.0"
+  },
   "lint-staged": {
     "*.ts": "eslint --ext .ts --fix"
   },

diff --git a/packages/api/core/package.json b/packages/api/core/package.json
@@ -56,7 +56,7 @@
     "colors": "^1.4.0",
     "debug": "^4.3.1",
     "electron-packager": "^15.0.0",
-    "electron-rebuild": "^2.3.2",
+    "electron-rebuild": "^3.1.1",
     "fast-glob": "^3.2.7",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",

diff --git a/packages/api/core/src/util/rebuild.ts b/packages/api/core/src/util/rebuild.ts
@@ -1,8 +1,7 @@
 import { asyncOra } from '@electron-forge/async-ora';
 import { ForgePlatform, ForgeArch } from '@electron-forge/shared-types';
 
-import rebuild from 'electron-rebuild';
-import { RebuildOptions } from 'electron-rebuild/lib/src/rebuild';
+import { rebuild, RebuildOptions } from 'electron-rebuild';
 
 export default async (
   buildPath: string,

diff --git a/packages/api/core/test/slow/api_spec_slow.ts b/packages/api/core/test/slow/api_spec_slow.ts
@@ -280,7 +280,7 @@ describe('Electron Forge API', () => {
       await fs.remove(path.resolve(dir, 'out'));
     });
 
-    describe('with native pre-gyp deps installed', () => {
+    describe('with prebuilt native module deps installed', () => {
       before(async () => {
         await installDeps(dir, ['ref-napi']);
       });

diff --git a/packages/utils/types/package.json b/packages/utils/types/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@electron-forge/async-ora": "6.0.0-beta.59",
     "electron-packager": "^15.0.0",
-    "electron-rebuild": "^2.3.2",
+    "electron-rebuild": "^3.1.1",
     "ora": "^5.0.0"
   },
   "engines": {

diff --git a/packages/utils/types/src/index.ts b/packages/utils/types/src/index.ts
@@ -1,7 +1,7 @@
 import { ChildProcess } from 'child_process';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { ArchOption, Options, TargetPlatform } from 'electron-packager';
-import { RebuildOptions } from 'electron-rebuild/lib/src/rebuild';
+import { RebuildOptions } from 'electron-rebuild';
 
 export type ElectronProcess = ChildProcess & { restarted: boolean };