webpack 4.1.0 → 4.4.0

package/bin/webpack.js

@@ -1,21 +1,80 @@
 #!/usr/bin/env node
+function runCommand(command, options) {
+	const cp = require("child_process");
+	return new Promise((resolve, reject) => {
+		const executedCommand = cp.spawn(command, options, {
+			stdio: "inherit"
+		});
+
+		executedCommand.on("error", error => {
+			reject(error);
+		});
+
+		executedCommand.on("exit", code => {
+			if (code === 0) {
+				resolve(true);
+			} else {
+				reject();
+			}
+		});
+	});
+}
 
 let webpackCliInstalled = false;
 try {
 	require.resolve("webpack-cli");
 	webpackCliInstalled = true;
-} catch (e) {
+} catch (err) {
 	webpackCliInstalled = false;
 }
 
-if (webpackCliInstalled) {
-	require("webpack-cli"); // eslint-disable-line node/no-missing-require, node/no-extraneous-require, node/no-unpublished-require
+if (!webpackCliInstalled) {
+	const path = require("path");
+	const fs = require("fs");
+	const readLine = require("readline");
+	const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
+
+	const packageManager = isYarn ? "yarn" : "npm";
+	const options = ["install", "-D", "webpack-cli"];
+
+	if (isYarn) {
+		options[0] = "add";
+	}
+
+	const commandToBeRun = `${packageManager} ${options.join(" ")}`;
+
+	const question = `Would you like to install webpack-cli? (That will run ${commandToBeRun}) `;
+
+	console.error("The CLI moved into a separate package: webpack-cli");
+	const questionInterface = readLine.createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+	questionInterface.question(question, answer => {
+		questionInterface.close();
+		switch (answer.toLowerCase()) {
+			case "y":
+			case "yes":
+			case "1": {
+				runCommand(packageManager, options)
+					.then(result => {
+						return require("webpack-cli"); //eslint-disable-line
+					})
+					.catch(error => {
+						console.error(error);
+						process.exitCode = 1;
+					});
+				break;
+			}
+			default: {
+				console.error(
+					"It needs to be installed alongside webpack to use the CLI"
+				);
+				process.exitCode = 1;
+				break;
+			}
+		}
+	});
 } else {
-	console.error("The CLI moved into a separate package: webpack-cli.");
-	console.error(
-		"Please install 'webpack-cli' in addition to webpack itself to use the CLI."
-	);
-	console.error("-> When using npm: npm install webpack-cli -D");
-	console.error("-> When using yarn: yarn add webpack-cli -D");
-	process.exitCode = 1;
+	require("webpack-cli"); // eslint-disable-line
 }

package/lib/APIPlugin.js

@@ -1,84 +1,84 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConstDependency = require("./dependencies/ConstDependency");
-const ParserHelpers = require("./ParserHelpers");
-
-const NullFactory = require("./NullFactory");
-
-/* eslint-disable camelcase */
-const REPLACEMENTS = {
-	__webpack_require__: "__webpack_require__",
-	__webpack_public_path__: "__webpack_require__.p",
-	__webpack_modules__: "__webpack_require__.m",
-	__webpack_chunk_load__: "__webpack_require__.e",
-	__non_webpack_require__: "require",
-	__webpack_nonce__: "__webpack_require__.nc",
-	"require.onError": "__webpack_require__.oe"
-};
-const NO_WEBPACK_REQUIRE = {
-	__non_webpack_require__: true
-};
-const REPLACEMENT_TYPES = {
-	__webpack_public_path__: "string",
-	__webpack_require__: "function",
-	__webpack_modules__: "object",
-	__webpack_chunk_load__: "function",
-	__webpack_nonce__: "string"
-};
-/* eslint-enable camelcase */
-
-class APIPlugin {
-	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"APIPlugin",
-			(compilation, { normalModuleFactory }) => {
-				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-				compilation.dependencyTemplates.set(
-					ConstDependency,
-					new ConstDependency.Template()
-				);
-
-				const handler = parser => {
-					Object.keys(REPLACEMENTS).forEach(key => {
-						parser.hooks.expression
-							.for(key)
-							.tap(
-								"APIPlugin",
-								NO_WEBPACK_REQUIRE[key]
-									? ParserHelpers.toConstantDependency(
-											parser,
-											REPLACEMENTS[key]
-										)
-									: ParserHelpers.toConstantDependencyWithWebpackRequire(
-											parser,
-											REPLACEMENTS[key]
-										)
-							);
-						parser.hooks.evaluateTypeof
-							.for(key)
-							.tap(
-								"APIPlugin",
-								ParserHelpers.evaluateToString(REPLACEMENT_TYPES[key])
-							);
-					});
-				};
-
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("APIPlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("APIPlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("APIPlugin", handler);
-			}
-		);
-	}
-}
-
-module.exports = APIPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConstDependency = require("./dependencies/ConstDependency");
+const ParserHelpers = require("./ParserHelpers");
+
+const NullFactory = require("./NullFactory");
+
+/* eslint-disable camelcase */
+const REPLACEMENTS = {
+	__webpack_require__: "__webpack_require__",
+	__webpack_public_path__: "__webpack_require__.p",
+	__webpack_modules__: "__webpack_require__.m",
+	__webpack_chunk_load__: "__webpack_require__.e",
+	__non_webpack_require__: "require",
+	__webpack_nonce__: "__webpack_require__.nc",
+	"require.onError": "__webpack_require__.oe"
+};
+const NO_WEBPACK_REQUIRE = {
+	__non_webpack_require__: true
+};
+const REPLACEMENT_TYPES = {
+	__webpack_public_path__: "string",
+	__webpack_require__: "function",
+	__webpack_modules__: "object",
+	__webpack_chunk_load__: "function",
+	__webpack_nonce__: "string"
+};
+/* eslint-enable camelcase */
+
+class APIPlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"APIPlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+				compilation.dependencyTemplates.set(
+					ConstDependency,
+					new ConstDependency.Template()
+				);
+
+				const handler = parser => {
+					Object.keys(REPLACEMENTS).forEach(key => {
+						parser.hooks.expression
+							.for(key)
+							.tap(
+								"APIPlugin",
+								NO_WEBPACK_REQUIRE[key]
+									? ParserHelpers.toConstantDependency(
+											parser,
+											REPLACEMENTS[key]
+									  )
+									: ParserHelpers.toConstantDependencyWithWebpackRequire(
+											parser,
+											REPLACEMENTS[key]
+									  )
+							);
+						parser.hooks.evaluateTypeof
+							.for(key)
+							.tap(
+								"APIPlugin",
+								ParserHelpers.evaluateToString(REPLACEMENT_TYPES[key])
+							);
+					});
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("APIPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("APIPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/esm")
+					.tap("APIPlugin", handler);
+			}
+		);
+	}
+}
+
+module.exports = APIPlugin;

