webpack 4.37.0 → 4.39.2

package/lib/logging/createConsoleLogger.js

@@ -15,8 +15,9 @@ const { LogType } = require("./Logger");
 
 /**
  * @typedef {Object} LoggerOptions
- * @property {false|true|"none"|"error"|"warn"|"info"|"log"|"verbose"} options.level loglevel
- * @property {FilterTypes|boolean} options.debug filter for debug logging
+ * @property {false|true|"none"|"error"|"warn"|"info"|"log"|"verbose"} level loglevel
+ * @property {FilterTypes|boolean} debug filter for debug logging
+ * @property {Console & { status?: Function, logTime?: Function }} console the console to log to
  */
 
 /**
@@ -62,7 +63,7 @@ const LogLevel = {
  * @param {LoggerOptions} options options object
  * @returns {function(string, LogTypeEnum, any[]): void} logging function
  */
-module.exports = ({ level = "info", debug = false }) => {
+module.exports = ({ level = "info", debug = false, console }) => {
 	const debugFilters =
 		typeof debug === "boolean"
 			? [() => debug]
@@ -79,12 +80,12 @@ module.exports = ({ level = "info", debug = false }) => {
 	 * @returns {void}
 	 */
 	const logger = (name, type, args) => {
-		const labeledArgs = (prefix = "") => {
+		const labeledArgs = () => {
 			if (Array.isArray(args)) {
 				if (args.length > 0 && typeof args[0] === "string") {
-					return [`${prefix}[${name}] ${args[0]}`, ...args.slice(1)];
+					return [`[${name}] ${args[0]}`, ...args.slice(1)];
 				} else {
-					return [`${prefix}[${name}]`, ...args];
+					return [`[${name}]`, ...args];
 				}
 			} else {
 				return [];
@@ -108,20 +109,33 @@ module.exports = ({ level = "info", debug = false }) => {
 				break;
 			case LogType.info:
 				if (!debug && loglevel > LogLevel.info) return;
-				console.info(...labeledArgs("<i> "));
+				console.info(...labeledArgs());
 				break;
 			case LogType.warn:
 				if (!debug && loglevel > LogLevel.warn) return;
-				console.warn(...labeledArgs("<w> "));
+				console.warn(...labeledArgs());
 				break;
 			case LogType.error:
 				if (!debug && loglevel > LogLevel.error) return;
-				console.error(...labeledArgs("<e> "));
+				console.error(...labeledArgs());
 				break;
 			case LogType.trace:
 				if (!debug) return;
 				console.trace();
 				break;
+			case LogType.groupCollapsed:
+				if (!debug && loglevel > LogLevel.log) return;
+				if (!debug && loglevel > LogLevel.verbose) {
+					// eslint-disable-next-line node/no-unsupported-features/node-builtins
+					if (typeof console.groupCollapsed === "function") {
+						// eslint-disable-next-line node/no-unsupported-features/node-builtins
+						console.groupCollapsed(...labeledArgs());
+					} else {
+						console.log(...labeledArgs());
+					}
+					break;
+				}
+			// falls through
 			case LogType.group:
 				if (!debug && loglevel > LogLevel.log) return;
 				// eslint-disable-next-line node/no-unsupported-features/node-builtins
@@ -132,32 +146,25 @@ module.exports = ({ level = "info", debug = false }) => {
 					console.log(...labeledArgs());
 				}
 				break;
-			case LogType.groupCollapsed:
-				if (!debug && loglevel > LogLevel.log) return;
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
-				if (typeof console.groupCollapsed === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
-					console.groupCollapsed(...labeledArgs());
-				} else {
-					console.log(...labeledArgs("<g> "));
-				}
-				break;
 			case LogType.groupEnd:
 				if (!debug && loglevel > LogLevel.log) return;
 				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.groupEnd === "function") {
 					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.groupEnd();
-				} else {
-					console.log(...labeledArgs("</g> "));
 				}
 				break;
-			case LogType.time:
+			case LogType.time: {
 				if (!debug && loglevel > LogLevel.log) return;
-				console.log(
-					`[${name}] ${args[0]}: ${args[1] * 1000 + args[2] / 1000000}ms`
-				);
+				const ms = args[1] * 1000 + args[2] / 1000000;
+				const msg = `[${name}] ${args[0]}: ${ms}ms`;
+				if (typeof console.logTime === "function") {
+					console.logTime(msg);
+				} else {
+					console.log(msg);
+				}
 				break;
+			}
 			case LogType.profile:
 				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.profile === "function") {
@@ -180,6 +187,20 @@ module.exports = ({ level = "info", debug = false }) => {
 					console.clear();
 				}
 				break;
+			case LogType.status:
+				if (!debug && loglevel > LogLevel.info) return;
+				if (typeof console.status === "function") {
+					if (args.length === 0) {
+						console.status();
+					} else {
+						console.status(...labeledArgs());
+					}
+				} else {
+					if (args.length !== 0) {
+						console.info(...labeledArgs());
+					}
+				}
+				break;
 			default:
 				throw new Error(`Unexpected LogType ${type}`);
 		}

package/lib/logging/runtime.js

@@ -5,7 +5,8 @@ const createConsoleLogger = require("./createConsoleLogger");
 /** @type {createConsoleLogger.LoggerOptions} */
 let currentDefaultLoggerOptions = {
 	level: "info",
-	debug: false
+	debug: false,
+	console
 };
 let currentDefaultLogger = createConsoleLogger(currentDefaultLoggerOptions);
 

package/lib/logging/truncateArgs.js

@@ -0,0 +1,76 @@
+/*
+ MIT License http://www.opensource.org/licenses/mit-license.php
+ Author Tobias Koppers @sokra
+ */
+
+"use strict";
+
+/**
+ * @param {any[]} args items to be truncated
+ * @param {number} maxLength maximum length of args including spaces between
+ * @returns {string[]} truncated args
+ */
+const truncateArgs = (args, maxLength) => {
+	const lengths = args.map(a => `${a}`.length);
+	const availableLength = maxLength - lengths.length + 1;
+
+	if (availableLength > 0 && args.length === 1) {
+		if (availableLength >= args[0].length) {
+			return args;
+		} else if (availableLength > 3) {
+			return ["..." + args[0].slice(-availableLength + 3)];
+		} else {
+			return [args[0].slice(-availableLength)];
+		}
+	}
+
+	// Check if there is space for at least 4 chars per arg
+	if (availableLength < lengths.reduce((s, i) => s + Math.min(i, 6), 0)) {
+		// remove args
+		if (args.length > 1)
+			return truncateArgs(args.slice(0, args.length - 1), maxLength);
+		return [];
+	}
+
+	let currentLength = lengths.reduce((a, b) => a + b, 0);
+
+	// Check if all fits into maxLength
+	if (currentLength <= availableLength) return args;
+
+	// Try to remove chars from the longest items until it fits
+	while (currentLength > availableLength) {
+		const maxLength = Math.max(...lengths);
+		const shorterItems = lengths.filter(l => l !== maxLength);
+		const nextToMaxLength =
+			shorterItems.length > 0 ? Math.max(...shorterItems) : 0;
+		const maxReduce = maxLength - nextToMaxLength;
+		let maxItems = lengths.length - shorterItems.length;
+		let overrun = currentLength - availableLength;
+		for (let i = 0; i < lengths.length; i++) {
+			if (lengths[i] === maxLength) {
+				const reduce = Math.min(Math.floor(overrun / maxItems), maxReduce);
+				lengths[i] -= reduce;
+				currentLength -= reduce;
+				overrun -= reduce;
+				maxItems--;
+			}
+		}
+	}
+
+	// Return args reduced to length in lengths
+	return args.map((a, i) => {
+		const str = `${a}`;
+		const length = lengths[i];
+		if (str.length === length) {
+			return str;
+		} else if (length > 5) {
+			return "..." + str.slice(-length + 3);
+		} else if (length > 0) {
+			return str.slice(-length);
+		} else {
+			return "";
+		}
+	});
+};
+
+module.exports = truncateArgs;

package/lib/node/NodeEnvironmentPlugin.js

@@ -9,6 +9,7 @@ const NodeOutputFileSystem = require("./NodeOutputFileSystem");
 const NodeJsInputFileSystem = require("enhanced-resolve/lib/NodeJsInputFileSystem");
 const CachedInputFileSystem = require("enhanced-resolve/lib/CachedInputFileSystem");
 const createConsoleLogger = require("../logging/createConsoleLogger");
+const nodeConsole = require("./nodeConsole");
 
 class NodeEnvironmentPlugin {
 	constructor(options) {
@@ -20,7 +21,8 @@ class NodeEnvironmentPlugin {
 			Object.assign(
 				{
 					level: "info",
-					debug: false
+					debug: false,
+					console: nodeConsole
 				},
 				this.options.infrastructureLogging
 			)

package/lib/node/nodeConsole.js

@@ -0,0 +1,135 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const truncateArgs = require("../logging/truncateArgs");
+const util = require("util");
+
+const tty = process.stderr.isTTY && process.env.TERM !== "dumb";
+
+let currentStatusMessage = undefined;
+let hasStatusMessage = false;
+let currentIndent = "";
+let currentCollapsed = 0;
+
+const indent = (str, prefix, colorPrefix, colorSuffix) => {
+	if (str === "") return str;
+	prefix = currentIndent + prefix;
+	if (tty) {
+		return (
+			prefix +
+			colorPrefix +
+			str.replace(/\n/g, colorSuffix + "\n" + prefix + colorPrefix) +
+			colorSuffix
+		);
+	} else {
+		return prefix + str.replace(/\n/g, "\n" + prefix);
+	}
+};
+
+const clearStatusMessage = () => {
+	if (hasStatusMessage) {
+		process.stderr.write("\x1b[2K\r");
+		hasStatusMessage = false;
+	}
+};
+
+const writeStatusMessage = () => {
+	if (!currentStatusMessage) return;
+	const l = process.stderr.columns;
+	const args = l
+		? truncateArgs(currentStatusMessage, l - 1)
+		: currentStatusMessage;
+	const str = args.join(" ");
+	const coloredStr = `\u001b[1m${str}\u001b[39m\u001b[22m`;
+	process.stderr.write(`\x1b[2K\r${coloredStr}`);
+	hasStatusMessage = true;
+};
+
+const writeColored = (prefix, colorPrefix, colorSuffix) => {
+	return (...args) => {
+		if (currentCollapsed > 0) return;
+		clearStatusMessage();
+		// @ts-ignore
+		const str = indent(util.format(...args), prefix, colorPrefix, colorSuffix);
+		process.stderr.write(str + "\n");
+		writeStatusMessage();
+	};
+};
+
+const writeGroupMessage = writeColored(
+	"<-> ",
+	"\u001b[1m\u001b[36m",
+	"\u001b[39m\u001b[22m"
+);
+
+const writeGroupCollapsedMessage = writeColored(
+	"<+> ",
+	"\u001b[1m\u001b[36m",
+	"\u001b[39m\u001b[22m"
+);
+
+module.exports = {
+	log: writeColored("    ", "\u001b[1m", "\u001b[22m"),
+	debug: writeColored("    ", "", ""),
+	trace: writeColored("    ", "", ""),
+	info: writeColored("<i> ", "\u001b[1m\u001b[32m", "\u001b[39m\u001b[22m"),
+	warn: writeColored("<w> ", "\u001b[1m\u001b[33m", "\u001b[39m\u001b[22m"),
+	error: writeColored("<e> ", "\u001b[1m\u001b[31m", "\u001b[39m\u001b[22m"),
+	logTime: writeColored("<t> ", "\u001b[1m\u001b[35m", "\u001b[39m\u001b[22m"),
+	group: (...args) => {
+		writeGroupMessage(...args);
+		if (currentCollapsed > 0) {
+			currentCollapsed++;
+		} else {
+			currentIndent += "  ";
+		}
+	},
+	groupCollapsed: (...args) => {
+		writeGroupCollapsedMessage(...args);
+		currentCollapsed++;
+	},
+	groupEnd: () => {
+		if (currentCollapsed > 0) currentCollapsed--;
+		else if (currentIndent.length >= 2)
+			currentIndent = currentIndent.slice(0, currentIndent.length - 2);
+	},
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
+	profile: console.profile && (name => console.profile(name)),
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
+	profileEnd: console.profileEnd && (name => console.profileEnd(name)),
+	clear:
+		tty &&
+		// eslint-disable-next-line node/no-unsupported-features/node-builtins
+		console.clear &&
+		(() => {
+			clearStatusMessage();
+			// eslint-disable-next-line node/no-unsupported-features/node-builtins
+			console.clear();
+			writeStatusMessage();
+		}),
+	status: tty
+		? (name, ...args) => {
+				args = args.filter(Boolean);
+				if (name === undefined && args.length === 0) {
+					clearStatusMessage();
+					currentStatusMessage = undefined;
+				} else if (
+					typeof name === "string" &&
+					name.startsWith("[webpack.Progress] ")
+				) {
+					currentStatusMessage = [name.slice(19), ...args];
+					writeStatusMessage();
+				} else if (name === "[webpack.Progress]") {
+					currentStatusMessage = [...args];
+					writeStatusMessage();
+				} else {
+					currentStatusMessage = [name, ...args];
+					writeStatusMessage();
+				}
+		  }
+		: writeColored("<s> ", "", "")
+};

package/lib/web/JsonpMainTemplatePlugin.js

@@ -367,7 +367,7 @@ class JsonpMainTemplatePlugin {
 							"for(;i < chunkIds.length; i++) {",
 							Template.indent([
 								"chunkId = chunkIds[i];",
-								"if(installedChunks[chunkId]) {",
+								"if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {",
 								Template.indent("resolves.push(installedChunks[chunkId][0]);"),
 								"}",
 								"installedChunks[chunkId] = 0;"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.37.0",
+  "version": "4.39.2",
   "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.",
   "license": "MIT",
@@ -9,25 +9,25 @@
     "@webassemblyjs/helper-module-context": "1.8.5",
     "@webassemblyjs/wasm-edit": "1.8.5",
     "@webassemblyjs/wasm-parser": "1.8.5",
-    "acorn": "^6.2.0",
-    "ajv": "^6.1.0",
-    "ajv-keywords": "^3.1.0",
-    "chrome-trace-event": "^1.0.0",
+    "acorn": "^6.2.1",
+    "ajv": "^6.10.2",
+    "ajv-keywords": "^3.4.1",
+    "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^4.1.0",
-    "eslint-scope": "^4.0.0",
+    "eslint-scope": "^4.0.3",
     "json-parse-better-errors": "^1.0.2",
-    "loader-runner": "^2.3.0",
-    "loader-utils": "^1.1.0",
-    "memory-fs": "~0.4.1",
-    "micromatch": "^3.1.8",
-    "mkdirp": "~0.5.0",
-    "neo-async": "^2.5.0",
-    "node-libs-browser": "^2.0.0",
+    "loader-runner": "^2.4.0",
+    "loader-utils": "^1.2.3",
+    "memory-fs": "^0.4.1",
+    "micromatch": "^3.1.10",
+    "mkdirp": "^0.5.1",
+    "neo-async": "^2.6.1",
+    "node-libs-browser": "^2.2.1",
     "schema-utils": "^1.0.0",
-    "tapable": "^1.1.0",
-    "terser-webpack-plugin": "^1.1.0",
-    "watchpack": "^1.5.0",
-    "webpack-sources": "^1.3.0"
+    "tapable": "^1.1.3",
+    "terser-webpack-plugin": "^1.4.1",
+    "watchpack": "^1.6.0",
+    "webpack-sources": "^1.4.1"
   },
   "devDependencies": {
     "@types/node": "^10.12.21",
@@ -53,8 +53,6 @@
     "husky": "^1.1.3",
     "i18n-webpack-plugin": "^1.0.0",
     "istanbul": "^0.4.5",
-    "jade": "^1.11.0",
-    "jade-loader": "~0.8.0",
     "jest": "24.1.0",
     "jest-junit": "^6.2.1",
     "json-loader": "^0.5.7",
@@ -64,7 +62,7 @@
     "lint-staged": "^8.0.4",
     "lodash": "^4.17.4",
     "prettier": "^1.14.3",
-    "pug": "^2.0.3",
+    "pug": "^2.0.4",
     "pug-loader": "^2.4.0",
     "raw-loader": "^1.0.0",
     "react": "^16.8.0",