webpack 2.4.0 → 2.6.0

package/lib/node/NodeSourcePlugin.js

@@ -2,83 +2,85 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
-var ParserHelpers = require("../ParserHelpers");
-var nodeLibsBrowser = require("node-libs-browser");
+"use strict";
+const AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
+const ParserHelpers = require("../ParserHelpers");
+const nodeLibsBrowser = require("node-libs-browser");
 
-function NodeSourcePlugin(options) {
-	this.options = options;
-}
-module.exports = NodeSourcePlugin;
-NodeSourcePlugin.prototype.apply = function(compiler) {
-	var options = this.options;
-
-	function getPathToModule(module, type) {
-		if(type === true || (type === undefined && nodeLibsBrowser[module])) {
-			if(!nodeLibsBrowser[module]) throw new Error("No browser version for node.js core module '" + module + "' available");
-			return nodeLibsBrowser[module];
-		} else if(type === "mock") {
-			return require.resolve("node-libs-browser/mock/" + module);
-		} else if(type === "empty") {
-			return require.resolve("node-libs-browser/mock/empty");
-		} else return module;
+module.exports = class NodeSourcePlugin {
+	constructor(options) {
+		this.options = options;
 	}
+	apply(compiler) {
+		const options = this.options;
 
-	function addExpression(parser, name, module, type, suffix) {
-		suffix = suffix || "";
-		parser.plugin("expression " + name, function() {
-			if(this.state.module && this.state.module.resource === getPathToModule(module, type)) return;
-			var mockModule = ParserHelpers.requireFileAsExpression(this.state.module.context, getPathToModule(module, type));
-			return ParserHelpers.addParsedVariableToModule(this, name, mockModule + suffix);
-		});
-	}
+		function getPathToModule(module, type) {
+			if(type === true || (type === undefined && nodeLibsBrowser[module])) {
+				if(!nodeLibsBrowser[module]) throw new Error(`No browser version for node.js core module ${module} available`);
+				return nodeLibsBrowser[module];
+			} else if(type === "mock") {
+				return require.resolve(`node-libs-browser/mock/${module}`);
+			} else if(type === "empty") {
+				return require.resolve("node-libs-browser/mock/empty");
+			} else return module;
+		}
 
-	compiler.plugin("compilation", function(compilation, params) {
-		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
+		function addExpression(parser, name, module, type, suffix) {
+			suffix = suffix || "";
+			parser.plugin(`expression ${name}`, function() {
+				if(this.state.module && this.state.module.resource === getPathToModule(module, type)) return;
+				const mockModule = ParserHelpers.requireFileAsExpression(this.state.module.context, getPathToModule(module, type));
+				return ParserHelpers.addParsedVariableToModule(this, name, mockModule + suffix);
+			});
+		}
 
-			if(parserOptions.node === false)
-				return;
+		compiler.plugin("compilation", function(compilation, params) {
+			params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
 
-			var localOptions = options;
-			if(parserOptions.node)
-				localOptions = Object.assign({}, localOptions, parserOptions.node);
+				if(parserOptions.node === false)
+					return;
 
-			if(localOptions.global) {
-				parser.plugin("expression global", function() {
-					var retrieveGlobalModule = ParserHelpers.requireFileAsExpression(this.state.module.context, require.resolve("../../buildin/global.js"));
-					return ParserHelpers.addParsedVariableToModule(this, "global", retrieveGlobalModule);
-				});
-			}
-			if(localOptions.process) {
-				var processType = localOptions.process;
-				addExpression(parser, "process", "process", processType);
-			}
-			if(localOptions.console) {
-				var consoleType = localOptions.console;
-				addExpression(parser, "console", "console", consoleType);
-			}
-			var bufferType = localOptions.Buffer;
-			if(bufferType) {
-				addExpression(parser, "Buffer", "buffer", bufferType, ".Buffer");
-			}
-			if(localOptions.setImmediate) {
-				var setImmediateType = localOptions.setImmediate;
-				addExpression(parser, "setImmediate", "timers", setImmediateType, ".setImmediate");
-				addExpression(parser, "clearImmediate", "timers", setImmediateType, ".clearImmediate");
-			}
+				let localOptions = options;
+				if(parserOptions.node)
+					localOptions = Object.assign({}, localOptions, parserOptions.node);
+
+				if(localOptions.global) {
+					parser.plugin("expression global", function() {
+						const retrieveGlobalModule = ParserHelpers.requireFileAsExpression(this.state.module.context, require.resolve("../../buildin/global.js"));
+						return ParserHelpers.addParsedVariableToModule(this, "global", retrieveGlobalModule);
+					});
+				}
+				if(localOptions.process) {
+					const processType = localOptions.process;
+					addExpression(parser, "process", "process", processType);
+				}
+				if(localOptions.console) {
+					const consoleType = localOptions.console;
+					addExpression(parser, "console", "console", consoleType);
+				}
+				const bufferType = localOptions.Buffer;
+				if(bufferType) {
+					addExpression(parser, "Buffer", "buffer", bufferType, ".Buffer");
+				}
+				if(localOptions.setImmediate) {
+					const setImmediateType = localOptions.setImmediate;
+					addExpression(parser, "setImmediate", "timers", setImmediateType, ".setImmediate");
+					addExpression(parser, "clearImmediate", "timers", setImmediateType, ".clearImmediate");
+				}
+			});
 		});
-	});
-	compiler.plugin("after-resolvers", function(compiler) {
-		Object.keys(nodeLibsBrowser).forEach(function(lib) {
-			if(options[lib] !== false) {
-				compiler.resolvers.normal.apply(
-					new AliasPlugin("described-resolve", {
-						name: lib,
-						onlyModule: true,
-						alias: getPathToModule(lib, options[lib])
-					}, "resolve")
-				);
-			}
+		compiler.plugin("after-resolvers", (compiler) => {
+			Object.keys(nodeLibsBrowser).forEach((lib) => {
+				if(options[lib] !== false) {
+					compiler.resolvers.normal.apply(
+						new AliasPlugin("described-resolve", {
+							name: lib,
+							onlyModule: true,
+							alias: getPathToModule(lib, options[lib])
+						}, "resolve")
+					);
+				}
+			});
 		});
-	});
+	}
 };

package/lib/optimize/CommonsChunkPlugin.js

@@ -190,7 +190,7 @@ You can however specify the name of the async chunk by passing the desired strin
 
 		// we dont have named chunks specified, so we just take all of them
 		if(asyncOrNoSelectedChunk) {
-			return allChunks;
+			return allChunks.filter(chunk => !chunk.isInitial());
 		}
 
 		/**

package/lib/webworker/WebWorkerMainTemplatePlugin.js

@@ -21,7 +21,9 @@ class WebWorkerMainTemplatePlugin {
 							return id + ": 1";
 						}).join(",\n")
 					),
-					"};"
+					"};",
+					"",
+					"var resolvedPromise = new Promise(function(resolve) { resolve(); });"
 				]);
 			}
 			return source;
@@ -44,7 +46,7 @@ class WebWorkerMainTemplatePlugin {
 					}) + ");"
 				]),
 				"}",
-				"return Promise.resolve();"
+				"return resolvedPromise;"
 			]);
 		});
 		mainTemplate.plugin("bootstrap", function(source, chunk, hash) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "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 loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "dependencies": {
@@ -21,7 +21,7 @@
     "source-map": "^0.5.3",
     "supports-color": "^3.1.0",
     "tapable": "~0.2.5",
-    "uglify-js": "^2.8.5",
+    "uglify-js": "^2.8.27",
     "watchpack": "^1.3.1",
     "webpack-sources": "^0.2.3",
     "yargs": "^6.0.0"
@@ -94,11 +94,13 @@
     "travis:benchmark": "npm run benchmark",
     "appveyor:test": "node --max_old_space_size=4096 node_modules\\mocha\\bin\\mocha --harmony test/*.test.js",
     "appveyor:benchmark": "npm run benchmark",
+    "circleci:test": "node --max_old_space_size=4096 node_modules/mocha/bin/mocha --harmony test/*.test.js",
+    "circleci:lint": "npm run lint-files && npm run nsp",
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "npm run lint-files",
     "lint-files": "npm run lint && npm run beautify-lint",
-    "lint": "eslint lib bin hot buildin test/**/webpack.config.js test/binCases/**/test.js examples/**/webpack.config.js",
-    "beautify-lint": "beautify-lint 'lib/**/*.js' 'hot/**/*.js' 'bin/**/*.js' 'benchmark/*.js' 'test/*.js'",
+    "lint": "eslint lib bin hot buildin \"test/**/webpack.config.js\" \"test/binCases/**/test.js\" \"examples/**/webpack.config.js\"",
+    "beautify-lint": "beautify-lint \"lib/**/*.js\" \"hot/**/*.js\" \"bin/**/*.js\" \"benchmark/*.js\" \"test/*.js\"",
     "nsp": "nsp check --output summary",
     "benchmark": "mocha test/*.benchmark.js --harmony -R spec",
     "cover": "node --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' node_modules/mocha/bin/_mocha -- test/*.test.js",

package/schemas/webpackOptionsSchema.json

@@ -270,6 +270,10 @@
             "use-credentials"
           ]
         },
+        "chunkLoadTimeout": {
+          "description": "Number of milliseconds before chunk request expires",
+          "type": "number"
+        },
         "devtoolFallbackModuleFilenameTemplate": {
           "description": "Similar to `output.devtoolModuleFilenameTemplate`, but used in the case of duplicate module identifiers.",
           "anyOf": [
@@ -333,6 +337,10 @@
           "minLength": 1,
           "type": "string"
         },
+        "hashSalt": {
+          "minLength": 1,
+          "type": "string"
+        },
         "hotUpdateChunkFilename": {
           "description": "The filename of the Hot Update Chunks. They are inside the output.path directory.",
           "type": "string",
@@ -989,6 +997,10 @@
               "type": "string",
               "description": "sort the modules by that field"
             },
+            "moduleTrace": {
+              "type": "boolean",
+              "description": "add dependencies and origin of warnings/errors"
+            },
             "chunksSort": {
               "type": "string",
               "description": "sort the chunks by that field"