webpack 3.8.1 → 3.11.0

package/lib/JsonpHotUpdateChunkTemplatePlugin.js

@@ -1,27 +1,27 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConcatSource = require("webpack-sources").ConcatSource;
-
-class JsonpHotUpdateChunkTemplatePlugin {
-	apply(hotUpdateChunkTemplate) {
-		hotUpdateChunkTemplate.plugin("render", function(modulesSource, modules, removedModules, hash, id) {
-			const source = new ConcatSource();
-			source.add(`${this.outputOptions.hotUpdateFunction}(${JSON.stringify(id)},`);
-			source.add(modulesSource);
-			source.add(")");
-			return source;
-		});
-		hotUpdateChunkTemplate.plugin("hash", function(hash) {
-			hash.update("JsonpHotUpdateChunkTemplatePlugin");
-			hash.update("3");
-			hash.update(`${this.outputOptions.hotUpdateFunction}`);
-			hash.update(`${this.outputOptions.library}`);
-		});
-	}
-}
-
-module.exports = JsonpHotUpdateChunkTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConcatSource = require("webpack-sources").ConcatSource;
+
+class JsonpHotUpdateChunkTemplatePlugin {
+	apply(hotUpdateChunkTemplate) {
+		hotUpdateChunkTemplate.plugin("render", function(modulesSource, modules, removedModules, hash, id) {
+			const source = new ConcatSource();
+			source.add(`${this.outputOptions.hotUpdateFunction}(${JSON.stringify(id)},`);
+			source.add(modulesSource);
+			source.add(")");
+			return source;
+		});
+		hotUpdateChunkTemplate.plugin("hash", function(hash) {
+			hash.update("JsonpHotUpdateChunkTemplatePlugin");
+			hash.update("3");
+			hash.update(`${this.outputOptions.hotUpdateFunction}`);
+			hash.update(`${this.outputOptions.library}`);
+		});
+	}
+}
+
+module.exports = JsonpHotUpdateChunkTemplatePlugin;

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};`,
@@ -195,8 +196,8 @@ class JsonpMainTemplatePlugin {
 function hotDisposeChunk(chunkId) {
 	delete installedChunks[chunkId];
 }
-var parentHotUpdateCallback = this[${JSON.stringify(hotUpdateFunction)}];
-this[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
+var parentHotUpdateCallback = window[${JSON.stringify(hotUpdateFunction)}];
+window[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
 		});
 		mainTemplate.plugin("hash", function(hash) {
 			hash.update("jsonp");

package/lib/JsonpTemplatePlugin.js

@@ -1,21 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const JsonpMainTemplatePlugin = require("./JsonpMainTemplatePlugin");
-const JsonpChunkTemplatePlugin = require("./JsonpChunkTemplatePlugin");
-const JsonpHotUpdateChunkTemplatePlugin = require("./JsonpHotUpdateChunkTemplatePlugin");
-
-class JsonpTemplatePlugin {
-	apply(compiler) {
-		compiler.plugin("this-compilation", (compilation) => {
-			compilation.mainTemplate.apply(new JsonpMainTemplatePlugin());
-			compilation.chunkTemplate.apply(new JsonpChunkTemplatePlugin());
-			compilation.hotUpdateChunkTemplate.apply(new JsonpHotUpdateChunkTemplatePlugin());
-		});
-	}
-}
-
-module.exports = JsonpTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const JsonpMainTemplatePlugin = require("./JsonpMainTemplatePlugin");
+const JsonpChunkTemplatePlugin = require("./JsonpChunkTemplatePlugin");
+const JsonpHotUpdateChunkTemplatePlugin = require("./JsonpHotUpdateChunkTemplatePlugin");
+
+class JsonpTemplatePlugin {
+	apply(compiler) {
+		compiler.plugin("this-compilation", (compilation) => {
+			compilation.mainTemplate.apply(new JsonpMainTemplatePlugin());
+			compilation.chunkTemplate.apply(new JsonpChunkTemplatePlugin());
+			compilation.hotUpdateChunkTemplate.apply(new JsonpHotUpdateChunkTemplatePlugin());
+		});
+	}
+}
+
+module.exports = JsonpTemplatePlugin;

package/lib/LibManifestPlugin.js

@@ -1,63 +1,63 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-const asyncLib = require("async");
-
-class LibManifestPlugin {
-	constructor(options) {
-		this.options = options;
-	}
-
-	apply(compiler) {
-		compiler.plugin("emit", (compilation, callback) => {
-			asyncLib.forEach(compilation.chunks, (chunk, callback) => {
-				if(!chunk.isInitial()) {
-					callback();
-					return;
-				}
-				const targetPath = compilation.getPath(this.options.path, {
-					hash: compilation.hash,
-					chunk
-				});
-				const name = this.options.name && compilation.getPath(this.options.name, {
-					hash: compilation.hash,
-					chunk
-				});
-				const manifest = {
-					name,
-					type: this.options.type,
-					content: chunk.mapModules(module => {
-						if(module.libIdent) {
-							const ident = module.libIdent({
-								context: this.options.context || compiler.options.context
-							});
-							if(ident) {
-								return {
-									ident,
-									data: {
-										id: module.id,
-										meta: module.meta,
-										exports: Array.isArray(module.providedExports) ? module.providedExports : undefined
-									}
-								};
-							}
-						}
-					}).filter(Boolean).reduce((obj, item) => {
-						obj[item.ident] = item.data;
-						return obj;
-					}, Object.create(null))
-				};
-				const content = new Buffer(JSON.stringify(manifest), "utf8"); //eslint-disable-line
-				compiler.outputFileSystem.mkdirp(path.dirname(targetPath), err => {
-					if(err) return callback(err);
-					compiler.outputFileSystem.writeFile(targetPath, content, callback);
-				});
-			}, callback);
-		});
-	}
-}
-module.exports = LibManifestPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const asyncLib = require("async");
+
+class LibManifestPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		compiler.plugin("emit", (compilation, callback) => {
+			asyncLib.forEach(compilation.chunks, (chunk, callback) => {
+				if(!chunk.isInitial()) {
+					callback();
+					return;
+				}
+				const targetPath = compilation.getPath(this.options.path, {
+					hash: compilation.hash,
+					chunk
+				});
+				const name = this.options.name && compilation.getPath(this.options.name, {
+					hash: compilation.hash,
+					chunk
+				});
+				const manifest = {
+					name,
+					type: this.options.type,
+					content: chunk.mapModules(module => {
+						if(module.libIdent) {
+							const ident = module.libIdent({
+								context: this.options.context || compiler.options.context
+							});
+							if(ident) {
+								return {
+									ident,
+									data: {
+										id: module.id,
+										meta: module.meta,
+										exports: Array.isArray(module.providedExports) ? module.providedExports : undefined
+									}
+								};
+							}
+						}
+					}).filter(Boolean).reduce((obj, item) => {
+						obj[item.ident] = item.data;
+						return obj;
+					}, Object.create(null))
+				};
+				const content = new Buffer(JSON.stringify(manifest), "utf8"); //eslint-disable-line
+				compiler.outputFileSystem.mkdirp(path.dirname(targetPath), err => {
+					if(err) return callback(err);
+					compiler.outputFileSystem.writeFile(targetPath, content, callback);
+				});
+			}, callback);
+		});
+	}
+}
+module.exports = LibManifestPlugin;

package/lib/LibraryTemplatePlugin.js

@@ -1,92 +1,92 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
-
-function accessorToObjectAccess(accessor) {
-	return accessor.map((a) => {
-		return `[${JSON.stringify(a)}]`;
-	}).join("");
-}
-
-function accessorAccess(base, accessor, joinWith) {
-	accessor = [].concat(accessor);
-	return accessor.map((a, idx) => {
-		a = base ?
-			base + accessorToObjectAccess(accessor.slice(0, idx + 1)) :
-			accessor[0] + accessorToObjectAccess(accessor.slice(1, idx + 1));
-		if(idx === accessor.length - 1) return a;
-		if(idx === 0 && typeof base === "undefined") return `${a} = typeof ${a} === "object" ? ${a} : {}`;
-		return `${a} = ${a} || {}`;
-	}).join(joinWith || "; ");
-}
-
-class LibraryTemplatePlugin {
-
-	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
-		this.name = name;
-		this.target = target;
-		this.umdNamedDefine = umdNamedDefine;
-		this.auxiliaryComment = auxiliaryComment;
-		this.exportProperty = exportProperty;
-	}
-
-	apply(compiler) {
-		compiler.plugin("this-compilation", (compilation) => {
-			if(this.exportProperty) {
-				var ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
-				compilation.apply(new ExportPropertyMainTemplatePlugin(this.exportProperty));
-			}
-			switch(this.target) {
-				case "var":
-					compilation.apply(new SetVarMainTemplatePlugin(`var ${accessorAccess(false, this.name)}`));
-					break;
-				case "assign":
-					compilation.apply(new SetVarMainTemplatePlugin(accessorAccess(undefined, this.name)));
-					break;
-				case "this":
-				case "window":
-				case "global":
-					if(this.name)
-						compilation.apply(new SetVarMainTemplatePlugin(accessorAccess(this.target, this.name)));
-					else
-						compilation.apply(new SetVarMainTemplatePlugin(this.target, true));
-					break;
-				case "commonjs":
-					if(this.name)
-						compilation.apply(new SetVarMainTemplatePlugin(accessorAccess("exports", this.name)));
-					else
-						compilation.apply(new SetVarMainTemplatePlugin("exports", true));
-					break;
-				case "commonjs2":
-				case "commonjs-module":
-					compilation.apply(new SetVarMainTemplatePlugin("module.exports"));
-					break;
-				case "amd":
-					var AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
-					compilation.apply(new AmdMainTemplatePlugin(this.name));
-					break;
-				case "umd":
-				case "umd2":
-					var UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
-					compilation.apply(new UmdMainTemplatePlugin(this.name, {
-						optionalAmdExternalAsGlobal: this.target === "umd2",
-						namedDefine: this.umdNamedDefine,
-						auxiliaryComment: this.auxiliaryComment
-					}));
-					break;
-				case "jsonp":
-					var JsonpExportMainTemplatePlugin = require("./JsonpExportMainTemplatePlugin");
-					compilation.apply(new JsonpExportMainTemplatePlugin(this.name));
-					break;
-				default:
-					throw new Error(`${this.target} is not a valid Library target`);
-			}
-		});
-	}
-}
-
-module.exports = LibraryTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
+
+function accessorToObjectAccess(accessor) {
+	return accessor.map((a) => {
+		return `[${JSON.stringify(a)}]`;
+	}).join("");
+}
+
+function accessorAccess(base, accessor, joinWith) {
+	accessor = [].concat(accessor);
+	return accessor.map((a, idx) => {
+		a = base ?
+			base + accessorToObjectAccess(accessor.slice(0, idx + 1)) :
+			accessor[0] + accessorToObjectAccess(accessor.slice(1, idx + 1));
+		if(idx === accessor.length - 1) return a;
+		if(idx === 0 && typeof base === "undefined") return `${a} = typeof ${a} === "object" ? ${a} : {}`;
+		return `${a} = ${a} || {}`;
+	}).join(joinWith || "; ");
+}
+
+class LibraryTemplatePlugin {
+
+	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
+		this.name = name;
+		this.target = target;
+		this.umdNamedDefine = umdNamedDefine;
+		this.auxiliaryComment = auxiliaryComment;
+		this.exportProperty = exportProperty;
+	}
+
+	apply(compiler) {
+		compiler.plugin("this-compilation", (compilation) => {
+			if(this.exportProperty) {
+				var ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
+				compilation.apply(new ExportPropertyMainTemplatePlugin(this.exportProperty));
+			}
+			switch(this.target) {
+				case "var":
+					compilation.apply(new SetVarMainTemplatePlugin(`var ${accessorAccess(false, this.name)}`));
+					break;
+				case "assign":
+					compilation.apply(new SetVarMainTemplatePlugin(accessorAccess(undefined, this.name)));
+					break;
+				case "this":
+				case "window":
+				case "global":
+					if(this.name)
+						compilation.apply(new SetVarMainTemplatePlugin(accessorAccess(this.target, this.name)));
+					else
+						compilation.apply(new SetVarMainTemplatePlugin(this.target, true));
+					break;
+				case "commonjs":
+					if(this.name)
+						compilation.apply(new SetVarMainTemplatePlugin(accessorAccess("exports", this.name)));
+					else
+						compilation.apply(new SetVarMainTemplatePlugin("exports", true));
+					break;
+				case "commonjs2":
+				case "commonjs-module":
+					compilation.apply(new SetVarMainTemplatePlugin("module.exports"));
+					break;
+				case "amd":
+					var AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
+					compilation.apply(new AmdMainTemplatePlugin(this.name));
+					break;
+				case "umd":
+				case "umd2":
+					var UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
+					compilation.apply(new UmdMainTemplatePlugin(this.name, {
+						optionalAmdExternalAsGlobal: this.target === "umd2",
+						namedDefine: this.umdNamedDefine,
+						auxiliaryComment: this.auxiliaryComment
+					}));
+					break;
+				case "jsonp":
+					var JsonpExportMainTemplatePlugin = require("./JsonpExportMainTemplatePlugin");
+					compilation.apply(new JsonpExportMainTemplatePlugin(this.name));
+					break;
+				default:
+					throw new Error(`${this.target} is not a valid Library target`);
+			}
+		});
+	}
+}
+
+module.exports = LibraryTemplatePlugin;

package/lib/LoaderOptionsPlugin.js

@@ -1,36 +1,36 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-
-class LoaderOptionsPlugin {
-	constructor(options) {
-		if(typeof options !== "object") options = {};
-		if(!options.test) options.test = {
-			test: () => true
-		};
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		compiler.plugin("compilation", (compilation) => {
-			compilation.plugin("normal-module-loader", (context, module) => {
-				const resource = module.resource;
-				if(!resource) return;
-				const i = resource.indexOf("?");
-				if(ModuleFilenameHelpers.matchObject(options, i < 0 ? resource : resource.substr(0, i))) {
-					const filterSet = new Set(["include", "exclude", "test"]);
-					Object.keys(options)
-						.filter((key) => !filterSet.has(key))
-						.forEach((key) => context[key] = options[key]);
-				}
-			});
-		});
-	}
-}
-
-module.exports = LoaderOptionsPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+
+class LoaderOptionsPlugin {
+	constructor(options) {
+		if(typeof options !== "object") options = {};
+		if(!options.test) options.test = {
+			test: () => true
+		};
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("normal-module-loader", (context, module) => {
+				const resource = module.resource;
+				if(!resource) return;
+				const i = resource.indexOf("?");
+				if(ModuleFilenameHelpers.matchObject(options, i < 0 ? resource : resource.substr(0, i))) {
+					const filterSet = new Set(["include", "exclude", "test"]);
+					Object.keys(options)
+						.filter((key) => !filterSet.has(key))
+						.forEach((key) => context[key] = options[key]);
+				}
+			});
+		});
+	}
+}
+
+module.exports = LoaderOptionsPlugin;

package/lib/LoaderTargetPlugin.js

@@ -1,19 +1,19 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class LoaderTargetPlugin {
-	constructor(target) {
-		this.target = target;
-	}
-
-	apply(compiler) {
-		compiler.plugin("compilation", (compilation) => {
-			compilation.plugin("normal-module-loader", (loaderContext) => loaderContext.target = this.target);
-		});
-	}
-}
-
-module.exports = LoaderTargetPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class LoaderTargetPlugin {
+	constructor(target) {
+		this.target = target;
+	}
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("normal-module-loader", (loaderContext) => loaderContext.target = this.target);
+		});
+	}
+}
+
+module.exports = LoaderTargetPlugin;

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/MemoryOutputFileSystem.js

@@ -1,5 +1,5 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = require("memory-fs");
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+module.exports = require("memory-fs");

package/lib/ModuleBuildError.js

@@ -1,42 +1,42 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-const cutOffLoaderExecution = require("./ErrorHelpers").cutOffLoaderExecution;
-
-class ModuleBuildError extends WebpackError {
-	constructor(module, err) {
-		super();
-
-		this.name = "ModuleBuildError";
-		this.message = "Module build failed: ";
-		if(err !== null && typeof err === "object") {
-			if(typeof err.stack === "string" && err.stack) {
-				var stack = cutOffLoaderExecution(err.stack);
-				if(!err.hideStack) {
-					this.message += stack;
-				} else {
-					this.details = stack;
-					if(typeof err.message === "string" && err.message) {
-						this.message += err.message;
-					} else {
-						this.message += err;
-					}
-				}
-			} else if(typeof err.message === "string" && err.message) {
-				this.message += err.message;
-			} else {
-				this.message += err;
-			}
-		}
-		this.module = module;
-		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = ModuleBuildError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+const cutOffLoaderExecution = require("./ErrorHelpers").cutOffLoaderExecution;
+
+class ModuleBuildError extends WebpackError {
+	constructor(module, err) {
+		super();
+
+		this.name = "ModuleBuildError";
+		this.message = "Module build failed: ";
+		if(err !== null && typeof err === "object") {
+			if(typeof err.stack === "string" && err.stack) {
+				var stack = cutOffLoaderExecution(err.stack);
+				if(!err.hideStack) {
+					this.message += stack;
+				} else {
+					this.details = stack;
+					if(typeof err.message === "string" && err.message) {
+						this.message += err.message;
+					} else {
+						this.message += err;
+					}
+				}
+			} else if(typeof err.message === "string" && err.message) {
+				this.message += err.message;
+			} else {
+				this.message += err;
+			}
+		}
+		this.module = module;
+		this.error = err;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = ModuleBuildError;