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

Don't prepend node_modules/meteor/<package>/ for npm/... directories.

Browse Source
This commit is contained in:
Ben Newman
2016-09-22 12:23:24 -04:00
parent bbac272530
commit 726074689e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/static-assets/server/npm-require.js
View File

@@ -76,9 +76,15 @@ function registerNodeModules(name, node_modules) {
parts.forEach(function (part, i) {
if (part === "npm") {
addByParts(parts.slice(i + 1), node_modules);
} else if (part === ".npm") {
if (name) {
parts.unshift("node_modules", "meteor", name);
}
if (parts[i + 1] === "package") {
addByParts(parts.slice(i + 2), node_modules);
} else if (parts[i + 1] === "plugin") {
assert.strictEqual(parts[i + 2], name);
addByParts(parts.slice(i + 3), node_modules);
@@ -100,12 +106,10 @@ function registerNodeModules(name, node_modules) {
assert.notEqual(parts[0], "");
assert.notEqual(parts[0], "..");
if (name) {
parts.unshift("node_modules", "meteor", name);
}
// Ensure a leading / character.
parts.unshift("");
if (parts[0].length > 0) {
parts.unshift("");
}
nodeModulesRegistry[parts.join("/")] = absPath;
}