webpack 3.9.0 → 3.12.0

package/README.md

@@ -83,7 +83,7 @@ within webpack itself use this plugin interface. This makes webpack very
 |:--:|:----:|:----------|
 |[common-chunks-webpack-plugin][common]|![common-npm]|Generates chunks of common modules shared between entry points and splits them into separate  bundles (e.g vendor.bundle.js && app.bundle.js)|
 |[extract-text-webpack-plugin][extract]|![extract-npm]|Extracts Text (CSS) from your bundles into a separate file (app.bundle.css)|
-|[compression-webpack-plugin][compression]|![compression-npm]|Prepare compressed versions of assets to serve them with Content-Encoding|
+|[compression-webpack-plugin][compression]|![compression-npm]|Prepares compressed versions of assets to serve them with Content-Encoding|
 |[i18n-webpack-plugin][i18n]|![i18n-npm]|Adds i18n support to your bundles|
 |[html-webpack-plugin][html-plugin]|![html-plugin-npm]| Simplifies creation of HTML files (`index.html`) to serve your bundles|
 
@@ -115,7 +115,7 @@ or are automatically applied via regex from your webpack configuration.
 |Name|Status|Description|
 |:--:|:----:|:----------|
 |[raw-loader][raw]|![raw-npm]|Loads raw content of a file (utf-8)|
-|[val-loader][val]|![val-npm]|Executes code as module and consider exports as JS code|
+|[val-loader][val]|![val-npm]|Executes code as module and considers exports as JS code|
 |[url-loader][url]|![url-npm]|Works like the file loader, but can return a Data Url if the file is smaller than a limit|
 |[file-loader][file]|![file-npm]|Emits the file into the output folder and returns the (relative) url|
 
@@ -146,10 +146,11 @@ or are automatically applied via regex from your webpack configuration.
 
 |Name|Status|Description|
 |:--:|:----:|:----------|
