added a simple mode for a single module

later this can be optimized by ast compression

Author: sokra

examples/harmony-unused-inline/README.md

@@ -51,47 +51,19 @@ export { add as reexportedAdd, multiply as reexportedMultiply } from "./math";
 
 ``` javascript
 /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
+/******/ 	// Context information
+/******/ 	var __webpack_require__ = {};
 
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
 
-/******/ 		var module = installedModules[moduleId];
-
-/******/ 		// Check if module is in cache
-/******/ 		if(!module) {
-
-/******/ 			// Create a new module (and put it into the cache)
-/******/ 			module = installedModules[moduleId] = {
-/******/ 				e: {},
-/******/ 				i: moduleId,
-/******/ 				l: false
-/******/ 			};
-
-/******/ 			// Execute the module function
-/******/ 			modules[moduleId].call(module.e, module, module.e, __webpack_require__);
-
-/******/ 			// Flag the module as loaded
-/******/ 			module.l = true;
-/******/ 		}
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.e;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
 
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "js/";
 
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ 	var __webpack_module__ = {l: false, i: 0, e: {}};
+/******/ 	modules[0].call(__webpack_module__.e, __webpack_module__, __webpack_module__.e, __webpack_require__);
+/******/ 	__webpack_module__.l = true;
+/******/ 	return __webpack_module__.e;
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -102,7 +74,7 @@ export { add as reexportedAdd, multiply as reexportedMultiply } from "./math";
   !*** inlined: ./library.js ***!
   !*** ./example.js ***!
   \********************/
-/***/ function(module, exports, __webpack_require__) {
+/***/ function(module, exports) {
 
 	/*!****************!*\
 	  !*** ./abc.js ***!
@@ -175,7 +147,7 @@ export { add as reexportedAdd, multiply as reexportedMultiply } from "./math";
 # js/output.js
 
 ``` javascript
-!function(n){function r(a){var t=e[a];return t||(t=e[a]={e:{},i:a,l:!1},n[a].call(t.e,t,t.e,r),t.l=!0),t.e}var e={};return r.m=n,r.c=e,r.p="js/",r(r.s=0)}([function(n,r,e){var a={};(function(n,r){n.l=!0}).call(a,{e:a,i:1,l:!1},a);var t={};(function(n,r){function e(){for(var n=0,r=0,e=arguments,a=e.length;a>r;)n+=e[r++];return n}function a(){for(var n=1,r=0,e=arguments,a=e.length;a>r;)n*=e[r++];return n}r.a=e,r.b=a,n.l=!0}).call(t,{e:t,i:3,l:!1},t);var l={};(function(n,r){var e=t;Object.defineProperty(r,"a",{configurable:!1,enumerable:!0,get:function(){return e.b}}),n.l=!0}).call(l,{e:l,i:2,l:!1},l);var u=t,i=l;u.a.bind()(1,2),i.a.bind()(1,2)}]);
+!function(n){var r={};r.p="js/";var e={l:!1,i:0,e:{}};return n[0].call(e.e,e,e.e,r),e.l=!0,e.e}([function(n,r){var e={};(function(n,r){n.l=!0}).call(e,{e:e,i:1,l:!1},e);var a={};(function(n,r){function e(){for(var n=0,r=0,e=arguments,a=e.length;a>r;)n+=e[r++];return n}function a(){for(var n=1,r=0,e=arguments,a=e.length;a>r;)n*=e[r++];return n}r.a=e,r.b=a,n.l=!0}).call(a,{e:a,i:3,l:!1},a);var l={};(function(n,r){var e=a;Object.defineProperty(r,"a",{configurable:!1,enumerable:!0,get:function(){return e.b}}),n.l=!0}).call(l,{e:l,i:2,l:!1},l);var t=a,i=l;t.a.bind()(1,2),i.a.bind()(1,2)}]);
 ```
 
 # Info
@@ -185,9 +157,9 @@ export { add as reexportedAdd, multiply as reexportedMultiply } from "./math";
 ```
 Hash: 263715f87c915965d5e3
 Version: webpack 2.0.7-beta
-Time: 117ms
-    Asset  Size  Chunks             Chunk Names
-output.js  4 kB       0  [emitted]  main
+Time: 187ms
+    Asset     Size  Chunks             Chunk Names
+output.js  3.27 kB       0  [emitted]  main
 chunk    {0} output.js (main) 728 bytes [rendered]
     > main [0] ./example.js 
     [0] ./example.js 121 bytes {0} [built]
