rollup 1.26.4 → 1.26.5

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.
package/dist/rollup.es.js CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  @license
3
- Rollup.js v1.26.4
4
- Sat, 09 Nov 2019 20:45:44 GMT - commit 6fed41031b703a361777dc3b5793a7fcbe4957ee
3
+ Rollup.js v1.26.5
4
+ Mon, 11 Nov 2019 05:31:23 GMT - commit 8318bb42ff91c510f740af07d8e41c4b3bd99918
5
5
 
6
6
 
7
7
  https://github.com/rollup/rollup
@@ -50,7 +50,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
50
50
  });
51
51
  }
52
52
 
53
- var version = "1.26.4";
53
+ var version = "1.26.5";
54
54
 
55
55
  var charToInteger = {};
56
56
  var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -13833,7 +13833,7 @@ function normalizeOutputOptions(inputOptions, rawOutputOptions, hasMultipleChunk
13833
13833
  }
13834
13834
  const mergedOptions = mergeOptions({
13835
13835
  config: {
13836
- output: Object.assign(Object.assign({}, rawOutputOptions), inputOptions.output)
13836
+ output: Object.assign(Object.assign(Object.assign({}, rawOutputOptions), rawOutputOptions.output), inputOptions.output)
13837
13837
  }
13838
13838
  });
13839
13839
  if (mergedOptions.optionError)
package/dist/rollup.js CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  @license
3
- Rollup.js v1.26.4
4
- Sat, 09 Nov 2019 20:45:44 GMT - commit 6fed41031b703a361777dc3b5793a7fcbe4957ee
3
+ Rollup.js v1.26.5
4
+ Mon, 11 Nov 2019 05:31:23 GMT - commit 8318bb42ff91c510f740af07d8e41c4b3bd99918
5
5
 
6
6
 
7
7
  https://github.com/rollup/rollup
@@ -13618,7 +13618,7 @@ function normalizeOutputOptions(inputOptions, rawOutputOptions, hasMultipleChunk
13618
13618
  }
13619
13619
  const mergedOptions = index.mergeOptions({
13620
13620
  config: {
13621
- output: Object.assign(Object.assign({}, rawOutputOptions), inputOptions.output)
13621
+ output: Object.assign(Object.assign(Object.assign({}, rawOutputOptions), rawOutputOptions.output), inputOptions.output)
13622
13622
  }
13623
13623
  });
13624
13624
  if (mergedOptions.optionError)
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  @license
3
- Rollup.js v1.26.4
4
- Sat, 09 Nov 2019 20:45:44 GMT - commit 6fed41031b703a361777dc3b5793a7fcbe4957ee
3
+ Rollup.js v1.26.5
4
+ Mon, 11 Nov 2019 05:31:23 GMT - commit 8318bb42ff91c510f740af07d8e41c4b3bd99918
5
5
 
6
6
 
7
7
  https://github.com/rollup/rollup
@@ -13,7 +13,7 @@
13
13
  var path = require('path');
14
14
  var module$1 = require('module');
15
15
 
16
- var version = "1.26.4";
16
+ var version = "1.26.5";
17
17
 
18
18
  function createCommonjsModule(fn, module) {
19
19
  return module = { exports: {} }, fn(module, module.exports), module.exports;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rollup",
3
- "version": "1.26.4",
3
+ "version": "1.26.5",
4
4
  "description": "Next-generation ES module bundler",
5
5
  "main": "dist/rollup.js",
6
6
  "module": "dist/rollup.es.js",