-|<a href="https://github.com/webpack/script-loader">`<script>`</a>|![script-npm]|Executes a JavaScript file once in global context (like in script tag), requires are not parsed|
+|<a href="https://github.com/webpack/script-loader">`<script>`</a>|![script-npm]|Executes a JavaScript file once in global context (like in script tag), `require()`s are not parsed|
 |<a href="https://github.com/babel/babel-loader"><img width="48" height="48" title="babel-loader" src="https://worldvectorlogo.com/logos/babel-10.svg"></a>|![babel-npm]|Loads ES2015+ code and transpiles to ES5 using <a href="https://github.com/babel/babel">Babel</a>|
 |<a href="https://github.com/jupl/traceur-loader"><img width="48" height="48" src="https://google.github.com/traceur-compiler/logo/tc.svg"></a>|![traceur-npm]|Loads ES2015+ code and transpiles to ES5 using [Traceur](https://github.com/google/traceur-compiler)|
 |<a href="https://github.com/TypeStrong/ts-loader"><img width="48" height="48" src="https://cdn.rawgit.com/Microsoft/TypeScript/master/doc/logo.svg"></a>|![type-npm]|Loads TypeScript like JavaScript|
+|[`awesome-typescript-loader`](https://github.com/s-panferov/awesome-typescript-loader)|![awesome-typescript-npm]|Awesome TypeScript loader for webpack|
 |<a href="https://github.com/webpack/coffee-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>|![coffee-npm]|Loads CoffeeScript like JavaScript|
 
 
@@ -158,12 +159,13 @@ or are automatically applied via regex from your webpack configuration.
 [traceur-npm]: https://img.shields.io/npm/v/traceur-loader.svg
 [coffee-npm]: https://img.shields.io/npm/v/coffee-loader.svg
 [type-npm]: https://img.shields.io/npm/v/ts-loader.svg
+[awesome-typescript-npm]: https://img.shields.io/npm/v/awesome-typescript-loader.svg
 
 #### Templating
 
 |Name|Status|Description|
 |:--:|:----:|:----------|
-|<a href="https://github.com/webpack/html-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/html5.svg"></a>|![html-npm]|Exports HTML as string, require references to static resources|
+|<a href="https://github.com/webpack/html-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/html5.svg"></a>|![html-npm]|Exports HTML as string, requires references to static resources|
 |<a href="https://github.com/pugjs/pug-loader"><img width="48" height="48" src="https://cdn.rawgit.com/pugjs/pug-logo/master/SVG/pug-final-logo-_-colour-128.svg"></a>|![pug-npm]|Loads Pug templates and returns a function|
 |<a href="https://github.com/webpack/jade-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/jade-3.svg"></a>|![jade-npm]|Loads Jade templates and returns a function|
 |<a href="https://github.com/peerigon/markdown-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/markdown.svg"></a>|![md-npm]|Compiles Markdown to HTML|
@@ -215,14 +217,14 @@ or are automatically applied via regex from your webpack configuration.
 |Name|Status|Description|
 |:--:|:----:|:----------|
 |<a href="https://github.com/vuejs/vue-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/vue-9.svg"></a>|![vue-npm]|Loads and compiles Vue Components|
-|<a href="https://github.com/JonDum/polymer-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/polymer.svg"></a>|![polymer-npm]|Process HTML & CSS with preprocessor of choice and `require()` Web Components like first-class modules|
+|<a href="https://github.com/webpack-contrib/polymer-webpack-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/polymer.svg"></a>|![polymer-npm]|Process HTML & CSS with preprocessor of choice and `require()` Web Components like first-class modules|
 |<a href="https://github.com/TheLarkInn/angular2-template-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/angular-icon-1.svg"></a>|![angular-npm]| Loads and compiles Angular 2 Components|
 |<a href="https://github.com/riot/tag-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/riot.svg"></a>|![riot-npm]| Riot official webpack loader|
 
 
 
 [vue-npm]: https://img.shields.io/npm/v/vue-loader.svg
-[polymer-npm]: https://img.shields.io/npm/v/polymer-loader.svg
+[polymer-npm]: https://img.shields.io/npm/v/polymer-webpack-loader.svg
 [angular-npm]: https://img.shields.io/npm/v/angular2-template-loader.svg
 [riot-npm]: https://img.shields.io/npm/v/riot-tag-loader.svg
 
@@ -262,15 +264,15 @@ Contributions go far beyond pull requests and commits. Although we love giving y
 * Adding unit, or functional tests
 * Triaging GitHub issues -- especially determining whether an issue still persists or is reproducible.
 * [Searching #webpack on twitter](https://twitter.com/search?q=webpack) and helping someone else who needs help
-* Teaching others how to contribute to one of the many webpack repo's!
-* [Blogging, speaking about, or creating tutorials](https://github.com/webpack-contrib/awesome-webpack) about one of webpack's many features. 
+* Teaching others how to contribute to one of the many webpack's repos!
+* [Blogging, speaking about, or creating tutorials](https://github.com/webpack-contrib/awesome-webpack) about one of webpack's many features.
 * Helping others in our webpack [gitter channel](https://gitter.im/webpack/webpack).
 
-If you are worried or don't know where to start, you can **always** reach out to [Sean Larkin (@TheLarkInn) on Twitter](https://twitter.com/thelarkinn) or simply submit an issue and a maintainer can help give you guidance! 
+If you are worried or don't know where to start, you can **always** reach out to [Sean Larkin (@TheLarkInn) on Twitter](https://twitter.com/thelarkinn) or simply submit an issue and a maintainer can help give you guidance!
 
-We have also started a series on our [Medium Publication](https://medium.com/webpack) called [The Contributor's Guide to webpack](https://medium.com/webpack/contributors-guide/home). We welcome you to read it and post any questions or responses if you still need help. 
+We have also started a series on our [Medium Publication](https://medium.com/webpack) called [The Contributor's Guide to webpack](https://medium.com/webpack/contributors-guide/home). We welcome you to read it and post any questions or responses if you still need help.
 
-_Looking to speak about webpack?_ We'd **love** to review your talk abstract/CFP! You can email it to webpack [at] opencollective [dot] com and we can give pointers or tips!!! 
+_Looking to speak about webpack?_ We'd **love** to review your talk abstract/CFP! You can email it to webpack [at] opencollective [dot] com and we can give pointers or tips!!!
 
 <h3 align="center">Creating your own plugins and loaders</h3>
 
@@ -280,9 +282,9 @@ If you create a loader or plugin, we would <3 for you to open source it, and put
 
 We consider webpack to be a low-level tool used not only individually but also layered beneath other awesome tools. Because of it's flexibility, webpack isn't always the _easiest_ entry-level solution, however we do believe it is the most powerful. That said, we're always looking for ways improve and simplify the tool without compromising functionality. If you have any ideas on ways to accomplish this, we're all ears!
 
-If you're just getting started, take a look at [our new docs and concepts page](https://webpack.js.org/concepts/). This has a high level overview that is great for beginners!! 
+If you're just getting started, take a look at [our new docs and concepts page](https://webpack.js.org/concepts/). This has a high level overview that is great for beginners!!
 
-If you want to discuss something or just need help, [here is our Gitter room](https://gitter.im/webpack/webpack) where there are always individuals looking to help out! 
+If you want to discuss something or just need help, [here is our Gitter room](https://gitter.im/webpack/webpack) where there are always individuals looking to help out!
 
 If you are still having difficulty, we would love for you to post
 a question to [StackOverflow with the webpack tag](https://stackoverflow.com/tags/webpack). It is much easier to answer questions that include your webpack.config.js and relevant files! So if you can provide them, we'd be extremely grateful (and more likely to help you find the answer!)

package/bin/webpack.js

@@ -364,7 +364,8 @@ yargs.parse(process.argv.slice(2), (err, argv, output) => {
 				lastHash = null;
 				console.error(err.stack || err);
 				if(err.details) console.error(err.details);
-				process.exit(1); // eslint-disable-line
+				process.exitCode = 1;
+				return;
 			}
 			if(outputOptions.json) {
 				process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");

package/hot/signal.js

@@ -24,6 +24,7 @@ if(module.hot) {
 				require("./log-apply-result")(updatedModules, renewedModules);
 
 				checkForUpdate(true);
+				return null;
 			});
 		}).catch(function(err) {
 			var status = module.hot.status();

package/lib/BannerPlugin.js

@@ -47,10 +47,12 @@ class BannerPlugin {
 								filename = filename.substr(0, querySplit);
 							}
 
-							if(filename.indexOf("/") < 0) {
+							const lastSlashIndex = filename.lastIndexOf("/");
+
+							if(lastSlashIndex === -1) {
 								basename = filename;
 							} else {
-								basename = filename.substr(filename.lastIndexOf("/") + 1);
+								basename = filename.substr(lastSlashIndex + 1);
 							}
 
 							const comment = compilation.getPath(banner, {

package/lib/Chunk.js

@@ -404,14 +404,14 @@ class Chunk {
 		return this.addMultiplierAndOverhead(integratedModulesSize, options);
 	}
 
-	getChunkMaps(includeEntries, realHash) {
+	getChunkMaps(includeInitial, realHash) {
 		const chunksProcessed = [];
 		const chunkHashMap = {};
 		const chunkNameMap = {};
 		(function addChunk(chunk) {
 			if(chunksProcessed.indexOf(chunk) >= 0) return;
 			chunksProcessed.push(chunk);
-			if(!chunk.hasRuntime() || includeEntries) {
+			if(!chunk.isInitial() || includeInitial) {
 				chunkHashMap[chunk.id] = realHash ? chunk.hash : chunk.renderedHash;
 				if(chunk.name)
 					chunkNameMap[chunk.id] = chunk.name;

package/lib/Compilation.js

@@ -32,9 +32,15 @@ function byId(a, b) {
 	return 0;
 }
 
+function byIndex(a, b) {
+	if(a.index < b.index) return -1;
+	if(a.index > b.index) return 1;
+	return 0;
+}
+
 function iterationBlockVariable(variables, fn) {
 	for(let indexVariable = 0; indexVariable < variables.length; indexVariable++) {
-		let varDep = variables[indexVariable].dependencies;
+		const varDep = variables[indexVariable].dependencies;
 		for(let indexVDep = 0; indexVDep < varDep.length; indexVDep++) {
 			fn(varDep[indexVDep]);
 		}
@@ -116,8 +122,8 @@ class Compilation extends Tapable {
 				cacheModule.disconnect();
 				this._modules[identifier] = cacheModule;
 				this.modules.push(cacheModule);
-				cacheModule.errors.forEach(err => this.errors.push(err), this);
-				cacheModule.warnings.forEach(err => this.warnings.push(err), this);
+				cacheModule.errors.forEach(err => this.errors.push(err));
+				cacheModule.warnings.forEach(err => this.warnings.push(err));
 				return cacheModule;
 			}
 		}
@@ -300,9 +306,7 @@ class Compilation extends Tapable {
 						iterationDependencies(dependencies);
 
 						if(_this.profile) {
-							if(!module.profile) {
-								module.profile = {};
-							}
+							module.profile = module.profile || {};
 							const time = Date.now() - start;
 							if(!module.profile.dependencies || time > module.profile.dependencies) {
 								module.profile.dependencies = time;
@@ -572,112 +576,111 @@ class Compilation extends Tapable {
 	}
 
 	seal(callback) {
-		const self = this;
-		self.applyPlugins0("seal");
-		self.nextFreeModuleIndex = 0;
-		self.nextFreeModuleIndex2 = 0;
-		self.preparedChunks.forEach(preparedChunk => {
+		this.applyPlugins0("seal");
+		this.nextFreeModuleIndex = 0;
+		this.nextFreeModuleIndex2 = 0;
+		this.preparedChunks.forEach(preparedChunk => {
 			const module = preparedChunk.module;
-			const chunk = self.addChunk(preparedChunk.name, module);
-			const entrypoint = self.entrypoints[chunk.name] = new Entrypoint(chunk.name);
+			const chunk = this.addChunk(preparedChunk.name, module);
+			const entrypoint = this.entrypoints[chunk.name] = new Entrypoint(chunk.name);
 			entrypoint.unshiftChunk(chunk);
 
 			chunk.addModule(module);
 			module.addChunk(chunk);
 			chunk.entryModule = module;
-			self.assignIndex(module);
-			self.assignDepth(module);
+			this.assignIndex(module);
+			this.assignDepth(module);
 		});
-		self.processDependenciesBlocksForChunks(self.chunks.slice());
-		self.sortModules(self.modules);
-		self.applyPlugins0("optimize");
+		this.processDependenciesBlocksForChunks(this.chunks.slice());
+		this.sortModules(this.modules);
+		this.applyPlugins0("optimize");
 
-		while(self.applyPluginsBailResult1("optimize-modules-basic", self.modules) ||
-			self.applyPluginsBailResult1("optimize-modules", self.modules) ||
-			self.applyPluginsBailResult1("optimize-modules-advanced", self.modules)) { /* empty */ }
-		self.applyPlugins1("after-optimize-modules", self.modules);
+		while(this.applyPluginsBailResult1("optimize-modules-basic", this.modules) ||
+			this.applyPluginsBailResult1("optimize-modules", this.modules) ||
+			this.applyPluginsBailResult1("optimize-modules-advanced", this.modules)) { /* empty */ }
+		this.applyPlugins1("after-optimize-modules", this.modules);
 
-		while(self.applyPluginsBailResult1("optimize-chunks-basic", self.chunks) ||
-			self.applyPluginsBailResult1("optimize-chunks", self.chunks) ||
-			self.applyPluginsBailResult1("optimize-chunks-advanced", self.chunks)) { /* empty */ }
-		self.applyPlugins1("after-optimize-chunks", self.chunks);
+		while(this.applyPluginsBailResult1("optimize-chunks-basic", this.chunks) ||
+			this.applyPluginsBailResult1("optimize-chunks", this.chunks) ||
+			this.applyPluginsBailResult1("optimize-chunks-advanced", this.chunks)) { /* empty */ }
+		this.applyPlugins1("after-optimize-chunks", this.chunks);
 
-		self.applyPluginsAsyncSeries("optimize-tree", self.chunks, self.modules, function sealPart2(err) {
+		this.applyPluginsAsyncSeries("optimize-tree", this.chunks, this.modules, (err) => {
 			if(err) {
 				return callback(err);
 			}
 
-			self.applyPlugins2("after-optimize-tree", self.chunks, self.modules);
+			this.applyPlugins2("after-optimize-tree", this.chunks, this.modules);
 
-			while(self.applyPluginsBailResult("optimize-chunk-modules-basic", self.chunks, self.modules) ||
-				self.applyPluginsBailResult("optimize-chunk-modules", self.chunks, self.modules) ||
-				self.applyPluginsBailResult("optimize-chunk-modules-advanced", self.chunks, self.modules)) { /* empty */ }
-			self.applyPlugins2("after-optimize-chunk-modules", self.chunks, self.modules);
+			while(this.applyPluginsBailResult("optimize-chunk-modules-basic", this.chunks, this.modules) ||
+				this.applyPluginsBailResult("optimize-chunk-modules", this.chunks, this.modules) ||
+				this.applyPluginsBailResult("optimize-chunk-modules-advanced", this.chunks, this.modules)) { /* empty */ }
+			this.applyPlugins2("after-optimize-chunk-modules", this.chunks, this.modules);
 
-			const shouldRecord = self.applyPluginsBailResult("should-record") !== false;
+			const shouldRecord = this.applyPluginsBailResult("should-record") !== false;
 
-			self.applyPlugins2("revive-modules", self.modules, self.records);
-			self.applyPlugins1("optimize-module-order", self.modules);
-			self.applyPlugins1("advanced-optimize-module-order", self.modules);
-			self.applyPlugins1("before-module-ids", self.modules);
-			self.applyPlugins1("module-ids", self.modules);
-			self.applyModuleIds();
-			self.applyPlugins1("optimize-module-ids", self.modules);
-			self.applyPlugins1("after-optimize-module-ids", self.modules);
+			this.applyPlugins2("revive-modules", this.modules, this.records);
+			this.applyPlugins1("optimize-module-order", this.modules);
+			this.applyPlugins1("advanced-optimize-module-order", this.modules);
+			this.applyPlugins1("before-module-ids", this.modules);
+			this.applyPlugins1("module-ids", this.modules);
+			this.applyModuleIds();
+			this.applyPlugins1("optimize-module-ids", this.modules);
+			this.applyPlugins1("after-optimize-module-ids", this.modules);
 
-			self.sortItemsWithModuleIds();
+			this.sortItemsWithModuleIds();
 
-			self.applyPlugins2("revive-chunks", self.chunks, self.records);
-			self.applyPlugins1("optimize-chunk-order", self.chunks);
-			self.applyPlugins1("before-chunk-ids", self.chunks);
-			self.applyChunkIds();
-			self.applyPlugins1("optimize-chunk-ids", self.chunks);
-			self.applyPlugins1("after-optimize-chunk-ids", self.chunks);
+			this.applyPlugins2("revive-chunks", this.chunks, this.records);
+			this.applyPlugins1("optimize-chunk-order", this.chunks);
+			this.applyPlugins1("before-chunk-ids", this.chunks);
+			this.applyChunkIds();
+			this.applyPlugins1("optimize-chunk-ids", this.chunks);
+			this.applyPlugins1("after-optimize-chunk-ids", this.chunks);
 
-			self.sortItemsWithChunkIds();
+			this.sortItemsWithChunkIds();
 
 			if(shouldRecord)
-				self.applyPlugins2("record-modules", self.modules, self.records);
+				this.applyPlugins2("record-modules", this.modules, this.records);
 			if(shouldRecord)
-				self.applyPlugins2("record-chunks", self.chunks, self.records);
+				this.applyPlugins2("record-chunks", this.chunks, this.records);
 
-			self.applyPlugins0("before-hash");
-			self.createHash();
-			self.applyPlugins0("after-hash");
+			this.applyPlugins0("before-hash");
+			this.createHash();
+			this.applyPlugins0("after-hash");
 
 			if(shouldRecord)
-				self.applyPlugins1("record-hash", self.records);
+				this.applyPlugins1("record-hash", this.records);
 
-			self.applyPlugins0("before-module-assets");
-			self.createModuleAssets();
-			if(self.applyPluginsBailResult("should-generate-chunk-assets") !== false) {
-				self.applyPlugins0("before-chunk-assets");
-				self.createChunkAssets();
+			this.applyPlugins0("before-module-assets");
+			this.createModuleAssets();
+			if(this.applyPluginsBailResult("should-generate-chunk-assets") !== false) {
+				this.applyPlugins0("before-chunk-assets");
+				this.createChunkAssets();
 			}
-			self.applyPlugins1("additional-chunk-assets", self.chunks);
-			self.summarizeDependencies();
+			this.applyPlugins1("additional-chunk-assets", this.chunks);
+			this.summarizeDependencies();
 			if(shouldRecord)
-				self.applyPlugins2("record", self, self.records);
+				this.applyPlugins2("record", this, this.records);
 
-			self.applyPluginsAsync("additional-assets", err => {
+			this.applyPluginsAsync("additional-assets", err => {
 				if(err) {
 					return callback(err);
 				}
-				self.applyPluginsAsync("optimize-chunk-assets", self.chunks, err => {
+				this.applyPluginsAsync("optimize-chunk-assets", this.chunks, err => {
 					if(err) {
 						return callback(err);
 					}
-					self.applyPlugins1("after-optimize-chunk-assets", self.chunks);
-					self.applyPluginsAsync("optimize-assets", self.assets, err => {
+					this.applyPlugins1("after-optimize-chunk-assets", this.chunks);
+					this.applyPluginsAsync("optimize-assets", this.assets, err => {
 						if(err) {
 							return callback(err);
 						}
-						self.applyPlugins1("after-optimize-assets", self.assets);
-						if(self.applyPluginsBailResult("need-additional-seal")) {
-							self.unseal();
-							return self.seal(callback);
+						this.applyPlugins1("after-optimize-assets", this.assets);
+						if(this.applyPluginsBailResult("need-additional-seal")) {
+							this.unseal();
+							return this.seal(callback);
 						}
-						return self.applyPluginsAsync("after-seal", callback);
+						return this.applyPluginsAsync("after-seal", callback);
 					});
 				});
 			});
@@ -685,11 +688,7 @@ class Compilation extends Tapable {
 	}
 
 	sortModules(modules) {
-		modules.sort((a, b) => {
-			if(a.index < b.index) return -1;
-			if(a.index > b.index) return 1;
-			return 0;
-		});
+		modules.sort(byIndex);
 	}
 
 	reportDependencyErrorsAndWarnings(module, blocks) {
@@ -1097,9 +1096,9 @@ class Compilation extends Tapable {
 	}
 
 	applyModuleIds() {
-		let unusedIds = [];
+		const unusedIds = [];
 		let nextFreeModuleId = 0;
-		let usedIds = [];
+		const usedIds = [];
 		// TODO consider Map when performance has improved https://gist.github.com/sokra/234c077e1299b7369461f1708519c392
 		const usedIdMap = Object.create(null);
 		if(this.usedModuleIds) {
@@ -1218,14 +1217,12 @@ class Compilation extends Tapable {
 	sortItemsWithChunkIds() {
 		this.chunks.sort(byId);
 
-		const modules = this.modules;
-		for(let indexModule = 0; indexModule < modules.length; indexModule++) {
-			modules[indexModule].sortItems(true);
+		for(let indexModule = 0; indexModule < this.modules.length; indexModule++) {
+			this.modules[indexModule].sortItems(true);
 		}
 
-		const chunks = this.chunks;
-		for(let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
-			chunks[indexChunk].sortItems();
+		for(let indexChunk = 0; indexChunk < this.chunks.length; indexChunk++) {
+			this.chunks[indexChunk].sortItems();
 		}
 
 		const byMessage = (a, b) => {
@@ -1253,18 +1250,16 @@ class Compilation extends Tapable {
 		this.contextDependencies = [];
 		this.missingDependencies = [];
 
-		const children = this.children;
-		for(let indexChildren = 0; indexChildren < children.length; indexChildren++) {
-			const child = children[indexChildren];
+		for(let indexChildren = 0; indexChildren < this.children.length; indexChildren++) {
+			const child = this.children[indexChildren];
 
 			this.fileDependencies = this.fileDependencies.concat(child.fileDependencies);
 			this.contextDependencies = this.contextDependencies.concat(child.contextDependencies);
 			this.missingDependencies = this.missingDependencies.concat(child.missingDependencies);
 		}
 
-		const modules = this.modules;
-		for(let indexModule = 0; indexModule < modules.length; indexModule++) {
-			const module = modules[indexModule];
+		for(let indexModule = 0; indexModule < this.modules.length; indexModule++) {
+			const module = this.modules[indexModule];
 
 			if(module.fileDependencies) {
 				const fileDependencies = module.fileDependencies;

package/lib/EnvironmentPlugin.js

@@ -7,6 +7,9 @@
 
 const DefinePlugin = require("./DefinePlugin");
 
+const needsEnvVarFix = ["8", "9"].indexOf(process.versions.node.split(".")[0]) >= 0 &&
+	process.platform === "win32";
+
 class EnvironmentPlugin {
 	constructor(keys) {
 		if(Array.isArray(keys)) {
@@ -23,6 +26,13 @@ class EnvironmentPlugin {
 
 	apply(compiler) {
 		const definitions = this.keys.reduce((defs, key) => {
+			// TODO remove once the fix has made its way into Node 8.
+			// Work around https://github.com/nodejs/node/pull/18463,
+			// affecting Node 8 & 9 by performing an OS-level
+			// operation that always succeeds before reading
+			// environment variables:
+			if(needsEnvVarFix) require("os").cpus();
+
 			const value = process.env[key] !== undefined ? process.env[key] : this.defaultValues[key];
 
 			if(value === undefined) {

package/lib/HotModuleReplacementPlugin.js

@@ -215,10 +215,13 @@ module.exports = class HotModuleReplacementPlugin {
 								this.state.module.addDependency(dep);
 								requests.push(request);
 							});
-							if(expr.arguments.length > 1)
+							if(expr.arguments.length > 1) {
 								this.applyPluginsBailResult("hot accept callback", expr.arguments[1], requests);
-							else
+								parser.walkExpression(expr.arguments[1]); // other args are ignored
+							} else {
 								this.applyPluginsBailResult("hot accept without callback", expr, requests);
+							}
+							return true;
 						}
 					}
 				});

package/lib/JsonpMainTemplatePlugin.js

@@ -29,6 +29,7 @@ class JsonpMainTemplatePlugin {
 			const chunkMaps = chunk.getChunkMaps();
 			const crossOriginLoading = this.outputOptions.crossOriginLoading;
 			const chunkLoadTimeout = this.outputOptions.chunkLoadTimeout;
+			const jsonpScriptType = this.outputOptions.jsonpScriptType;
 			const scriptSrcPath = this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
 				hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
 				hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`,
@@ -48,7 +49,7 @@ class JsonpMainTemplatePlugin {
 			});
 			return this.asString([
 				"var script = document.createElement('script');",
-				"script.type = 'text/javascript';",
+				`script.type = ${JSON.stringify(jsonpScriptType)};`,
 				"script.charset = 'utf-8';",
 				"script.async = true;",
 				`script.timeout = ${chunkLoadTimeout};`,

package/lib/MainTemplate.js

@@ -99,7 +99,9 @@ module.exports = class MainTemplate extends Template {
 		});
 		this.plugin("require-extensions", (source, chunk, hash) => {
 			const buf = [];
-			if(chunk.chunks.length > 0) {
+			const chunkMaps = chunk.getChunkMaps();
+			// Check if there are non initial chunks which need to be imported using require-ensure
+			if(Object.keys(chunkMaps.hash).length) {
 				buf.push("// This file contains only the entry chunk.");
 				buf.push("// The chunk loading function for additional chunks");
 				buf.push(`${this.requireFn}.e = function requireEnsure(chunkId) {`);

package/lib/NoEmitOnErrorsPlugin.js

@@ -7,12 +7,12 @@
 class NoEmitOnErrorsPlugin {
 	apply(compiler) {
 		compiler.plugin("should-emit", (compilation) => {
-			if(compilation.errors.length > 0)
+			if(compilation.getStats().hasErrors())
 				return false;
 		});
 		compiler.plugin("compilation", (compilation) => {
 			compilation.plugin("should-record", () => {
-				if(compilation.errors.length > 0)
+				if(compilation.getStats().hasErrors())
 					return false;
 			});
 		});

package/lib/NormalModuleFactory.js

@@ -133,7 +133,9 @@ class NormalModuleFactory extends Tapable {
 				try {
 					loaders.forEach(item => {
 						if(typeof item.options === "string" && /^\?/.test(item.options)) {
-							item.options = this.ruleSet.findOptionsByIdent(item.options.substr(1));
+							const ident = item.options.substr(1);
+							item.options = this.ruleSet.findOptionsByIdent(ident);
+							item.ident = ident;
 						}
 					});
 				} catch(e) {

package/lib/Parser.js

@@ -174,6 +174,15 @@ class Parser extends Tapable {
 				res.setNumber(left.number / right.number);
 				res.setRange(expr.range);
 				return res;
+			} else if(expr.operator === "**") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(Math.pow(left.number, right.number));
+				res.setRange(expr.range);
+				return res;
 			} else if(expr.operator === "==" || expr.operator === "===") {
 				left = this.evaluateExpression(expr.left);
 				right = this.evaluateExpression(expr.right);
@@ -200,6 +209,60 @@ class Parser extends Tapable {
 				} else if(left.isBoolean() && right.isBoolean()) {
 					return res.setBoolean(left.bool !== right.bool);
 				}
+			} else if(expr.operator === "&") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number & right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "|") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number | right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "^") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number ^ right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === ">>>") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number >>> right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === ">>") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number >> right.number);
+				res.setRange(expr.range);
+				return res;
+			} else if(expr.operator === "<<") {
+				left = this.evaluateExpression(expr.left);
+				right = this.evaluateExpression(expr.right);
+				if(!left || !right) return;
+				if(!left.isNumber() || !right.isNumber()) return;
+				res = new BasicEvaluatedExpression();
+				res.setNumber(left.number << right.number);
+				res.setRange(expr.range);
+				return res;
 			}
 		});
 		this.plugin("evaluate UnaryExpression", function(expr) {
@@ -242,6 +305,14 @@ class Parser extends Tapable {
 				} else if(argument.isNumber()) {
 					return new BasicEvaluatedExpression().setBoolean(!argument.number).setRange(expr.range);
 				}
+			} else if(expr.operator === "~") {
+				const argument = this.evaluateExpression(expr.argument);
+				if(!argument) return;
+				if(!argument.isNumber()) return;
+				const res = new BasicEvaluatedExpression();
+				res.setNumber(~argument.number);
+				res.setRange(expr.range);
+				return res;
 			}
 		});
 		this.plugin("evaluate typeof undefined", function(expr) {
@@ -1047,6 +1118,14 @@ class Parser extends Tapable {
 	}
 
 	walkNewExpression(expression) {
+		const callee = this.evaluateExpression(expression.callee);
+		if(callee.isIdentifier()) {
+			const result = this.applyPluginsBailResult("new " + callee.identifier, expression);
+			if(result === true) {
+				return;
+			}
+		}
+
 		this.walkExpression(expression.callee);
 		if(expression.arguments)
 			this.walkExpressions(expression.arguments);

package/lib/SourceMapDevToolPlugin.js

@@ -181,14 +181,14 @@ class SourceMapDevToolPlugin {
 						}
 						let sourceMapFile = compilation.getPath(sourceMapFilename, {
 							chunk,
-							filename,
+							filename: options.fileContext ? path.relative(options.fileContext, filename) : filename,
 							query,
 							basename: basename(filename)
 						});
 						if(sourceMapFile.indexOf("[contenthash]") !== -1) {
 							sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));
 						}
-						const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
+						const sourceMapUrl = options.publicPath ? options.publicPath + sourceMapFile.replace(/\\/g, "/") : path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
 						if(currentSourceMappingURLComment !== false) {
 							asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
 						}

package/lib/Stats.js

@@ -50,11 +50,13 @@ class Stats {
 	}
 
 	hasWarnings() {
-		return this.compilation.warnings.length > 0;
+		return this.compilation.warnings.length > 0 ||
+			this.compilation.children.some(child => child.getStats().hasWarnings());
 	}
 
 	hasErrors() {
-		return this.compilation.errors.length > 0;
+		return this.compilation.errors.length > 0 ||
+			this.compilation.children.some(child => child.getStats().hasErrors());
 	}
 
 	// remove a prefixed "!" that can be specified to reverse sort order

package/lib/TemplatedPathPlugin.js

@@ -60,6 +60,10 @@ const replacePathVariables = (path, data) => {
 	const chunkHash = chunk && (chunk.renderedHash || chunk.hash);
 	const chunkHashWithLength = chunk && chunk.hashWithLength;
 
+	if(typeof path === "function") {
+		path = path(data);
+	}
+
 	if(data.noChunkHash && REGEXP_CHUNKHASH_FOR_TEST.test(path)) {
 		throw new Error(`Cannot use [chunkhash] for chunk in '${path}' (use [hash] instead)`);
 	}
@@ -101,9 +105,9 @@ class TemplatedPathPlugin {
 				const outputOptions = this.outputOptions;
 				const chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
 				if(REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename))
-					hash.update(JSON.stringify(chunk.getChunkMaps(true, true).hash));
+					hash.update(JSON.stringify(chunk.getChunkMaps(false, true).hash));
 				if(REGEXP_NAME_FOR_TEST.test(chunkFilename))
-					hash.update(JSON.stringify(chunk.getChunkMaps(true, true).name));
+					hash.update(JSON.stringify(chunk.getChunkMaps(false, true).name));
 			});
 		});
 	}

package/lib/WebpackOptionsDefaulter.js

@@ -61,6 +61,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("output.hotUpdateChunkFilename", "[id].[hash].hot-update.js");
 		this.set("output.hotUpdateMainFilename", "[hash].hot-update.json");
 		this.set("output.crossOriginLoading", false);
+		this.set("output.jsonpScriptType", "text/javascript");
 		this.set("output.chunkLoadTimeout", 120000);
 		this.set("output.hashFunction", "md5");
 		this.set("output.hashDigest", "hex");

package/lib/dependencies/RequireIncludeDependency.js

@@ -11,6 +11,14 @@ class RequireIncludeDependency extends ModuleDependency {
 		this.range = range;
 	}
 
+	getReference() {
+		if(!this.module) return null;
+		return {
+			module: this.module,
+			importedNames: [] // This doesn't use any export
+		};
+	}
+
 	get type() {
 		return "require.include";
 	}

package/lib/node/NodeTargetPlugin.js

@@ -6,9 +6,11 @@
 
 const ExternalsPlugin = require("../ExternalsPlugin");
 
+const builtins = require("module").builtinModules || Object.keys(process.binding("natives"));
+
 class NodeTargetPlugin {
 	apply(compiler) {
-		new ExternalsPlugin("commonjs", Object.keys(process.binding("natives"))).apply(compiler);
+		new ExternalsPlugin("commonjs", builtins).apply(compiler);
 	}
 }
 

package/lib/optimize/ConcatenatedModule.js

@@ -143,6 +143,7 @@ function getPathInAst(ast, node) {
 	}
 
 	function enterNode(n) {
+		if(!n) return undefined;
 		const r = n.range;
 		if(r) {
 			if(r[0] <= nr[0] && r[1] >= nr[1]) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "webpack",
-  "version": "3.9.0",
+  "version": "3.12.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": {
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^2.0.0",
-    "ajv": "^5.1.5",
-    "ajv-keywords": "^2.0.0",
+    "ajv": "^6.1.0",
+    "ajv-keywords": "^3.1.0",
     "async": "^2.1.2",
     "enhanced-resolve": "^3.4.0",
     "escope": "^3.6.0",
@@ -54,7 +54,6 @@
     "lodash": "^4.17.4",
     "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.0.0",
-    "nsp": "^2.6.1",
     "raw-loader": "~0.5.0",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",
@@ -95,13 +94,13 @@
     "test:unit": "mocha test/*.unittest.js --max-old-space-size=4096 --harmony --trace-deprecation --check-leaks",
     "travis:integration": "npm run cover:init && npm run cover:integration && npm run cover:report-min",
     "travis:unit": "npm run cover:init && npm run cover:unit && npm run cover:report-min",
-    "travis:lint": "npm run lint-files && npm run nsp",
+    "travis:lint": "npm run lint-files",
     "travis:benchmark": "npm run benchmark",
     "appveyor:integration": "npm run cover:init && npm run cover:integration && npm run cover:report-min",
     "appveyor:unit": "npm run cover:init && npm run cover:unit && npm run cover:report-min",
     "appveyor:benchmark": "npm run benchmark",
     "circleci:test": "node node_modules/mocha/bin/mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.test.js test/*.unittest.js",
-    "circleci:lint": "npm run lint-files && npm run nsp",
+    "circleci:lint": "npm run lint-files",
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "npm run lint-files",
     "lint-files": "npm run lint && npm run beautify-lint && npm run schema-lint",
@@ -109,7 +108,6 @@
     "fix": "npm run lint -- --fix",
     "beautify-lint": "beautify-lint \"lib/**/*.js\" \"hot/**/*.js\" \"bin/**/*.js\" \"benchmark/*.js\" \"test/*.js\"",
     "schema-lint": "mocha test/*.lint.js --opts test/lint-mocha.opts",
-    "nsp": "nsp check --output summary",
     "benchmark": "mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.benchmark.js -R spec",
     "cover": "npm run cover:init && npm run cover:all && npm run cover:report",
     "cover:init": "rimraf coverage",

package/schemas/webpackOptionsSchema.json

@@ -296,7 +296,14 @@
         },
         "chunkFilename": {
           "description": "The filename of non-entry chunks as relative path inside the `output.path` directory.",
-          "type": "string",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "instanceof": "Function"
+            }
+          ],
           "absolutePath": false
         },
         "crossOriginLoading": {
@@ -307,6 +314,13 @@
             "use-credentials"
           ]
         },
+        "jsonpScriptType": {
+          "description": "This option enables loading async chunks via a custom script type, such as script type=\"module\"",
+          "enum": [
+            "text/javascript",
+            "module"
+          ]
+        },
         "chunkLoadTimeout": {
           "description": "Number of milliseconds before chunk request expires",
           "type": "number"
@@ -348,7 +362,14 @@
         },
         "filename": {
           "description": "Specifies the name of each output file on disk. You must **not** specify an absolute path here! The `output.path` option determines the location on disk the files are written to, filename is used solely for naming the individual files.",
-          "type": "string",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "instanceof": "Function"
+            }
+          ],
           "absolutePath": false
         },
         "hashDigest": {
@@ -376,7 +397,14 @@
         },
         "hotUpdateChunkFilename": {
           "description": "The filename of the Hot Update Chunks. They are inside the output.path directory.",
-          "type": "string",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "instanceof": "Function"
+            }
+          ],
           "absolutePath": false
         },
         "hotUpdateFunction": {
@@ -385,7 +413,14 @@
         },
         "hotUpdateMainFilename": {
           "description": "The filename of the Hot Update Main File. It is inside the `output.path` directory.",
-          "type": "string",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "instanceof": "Function"
+            }
+          ],
           "absolutePath": false
         },
         "jsonpFunction": {
@@ -464,7 +499,14 @@
         },
         "publicPath": {
           "description": "The `publicPath` specifies the public URL address of the output files when referenced in a browser.",
-          "type": "string"
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "instanceof": "Function"
+            }
+          ]
         },
         "sourceMapFilename": {
           "description": "The filename of the SourceMaps for the JavaScript files. They are inside the `output.path` directory.",
@@ -931,6 +973,10 @@
                 }
               ]
             },
+            "ident": {
+              "description": "Unique loader identifier",
+              "type": "string"
+            },
             "query": {
               "description": "Loader query",
               "anyOf": [
@@ -1468,6 +1514,13 @@
           "description": "Delay the rebuilt after the first change. Value is a time in ms.",
           "type": "number"
         },
+        "ignored": {
+          "description": "Ignore some files from watching"
+        },
+        "stdin": {
+          "description": "Stop watching when stdin stream has ended",
+          "type": "boolean"
+        },
         "poll": {
           "description": "Enable polling mode for watching",
           "anyOf": [