moved templates

sokra · sokra · commit d394065af642 · 2012-05-07T09:01:28.000+02:00
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -9,8 +9,6 @@ var fs = require("fs");
 
 var HASH_REGEXP = /\[hash\]/i;
 
-var templateAsync = require("fs").readFileSync(path.join(__dirname, "templateAsync.js"));
-var templateSingle = require("fs").readFileSync(path.join(__dirname, "templateSingle.js"));
 /*
 	webpack(context, moduleName, options, callback);
 	webpack(context, moduleName, callback);
@@ -168,15 +166,15 @@ function webpack(context, moduleName, options, finalCallback) {
 			chunkIds.sort(function(a,b) {
 				return parseInt(b, 10) - parseInt(a, 10);
 			});
+			var template = getTemplate(options, {chunks: chunkIds.length > 1});
 			var hash;
 			try {
 				hash = new (require("crypto").Hash)("md5");
 				hash.update(JSON.stringify(options.libary || ""));
 				hash.update(JSON.stringify(options.outputPostfix));
 				hash.update(JSON.stringify(options.outputJsonpFunction));
 				hash.update(JSON.stringify(options.scriptSrcPrefix));
-				hash.update(templateAsync);
-				hash.update(templateSingle);
+				hash.update(template);
 				hash.update("1");
 			} catch(e) {
 				callback(e);
@@ -204,7 +202,7 @@ function webpack(context, moduleName, options, finalCallback) {
 						buffer.push("=\n");
 					}
 					if(chunkIds.length > 1) {
-						buffer.push(templateAsync);
+						buffer.push(template);
 						buffer.push("/******/({a:");
 						buffer.push(JSON.stringify(options.outputPostfix.replace(HASH_REGEXP, hash)));
 						buffer.push(",b:");
@@ -213,7 +211,7 @@ function webpack(context, moduleName, options, finalCallback) {
 						buffer.push(JSON.stringify(options.scriptSrcPrefix.replace(HASH_REGEXP, hash)));
 						buffer.push(",\n");
 					} else {
-						buffer.push(templateSingle);
+						buffer.push(template);
 						buffer.push("/******/({\n");
 					}
 				} else {
@@ -331,7 +329,7 @@ function webpack(context, moduleName, options, finalCallback) {
 				buffer.push(options.libary);
 				buffer.push("=\n");
 			}
-			buffer.push(templateSingle);
+			buffer.push(getTemplate(options, {chunks: false}));
 			buffer.push("/******/({\n");
 			buffer.push(writeChunk(depTree, options));
 			buffer.push("/******/})");
@@ -347,6 +345,16 @@ function webpack(context, moduleName, options, finalCallback) {
 	return options.events;
 }
 
+function getTemplate(options, templateOptions) {
+	if(options.template) {
+		if(typeof options.template === "string")
+			return require(options.template)(options, templateOptions);
+		else
+			return options.template(options, templateOptions);
+	} else 
+		return require("../templates/browser")(options, templateOptions);
+}
+
 function uglify(input, filename) {
 	var uglify = require("uglify-js");
 	try {
diff --git a/templates/browser.js b/templates/browser.js
@@ -0,0 +1,7 @@
+module.exports = function(options, templateOptions) {
+	if(templateOptions.chunks) {
+		return require("fs").readFileSync(require("path").join(__dirname, "browserAsync.js"));
+	} else {
+		return require("fs").readFileSync(require("path").join(__dirname, "browserSingle.js"));
+	}
+}
diff --git a/templates/browserAsync.js b/templates/browserAsync.js
@@ -25,6 +25,7 @@
 /******/				head.appendChild(script);
 /******/			}
 /******/		};
+/******/		require.modules = modules;
 /******/		window[modules.b] = function(chunkId, moreModules) {
 /******/			for(var moduleId in moreModules)
 /******/				modules[moduleId] = moreModules[moduleId];
diff --git a/templates/browserSingle.js b/templates/browserSingle.js
@@ -13,5 +13,6 @@
 /******/	require.ensure = function(chunkId, callback) {
 /******/		callback(require);
 /******/	};
+/******/	require.modules = modules;
 /******/	return require(0);
 /******/})
