better compressed require.context

sokra · sokra · commit f5290b0e8602 · 2012-10-26T15:05:06.000+02:00
diff --git a/lib/writeSource.js b/lib/writeSource.js
@@ -8,23 +8,41 @@ module.exports = function(module, options, toRealId, toRealChuckId) {
 	if(typeof module.source !== "string") {
 		// if no source is avalible, try to generate it
 		if(module.requireMap) { // with a require map
-			var extensions = (options.resolve && options.resolve.extensions) || [".web.js", ".js"];
-			var extensionsAccess = [];
-			extensions.forEach(function(ext) {
-				extensionsAccess.push("map[name+\"" +
-						ext.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") +
-						"\"]");
-			});
+			var extensions = ((options.resolve && options.resolve.extensions) || ["", ".web.js", ".js"]).slice();
 			var realRequireMap = {};
+			var usedExtensions = [];
 			Object.keys(module.requireMap).sort().forEach(function(file) {
-				realRequireMap[file] = toRealId(module.requireMap[file]);
+				var realId = toRealId(module.requireMap[file]);
+				if(!realId) realId = realId + ""; // not cause a bug if realId === 0
+				realRequireMap[file] = realId;
+				for(var i = 0; i < extensions.length; i++) {
+					var ext = extensions[i]
+					var idx = file.lastIndexOf(ext);
+					if(idx >= 0 && idx === file.length - ext.length) {
+						usedExtensions.push(ext);
+						extensions.splice(i, 1);
+						i--;
+					}
+				}
+			});
+			var extensionsAccess = [];
+			usedExtensions.forEach(function(ext) {
+				if(ext === "")
+					extensionsAccess.push("map[name]");
+				else
+					extensionsAccess.push("map[name+" + JSON.stringify(ext) + "]");
 			});
 
-			result = "/***/\tvar map = " + JSON.stringify(realRequireMap) + ",\n" +
-				"/***/\trequireInContext = module.exports = function(name) {\n" +
-				"/***/\t\treturn require(" + extensionsAccess.join(" || ") + "||name);\n" +
+			result = "/***/\tvar map = " + JSON.stringify(realRequireMap) + ";\n" +
+				"/***/\texports = module.exports = function(name) {\n" +
+				"/***/\t\treturn require(exports.id(name) || name)\n" +
+				"/***/\t};\n" +
+				"/***/\texports.id = function(name) {\n" +
+				"/***/\t\treturn " + extensionsAccess.join(" || ") + ";\n" +
 				"/***/\t};\n" +
-				"/***/\trequireInContext.keys = function() { return Object.keys(map) }";
+				"/***/\texports.keys = function() {\n" +
+				"/***/\t\treturn Object.keys(map);\n" +
+				"/***/\t};";
 		} else
 			return;
 	} else {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.7.8",
+	"version": "0.7.9",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.7.8",`
	`3`	`+ "version": "0.7.9",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",`
`6`	`6`	`"dependencies": {`