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

Fix InputFile.prototype.require on Windows.

Browse Source 
Fixes #7098.
This commit is contained in:
Ben Newman
2016-05-22 21:28:51 -04:00
parent 2f3269f59c
commit 8395c7b832
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/isobuild/compiler-plugin.js
View File

@@ -311,10 +311,12 @@ class InputFile extends buildPluginModule.InputFile {
}
const sourceBatch = this._resourceSlot.packageSourceBatch;
const parentId = files.convertToPosixPath(files.pathJoin(
const parentPath = files.convertToOSPath(files.pathJoin(
sourceBatch.sourceRoot,
this.getPathInPackage()
));
// Absolute CommonJS module identifier of the parent module.
const parentId = files.convertToPosixPath(parentPath, true);
const Module = module.constructor;
const parent = new Module(parentId);
@@ -322,25 +324,31 @@ class InputFile extends buildPluginModule.InputFile {
// that it could potentially be found in a node_modules directory.
const isTopLevelId = "./".indexOf(id.charAt(0)) < 0;
if (isTopLevelId) {
parent.paths = [];
const nmds = sourceBatch.unibuild.nodeModulesDirectories;
const osPaths = Object.create(null);
const nonLocalPaths = [];
// Add any local node_modules directory paths that are both ancestors
// of this file and included in this PackageSourceBatch.
Module._nodeModulePaths(parentId).forEach(path => {
if (_.has(nmds, path.replace(/\/*$/, "/")) ||
_.has(nmds, path.replace(/\/+$/, ""))) {
_.each(nmds, (nmd, path) => {
path = files.convertToOSPath(path.replace(/\/$/g, ""));
osPaths[path] = true;
if (! nmd.local) {
nonLocalPaths.push(path);
}
});
parent.paths = [];
// Add any local node_modules directory paths that are both
// ancestors of this file and included in this PackageSourceBatch.
Module._nodeModulePaths(parentPath).forEach(path => {
if (_.has(osPaths, path)) {
parent.paths.push(path);
}
});
// Now add any non-local node_modules directories that are used by
// this PackageSourceBatch.
_.each(nmds, (nmd, path) => {
if (! nmd.local) {
parent.paths.push(path);
}
});
parent.paths.push(...nonLocalPaths);
}
return this._resolveCache[id] =