package/lib/AmdMainTemplatePlugin.js

@@ -1,77 +1,75 @@
-/*
- MIT License http://www.opensource.org/licenses/mit-license.php
- Author Tobias Koppers @sokra
- */
-
-"use strict";
-
-const ConcatSource = require("webpack-sources").ConcatSource;
-const Template = require("./Template");
-
-class AmdMainTemplatePlugin {
-	constructor(name) {
-		this.name = name;
-	}
-
-	apply(compilation) {
-		const { mainTemplate, chunkTemplate } = compilation;
-
-		const onRenderWithEntry = (source, chunk, hash) => {
-			const externals = chunk.getModules().filter(m => m.external);
-			const externalsDepsArray = JSON.stringify(
-				externals.map(
-					m => (typeof m.request === "object" ? m.request.amd : m.request)
-				)
-			);
-			const externalsArguments = externals
-				.map(
-					m => `__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(`${m.id}`)}__`
-				)
-				.join(", ");
-
-			if (this.name) {
-				const name = mainTemplate.getAssetPath(this.name, {
-					hash,
-					chunk
-				});
-
-				return new ConcatSource(
-					`define(${JSON.stringify(name)}, ${externalsDepsArray}, function(${
-						externalsArguments
-					}) { return `,
-					source,
-					"});"
-				);
-			} else if (externalsArguments) {
-				return new ConcatSource(
-					`define(${externalsDepsArray}, function(${
-						externalsArguments
-					}) { return `,
-					source,
-					"});"
-				);
-			} else {
-				return new ConcatSource("define(function() { return ", source, "});");
-			}
-		};
-
-		for (const template of [mainTemplate, chunkTemplate]) {
-			template.hooks.renderWithEntry.tap(
-				"AmdMainTemplatePlugin",
-				onRenderWithEntry
-			);
-		}
-
-		mainTemplate.hooks.globalHashPaths.tap("AmdMainTemplatePlugin", paths => {
-			if (this.name) paths.push(this.name);
-			return paths;
-		});
-
-		mainTemplate.hooks.hash.tap("AmdMainTemplatePlugin", hash => {
-			hash.update("exports amd");
-			hash.update(this.name);
-		});
-	}
-}
-
-module.exports = AmdMainTemplatePlugin;
+/*
+ MIT License http://www.opensource.org/licenses/mit-license.php
+ Author Tobias Koppers @sokra
+ */
+
+"use strict";
+
+const { ConcatSource } = require("webpack-sources");
+const Template = require("./Template");
+
+class AmdMainTemplatePlugin {
+	constructor(name) {
+		this.name = name;
+	}
+
+	apply(compilation) {
+		const { mainTemplate, chunkTemplate } = compilation;
+
+		const onRenderWithEntry = (source, chunk, hash) => {
+			const externals = chunk.getModules().filter(m => m.external);
+			const externalsDepsArray = JSON.stringify(
+				externals.map(
+					m => (typeof m.request === "object" ? m.request.amd : m.request)
+				)
+			);
+			const externalsArguments = externals
+				.map(
+					m => `__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(`${m.id}`)}__`
+				)
+				.join(", ");
+
+			if (this.name) {
+				const name = mainTemplate.getAssetPath(this.name, {
+					hash,
+					chunk
+				});
+
+				return new ConcatSource(
+					`define(${JSON.stringify(
+						name
+					)}, ${externalsDepsArray}, function(${externalsArguments}) { return `,
+					source,
+					"});"
+				);
+			} else if (externalsArguments) {
+				return new ConcatSource(
+					`define(${externalsDepsArray}, function(${externalsArguments}) { return `,
+					source,
+					"});"
+				);
+			} else {
+				return new ConcatSource("define(function() { return ", source, "});");
+			}
+		};
+
+		for (const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap(
+				"AmdMainTemplatePlugin",
+				onRenderWithEntry
+			);
+		}
+
+		mainTemplate.hooks.globalHashPaths.tap("AmdMainTemplatePlugin", paths => {
+			if (this.name) paths.push(this.name);
+			return paths;
+		});
+
+		mainTemplate.hooks.hash.tap("AmdMainTemplatePlugin", hash => {
+			hash.update("exports amd");
+			hash.update(this.name);
+		});
+	}
+}
+
+module.exports = AmdMainTemplatePlugin;

