fix(hadron-build): Provide a projectRootPath and actually pass rebuild config overrides to electron-rebuild (#2282)

gribnoysup · web-flow · commit 6be1ebc990bc · 2021-06-22T09:19:20.000+02:00
* chore: Update electron-rebuild to latest

* fix(hadron-build): Set `rebuild` option on the Target so that release tasks can have access to them

* fix(hadron-build): Set projectRootPath to the application package root so that all modules that need a rebuild can be resolved correctly
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/collection-model/package.json b/packages/collection-model/package.json
@@ -36,7 +36,7 @@
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
     "electron-mocha": "^8.2.0",
-    "electron-rebuild": "^1.8.8",
+    "electron-rebuild": "^2.3.5",
     "eslint": "^7.25.0",
     "eslint-config-mongodb-js": "^5.0.3",
     "mocha": "^7.0.0",
diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json
@@ -75,7 +75,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.9.0",
     "enzyme-adapter-react-16": "^1.11.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-app-stores/package.json b/packages/compass-app-stores/package.json
@@ -55,7 +55,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-collection-stats/package.json b/packages/compass-collection-stats/package.json
@@ -60,7 +60,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-collection/package.json b/packages/compass-collection/package.json
@@ -81,7 +81,7 @@
     "d3-timer": "1.0.7",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/compass-connect/package.json b/packages/compass-connect/package.json
@@ -66,7 +66,7 @@
     "debug": "^4.1.0",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.8.8",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-crud/package.json b/packages/compass-crud/package.json
@@ -64,7 +64,7 @@
     "css-loader": "^4.3.0",
     "depcheck": "^1.3.1",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.8.4",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.19.0",
diff --git a/packages/compass-deployment-awareness/package.json b/packages/compass-deployment-awareness/package.json
@@ -54,7 +54,7 @@
     "css-loader": "^4.3.0",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/compass-explain-plan/package.json b/packages/compass-explain-plan/package.json
@@ -77,7 +77,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.8.4",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.10.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-export-to-language/package.json b/packages/compass-export-to-language/package.json
@@ -57,7 +57,7 @@
     "debug": "^3.2.6",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.8.6",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-field-store/package.json b/packages/compass-field-store/package.json
@@ -47,7 +47,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/compass-find-in-page/package.json b/packages/compass-find-in-page/package.json
@@ -58,7 +58,7 @@
     "css-loader": "^4.3.0",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-home/package.json b/packages/compass-home/package.json
@@ -85,7 +85,7 @@
     "debug": "^3.0.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json
@@ -66,7 +66,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.8.6",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json
@@ -63,7 +63,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/compass-instance/package.json b/packages/compass-instance/package.json
@@ -58,7 +58,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/compass-metrics/package.json b/packages/compass-metrics/package.json
@@ -50,7 +50,7 @@
     "debug": "mongodb-js/debug#v2.2.3",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-query-bar/package.json b/packages/compass-query-bar/package.json
@@ -74,7 +74,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/compass-schema-validation/package.json b/packages/compass-schema-validation/package.json
@@ -74,7 +74,7 @@
     "debug": "^4.1.0",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.1",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json
@@ -66,7 +66,7 @@
     "debug": "^4.3.1",
     "depcheck": "^1.3.1",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.17.0",
diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json
@@ -79,7 +79,7 @@
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
     "electron-devtools-installer": "^3.1.1",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^7.25.0",
diff --git a/packages/compass-sidebar/package.json b/packages/compass-sidebar/package.json
@@ -61,7 +61,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/databases-collections/package.json b/packages/databases-collections/package.json
@@ -63,7 +63,7 @@
     "debug": "^4.1.1",
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^7.25.0",
diff --git a/packages/hadron-build/commands/release.js b/packages/hadron-build/commands/release.js
@@ -364,14 +364,18 @@ const transformPackageJson = (CONFIG, done) => {
  * @api public
  */
 const installDependencies = (CONFIG, done) => {
+  const appPackagePath = path.join(CONFIG.resources, 'app');
+
   var args = [
     'install',
     '--production'
   ];
+
   cli.debug('Installing dependencies');
+
   var opts = {
     env: process.env,
-    cwd: path.join(CONFIG.resources, 'app')
+    cwd: appPackagePath
   };
 
   run('npm', args, opts, function(err) {
@@ -383,7 +387,12 @@ const installDependencies = (CONFIG, done) => {
     rebuild({
       ...CONFIG.rebuild,
       electronVersion: CONFIG.packagerOptions.electronVersion,
-      buildPath: path.join(CONFIG.resources, 'app'),
+      buildPath: appPackagePath,
+      // `projectRootPath` is undocumented, but changes modules resolution quite
+      // a bit and required for the electron-rebuild to be able to pick up
+      // dependencies inside project root, but outside of their dependants (e.g.
+      // a transitive dependency that was hoisted by npm installation process)
+      projectRootPath: appPackagePath,
       force: true
     }).then(() => {
       cli.debug('Native modules rebuilt against Electron.');
diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js
@@ -134,6 +134,7 @@ class Target {
     this.channel = 'stable';
 
     this.asar = { unpack: [], ...pkg.config.hadron.asar };
+    this.rebuild = { ...pkg.config.hadron.rebuild };
 
     // extract channel from version string, e.g. `beta` for `1.3.5-beta.1`
     const mtch = this.version.match(/-([a-z]+)(\.\d+)?$/);
diff --git a/packages/hadron-build/package.json b/packages/hadron-build/package.json
@@ -35,7 +35,7 @@
     "electron-notarize": "^0.3.0",
     "electron-packager": "^14.2.0",
     "electron-packager-plugin-non-proprietary-codecs-ffmpeg": "^1.0.2",
-    "electron-rebuild": "^1.10.0",
+    "electron-rebuild": "^2.3.5",
     "execa": "^0.6.0",
     "figures": "^3.2.0",
     "flatnest": "^1.0.0",
diff --git a/packages/storage-mixin/package.json b/packages/storage-mixin/package.json
@@ -56,7 +56,7 @@
     "depcheck": "^1.4.0",
     "electron": "^6.1.12",
     "electron-mocha": "^8.1.2",
-    "electron-rebuild": "^1.8.8",
+    "electron-rebuild": "^2.3.5",
     "eslint": "^7.25.0",
     "eslint-config-mongodb-js": "^5.0.3",
     "mocha": "^7.0.0",
