removed the last TODO :)

sokra · sokra · commit dabbab46273f · 2013-06-15T17:31:56.000+02:00
diff --git a/lib/dependencies/RequireContextPlugin.js b/lib/dependencies/RequireContextPlugin.js
@@ -26,7 +26,6 @@ RequireContextPlugin.prototype.apply = function(compiler) {
 		compilation.dependencyFactories.set(ContextElementDependency, normalModuleFactory);
 	});
 	compiler.plugin("context-module-factory", function(cmf) {
-		// TODO extract in modules
 		cmf.plugin("alternatives", function(items, callback) {
 			if(items.length == 0) return callback(null, items);
 
@@ -48,10 +47,16 @@ RequireContextPlugin.prototype.apply = function(compiler) {
 		cmf.plugin("alternatives", function(items, callback) {
 			if(items.length == 0) return callback(null, items);
 
-			callback(null, items.filter(function(obj) {
-				return modulesDirectories.filter(function(dir) {
-					return obj.request.indexOf("/" + dir + "/") >= 0;
-				}) == 0;
+			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);
+						break;
+					}
+				}
+				return obj;
 			}));
 		});
 	});
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.10.0-beta22",
+	"version": "0.10.0-beta23",
 	"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": {
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -362,6 +362,7 @@ describe("main", function() {
 			(require.context("../././templates"))("./tmpl").should.be.eql("test template");
 			(require.context(".././templates/.")("./tmpl")).should.be.eql("test template");
 			require . context ( "." + "." + "/" + "templ" + "ates" ) ( "./subdir/tmpl.js" ).should.be.eql("subdir test template");
+			require.context("../templates", true, /./)("xyz").should.be.eql("xyz");
 		});
 
 		it("should automatically create contexts", function() {
diff --git a/test/browsertest/templates/node_modules/xyz.js b/test/browsertest/templates/node_modules/xyz.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.10.0-beta22",`
	`3`	`+ "version": "0.10.0-beta23",`
`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": {`