Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 22, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e72f030
chore: Update electron-rebuild to latest
gribnoysup Jun 21, 2021
e4e9d9e
fix(hadron-build): Set `rebuild` option on the Target so that release…
gribnoysup Jun 21, 2021
ef55817
fix(hadron-build): Set projectRootPath to the application package roo…
gribnoysup Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,935 changes: 479 additions & 1,456 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/collection-model/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-aggregations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-app-stores/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-collection-stats/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-collection/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-connect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-crud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-deployment-awareness/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-explain-plan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-export-to-language/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-field-store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-find-in-page/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-home/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-import-export/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-indexes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-instance/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-metrics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-query-bar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-schema-validation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-shell/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-sidebar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/databases-collections/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
13 changes: 11 additions & 2 deletions packages/hadron-build/commands/release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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.');
Expand Down
1 change: 1 addition & 0 deletions packages/hadron-build/lib/target.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+)?$/);
Expand Down
2 changes: 1 addition & 1 deletion packages/hadron-build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/storage-mixin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down