webpack 1.13.0 → 1.13.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -57,7 +57,7 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla
57
57
  }
58
58
  sourceMap.sourceRoot = "";
59
59
  sourceMap.file = module.id + ".js";
60
- var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));
60
+ var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));
61
61
  source.__EvalSourceMapDevToolData = new RawSource("eval(" + JSON.stringify(content + footer) + ");");
62
62
  return source.__EvalSourceMapDevToolData;
63
63
  });
@@ -152,7 +152,7 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {
152
152
  return JSON.stringify(sourceMap);
153
153
  })
154
154
  .replace(/\[url\]/g, function() {
155
- return "data:application/json;base64," +
155
+ return "data:application/json;charset=utf-8;base64," +
156
156
  new Buffer(JSON.stringify(sourceMap)).toString("base64");
157
157
  })
158
158
  );
package/lib/webpack.js CHANGED
@@ -28,7 +28,10 @@ function webpack(options, callback) {
28
28
  }
29
29
  if(callback) {
30
30
  if(typeof callback !== "function") throw new Error("Invalid argument: callback");
31
- if(options.watch === true) {
31
+ if(options.watch === true || (Array.isArray(options) &&
32
+ options.some(function(o) {
33
+ return o.watch;
34
+ }))) {
32
35
  var watchOptions = (!Array.isArray(options) ? options : options[0]).watchOptions || {};
33
36
  // TODO remove this in next major version
34
37
  var watchDelay = (!Array.isArray(options) ? options : options[0]).watchDelay;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "webpack",
3
- "version": "1.13.0",
3
+ "version": "1.13.1",
4
4
  "author": "Tobias Koppers @sokra",
5
5
  "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",
6
6
  "dependencies": {