update packages

1 files changed, 197 insertions, 97 deletions

diff --git a/node_modules/webpack/lib/NodeStuffPlugin.js b/node_modules/webpack/lib/NodeStuffPlugin.js
index b18ed173c..75d2e73b0 100644
--- a/node_modules/webpack/lib/NodeStuffPlugin.js
+++ b/node_modules/webpack/lib/NodeStuffPlugin.js
@@ -1,97 +1,197 @@
-/*

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

-	Author Tobias Koppers @sokra

-*/

-"use strict";

-

-const path = require("path");

-const ParserHelpers = require("./ParserHelpers");

-const ConstDependency = require("./dependencies/ConstDependency");

-

-const NullFactory = require("./NullFactory");

-

-class NodeStuffPlugin {

-	constructor(options) {

-		this.options = options;

-	}

-

-	apply(compiler) {

-		const options = this.options;

-		compiler.plugin("compilation", (compilation, params) => {

-			compilation.dependencyFactories.set(ConstDependency, new NullFactory());

-			compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());

-

-			params.normalModuleFactory.plugin("parser", (parser, parserOptions) => {

-

-				if(parserOptions.node === false)

-					return;

-

-				let localOptions = options;

-				if(parserOptions.node)

-					localOptions = Object.assign({}, localOptions, parserOptions.node);

-

-				function setConstant(expressionName, value) {

-					parser.plugin(`expression ${expressionName}`, function() {

-						this.state.current.addVariable(expressionName, JSON.stringify(value));

-						return true;

-					});

-				}

-

-				function setModuleConstant(expressionName, fn) {

-					parser.plugin(`expression ${expressionName}`, function() {

-						this.state.current.addVariable(expressionName, JSON.stringify(fn(this.state.module)));

-						return true;

-					});

-				}

-				const context = compiler.context;

-				if(localOptions.__filename === "mock") {

-					setConstant("__filename", "/index.js");

-				} else if(localOptions.__filename) {

-					setModuleConstant("__filename", module => path.relative(context, module.resource));

-				}

-				parser.plugin("evaluate Identifier __filename", function(expr) {

-					if(!this.state.module) return;

-					const resource = this.state.module.resource;

-					const i = resource.indexOf("?");

-					return ParserHelpers.evaluateToString(i < 0 ? resource : resource.substr(0, i))(expr);

-				});

-				if(localOptions.__dirname === "mock") {

-					setConstant("__dirname", "/");

-				} else if(localOptions.__dirname) {

-					setModuleConstant("__dirname", module => path.relative(context, module.context));

-				}

-				parser.plugin("evaluate Identifier __dirname", function(expr) {

-					if(!this.state.module) return;

-					return ParserHelpers.evaluateToString(this.state.module.context)(expr);

-				});

-				parser.plugin("expression require.main", ParserHelpers.toConstantDependency("__webpack_require__.c[__webpack_require__.s]"));

-				parser.plugin(

-					"expression require.extensions",

-					ParserHelpers.expressionIsUnsupported("require.extensions is not supported by webpack. Use a loader instead.")

-				);

-				parser.plugin("expression module.loaded", ParserHelpers.toConstantDependency("module.l"));

-				parser.plugin("expression module.id", ParserHelpers.toConstantDependency("module.i"));

-				parser.plugin("expression module.exports", function() {

-					const module = this.state.module;

-					const isHarmony = module.meta && module.meta.harmonyModule;

-					if(!isHarmony)

-						return true;

-				});

-				parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToIdentifier("module.hot", false));

-				parser.plugin("expression module", function() {

-					const module = this.state.module;

-					const isHarmony = module.meta && module.meta.harmonyModule;

-					let moduleJsPath = path.join(__dirname, "..", "buildin", isHarmony ? "harmony-module.js" : "module.js");

-					if(module.context) {

-						moduleJsPath = path.relative(this.state.module.context, moduleJsPath);

-						if(!/^[A-Z]:/i.test(moduleJsPath)) {

-							moduleJsPath = `./${moduleJsPath.replace(/\\/g, "/")}`;

-						}

-					}

-					return ParserHelpers.addParsedVariableToModule(this, "module", `require(${JSON.stringify(moduleJsPath)})(module)`);

-				});

-			});

-		});

-	}

-}

-module.exports = NodeStuffPlugin;

