update packages

1 files changed, 100 insertions, 61 deletions

diff --git a/node_modules/webpack/lib/FunctionModuleTemplatePlugin.js b/node_modules/webpack/lib/FunctionModuleTemplatePlugin.js
index 234a840f5..cf2e1b0ea 100644
--- a/node_modules/webpack/lib/FunctionModuleTemplatePlugin.js
+++ b/node_modules/webpack/lib/FunctionModuleTemplatePlugin.js
@@ -1,61 +1,100 @@
-/*

-	MIT License http://www.opensource.org/licenses/mit-license.php

-	Author Tobias Koppers @sokra

-*/

-"use strict";

-

-const ConcatSource = require("webpack-sources").ConcatSource;

-

-class FunctionModuleTemplatePlugin {

-	apply(moduleTemplate) {

-		moduleTemplate.plugin("render", function(moduleSource, module) {

-			const source = new ConcatSource();

-			const defaultArguments = [module.moduleArgument || "module", module.exportsArgument || "exports"];

-			if((module.arguments && module.arguments.length !== 0) || module.hasDependencies(d => d.requireWebpackRequire !== false)) {

-				defaultArguments.push("__webpack_require__");

-			}

-			source.add("/***/ (function(" + defaultArguments.concat(module.arguments || []).join(", ") + ") {\n\n");

-			if(module.strict) source.add("\"use strict\";\n");

-			source.add(moduleSource);

-			source.add("\n\n/***/ })");

-			return source;

-		});

-

-		moduleTemplate.plugin("package", function(moduleSource, module) {

-			if(this.outputOptions.pathinfo) {

-				const source = new ConcatSource();

-				const req = module.readableIdentifier(this.requestShortener);

-				source.add("/*!****" + req.replace(/./g, "*") + "****!*\\\n");

-				source.add("  !*** " + req.replace(/\*\//g, "*_/") + " ***!\n");

-				source.add("  \\****" + req.replace(/./g, "*") + "****/\n");

-				if(Array.isArray(module.providedExports) && module.providedExports.length === 0)

-					source.add("/*! no exports provided */\n");

-				else if(Array.isArray(module.providedExports))

-					source.add("/*! exports provided: " + module.providedExports.join(", ") + " */\n");

-				else if(module.providedExports)

-					source.add("/*! dynamic exports provided */\n");

-				if(Array.isArray(module.usedExports) && module.usedExports.length === 0)

-					source.add("/*! no exports used */\n");

-				else if(Array.isArray(module.usedExports))

-					source.add("/*! exports used: " + module.usedExports.join(", ") + " */\n");

-				else if(module.usedExports)

-					source.add("/*! all exports used */\n");

-				if(module.optimizationBailout) {

-					module.optimizationBailout.forEach(text => {

-						if(typeof text === "function") text = text(this.requestShortener);

-						source.add(`/*! ${text} */\n`);

-					});

-				}

-				source.add(moduleSource);

-				return source;

-			}

-			return moduleSource;

-		});

-

-		moduleTemplate.plugin("hash", function(hash) {

-			hash.update("FunctionModuleTemplatePlugin");

-			hash.update("2");

-		});

-	}

-}

-module.exports = FunctionModuleTemplatePlugin;

+/*
+	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 FunctionModuleTemplatePlugin {
+	apply(moduleTemplate) {
+		moduleTemplate.hooks.render.tap(
+			"FunctionModuleTemplatePlugin",
+			(moduleSource, module) => {
+				const source = new ConcatSource();
+				const args = [module.moduleArgument];
+				// TODO remove HACK checking type for javascript
+				if (module.type && module.type.startsWith("javascript")) {
+					args.push(module.exportsArgument);
+					if (module.hasDependencies(d => d.requireWebpackRequire !== false)) {
+						args.push("__webpack_require__");
+					}
+				} else if (module.type && module.type.startsWith("json")) {
+					// no additional arguments needed
+				} else {
+					args.push(module.exportsArgument, "__webpack_require__");
+				}
+				source.add("/***/ (function(" + args.join(", ") + ") {\n\n");
+				if (module.buildInfo.strict) source.add('"use strict";\n');
+				source.add(moduleSource);
+				source.add("\n\n/***/ })");
+				return source;
+			}
+		);
+
+		moduleTemplate.hooks.package.tap(
+			"FunctionModuleTemplatePlugin",
+			(moduleSource, module) => {
+				if (moduleTemplate.runtimeTemplate.outputOptions.pathinfo) {
+					const source = new ConcatSource();
+					const req = module.readableIdentifier(
+						moduleTemplate.runtimeTemplate.requestShortener
+					);
+					source.add("/*!****" + req.replace(/./g, "*") + "****!*\\\n");
+					source.add("  !*** " + req.replace(/\*\//g, "*_/") + " ***!\n");
+					source.add("  \\****" + req.replace(/./g, "*") + "****/\n");
+					if (
+						Array.isArray(module.buildMeta.providedExports) &&
+						module.buildMeta.providedExports.length === 0
+					) {
+						source.add(Template.toComment("no exports provided") + "\n");
+					} else if (Array.isArray(module.buildMeta.providedExports)) {
+						source.add(
+							Template.toComment(
+								"exports provided: " +
+									module.buildMeta.providedExports.join(", ")
+							) + "\n"
+						);
+					} else if (module.buildMeta.providedExports) {
+						source.add(Template.toComment("no static exports found") + "\n");
+					}
+					if (
+						Array.isArray(module.usedExports) &&
+						module.usedExports.length === 0
+					) {
+						source.add(Template.toComment("no exports used") + "\n");
+					} else if (Array.isArray(module.usedExports)) {
+						source.add(
+							Template.toComment(
+								"exports used: " + module.usedExports.join(", ")
+							) + "\n"
+						);
+					} else if (module.usedExports) {
+						source.add(Template.toComment("all exports used") + "\n");
+					}
+					if (module.optimizationBailout) {
+						for (const text of module.optimizationBailout) {
+							let code;
+							if (typeof text === "function") {
+								code = text(moduleTemplate.runtimeTemplate.requestShortener);
+							} else {
+								code = text;
+							}
+							source.add(Template.toComment(`${code}`) + "\n");
+						}
+					}
+					source.add(moduleSource);
+					return source;
+				}
+				return moduleSource;
+			}
+		);
+
+		moduleTemplate.hooks.hash.tap("FunctionModuleTemplatePlugin", hash => {
+			hash.update("FunctionModuleTemplatePlugin");
+			hash.update("2");
+		});
+	}
+}
+module.exports = FunctionModuleTemplatePlugin;