move default script type option to WebpackOptionsDefaulter

neeharv · neeharv · commit 8eb0bb675e03 · 2018-01-04T20:00:50.000+05:30
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -29,7 +29,7 @@ class JsonpMainTemplatePlugin {
 			const chunkMaps = chunk.getChunkMaps();
 			const crossOriginLoading = this.outputOptions.crossOriginLoading;
 			const chunkLoadTimeout = this.outputOptions.chunkLoadTimeout;
-			const jsonpScriptType = this.outputOptions.jsonpScriptType || "text/javascript";
+			const jsonpScriptType = this.outputOptions.jsonpScriptType;
 			const scriptSrcPath = this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
 				hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
 				hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`,
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -61,6 +61,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("output.hotUpdateChunkFilename", "[id].[hash].hot-update.js");
 		this.set("output.hotUpdateMainFilename", "[hash].hot-update.json");
 		this.set("output.crossOriginLoading", false);
+		this.set("output.jsonpScriptType", "text/javascript");
 		this.set("output.chunkLoadTimeout", 120000);
 		this.set("output.hashFunction", "md5");
 		this.set("output.hashDigest", "hex");