+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const ParserHelpers = require("./ParserHelpers");
+const ConstDependency = require("./dependencies/ConstDependency");
+
+const NullFactory = require("./NullFactory");
+
+class NodeStuffPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		compiler.hooks.compilation.tap(
+			"NodeStuffPlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+				compilation.dependencyTemplates.set(
+					ConstDependency,
+					new ConstDependency.Template()
+				);
+
+				const handler = (parser, parserOptions) => {
+					if (parserOptions.node === false) return;
+
+					let localOptions = options;
+					if (parserOptions.node) {
+						localOptions = Object.assign({}, localOptions, parserOptions.node);
+					}
+
+					const setConstant = (expressionName, value) => {
+						parser.hooks.expression
+							.for(expressionName)
+							.tap("NodeStuffPlugin", () => {
+								parser.state.current.addVariable(
+									expressionName,
+									JSON.stringify(value)
+								);
+								return true;
+							});
+					};
+
+					const setModuleConstant = (expressionName, fn) => {
+						parser.hooks.expression
+							.for(expressionName)
+							.tap("NodeStuffPlugin", () => {
+								parser.state.current.addVariable(
+									expressionName,
+									JSON.stringify(fn(parser.state.module))
+								);
+								return true;
+							});
+					};
+					const context = compiler.context;
+					if (localOptions.__filename === "mock") {
+						setConstant("__filename", "/index.js");
+					} else if (localOptions.__filename) {
+						setModuleConstant("__filename", module =>
+							path.relative(context, module.resource)
+						);
+					}
+					parser.hooks.evaluateIdentifier
+						.for("__filename")
+						.tap("NodeStuffPlugin", expr => {
+							if (!parser.state.module) return;
+							const resource = parser.state.module.resource;
+							const i = resource.indexOf("?");
+							return ParserHelpers.evaluateToString(
+								i < 0 ? resource : resource.substr(0, i)
+							)(expr);
+						});
+					if (localOptions.__dirname === "mock") {
+						setConstant("__dirname", "/");
+					} else if (localOptions.__dirname) {
+						setModuleConstant("__dirname", module =>
+							path.relative(context, module.context)
+						);
+					}
+					parser.hooks.evaluateIdentifier
+						.for("__dirname")
+						.tap("NodeStuffPlugin", expr => {
+							if (!parser.state.module) return;
+							return ParserHelpers.evaluateToString(
+								parser.state.module.context
+							)(expr);
+						});
+					parser.hooks.expression
+						.for("require.main")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.toConstantDependencyWithWebpackRequire(
+								parser,
+								"__webpack_require__.c[__webpack_require__.s]"
+							)
+						);
+					parser.hooks.expression
+						.for("require.extensions")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"require.extensions is not supported by webpack. Use a loader instead."
+							)
+						);
+					parser.hooks.expression
+						.for("require.main.require")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"require.main.require is not supported by webpack."
+							)
+						);
+					parser.hooks.expression
+						.for("module.parent.require")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"module.parent.require is not supported by webpack."
+							)
+						);
+					parser.hooks.expression
+						.for("module.loaded")
+						.tap("NodeStuffPlugin", expr => {
+							parser.state.module.buildMeta.moduleConcatenationBailout =
+								"module.loaded";
+							return ParserHelpers.toConstantDependency(parser, "module.l")(
+								expr
+							);
+						});
+					parser.hooks.expression
+						.for("module.id")
+						.tap("NodeStuffPlugin", expr => {
+							parser.state.module.buildMeta.moduleConcatenationBailout =
+								"module.id";
+							return ParserHelpers.toConstantDependency(parser, "module.i")(
+								expr
+							);
+						});
+					parser.hooks.expression
+						.for("module.exports")
+						.tap("NodeStuffPlugin", () => {
+							const module = parser.state.module;
+							const isHarmony =
+								module.buildMeta && module.buildMeta.exportsType;
+							if (!isHarmony) return true;
+						});
+					parser.hooks.evaluateIdentifier
+						.for("module.hot")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.evaluateToIdentifier("module.hot", false)
+						);
+					parser.hooks.expression.for("module").tap("NodeStuffPlugin", () => {
+						const module = parser.state.module;
+						const isHarmony = module.buildMeta && module.buildMeta.exportsType;
+						let moduleJsPath = path.join(
+							__dirname,
+							"..",
+							"buildin",
+							isHarmony ? "harmony-module.js" : "module.js"
+						);
+						if (module.context) {
+							moduleJsPath = path.relative(
+								parser.state.module.context,
+								moduleJsPath
+							);
+							if (!/^[A-Z]:/i.test(moduleJsPath)) {
+								moduleJsPath = `./${moduleJsPath.replace(/\\/g, "/")}`;
+							}
+						}
+						return ParserHelpers.addParsedVariableToModule(
+							parser,
+							"module",
+							`require(${JSON.stringify(moduleJsPath)})(module)`
+						);
+					});
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("NodeStuffPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("NodeStuffPlugin", handler);
+			}
+		);
+	}
+}
+module.exports = NodeStuffPlugin;