package/lib/AsyncDependencyToInitialChunkError.js

@@ -1,23 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Sean Larkin @thelarkinn
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-module.exports = class AsyncDependencyToInitialChunkError extends WebpackError {
-	constructor(chunkName, module, loc) {
-		super();
-
-		this.name = "AsyncDependencyToInitialChunkError";
-		this.message = `It's not allowed to load an initial chunk on demand. The chunk name "${
-			chunkName
-		}" is already used by an entrypoint.`;
-		this.module = module;
-		this.origin = module;
-		this.originLoc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sean Larkin @thelarkinn
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+module.exports = class AsyncDependencyToInitialChunkError extends WebpackError {
+	constructor(chunkName, module, loc) {
+		super();
+
+		this.name = "AsyncDependencyToInitialChunkError";
+		this.message = `It's not allowed to load an initial chunk on demand. The chunk name "${chunkName}" is already used by an entrypoint.`;
+		this.module = module;
+		this.origin = module;
+		this.originLoc = loc;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};

package/lib/BannerPlugin.js

@@ -1,101 +1,101 @@
-/*
- MIT License http://www.opensource.org/licenses/mit-license.php
- Author Tobias Koppers @sokra
- */
-
-"use strict";
-
-const ConcatSource = require("webpack-sources").ConcatSource;
-const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-const Template = require("./Template");
-
-const validateOptions = require("schema-utils");
-const schema = require("../schemas/plugins/BannerPlugin.json");
-
-const wrapComment = str => {
-	if (!str.includes("\n")) return Template.toComment(str);
-	return `/*!\n * ${str
-		.replace(/\*\//g, "* /")
-		.split("\n")
-		.join("\n * ")}\n */`;
-};
-
-class BannerPlugin {
-	constructor(options) {
-		if (arguments.length > 1)
-			throw new Error(
-				"BannerPlugin only takes one argument (pass an options object)"
-			);
-
-		validateOptions(schema, options, "Banner Plugin");
-
-		if (typeof options === "string")
-			options = {
-				banner: options
-			};
-		this.options = options || {};
-		this.banner = this.options.raw
-			? options.banner
-			: wrapComment(options.banner);
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		const banner = this.banner;
-		const matchObject = ModuleFilenameHelpers.matchObject.bind(
-			undefined,
-			options
-		);
-
-		compiler.hooks.compilation.tap("BannerPlugin", compilation => {
-			compilation.hooks.optimizeChunkAssets.tap("BannerPlugin", chunks => {
-				for (const chunk of chunks) {
-					if (options.entryOnly && !chunk.canBeInitial()) {
-						continue;
-					}
-
-					for (const file of chunk.files) {
-						if (!matchObject(file)) {
-							continue;
-						}
-
-						let basename;
-						let query = "";
-						let filename = file;
-						const hash = compilation.hash;
-						const querySplit = filename.indexOf("?");
-
-						if (querySplit >= 0) {
-							query = filename.substr(querySplit);
-							filename = filename.substr(0, querySplit);
-						}
-
-						const lastSlashIndex = filename.lastIndexOf("/");
-
-						if (lastSlashIndex === -1) {
-							basename = filename;
-						} else {
-							basename = filename.substr(lastSlashIndex + 1);
-						}
-
-						const comment = compilation.getPath(banner, {
-							hash,
-							chunk,
-							filename,
-							basename,
-							query
-						});
-
-						compilation.assets[file] = new ConcatSource(
-							comment,
-							"\n",
-							compilation.assets[file]
-						);
-					}
-				}
-			});
-		});
-	}
-}
-
-module.exports = BannerPlugin;
+/*
+ MIT License http://www.opensource.org/licenses/mit-license.php
+ Author Tobias Koppers @sokra
+ */
+
+"use strict";
+
+const { ConcatSource } = require("webpack-sources");
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+const Template = require("./Template");
+
+const validateOptions = require("schema-utils");
+const schema = require("../schemas/plugins/BannerPlugin.json");
+
+const wrapComment = str => {
+	if (!str.includes("\n")) return Template.toComment(str);
+	return `/*!\n * ${str
+		.replace(/\*\//g, "* /")
+		.split("\n")
+		.join("\n * ")}\n */`;
+};
+
+class BannerPlugin {
+	constructor(options) {
+		if (arguments.length > 1)
+			throw new Error(
+				"BannerPlugin only takes one argument (pass an options object)"
+			);
+
+		validateOptions(schema, options, "Banner Plugin");
+
+		if (typeof options === "string")
+			options = {
+				banner: options
+			};
+		this.options = options || {};
+		this.banner = this.options.raw
+			? options.banner
+			: wrapComment(options.banner);
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		const banner = this.banner;
+		const matchObject = ModuleFilenameHelpers.matchObject.bind(
+			undefined,
+			options
+		);
+
+		compiler.hooks.compilation.tap("BannerPlugin", compilation => {
+			compilation.hooks.optimizeChunkAssets.tap("BannerPlugin", chunks => {
+				for (const chunk of chunks) {
+					if (options.entryOnly && !chunk.canBeInitial()) {
+						continue;
+					}
+
+					for (const file of chunk.files) {
+						if (!matchObject(file)) {
+							continue;
+						}
+
+						let basename;
+						let query = "";
+						let filename = file;
+						const hash = compilation.hash;
+						const querySplit = filename.indexOf("?");
+
+						if (querySplit >= 0) {
+							query = filename.substr(querySplit);
+							filename = filename.substr(0, querySplit);
+						}
+
+						const lastSlashIndex = filename.lastIndexOf("/");
+
+						if (lastSlashIndex === -1) {
+							basename = filename;
+						} else {
+							basename = filename.substr(lastSlashIndex + 1);
+						}
+
+						const comment = compilation.getPath(banner, {
+							hash,
+							chunk,
+							filename,
+							basename,
+							query
+						});
+
+						compilation.assets[file] = new ConcatSource(
+							comment,
+							"\n",
+							compilation.assets[file]
+						);
+					}
+				}
+			});
+		});
+	}
+}
+
+module.exports = BannerPlugin;