WIP: move stuff to the RuntimeTemplate

sokra · sokra · commit d0aad14bfcdc · 2017-12-21T12:34:47.000+01:00
diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
@@ -120,4 +120,8 @@ module.exports = class RuntimeTemplate {
 	onError() {
 		return "__webpack_require__.oe";
 	}
+
+	defineEsModuleFlagStatement({ exportsArgument }) {
+		return `__webpack_require__.r(${exportsArgument});\n`;
+	}
 };
diff --git a/lib/dependencies/HarmonyCompatibilityDependency.js b/lib/dependencies/HarmonyCompatibilityDependency.js
@@ -17,11 +17,10 @@ class HarmonyCompatibilityDependency extends NullDependency {
 }
 
 HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate {
-	apply(dep, source) {
+	apply(dep, source, runtime) {
 		const usedExports = dep.originModule.usedExports;
 		if(usedExports !== false && !Array.isArray(usedExports)) {
-			const exportName = dep.originModule.exportsArgument;
-			const content = `__webpack_require__.r(${exportName});\n`;
+			const content = runtime.defineEsModuleFlagStatement({ exportsArgument: dep.originModule.exportsArgument });
 			source.insert(-10, content);
 		}
 	}
diff --git a/lib/dependencies/RequireEnsureDependency.js b/lib/dependencies/RequireEnsureDependency.js
@@ -26,7 +26,7 @@ RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate {
 		const errorCallbackExists = depBlock.expr.arguments.length === 4 || (!depBlock.chunkName && depBlock.expr.arguments.length === 3);
 		const startBlock = `${promise}.then((`;
 		const middleBlock = ").bind(null, __webpack_require__)).catch(";
-		const endBlock = ").bind(null, __webpack_require__)).catch(__webpack_require__.oe)";
+		const endBlock = `).bind(null, __webpack_require__)).catch(${runtime.onError()})`;
 		source.replace(depBlock.expr.range[0], depBlock.expr.arguments[1].range[0] - 1, startBlock);
 		if(errorCallbackExists) {
 			source.replace(depBlock.expr.arguments[1].range[1], depBlock.expr.arguments[2].range[0] - 1, middleBlock);
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -625,7 +625,9 @@ class ConcatenatedModule extends Module {
 		// add harmony compatibility flag (must be first because of possible circular dependencies)
 		const usedExports = this.rootModule.usedExports;
 		if(usedExports === true) {
-			result.add(`__webpack_require__.r(${this.exportsArgument});\n`);
+			result.add(runtimeTemplate.defineEsModuleFlagStatement({
+				exportsArgument: this.exportsArgument
+			}));
 		}
 
 		// define required namespace objects (must be before evaluation modules)

Original file line number	Diff line number	Diff line change
`@@ -120,4 +120,8 @@ module.exports = class RuntimeTemplate {`
`120`	`120`	`onError() {`
`121`	`121`	`return "__webpack_require__.oe";`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ defineEsModuleFlagStatement({ exportsArgument }) {`
	`125`	+ return `__webpack_require__.r(${exportsArgument});\n`;
	`126`	`+ }`
`123`	`127`	`};`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,10 @@ class HarmonyCompatibilityDependency extends NullDependency {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate {`
`20`		`- apply(dep, source) {`
	`20`	`+ apply(dep, source, runtime) {`
`21`	`21`	`const usedExports = dep.originModule.usedExports;`
`22`	`22`	`if(usedExports !== false && !Array.isArray(usedExports)) {`
`23`		`- const exportName = dep.originModule.exportsArgument;`
`24`		- const content = `__webpack_require__.r(${exportName});\n`;
	`23`	`+ const content = runtime.defineEsModuleFlagStatement({ exportsArgument: dep.originModule.exportsArgument });`
`25`	`24`	`source.insert(-10, content);`
`26`	`25`	`}`
`27`	`26`	`}`