fix: Fix support for scoped dependencies

medikoo · Mar 24, 2020 · 543a3a5 · 543a3a5
1 parent 75f766d
commit 543a3a5
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 5 deletions.
diff --git a/lib/find-package-root.js b/lib/find-package-root.js
@@ -19,7 +19,12 @@ module.exports = memoize(
 							const parent = dirname(path);
 							if (parent === path) return null;
 							if (basename(parent) === "node_modules") return path;
-							return module.exports(parent);
+							return module.exports(parent)(result => {
+								if (result !== parent || !basename(parent).startsWith("@")) {
+									return result;
+								}
+								return path;
+							});
 						}
 				  )
 		),

diff --git a/lib/parser.js b/lib/parser.js
@@ -36,6 +36,7 @@ if (!isValue(sep)) {
 	throw new Error("Unsupported Node version. Please upgrade, Webmake needs at least Node v0.8");
 }
 const dirEndMatch = new RegExp(`(?:^|/|\\${ sep })\\.*$`, "u");
+const packageNamePattern = /(@[^/]+\/[^/]+|[^@/][^/]*)(?:\/|$)/u;
 
 const cssDeps = [
 	{
@@ -481,7 +482,7 @@ const parser = {
 		const org = dep.value, lScope = scope;
 		let filename = join(dep.value), tree, currentRequire, main, path, ext;
 
-		const [name] = filename.split(sep, 1);
+		const [, name] = filename.match(packageNamePattern);
 		return deferred.promisifySync(() => {
 			// If already processed, return result
 			if (this.modules[name]) return this.modules[name];

diff --git a/lib/webmake.tpl b/lib/webmake.tpl
@@ -29,7 +29,7 @@
 			path.push(name);
 			name = '';
 		}
-		while ((dir = path.shift()) != null) {
+		while ((dir = path.shift()) != null)  {
 			if (!dir || (dir === '.')) continue;
 			if (dir === '..') {
 				scope = tree.pop();
@@ -81,7 +81,7 @@
 			id = '/';
 			tree = [];
 		} else if (t !== '.') {
-			name = path.split('/', 1)[0];
+			name = path.indexOf('@') === 0 ? path.split('/', 2).join("/") : path.split('/', 1)[0];
 			scope = modules[name];
 			if (!scope) {
 				if (envRequire) return envRequire(fullPath);

diff --git a/test/__playground/lib/program.js b/test/__playground/lib/program.js
@@ -21,6 +21,8 @@ exports.outerId = require("./sub/inner/inner").modId;
 exports.pathOther = require("./path/other");
 exports.nodeshim = require("path");
 exports.json = require("./mario");
+exports.externalByIndex = require("regular");
+exports.scopedByIndex = require("@scope/package");
 exports.modId = module.id;
 
 try {

diff --git a/test/__playground/node_modules/@scope/package/index.js b/test/__playground/node_modules/@scope/package/index.js
diff --git a/test/__playground/node_modules/regular/index.js b/test/__playground/node_modules/regular/index.js
diff --git a/test/index.js b/test/index.js
@@ -39,6 +39,8 @@ module.exports = {
 			a(program.pathFile.name, "path.js", "Dir/file collision: file");
 			a(program.pathDir.name, "path", "Dir/file collision: dir");
 			a(program.pathIndex.name, "path", "Dir/file collision: dir/index");
+			a(program.externalByIndex.name, "external-by-index", "External package by index");
+			a(program.scopedByIndex.name, "scoped-by-index", "External scoped package by index");
 
 			a(program.commonPathPart.id, "sub-longer-bar", "Common path part: main");
 			a(program.commonPathPart.sub.id, "sub-foo", "Common path part: outer");

diff --git a/test/lib/parser.js b/test/lib/parser.js
@@ -14,7 +14,8 @@ module.exports = {
 			.readInput(input)(path => {
 				a(path, "__playground/lib/program", "Path");
 				a.deep(
-					Object.keys(parser.modules).sort(), ["__playground", "no-main", "path", "test"],
+					Object.keys(parser.modules).sort(),
+					["@scope/package", "__playground", "no-main", "path", "regular", "test"],
 					"Modules"
 				);
 			})