webpack 4.8.2 → 4.9.2

package/lib/JsonParser.js

@@ -4,6 +4,7 @@
 */
 "use strict";
 
+const parseJson = require("json-parse-better-errors");
 const JsonExportsDependency = require("./dependencies/JsonExportsDependency");
 
 class JsonParser {
@@ -12,7 +13,7 @@ class JsonParser {
 	}
 
 	parse(source, state) {
-		const data = JSON.parse(source);
+		const data = parseJson(source[0] === "\ufeff" ? source.slice(1) : source);
 		state.module.buildInfo.jsonData = data;
 		state.module.buildMeta.exportsType = "named";
 		if (typeof data === "object" && data)

package/lib/LibManifestPlugin.js

@@ -6,6 +6,7 @@
 
 const path = require("path");
 const asyncLib = require("neo-async");
+const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
 
 class LibManifestPlugin {
 	constructor(options) {
@@ -37,6 +38,14 @@ class LibManifestPlugin {
 							name,
 							type: this.options.type,
 							content: Array.from(chunk.modulesIterable, module => {
+								if (
+									this.options.entryOnly &&
+									!module.reasons.some(
+										r => r.dependency instanceof SingleEntryDependency
+									)
+								) {
+									return;
+								}
 								if (module.libIdent) {
 									const ident = module.libIdent({
 										context: this.options.context || compiler.options.context

package/lib/LibraryTemplatePlugin.js

@@ -6,30 +6,45 @@
 
 const SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
 
+/** @typedef {import("./Compiler")} Compiler */
+
+/**
+ * @param {string[]} accessor the accessor to convert to path
+ * @returns {string} the path
+ */
 const accessorToObjectAccess = accessor => {
-	return accessor
-		.map(a => {
-			return `[${JSON.stringify(a)}]`;
-		})
-		.join("");
+	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
 };
 
-const 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;
+/**
+ * @param {string=} base the path prefix
+ * @param {string|string[]} accessor the accessor
+ * @param {string=} joinWith the element separator
+ * @returns {string} the path
+ */
+const accessorAccess = (base, accessor, joinWith = "; ") => {
+	const accessors = Array.isArray(accessor) ? accessor : [accessor];
+	return accessors
+		.map((_, idx) => {
+			const a = base
+				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
+				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
+			if (idx === accessors.length - 1) return a;
 			if (idx === 0 && typeof base === "undefined")
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
 			return `${a} = ${a} || {}`;
 		})
-		.join(joinWith || "; ");
+		.join(joinWith);
 };
 
 class LibraryTemplatePlugin {
+	/**
+	 * @param {string} name name of library
+	 * @param {string} target type of library
+	 * @param {boolean} umdNamedDefine setting this to true will name the UMD module
+	 * @param {string|TODO} auxiliaryComment comment in the UMD wrapper
+	 * @param {string|string[]} exportProperty which export should be exposed as library
+	 */
 	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
 		this.name = name;
 		this.target = target;
@@ -38,10 +53,14 @@ class LibraryTemplatePlugin {
 		this.exportProperty = exportProperty;
 	}
 
+	/**
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.thisCompilation.tap("LibraryTemplatePlugin", compilation => {
 			if (this.exportProperty) {
-				var ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
+				const ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
 				new ExportPropertyMainTemplatePlugin(this.exportProperty).apply(
 					compilation
 				);
@@ -49,66 +68,80 @@ class LibraryTemplatePlugin {
 			switch (this.target) {
 				case "var":
 					new SetVarMainTemplatePlugin(
-						`var ${accessorAccess(false, this.name)}`
+						`var ${accessorAccess(undefined, this.name)}`,
+						false
 					).apply(compilation);
 					break;
 				case "assign":
 					new SetVarMainTemplatePlugin(
-						accessorAccess(undefined, this.name)
+						accessorAccess(undefined, this.name),
+						false
 					).apply(compilation);
 					break;
 				case "this":
 				case "self":
 				case "window":
-					if (this.name)
+					if (this.name) {
 						new SetVarMainTemplatePlugin(
-							accessorAccess(this.target, this.name)
+							accessorAccess(this.target, this.name),
+							false
 						).apply(compilation);
-					else
+					} else {
 						new SetVarMainTemplatePlugin(this.target, true).apply(compilation);
+					}
 					break;
 				case "global":
-					if (this.name)
+					if (this.name) {
 						new SetVarMainTemplatePlugin(
 							accessorAccess(
 								compilation.runtimeTemplate.outputOptions.globalObject,
 								this.name
-							)
+							),
+							false
 						).apply(compilation);
-					else
+					} else {
 						new SetVarMainTemplatePlugin(
 							compilation.runtimeTemplate.outputOptions.globalObject,
 							true
 						).apply(compilation);
+					}
 					break;
 				case "commonjs":
-					if (this.name)
+					if (this.name) {
 						new SetVarMainTemplatePlugin(
-							accessorAccess("exports", this.name)
+							accessorAccess("exports", this.name),
+							false
 						).apply(compilation);
-					else new SetVarMainTemplatePlugin("exports", true).apply(compilation);
+					} else {
+						new SetVarMainTemplatePlugin("exports", true).apply(compilation);
+					}
 					break;
 				case "commonjs2":
 				case "commonjs-module":
-					new SetVarMainTemplatePlugin("module.exports").apply(compilation);
+					new SetVarMainTemplatePlugin("module.exports", false).apply(
+						compilation
+					);
 					break;
-				case "amd":
-					var AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
+				case "amd": {
+					const AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
 					new AmdMainTemplatePlugin(this.name).apply(compilation);
 					break;
+				}
 				case "umd":
-				case "umd2":
-					var UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
+				case "umd2": {
+					const UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
 					new UmdMainTemplatePlugin(this.name, {
 						optionalAmdExternalAsGlobal: this.target === "umd2",
 						namedDefine: this.umdNamedDefine,
 						auxiliaryComment: this.auxiliaryComment
 					}).apply(compilation);
 					break;
-				case "jsonp":
-					var JsonpExportMainTemplatePlugin = require("./web/JsonpExportMainTemplatePlugin");
+				}
+				case "jsonp": {
+					const JsonpExportMainTemplatePlugin = require("./web/JsonpExportMainTemplatePlugin");
 					new JsonpExportMainTemplatePlugin(this.name).apply(compilation);
 					break;
+				}
 				default:
 					throw new Error(`${this.target} is not a valid Library target`);
 			}