update packages

1 files changed, 132 insertions, 62 deletions

diff --git a/node_modules/webpack/lib/DllReferencePlugin.js b/node_modules/webpack/lib/DllReferencePlugin.js
index b0e386792..151862e5f 100644
--- a/node_modules/webpack/lib/DllReferencePlugin.js
+++ b/node_modules/webpack/lib/DllReferencePlugin.js
@@ -1,62 +1,132 @@
-/*

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

-	Author Tobias Koppers @sokra

-*/

-"use strict";

-

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

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

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

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

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

-

-class DllReferencePlugin {

-	constructor(options) {

-		this.options = options;

-	}

-

-	apply(compiler) {

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

-			const normalModuleFactory = params.normalModuleFactory;

-			compilation.dependencyFactories.set(DelegatedSourceDependency, normalModuleFactory);

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

-		});

-

-		compiler.plugin("before-compile", (params, callback) => {

-			const manifest = this.options.manifest;

-			if(typeof manifest === "string") {

-				params.compilationDependencies.push(manifest);

-				compiler.inputFileSystem.readFile(manifest, function(err, result) {

-					if(err) return callback(err);

-					params["dll reference " + manifest] = JSON.parse(result.toString("utf-8"));

-					return callback();

-				});

-			} else {

-				return callback();

-			}

-		});

-

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

-			let manifest = this.options.manifest;

-			if(typeof manifest === "string") {

-				manifest = params["dll reference " + manifest];

-			}

-			const name = this.options.name || manifest.name;

-			const sourceType = this.options.sourceType || (manifest && manifest.type) || "var";

-			const externals = {};

-			const source = "dll-reference " + name;

-			externals[source] = name;

-			params.normalModuleFactory.apply(new ExternalModuleFactoryPlugin(sourceType, externals));

-			params.normalModuleFactory.apply(new DelegatedModuleFactoryPlugin({

-				source: source,

-				type: this.options.type,

-				scope: this.options.scope,

-				context: this.options.context || compiler.options.context,

-				content: this.options.content || manifest.content,

-				extensions: this.options.extensions

-			}));

-		});

-	}

-}

-

-module.exports = DllReferencePlugin;

+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const parseJson = require("json-parse-better-errors");
+const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
+const DelegatedModuleFactoryPlugin = require("./DelegatedModuleFactoryPlugin");
+const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
+const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
+const NullFactory = require("./NullFactory");
+const makePathsRelative = require("./util/identifier").makePathsRelative;
+const WebpackError = require("./WebpackError");
+
+const validateOptions = require("schema-utils");
+const schema = require("../schemas/plugins/DllReferencePlugin.json");
+
+class DllReferencePlugin {
+	constructor(options) {
+		validateOptions(schema, options, "Dll Reference Plugin");
+		this.options = options;
+	}
+
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"DllReferencePlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(
+					DelegatedSourceDependency,
+					normalModuleFactory
+				);
+				compilation.dependencyFactories.set(
+					DelegatedExportsDependency,
+					new NullFactory()
+				);
+			}
+		);
+
+		compiler.hooks.beforeCompile.tapAsync(
+			"DllReferencePlugin",
+			(params, callback) => {
+				const manifest = this.options.manifest;
+				if (typeof manifest === "string") {
+					params.compilationDependencies.add(manifest);
+					compiler.inputFileSystem.readFile(manifest, (err, result) => {
+						if (err) return callback(err);
+						// Catch errors parsing the manifest so that blank
+						// or malformed manifest files don't kill the process.
+						try {
+							params["dll reference " + manifest] = parseJson(
+								result.toString("utf-8")
+							);
+						} catch (e) {
+							// Store the error in the params so that it can
+							// be added as a compilation error later on.
+							const manifestPath = makePathsRelative(
+								compiler.options.context,
+								manifest
+							);
+							params[
+								"dll reference parse error " + manifest
+							] = new DllManifestError(manifestPath, e.message);
+						}
+						return callback();
+					});
+				} else {
+					return callback();
+				}
+			}
+		);
+
+		compiler.hooks.compile.tap("DllReferencePlugin", params => {
+			let manifest = this.options.manifest;
+			if (typeof manifest === "string") {
+				// If there was an error parsing the manifest
+				// file, exit now because the error will be added
+				// as a compilation error in the "compilation" hook.
+				if (params["dll reference parse error " + manifest]) {
+					return;
+				}
+				manifest = params["dll reference " + manifest];
+			}
+			const name = this.options.name || manifest.name;
+			const sourceType =
+				this.options.sourceType || (manifest && manifest.type) || "var";
+			const externals = {};
+			const source = "dll-reference " + name;
+			externals[source] = name;
+			const normalModuleFactory = params.normalModuleFactory;
+			new ExternalModuleFactoryPlugin(sourceType, externals).apply(
+				normalModuleFactory
+			);
+			new DelegatedModuleFactoryPlugin({
+				source: source,
+				type: this.options.type,
+				scope: this.options.scope,
+				context: this.options.context || compiler.options.context,
+				content: this.options.content || manifest.content,
+				extensions: this.options.extensions
+			}).apply(normalModuleFactory);
+		});
+
+		compiler.hooks.compilation.tap(
+			"DllReferencePlugin",
+			(compilation, params) => {
+				let manifest = this.options.manifest;
+				if (typeof manifest === "string") {
+					// If there was an error parsing the manifest file, add the
+					// error as a compilation error to make the compilation fail.
+					let e = params["dll reference parse error " + manifest];
+					if (e) {
+						compilation.errors.push(e);
+					}
+				}
+			}
+		);
+	}
+}
+
+class DllManifestError extends WebpackError {
+	constructor(filename, message) {
+		super();
+
+		this.name = "DllManifestError";
+		this.message = `Dll manifest ${filename}\n${message}`;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = DllReferencePlugin;