change ModuleTemplate.render argument to options object

sokra · sokra · commit f13109108266 · 2017-11-10T11:36:36.000+01:00
diff --git a/lib/ChunkTemplate.js b/lib/ChunkTemplate.js
@@ -69,7 +69,7 @@ module.exports = class ChunkTemplate extends Template {
 	}
 
 	renderWebAssembly(module, moduleTemplate, dependencyTemplates) {
-		return moduleTemplate.render(module, dependencyTemplates);
+		return moduleTemplate.render(module, dependencyTemplates, {});
 	}
 
 	updateHash(hash) {
diff --git a/lib/FetchCompileWasmModuleTemplatePlugin.js b/lib/FetchCompileWasmModuleTemplatePlugin.js
@@ -8,7 +8,7 @@ const RawSource = require("webpack-sources").RawSource;
 
 class FetchCompileWasmModuleTemplatePlugin {
 	apply(moduleTemplate) {
-		moduleTemplate.plugin("module", function(moduleSource, module, chunk) {
+		moduleTemplate.plugin("module", function(moduleSource, module, { chunk }) {
 			if(module.type && module.type.startsWith("webassembly")) {
 				if(chunk.isInitial())
 					throw new Error("Sync WebAsssmbly compilation is not yet implemented");
diff --git a/lib/ModuleTemplate.js b/lib/ModuleTemplate.js
@@ -11,12 +11,11 @@ module.exports = class ModuleTemplate extends Template {
 		super(outputOptions);
 	}
 
-	// TODO move chunk into extra options object, it's not available i. e. in wasm modules
-	render(module, dependencyTemplates, chunk) {
+	render(module, dependencyTemplates, options) {
 		const moduleSource = module.source(dependencyTemplates, this.outputOptions, this.requestShortener);
-		const moduleSourcePostModule = this.applyPluginsWaterfall("module", moduleSource, module, chunk, dependencyTemplates);
-		const moduleSourcePostRender = this.applyPluginsWaterfall("render", moduleSourcePostModule, module, chunk, dependencyTemplates);
-		return this.applyPluginsWaterfall("package", moduleSourcePostRender, module, chunk, dependencyTemplates);
+		const moduleSourcePostModule = this.applyPluginsWaterfall("module", moduleSource, module, options, dependencyTemplates);
+		const moduleSourcePostRender = this.applyPluginsWaterfall("render", moduleSourcePostModule, module, options, dependencyTemplates);
+		return this.applyPluginsWaterfall("package", moduleSourcePostRender, module, options, dependencyTemplates);
 	}
 
 	updateHash(hash) {
diff --git a/lib/Template.js b/lib/Template.js
@@ -138,7 +138,7 @@ module.exports = class Template extends Tapable {
 		var allModules = modules.map(module => {
 			return {
 				id: module.id,
-				source: moduleTemplate.render(module, dependencyTemplates, chunk)
+				source: moduleTemplate.render(module, dependencyTemplates, { chunk })
 			};
 		});
 		if(removedModules && removedModules.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ module.exports = class ChunkTemplate extends Template {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`renderWebAssembly(module, moduleTemplate, dependencyTemplates) {`
`72`		`- return moduleTemplate.render(module, dependencyTemplates);`
	`72`	`+ return moduleTemplate.render(module, dependencyTemplates, {});`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`updateHash(hash) {`