nested node_modules shouldn't be resolved as modules

sokra · sokra · commit a6a71dc90c28 · 2013-11-06T09:28:15.000+01:00
in a require.context

buggy would be require.context(".", true, /^/)("xyz/node_modules/abc")
diff --git a/lib/dependencies/RequireContextPlugin.js b/lib/dependencies/RequireContextPlugin.js
@@ -50,9 +50,9 @@ RequireContextPlugin.prototype.apply = function(compiler) {
 			callback(null, items.map(function(obj) {
 				for(var i = 0; i < modulesDirectories.length; i++) {
 					var dir = modulesDirectories[i];
-					var idx = obj.request.indexOf("/" + dir + "/");
-					if(idx >= 0) {
-						obj.request = obj.request.slice(idx+dir.length+2);
+					var idx = obj.request.indexOf("./" + dir + "/");
+					if(idx === 0) {
+						obj.request = obj.request.slice(dir.length+3);
 						break;
 					}
 				}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.11.4",
+	"version": "0.11.5",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs/AMD/Labeled Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ RequireContextPlugin.prototype.apply = function(compiler) {`
`50`	`50`	`callback(null, items.map(function(obj) {`
`51`	`51`	`for(var i = 0; i < modulesDirectories.length; i++) {`
`52`	`52`	`var dir = modulesDirectories[i];`
`53`		`- var idx = obj.request.indexOf("/" + dir + "/");`
`54`		`- if(idx >= 0) {`
`55`		`- obj.request = obj.request.slice(idx+dir.length+2);`
	`53`	`+ var idx = obj.request.indexOf("./" + dir + "/");`
	`54`	`+ if(idx === 0) {`
	`55`	`+ obj.request = obj.request.slice(dir.length+3);`
`56`	`56`	`break;`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.11.4",`
	`3`	`+ "version": "0.11.5",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD/Labeled Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",`
`6`	`6`	`"dependencies": {`