1 files changed, 49 insertions, 58 deletions
diff --git a/node_modules/webpack/lib/dependencies/AMDRequireArrayDependency.js b/node_modules/webpack/lib/dependencies/AMDRequireArrayDependency.js
index ad77b0705..ddb9c293f 100644
--- a/node_modules/webpack/lib/dependencies/AMDRequireArrayDependency.js
+++ b/node_modules/webpack/lib/dependencies/AMDRequireArrayDependency.js
@@ -1,58 +1,49 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const Dependency = require("../Dependency");
-const webpackMissingModuleModule = require("./WebpackMissingModule").module;
-
-class AMDRequireArrayDependency extends Dependency {
-	constructor(depsArray, range) {
-		super();
-		this.depsArray = depsArray;
-		this.range = range;
-	}
-
-	get type() {
-		return "amd require array";
-	}
-}
-
-AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate {
-	apply(dep, source, outputOptions, requestShortener) {
-		const content = this.getContent(dep, outputOptions, requestShortener);
-		source.replace(dep.range[0], dep.range[1] - 1, content);
-	}
-
-	getContent(dep, outputOptions, requestShortener) {
-		const requires = dep.depsArray.map((dependency) => {
-			const optionalComment = this.optionalComment(outputOptions.pathinfo, requestShortener.shorten(dependency.request));
-			return this.contentForDependency(dependency, optionalComment);
-		});
-		return `[${requires.join(", ")}]`;
-	}
-
-	optionalComment(pathInfo, shortenedRequest) {
-		if(!pathInfo) {
-			return "";
-		}
-		return `/*! ${shortenedRequest} */ `;
-	}
-
-	contentForDependency(dep, comment) {
-		if(typeof dep === "string") {
-			return dep;
-		}
-
-		if(dep.module) {
-			const stringifiedId = JSON.stringify(dep.module.id);
-			return `__webpack_require__(${comment}${stringifiedId})`;
-		} else if(dep.localModule) {
-			return dep.localModule.variableName();
-		}
-
-		return webpackMissingModuleModule(dep.request);
-	}
-};
-
-module.exports = AMDRequireArrayDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const Dependency = require("../Dependency");
+
+class AMDRequireArrayDependency extends Dependency {
+	constructor(depsArray, range) {
+		super();
+		this.depsArray = depsArray;
+		this.range = range;
+	}
+
+	get type() {
+		return "amd require array";
+	}
+}
+
+AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate {
+	apply(dep, source, runtime) {
+		const content = this.getContent(dep, runtime);
+		source.replace(dep.range[0], dep.range[1] - 1, content);
+	}
+
+	getContent(dep, runtime) {
+		const requires = dep.depsArray.map(dependency => {
+			return this.contentForDependency(dependency, runtime);
+		});
+		return `[${requires.join(", ")}]`;
+	}
+
+	contentForDependency(dep, runtime) {
+		if (typeof dep === "string") {
+			return dep;
+		}
+
+		if (dep.localModule) {
+			return dep.localModule.variableName();
+		} else {
+			return runtime.moduleExports({
+				module: dep.module,
+				request: dep.request
+			});
+		}
+	}
+};
+
+module.exports = AMDRequireArrayDependency;