webpack 3.6.0 → 3.8.1

package/lib/IgnorePlugin.js

@@ -1,69 +1,69 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class IgnorePlugin {
-	constructor(resourceRegExp, contextRegExp) {
-		this.resourceRegExp = resourceRegExp;
-		this.contextRegExp = contextRegExp;
-
-		this.checkIgnore = this.checkIgnore.bind(this);
-	}
-
-	/*
-	 * Only returns true if a "resourceRegExp" exists
-	 * and the resource given matches the regexp.
-	 */
-	checkResource(resource) {
-		if(!this.resourceRegExp) {
-			return false;
-		}
-		return this.resourceRegExp.test(resource);
-	}
-
-	/*
-	 * Returns true if contextRegExp does not exist
-	 * or if context matches the given regexp.
-	 */
-	checkContext(context) {
-		if(!this.contextRegExp) {
-			return true;
-		}
-		return this.contextRegExp.test(context);
-	}
-
-	/*
-	 * Returns true if result should be ignored.
-	 * false if it shouldn't.
-	 *
-	 * Not that if "contextRegExp" is given, both the "resourceRegExp"
-	 * and "contextRegExp" have to match.
-	 */
-	checkResult(result) {
-		if(!result) {
-			return true;
-		}
-		return this.checkResource(result.request) && this.checkContext(result.context);
-	}
-
-	checkIgnore(result, callback) {
-		// check if result is ignored
-		if(this.checkResult(result)) {
-			return callback();
-		}
-		return callback(null, result);
-	}
-
-	apply(compiler) {
-		compiler.plugin("normal-module-factory", (nmf) => {
-			nmf.plugin("before-resolve", this.checkIgnore);
-		});
-		compiler.plugin("context-module-factory", (cmf) => {
-			cmf.plugin("before-resolve", this.checkIgnore);
-		});
-	}
-}
-
-module.exports = IgnorePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class IgnorePlugin {
+	constructor(resourceRegExp, contextRegExp) {
+		this.resourceRegExp = resourceRegExp;
+		this.contextRegExp = contextRegExp;
+
+		this.checkIgnore = this.checkIgnore.bind(this);
+	}
+
+	/*
+	 * Only returns true if a "resourceRegExp" exists
+	 * and the resource given matches the regexp.
+	 */
+	checkResource(resource) {
+		if(!this.resourceRegExp) {
+			return false;
+		}
+		return this.resourceRegExp.test(resource);
+	}
+
+	/*
+	 * Returns true if contextRegExp does not exist
+	 * or if context matches the given regexp.
+	 */
+	checkContext(context) {
+		if(!this.contextRegExp) {
+			return true;
+		}
+		return this.contextRegExp.test(context);
+	}
+
+	/*
+	 * Returns true if result should be ignored.
+	 * false if it shouldn't.
+	 *
+	 * Not that if "contextRegExp" is given, both the "resourceRegExp"
+	 * and "contextRegExp" have to match.
+	 */
+	checkResult(result) {
+		if(!result) {
+			return true;
+		}
+		return this.checkResource(result.request) && this.checkContext(result.context);
+	}
+
+	checkIgnore(result, callback) {
+		// check if result is ignored
+		if(this.checkResult(result)) {
+			return callback();
+		}
+		return callback(null, result);
+	}
+
+	apply(compiler) {
+		compiler.plugin("normal-module-factory", (nmf) => {
+			nmf.plugin("before-resolve", this.checkIgnore);
+		});
+		compiler.plugin("context-module-factory", (cmf) => {
+			cmf.plugin("before-resolve", this.checkIgnore);
+		});
+	}
+}
+
+module.exports = IgnorePlugin;

package/lib/JsonpExportMainTemplatePlugin.js

@@ -1,37 +1,37 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConcatSource = require("webpack-sources").ConcatSource;
-
-class JsonpExportMainTemplatePlugin {
-	constructor(name) {
-		this.name = name;
-	}
-
-	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-
-		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
-			const name = mainTemplate.applyPluginsWaterfall("asset-path", this.name || "", {
-				hash: hash,
-				chunk: chunk
-			});
-			return new ConcatSource(`${name}(`, source, ");");
-		});
-
-		mainTemplate.plugin("global-hash-paths", paths => {
-			if(this.name) paths.push(this.name);
-			return paths;
-		});
-
-		mainTemplate.plugin("hash", hash => {
-			hash.update("jsonp export");
-			hash.update(`${this.name}`);
-		});
-	}
-}
-
-module.exports = JsonpExportMainTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConcatSource = require("webpack-sources").ConcatSource;
+
+class JsonpExportMainTemplatePlugin {
+	constructor(name) {
+		this.name = name;
+	}
+
+	apply(compilation) {
+		const mainTemplate = compilation.mainTemplate;
+
+		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+			const name = mainTemplate.applyPluginsWaterfall("asset-path", this.name || "", {
+				hash: hash,
+				chunk: chunk
+			});
+			return new ConcatSource(`${name}(`, source, ");");
+		});
+
+		mainTemplate.plugin("global-hash-paths", paths => {
+			if(this.name) paths.push(this.name);
+			return paths;
+		});
+
+		mainTemplate.plugin("hash", hash => {
+			hash.update("jsonp export");
+			hash.update(`${this.name}`);
+		});
+	}
+}
+
+module.exports = JsonpExportMainTemplatePlugin;

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/JsonpMainTemplate.runtime.js

@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-/*globals hotAddUpdateChunk parentHotUpdateCallback document XMLHttpRequest $require$ $hotChunkFilename$ $hotMainFilename$ */
+/*globals hotAddUpdateChunk parentHotUpdateCallback document XMLHttpRequest $require$ $hotChunkFilename$ $hotMainFilename$ $crossOriginLoading$ */
 module.exports = function() {
 	function webpackHotUpdateCallback(chunkId, moreModules) { // eslint-disable-line no-unused-vars
 		hotAddUpdateChunk(chunkId, moreModules);
@@ -15,6 +15,7 @@ module.exports = function() {
 		script.type = "text/javascript";
 		script.charset = "utf-8";
 		script.src = $require$.p + $hotChunkFilename$;
+		$crossOriginLoading$;
 		head.appendChild(script);
 	}
 

package/lib/JsonpMainTemplatePlugin.js

@@ -171,6 +171,7 @@ class JsonpMainTemplatePlugin {
 		mainTemplate.plugin("hot-bootstrap", function(source, chunk, hash) {
 			const hotUpdateChunkFilename = this.outputOptions.hotUpdateChunkFilename;
 			const hotUpdateMainFilename = this.outputOptions.hotUpdateMainFilename;
+			const crossOriginLoading = this.outputOptions.crossOriginLoading;
 			const hotUpdateFunction = this.outputOptions.hotUpdateFunction;
 			const currentHotUpdateChunkFilename = this.applyPluginsWaterfall("asset-path", JSON.stringify(hotUpdateChunkFilename), {
 				hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
@@ -186,6 +187,7 @@ class JsonpMainTemplatePlugin {
 			const runtimeSource = Template.getFunctionContent(require("./JsonpMainTemplate.runtime.js"))
 				.replace(/\/\/\$semicolon/g, ";")
 				.replace(/\$require\$/g, this.requireFn)
+				.replace(/\$crossOriginLoading\$/g, crossOriginLoading ? `script.crossOrigin = ${JSON.stringify(crossOriginLoading)}` : "")
 				.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
 				.replace(/\$hotChunkFilename\$/g, currentHotUpdateChunkFilename)
 				.replace(/\$hash\$/g, JSON.stringify(hash));

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;