Refactor AMDRequireArrayDependency to es6 (webpack#3774)

timse · TheLarkInn · commit 8e3942383814 · 2017-01-05T11:57:36.000-06:00
* raw refactor of AmdRequireArrayDependency to es6
diff --git a/lib/dependencies/AMDRequireArrayDependency.js b/lib/dependencies/AMDRequireArrayDependency.js
@@ -2,33 +2,55 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var Dependency = require("../Dependency");
+"use strict";
+const Dependency = require("../Dependency");
+const webpackMissingModuleModule = require("./WebpackMissingModule").module;
 
-function AMDRequireArrayDependency(depsArray, range) {
-	Dependency.call(this);
-	this.depsArray = depsArray;
-	this.range = range;
+class AMDRequireArrayDependency extends Dependency {
+	constructor(depsArray, range) {
+		super();
+		this.depsArray = depsArray;
+		this.range = range;
+	}
+
+	get type() {
+		return "amd require array";
+	}
 }
-module.exports = AMDRequireArrayDependency;
 
-AMDRequireArrayDependency.prototype = Object.create(Dependency.prototype);
-AMDRequireArrayDependency.prototype.constructor = AMDRequireArrayDependency;
-AMDRequireArrayDependency.prototype.type = "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);
+	}
 
-AMDRequireArrayDependency.Template = function AMDRequireArrayDependencyTemplate() {};
+	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(", ")}]`;
+	}
 
-AMDRequireArrayDependency.Template.prototype.apply = function(dep, source, outputOptions, requestShortener) {
-	var content = "[" + dep.depsArray.map(function(dep) {
+	optionalComment(pathInfo, shortenedRequest) {
+		if(!pathInfo) {
+			return "";
+		}
+		return `/*! ${shortenedRequest} */ `;
+	}
+
+	contentForDependency(dep, comment) {
 		if(typeof dep === "string") {
 			return dep;
-		} else {
-			var comment = "";
-			if(outputOptions.pathinfo) comment = "/*! " + requestShortener.shorten(dep.request) + " */ ";
-			if(dep.module)
-				return "__webpack_require__(" + comment + JSON.stringify(dep.module.id) + ")";
-			else
-				return require("./WebpackMissingModule").module(dep.request);
 		}
-	}).join(", ") + "]";
-	source.replace(dep.range[0], dep.range[1] - 1, content);
-};
+
+		if(dep.module) {
+			const stringifiedId = JSON.stringify(dep.module.id);
+			return `__webpack_require__(${comment}${stringifiedId})`;
+		}
+
+		return webpackMissingModuleModule(dep.request);
+	}
+}
+
+module.exports = AMDRequireArrayDependency;
