github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rebuild binary npm packages used by compiler plugins, too.

Browse Source 
Fixes #7297.
This commit is contained in:
Ben Newman
2016-07-11 20:40:50 -04:00
parent d732c2e649
commit f001d223fa
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/isobuild/bundler.js
View File

@@ -1953,6 +1953,9 @@ class JsImage {
ret.arch = json.arch;
// Rebuild binary npm packages if unibuild arch matches host arch.
const rebuildBinaries = archinfo.matches(archinfo.host(), ret.arch);
_.each(json.load, function (item) {
rejectBadPath(item.path);
@@ -1962,7 +1965,8 @@ class JsImage {
ret.nodeModulesDirectories,
nodeModulesDirectories =
NodeModulesDirectory.readDirsFromJSON(item.node_modules, {
sourceRoot: dir
sourceRoot: dir,
rebuildBinaries,
})
);
}

10
tools/isobuild/isopack.js
View File

@@ -1085,13 +1085,17 @@ _.extend(Isopack.prototype, {
}
});
// Rebuild binary npm packages if unibuild arch matches host arch.
const rebuildBinaries = archinfo.matches(
archinfo.host(),
unibuildMeta.arch
);
const nodeModulesDirectories = bundler.NodeModulesDirectory
.readDirsFromJSON(unibuildJson.node_modules, {
packageName: self.name,
sourceRoot: unibuildBasePath,
// Rebuild binaries if unibuild arch matches host arch.
rebuildBinaries: archinfo.matches(
archinfo.host(), unibuildMeta.arch)
rebuildBinaries,
});
self.unibuilds.push(new Unibuild(self, {