@@ -205,9 +177,9 @@ chunk    {0} output.js (main) 728 bytes [rendered]
 ```
 Hash: 263715f87c915965d5e3
 Version: webpack 2.0.7-beta
-Time: 193ms
+Time: 251ms
     Asset       Size  Chunks             Chunk Names
-output.js  653 bytes       0  [emitted]  main
+output.js  592 bytes       0  [emitted]  main
 chunk    {0} output.js (main) 728 bytes [rendered]
     > main [0] ./example.js 
     [0] ./example.js 121 bytes {0} [built]

lib/APIPlugin.js

@@ -18,6 +18,14 @@ var REPLACEMENTS = {
 	__non_webpack_require__: "require", // eslint-disable-line camelcase
 	"require.onError": "__webpack_require__.oe" // eslint-disable-line camelcase
 };
+var REQUIRED_API = {
+	__webpack_require__: ["__webpack_require__", "__webpack_require__()"], // eslint-disable-line camelcase
+	__webpack_public_path__: ["__webpack_require__"], // eslint-disable-line camelcase
+	__webpack_modules__: ["__webpack_require__"], // eslint-disable-line camelcase
+	__webpack_chunk_load__: ["__webpack_require__"], // eslint-disable-line camelcase
+	__non_webpack_require__: [], // eslint-disable-line camelcase
+	"require.onError": ["__webpack_require__"] // eslint-disable-line camelcase
+};
 var REPLACEMENT_TYPES = {
 	__webpack_public_path__: "string", // eslint-disable-line camelcase
 	__webpack_require__: "function", // eslint-disable-line camelcase
@@ -33,7 +41,7 @@ APIPlugin.prototype.apply = function(compiler) {
 	Object.keys(REPLACEMENTS).forEach(function(key) {
 		compiler.parser.plugin("expression " + key, function(expr) {
 			var dep = new ConstDependency(REPLACEMENTS[key], expr.range);
-			dep.requiredApi = ["__webpack_require__"];
+			dep.requiredApi = REQUIRED_API[key];
 			dep.loc = expr.loc;
 			this.state.current.addDependency(dep);
 			return true;

lib/Dependency.js

@@ -20,7 +20,7 @@ Dependency.prototype.getReference = function() {
 	}
 };
 
-Dependency.prototype.requiredApi = ["module", "exports", "__webpack_require__"];
+Dependency.prototype.requiredApi = ["module", "exports", "__webpack_require__", "__webpack_require__()"];
 
 Dependency.prototype.updateHash = function(hash) {
 	hash.update((this.module && this.module.id) + "");

lib/ExtendedAPIPlugin.js

@@ -20,7 +20,7 @@ ExtendedAPIPlugin.prototype.apply = function(compiler) {
 	compiler.plugin("compilation", function(compilation) {
 		compilation.dependencyFactories.set(ConstDependency, new NullFactory());
 		compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
-		compilation.mainTemplate.plugin("require-extensions", function(source, chunk, hash) {
+		compilation.mainTemplate.plugin("simple-require-extensions", function(source, chunk, hash) {
 			var buf = [source];
 			buf.push("");
 			buf.push("// __webpack_hash__");

lib/HotModuleReplacementPlugin.js

@@ -137,6 +137,10 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 			this.assets[filename] = source;
 		});
 
+		compilation.mainTemplate.plugin("simple-mode", function() {
+			return false;
+		});
+
 		compilation.mainTemplate.plugin("hash", function(hash) {
 			hash.update("HotMainTemplateDecorator");
 		});

lib/MainTemplate.js

@@ -26,6 +26,23 @@ function MainTemplate(outputOptions) {
 		}
 		return this.asString(buf);
 	});
+	this.plugin("simple-startup", function(source, chunk, hash) {
+		var buf = [];
+		if(chunk.entryModule) {
+			buf.push("// init module object");
+			buf.push("var __webpack_module__ = {l: false, i: " + JSON.stringify(chunk.entryModule.id) + ", e: {}};");
+			buf.push("");
+			buf.push("// execute module");
+			buf.push("modules[" + JSON.stringify(chunk.entryModule.id) + "].call(__webpack_module__.e, __webpack_module__, __webpack_module__.e, " + this.requireFn + ");");
+			buf.push("");
+			buf.push("// set loaded to true");
+			buf.push("__webpack_module__.l = true;");
+			buf.push("");
+			buf.push("// return exports");
+			buf.push("return __webpack_module__.e;");
+		}
+		return this.asString(buf);
+	});
 	this.plugin("render", function(bootstrapSource, chunk, hash, moduleTemplate, dependencyTemplates) {
 		var source = new ConcatSource();
 		source.add("/******/ (function(modules) { // webpackBootstrap\n");
@@ -88,7 +105,7 @@ function MainTemplate(outputOptions) {
 		]);
 	});
 	this.plugin("require-extensions", function(source, chunk, hash) {
-		var buf = [];
+		var buf = [source];
 		if(chunk.chunks.length > 0) {
 			buf.push("// This file contains only the entry chunk.");
 			buf.push("// The chunk loading function for additional chunks");
@@ -104,6 +121,11 @@ function MainTemplate(outputOptions) {
 		buf.push("// expose the module cache");
 		buf.push(this.requireFn + ".c = installedModules;");
 
+		return this.asString(buf);
+	});
+	this.plugin("simple-require-extensions", function(source, chunk, hash) {
+		var buf = [source];
+
 		var publicPath = this.getPublicPath({
 			hash: hash
 		});
@@ -118,18 +140,34 @@ module.exports = MainTemplate;
 MainTemplate.prototype = Object.create(Template.prototype);
 MainTemplate.prototype.requireFn = "__webpack_require__";
 MainTemplate.prototype.render = function(hash, chunk, moduleTemplate, dependencyTemplates) {
+	var simpleMode = this.applyPluginsBailResult("simple-mode") !== false && chunk.chunks.length === 0 && chunk.modules.every(function(m) {
+		return !m.isApiRequired("__webpack_require__()");
+	});
 	var buf = [];
 	buf.push(this.applyPluginsWaterfall("bootstrap", "", chunk, hash, moduleTemplate, dependencyTemplates));
-	buf.push(this.applyPluginsWaterfall("local-vars", "", chunk, hash));
-	buf.push("");
-	buf.push("// The require function");
-	buf.push("function " + this.requireFn + "(moduleId) {");
-	buf.push(this.indent(this.applyPluginsWaterfall("require", "", chunk, hash)));
-	buf.push("}");
-	buf.push("");
-	buf.push(this.asString(this.applyPluginsWaterfall("require-extensions", "", chunk, hash)));
-	buf.push("");
-	buf.push(this.asString(this.applyPluginsWaterfall("startup", "", chunk, hash)));
+	if(simpleMode) {
+		buf.push(this.applyPluginsWaterfall("simple-local-vars", "", chunk, hash));
+		buf.push("");
+		buf.push("// Context information");
+		buf.push("var " + this.requireFn + " = {};");
+		buf.push("");
+		buf.push(this.asString(this.applyPluginsWaterfall("simple-require-extensions", "", chunk, hash)));
+		buf.push("");
+		buf.push(this.asString(this.applyPluginsWaterfall("simple-startup", "", chunk, hash)));
+	} else {
+		buf.push(this.applyPluginsWaterfall("simple-local-vars", "", chunk, hash));
+		buf.push(this.applyPluginsWaterfall("local-vars", "", chunk, hash));
+		buf.push("");
+		buf.push("// The require function");
+		buf.push("function " + this.requireFn + "(moduleId) {");
+		buf.push(this.indent(this.applyPluginsWaterfall("require", "", chunk, hash)));
+		buf.push("}");
+		buf.push("");
+		buf.push(this.asString(this.applyPluginsWaterfall("simple-require-extensions", "", chunk, hash)));
+		buf.push(this.asString(this.applyPluginsWaterfall("require-extensions", "", chunk, hash)));
+		buf.push("");
+		buf.push(this.asString(this.applyPluginsWaterfall("startup", "", chunk, hash)));
+	}
 	var source = this.applyPluginsWaterfall("render", new OriginalSource(this.prefix(buf, " \t") + "\n", "webpack/bootstrap " + hash), chunk, hash, moduleTemplate, dependencyTemplates);
 	if(chunk.modules.some(function(module) {
 			return module.entry;

lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -218,7 +218,7 @@ AMDDefineDependencyParserPlugin.prototype.apply = function(parser) {
 			var dep, localModule;
 			if(param.string === "require") {
 				dep = new ConstDependency("__webpack_require__", param.range);
-				dep.requiredApi = ["__webpack_require__"];
+				dep.requiredApi = ["__webpack_require__", "__webpack_require__()"];
 			} else if(["require", "exports", "module"].indexOf(param.string) >= 0) {
 				dep = new ConstDependency(param.string, param.range);
 				dep.requiredApi = [param.string];

lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -114,7 +114,7 @@ AMDRequireDependenciesBlockParserPlugin.prototype.apply = function(parser) {
 			var dep, localModule;
 			if(param.string === "require") {
 				dep = new ConstDependency("__webpack_require__", param.string);
-				dep.requiredApi = ["__webpack_require__"];
+				dep.requiredApi = ["__webpack_require__", "__webpack_require__()"];
 			} else if(["exports", "module"].indexOf(param.string) >= 0) {
 				dep = new ConstDependency(param.string, param.range);
 				dep.requiredApi = [param.string];

lib/dependencies/HarmonyImportDependency.js

@@ -29,7 +29,7 @@ HarmonyImportDependency.prototype.getSupportedInlineModes = function() {
 };
 
 HarmonyImportDependency.prototype.requiredApi = function() {
-	return ModuleHelpers.requiredApiForLoadModule(dep.module);
+	return ModuleHelpers.requiredApiForLoadModule(this.module);
 };
 
 HarmonyImportDependency.makeStatement = function(declare, dep, outputOptions, requestShortener) {

lib/dependencies/ModuleHelpers.js

@@ -29,5 +29,5 @@ ModuleHelpers.requiredApiForLoadModule = function(module) {
 		case "hoist":
 			return [];
 	}
-	return ["__webpack_require__"];
+	return ["__webpack_require__", "__webpack_require__()"];
 };