Make some AMD dep classes easier to subclass

Author: chuckdumont

lib/dependencies/AMDRequireDependenciesBlock.js

@@ -36,8 +36,12 @@ module.exports = class AMDRequireDependenciesBlock extends AsyncDependenciesBloc
 		} else {
 			this.range = expr.range;
 		}
-		const dep = new AMDRequireDependency(this);
+		const dep = this.newRequireDependency();
 		dep.loc = loc;
 		this.addDependency(dep);
 	}
+
+	newRequireDependency() {
+		return new AMDRequireDependency(this);
+	}
 };

lib/dependencies/AMDRequireDependency.js

@@ -13,6 +13,17 @@ class AMDRequireDependency extends NullDependency {
 }
 
 AMDRequireDependency.Template = class AMDRequireDependencyTemplate {
+	get definitions() {
+		return {
+			a: "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ",
+			af: "; (",
+			f: ").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);",
+			ea: "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ",
+			eaf: "; (",
+			ef: ").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);"
+		};
+	}
+
 	apply(dep, source, runtime) {
 		const depBlock = dep.block;
 		const promise = runtime.blockPromise({
@@ -73,19 +84,13 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate {
 				depBlock.arrayRange[0] - 1,
 				startBlock
 			);
-			source.insert(
-				depBlock.arrayRange[0] + 0.9,
-				"var __WEBPACK_AMD_REQUIRE_ARRAY__ = "
-			);
+			source.insert(depBlock.arrayRange[0] + 0.9, this.definitions.ea);
 			source.replace(
 				depBlock.arrayRange[1],
 				depBlock.functionRange[0] - 1,
-				"; ("
-			);
-			source.insert(
-				depBlock.functionRange[1],
-				").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);"
+				this.definitions.eaf
 			);
+			source.insert(depBlock.functionRange[1], this.definitions.ef);
 			source.replace(
 				depBlock.functionRange[1],
 				depBlock.errorCallbackRange[0] - 1,
@@ -110,19 +115,13 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate {
 				depBlock.arrayRange[0] - 1,
 				startBlock
 			);
-			source.insert(
-				depBlock.arrayRange[0] + 0.9,
-				"var __WEBPACK_AMD_REQUIRE_ARRAY__ = "
-			);
+			source.insert(depBlock.arrayRange[0] + 0.9, this.definitions.a);
 			source.replace(
 				depBlock.arrayRange[1],
 				depBlock.functionRange[0] - 1,
-				"; ("
-			);
-			source.insert(
-				depBlock.functionRange[1],
-				").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);"
+				this.definitions.af
 			);
+			source.insert(depBlock.functionRange[1], this.definitions.f);
 			source.replace(
 				depBlock.functionRange[1],
 				depBlock.outerRange[1] - 1,