root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

move default script type option to WebpackOptionsDefaulter

This commit is contained in:
Neehar Venugopal 2018-01-04 20:00:50 +05:30
parent be327f9718
commit 8eb0bb675e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/JsonpMainTemplatePlugin.js
View File

@ -29,7 +29,7 @@ class JsonpMainTemplatePlugin {
const chunkMaps = chunk.getChunkMaps(); const chunkMaps = chunk.getChunkMaps();
const crossOriginLoading = this.outputOptions.crossOriginLoading; const crossOriginLoading = this.outputOptions.crossOriginLoading;
const chunkLoadTimeout = this.outputOptions.chunkLoadTimeout; 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), { const scriptSrcPath = this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
hash: `" + ${this.renderCurrentHashCode(hash)} + "`, hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`, hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`,

1
lib/WebpackOptionsDefaulter.js
View File

@ -61,6 +61,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
this.set("output.hotUpdateChunkFilename", "[id].[hash].hot-update.js"); this.set("output.hotUpdateChunkFilename", "[id].[hash].hot-update.js");
this.set("output.hotUpdateMainFilename", "[hash].hot-update.json"); this.set("output.hotUpdateMainFilename", "[hash].hot-update.json");
this.set("output.crossOriginLoading", false); this.set("output.crossOriginLoading", false);
this.set("output.jsonpScriptType", "text/javascript");
this.set("output.chunkLoadTimeout", 120000); this.set("output.chunkLoadTimeout", 120000);
this.set("output.hashFunction", "md5"); this.set("output.hashFunction", "md5");
this.set("output.hashDigest", "hex"); this.set("output.hashDigest", "hex");