moved defaults for options.output into central place

elastic · Jan 6, 2016 · c838656 · c838656
1 parent 6bc4585
commit c838656
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -824,9 +824,8 @@ Compilation.prototype.createModuleAssets = function createModuleAssets() {
 
 Compilation.prototype.createChunkAssets = function createChunkAssets() {
  var outputOptions = this.outputOptions;
- var filename = outputOptions.filename || "[name].js";
- var chunkFilename = outputOptions.chunkFilename ||
- (filename.indexOf("[name]") >= 0 ? filename.replace("[name]", "[id]") : "[id]." + filename);
+ var filename = outputOptions.filename;
+ var chunkFilename = outputOptions.chunkFilename;
  for(var i = 0; i < this.chunks.length; i++) {
  var chunk = this.chunks[i];
  chunk.files = [];

diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -27,8 +27,8 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
  return source;
  });
  mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
- var filename = this.outputOptions.filename || "bundle.js";
- var chunkFilename = this.outputOptions.chunkFilename || "[id]." + filename;
+ var filename = this.outputOptions.filename;
+ var chunkFilename = this.outputOptions.chunkFilename;
  var chunkMaps = chunk.getChunkMaps();
  var crossOriginLoading = this.outputOptions.crossOriginLoading;
  var chunkLoadTimeout = this.outputOptions.chunkLoadTimeout || 120000;

diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -3,6 +3,7 @@
  Author Tobias Koppers @sokra
 */
 var OptionsDefaulter = require("./OptionsDefaulter");
+var Template = require("./Template");
 
 function WebpackOptionsDefaulter() {
  OptionsDefaulter.call(this);
@@ -29,6 +30,7 @@ function WebpackOptionsDefaulter() {
  this.set("module.wrappedContextRecursive", true);
  this.set("module.wrappedContextCritical", false);
 
+ this.set("output.filename", "[name].js");
  this.set("output.libraryTarget", "var");
  this.set("output.path", "");
  this.set("output.sourceMapFilename", "[file].map[query]");
@@ -75,4 +77,11 @@ WebpackOptionsDefaulter.prototype.process = function(options) {
  else
  options.resolve.mainFields = ["main"];
  }
+
+ var outputOptions = options.output;
+ var filename = outputOptions.filename;
+ if(outputOptions.chunkFilename === undefined)
+ outputOptions.chunkFilename = filename.indexOf("[name]") >= 0 ? filename.replace("[name]", "[id]") : "[id]." + filename;
+ if(outputOptions.hotUpdateFunction === undefined)
+ outputOptions.hotUpdateFunction = Template.toIdentifier("webpackHotUpdate" + (outputOptions.library || ""));
 };
diff --git a/lib/node/NodeMainTemplatePlugin.js b/lib/node/NodeMainTemplatePlugin.js
@@ -46,8 +46,8 @@ NodeMainTemplatePlugin.prototype.apply = function(mainTemplate) {
  return source;
  });
  mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
- var filename = this.outputOptions.filename || "bundle.js";
- var chunkFilename = this.outputOptions.chunkFilename || "[id]." + filename;
+ var filename = this.outputOptions.filename;
+ var chunkFilename = this.outputOptions.chunkFilename;
  var chunkMaps = chunk.getChunkMaps();
  var insertMoreModules = [
  "var moreModules = chunk.modules, chunkIds = chunk.ids;",

diff --git a/lib/webworker/WebWorkerMainTemplatePlugin.js b/lib/webworker/WebWorkerMainTemplatePlugin.js
@@ -28,8 +28,8 @@ WebWorkerMainTemplatePlugin.prototype.apply = function(mainTemplate) {
  return source;
  });
  mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
- var filename = this.outputOptions.filename || "bundle.js";
- var chunkFilename = this.outputOptions.chunkFilename || "[id]." + filename;
+ var filename = this.outputOptions.filename;
+ var chunkFilename = this.outputOptions.chunkFilename;
  return this.asString([
  "// \"1\" is the signal for \"already loaded\"",
  "if(!installedChunks[chunkId]) {",