rollup 1.16.7 → 1.17.0

package/dist/rollup.es.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v1.16.7
-	Tue, 09 Jul 2019 04:45:32 GMT - commit faebb27a39b40d1c3eccda555fc8a52f23fc5b03
+	Rollup.js v1.17.0
+	Mon, 15 Jul 2019 04:31:04 GMT - commit 5d1541a577b06d9004a3533bde672761e5798482
 
 
 	https://github.com/rollup/rollup
@@ -16,7 +16,7 @@ import { tokTypes, Parser } from 'acorn';
 import { EventEmitter } from 'events';
 import module$1 from 'module';
 
-var version = "1.16.7";
+var version = "1.17.0";
 
 var minimalisticAssert = assert;
 function assert(val, msg) {
@@ -583,13 +583,13 @@ function decode(mappings) {
         var c = mappings.charCodeAt(i);
         if (c === 44) { // ","
             if (segment.length)
-                line.push(new Int32Array(segment));
+                line.push(segment);
             segment = [];
             j = 0;
         }
         else if (c === 59) { // ";"
             if (segment.length)
-                line.push(new Int32Array(segment));
+                line.push(segment);
             segment = [];
             j = 0;
             decoded.push(line);
@@ -609,26 +609,30 @@ function decode(mappings) {
             }
             else {
                 var shouldNegate = value & 1;
-                value >>= 1;
-                var num = shouldNegate ? -value : value;
+                value >>>= 1;
+                if (shouldNegate) {
+                    value = -value;
+                    if (value === 0)
+                        value = -0x80000000;
+                }
                 if (j == 0) {
-                    generatedCodeColumn += num;
+                    generatedCodeColumn += value;
                     segment.push(generatedCodeColumn);
                 }
                 else if (j === 1) {
-                    sourceFileIndex += num;
+                    sourceFileIndex += value;
                     segment.push(sourceFileIndex);
                 }
                 else if (j === 2) {
-                    sourceCodeLine += num;
+                    sourceCodeLine += value;
                     segment.push(sourceCodeLine);
                 }
                 else if (j === 3) {
-                    sourceCodeColumn += num;
+                    sourceCodeColumn += value;
                     segment.push(sourceCodeColumn);
                 }
                 else if (j === 4) {
-                    nameIndex += num;
+                    nameIndex += value;
                     segment.push(nameIndex);
                 }
                 j++;
@@ -637,7 +641,7 @@ function decode(mappings) {
         }
     }
     if (segment.length)
-        line.push(new Int32Array(segment));
+        line.push(segment);
     decoded.push(line);
     return decoded;
 }
@@ -683,7 +687,7 @@ function encodeInteger(num) {
     num = num < 0 ? (-num << 1) | 1 : num << 1;
     do {
         var clamped = num & 31;
-        num >>= 5;
+        num >>>= 5;
         if (num > 0) {
             clamped |= 32;
         }
@@ -8276,6 +8280,8 @@ function isReference(node, parent) {
         return !node.computed && isReference(node.object, node);
     }
     if (node.type === 'Identifier') {
+        if (!parent)
+            return true;
         switch (parent.type) {
             // disregard `bar` in `foo.bar`
             case 'MemberExpression': return parent.computed || node === parent.object;
@@ -12851,13 +12857,13 @@ base$1.WithStatement = function (node, st, c) {
 };
 base$1.SwitchStatement = function (node, st, c) {
   c(node.discriminant, st, "Expression");
-  for (var i = 0, list = node.cases; i < list.length; i += 1) {
-    var cs = list[i];
+  for (var i$1 = 0, list$1 = node.cases; i$1 < list$1.length; i$1 += 1) {
+    var cs = list$1[i$1];
 
     if (cs.test) { c(cs.test, st, "Expression"); }
-    for (var i$1 = 0, list$1 = cs.consequent; i$1 < list$1.length; i$1 += 1)
+    for (var i = 0, list = cs.consequent; i < list.length; i += 1)
       {
-      var cons = list$1[i$1];
+      var cons = list[i];
 
       c(cons, st, "Statement");
     }
@@ -13052,7 +13058,7 @@ base$1.ImportDeclaration = function (node, st, c) {
   }
   c(node.source, st, "Expression");
 };
-base$1.ImportSpecifier = base$1.ImportDefaultSpecifier = base$1.ImportNamespaceSpecifier = base$1.Identifier = base$1.Literal = ignore;
+base$1.ImportSpecifier = base$1.ImportDefaultSpecifier = base$1.ImportNamespaceSpecifier = base$1.Identifier = base$1.Literal = base$1.Import = ignore;
 
 base$1.TaggedTemplateExpression = function (node, st, c) {
   c(node.tag, st, "Expression");
@@ -13902,12 +13908,12 @@ class Link {
         return null;
     }
 }
-function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, excludeContent) {
-    function linkMap(source, map) {
+function getLinkMap(graph) {
+    return function linkMap(source, map) {
         if (map.mappings) {
             return new Link(map, [source]);
         }
-        bundle.graph.warn({
+        graph.warn({
             code: 'SOURCEMAP_BROKEN',
             message: `Sourcemap is likely to be incorrect: a plugin${map.plugin ? ` ('${map.plugin}')` : ``} was used to transform files, but didn't generate a sourcemap for the transformation. Consult the plugin documentation for help`,
             plugin: map.plugin,
@@ -13917,27 +13923,29 @@ function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, ex
             mappings: [],
             names: []
         }, [source]);
+    };
+}
+function getCollapsedSourcemap(id, originalCode, originalSourcemap, sourcemapChain, linkMap) {
+    let source;
+    if (!originalSourcemap) {
+        source = new Source(id, originalCode);
     }
+    else {
+        const sources = originalSourcemap.sources;
+        const sourcesContent = originalSourcemap.sourcesContent || [];
+        // TODO indiscriminately treating IDs and sources as normal paths is probably bad.
+        const directory = dirname(id) || '.';
+        const sourceRoot = originalSourcemap.sourceRoot || '.';
+        const baseSources = sources.map((source, i) => new Source(resolve(directory, sourceRoot, source), sourcesContent[i]));
+        source = new Link(originalSourcemap, baseSources);
+    }
+    return sourcemapChain.reduce(linkMap, source);
+}
+function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, excludeContent) {
+    const linkMap = getLinkMap(bundle.graph);
     const moduleSources = modules
         .filter(module => !module.excludeFromSourcemap)
-        .map(module => {
-        let source;
-        const originalSourcemap = module.originalSourcemap;
-        if (!originalSourcemap) {
-            source = new Source(module.id, module.originalCode);
-        }
-        else {
-            const sources = originalSourcemap.sources;
-            const sourcesContent = originalSourcemap.sourcesContent || [];
-            // TODO indiscriminately treating IDs and sources as normal paths is probably bad.
-            const directory = dirname(module.id) || '.';
-            const sourceRoot = originalSourcemap.sourceRoot || '.';
-            const baseSources = sources.map((source, i) => new Source(resolve(directory, sourceRoot, source), sourcesContent[i]));
-            source = new Link(originalSourcemap, baseSources);
-        }
-        source = module.sourcemapChain.reduce(linkMap, source);
-        return source;
-    });
+        .map(module => getCollapsedSourcemap(module.id, module.originalCode, module.originalSourcemap, module.sourcemapChain, linkMap));
     // DecodedSourceMap (from magic-string) uses a number[] instead of the more
     // correct SourceMapSegment tuples. Cast it here to gain type safety.
     let source = new Link(map, moduleSources);
@@ -13951,6 +13959,14 @@ function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, ex
     sourcesContent = (excludeContent ? null : sourcesContent);
     return new SourceMap({ file, sources, sourcesContent, names, mappings });
 }
+function collapseSourcemap(graph, id, originalCode, originalSourcemap, sourcemapChain) {
+    if (!sourcemapChain.length) {
+        return originalSourcemap;
+    }
+    const source = getCollapsedSourcemap(id, originalCode, originalSourcemap, sourcemapChain, getLinkMap(graph));
+    const map = source.traceMappings();
+    return Object.assign({ version: 3 }, map);
+}
 
 const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT = {
     amd: deconflictImportsOther,
@@ -15979,7 +15995,7 @@ const uncacheablePlugin = pluginName => ({
 function transform(graph, source, module) {
     const id = module.id;
     const sourcemapChain = [];
-    const originalSourcemap = source.map === null ? null : decodedSourcemap(source.map);
+    let originalSourcemap = source.map === null ? null : decodedSourcemap(source.map);
     const baseEmitAsset = graph.pluginDriver.emitAsset;
     const originalCode = source.code;
     let ast = source.ast;
@@ -16099,6 +16115,18 @@ function transform(graph, source, module) {
                         setAssetSourceErr = err;
                     }
                 }
+            },
+            getCombinedSourcemap() {
+                const combinedMap = collapseSourcemap(graph, id, originalCode, originalSourcemap, sourcemapChain);
+                if (!combinedMap) {
+                    const magicString = new MagicString(originalCode);
+                    return magicString.generateMap({ includeContent: true, hires: true, source: id });
+                }
+                if (originalSourcemap !== combinedMap) {
+                    originalSourcemap = combinedMap;
+                    sourcemapChain.length = 0;
+                }
+                return new SourceMap(Object.assign({}, combinedMap, { file: null, sourcesContent: combinedMap.sourcesContent }));
             } });
     })
         .catch(err => {

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v1.16.7
-	Tue, 09 Jul 2019 04:45:32 GMT - commit faebb27a39b40d1c3eccda555fc8a52f23fc5b03
+	Rollup.js v1.17.0
+	Mon, 15 Jul 2019 04:31:04 GMT - commit 5d1541a577b06d9004a3533bde672761e5798482
 
 
 	https://github.com/rollup/rollup
@@ -23,7 +23,7 @@ var acorn__default = _interopDefault(acorn);
 var events = require('events');
 var module$1 = _interopDefault(require('module'));
 
-var version = "1.16.7";
+var version = "1.17.0";
 
 var minimalisticAssert = assert;
 function assert(val, msg) {
@@ -590,13 +590,13 @@ function decode(mappings) {
         var c = mappings.charCodeAt(i);
         if (c === 44) { // ","
             if (segment.length)
-                line.push(new Int32Array(segment));
+                line.push(segment);
             segment = [];
             j = 0;
         }
         else if (c === 59) { // ";"
             if (segment.length)
-                line.push(new Int32Array(segment));
+                line.push(segment);
             segment = [];
             j = 0;
             decoded.push(line);
@@ -616,26 +616,30 @@ function decode(mappings) {
             }
             else {
                 var shouldNegate = value & 1;
-                value >>= 1;
-                var num = shouldNegate ? -value : value;
+                value >>>= 1;
+                if (shouldNegate) {
+                    value = -value;
+                    if (value === 0)
+                        value = -0x80000000;
+                }
                 if (j == 0) {
-                    generatedCodeColumn += num;
+                    generatedCodeColumn += value;
                     segment.push(generatedCodeColumn);
                 }
                 else if (j === 1) {
-                    sourceFileIndex += num;
+                    sourceFileIndex += value;
                     segment.push(sourceFileIndex);
                 }
                 else if (j === 2) {
-                    sourceCodeLine += num;
+                    sourceCodeLine += value;
                     segment.push(sourceCodeLine);
                 }
                 else if (j === 3) {
-                    sourceCodeColumn += num;
+                    sourceCodeColumn += value;
                     segment.push(sourceCodeColumn);
                 }
                 else if (j === 4) {
-                    nameIndex += num;
+                    nameIndex += value;
                     segment.push(nameIndex);
                 }
                 j++;
@@ -644,7 +648,7 @@ function decode(mappings) {
         }
     }
     if (segment.length)
-        line.push(new Int32Array(segment));
+        line.push(segment);
     decoded.push(line);
     return decoded;
 }
@@ -690,7 +694,7 @@ function encodeInteger(num) {
     num = num < 0 ? (-num << 1) | 1 : num << 1;
     do {
         var clamped = num & 31;
-        num >>= 5;
+        num >>>= 5;
         if (num > 0) {
             clamped |= 32;
         }
@@ -8283,6 +8287,8 @@ function isReference(node, parent) {
         return !node.computed && isReference(node.object, node);
     }
     if (node.type === 'Identifier') {
+        if (!parent)
+            return true;
         switch (parent.type) {
             // disregard `bar` in `foo.bar`
             case 'MemberExpression': return parent.computed || node === parent.object;
@@ -12858,13 +12864,13 @@ base$1.WithStatement = function (node, st, c) {
 };
 base$1.SwitchStatement = function (node, st, c) {
   c(node.discriminant, st, "Expression");
-  for (var i = 0, list = node.cases; i < list.length; i += 1) {
-    var cs = list[i];
+  for (var i$1 = 0, list$1 = node.cases; i$1 < list$1.length; i$1 += 1) {
+    var cs = list$1[i$1];
 
     if (cs.test) { c(cs.test, st, "Expression"); }
-    for (var i$1 = 0, list$1 = cs.consequent; i$1 < list$1.length; i$1 += 1)
+    for (var i = 0, list = cs.consequent; i < list.length; i += 1)
       {
-      var cons = list$1[i$1];
+      var cons = list[i];
 
       c(cons, st, "Statement");
     }
@@ -13059,7 +13065,7 @@ base$1.ImportDeclaration = function (node, st, c) {
   }
   c(node.source, st, "Expression");
 };
-base$1.ImportSpecifier = base$1.ImportDefaultSpecifier = base$1.ImportNamespaceSpecifier = base$1.Identifier = base$1.Literal = ignore;
+base$1.ImportSpecifier = base$1.ImportDefaultSpecifier = base$1.ImportNamespaceSpecifier = base$1.Identifier = base$1.Literal = base$1.Import = ignore;
 
 base$1.TaggedTemplateExpression = function (node, st, c) {
   c(node.tag, st, "Expression");
@@ -13909,12 +13915,12 @@ class Link {
         return null;
     }
 }
-function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, excludeContent) {
-    function linkMap(source, map) {
+function getLinkMap(graph) {
+    return function linkMap(source, map) {
         if (map.mappings) {
             return new Link(map, [source]);
         }
-        bundle.graph.warn({
+        graph.warn({
             code: 'SOURCEMAP_BROKEN',
             message: `Sourcemap is likely to be incorrect: a plugin${map.plugin ? ` ('${map.plugin}')` : ``} was used to transform files, but didn't generate a sourcemap for the transformation. Consult the plugin documentation for help`,
             plugin: map.plugin,
@@ -13924,27 +13930,29 @@ function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, ex
             mappings: [],
             names: []
         }, [source]);
+    };
+}
+function getCollapsedSourcemap(id, originalCode, originalSourcemap, sourcemapChain, linkMap) {
+    let source;
+    if (!originalSourcemap) {
+        source = new Source(id, originalCode);
     }
+    else {
+        const sources = originalSourcemap.sources;
+        const sourcesContent = originalSourcemap.sourcesContent || [];
+        // TODO indiscriminately treating IDs and sources as normal paths is probably bad.
+        const directory = path.dirname(id) || '.';
+        const sourceRoot = originalSourcemap.sourceRoot || '.';
+        const baseSources = sources.map((source, i) => new Source(path.resolve(directory, sourceRoot, source), sourcesContent[i]));
+        source = new Link(originalSourcemap, baseSources);
+    }
+    return sourcemapChain.reduce(linkMap, source);
+}
+function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, excludeContent) {
+    const linkMap = getLinkMap(bundle.graph);
     const moduleSources = modules
         .filter(module => !module.excludeFromSourcemap)
-        .map(module => {
-        let source;
-        const originalSourcemap = module.originalSourcemap;
-        if (!originalSourcemap) {
-            source = new Source(module.id, module.originalCode);
-        }
-        else {
-            const sources = originalSourcemap.sources;
-            const sourcesContent = originalSourcemap.sourcesContent || [];
-            // TODO indiscriminately treating IDs and sources as normal paths is probably bad.
-            const directory = path.dirname(module.id) || '.';
-            const sourceRoot = originalSourcemap.sourceRoot || '.';
-            const baseSources = sources.map((source, i) => new Source(path.resolve(directory, sourceRoot, source), sourcesContent[i]));
-            source = new Link(originalSourcemap, baseSources);
-        }
-        source = module.sourcemapChain.reduce(linkMap, source);
-        return source;
-    });
+        .map(module => getCollapsedSourcemap(module.id, module.originalCode, module.originalSourcemap, module.sourcemapChain, linkMap));
     // DecodedSourceMap (from magic-string) uses a number[] instead of the more
     // correct SourceMapSegment tuples. Cast it here to gain type safety.
     let source = new Link(map, moduleSources);
@@ -13958,6 +13966,14 @@ function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, ex
     sourcesContent = (excludeContent ? null : sourcesContent);
     return new SourceMap({ file, sources, sourcesContent, names, mappings });
 }
+function collapseSourcemap(graph, id, originalCode, originalSourcemap, sourcemapChain) {
+    if (!sourcemapChain.length) {
+        return originalSourcemap;
+    }
+    const source = getCollapsedSourcemap(id, originalCode, originalSourcemap, sourcemapChain, getLinkMap(graph));
+    const map = source.traceMappings();
+    return Object.assign({ version: 3 }, map);
+}
 
 const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT = {
     amd: deconflictImportsOther,
@@ -15986,7 +16002,7 @@ const uncacheablePlugin = pluginName => ({
 function transform(graph, source, module) {
     const id = module.id;
     const sourcemapChain = [];
-    const originalSourcemap = source.map === null ? null : decodedSourcemap(source.map);
+    let originalSourcemap = source.map === null ? null : decodedSourcemap(source.map);
     const baseEmitAsset = graph.pluginDriver.emitAsset;
     const originalCode = source.code;
     let ast = source.ast;
@@ -16106,6 +16122,18 @@ function transform(graph, source, module) {
                         setAssetSourceErr = err;
                     }
                 }
+            },
+            getCombinedSourcemap() {
+                const combinedMap = collapseSourcemap(graph, id, originalCode, originalSourcemap, sourcemapChain);
+                if (!combinedMap) {
+                    const magicString = new MagicString(originalCode);
+                    return magicString.generateMap({ includeContent: true, hires: true, source: id });
+                }
+                if (originalSourcemap !== combinedMap) {
+                    originalSourcemap = combinedMap;
+                    sourcemapChain.length = 0;
+                }
+                return new SourceMap(Object.assign({}, combinedMap, { file: null, sourcesContent: combinedMap.sourcesContent }));
             } });
     })
         .catch(err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "1.16.7",
+  "version": "1.17.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/rollup.es.js",
@@ -61,8 +61,8 @@
   "homepage": "https://github.com/rollup/rollup",
   "dependencies": {
     "@types/estree": "0.0.39",
-    "@types/node": "^12.0.10",
-    "acorn": "^6.1.1"
+    "@types/node": "^12.6.2",
+    "acorn": "^6.2.0"
   },
   "devDependencies": {
     "@types/chokidar": "^2.1.3",
@@ -72,8 +72,8 @@
     "acorn-dynamic-import": "^4.0.0",
     "acorn-import-meta": "^1.0.0",
     "acorn-jsx": "^5.0.1",
-    "acorn-walk": "^6.1.1",
-    "buble": "^0.19.7",
+    "acorn-walk": "^6.2.0",
+    "buble": "^0.19.8",
     "chokidar": "^2.1.6",
     "console-group": "^0.3.3",
     "core-js": "^3.1.4",
@@ -82,14 +82,14 @@
     "es6-shim": "^0.35.5",
     "eslint": "^6.0.1",
     "eslint-plugin-import": "^2.18.0",
-    "execa": "^2.0.2",
+    "execa": "^2.0.3",
     "fixturify": "^1.2.0",
     "hash.js": "^1.1.7",
     "husky": "^3.0.0",
     "immutable": "^4.0.0-rc.12",
-    "is-reference": "^1.1.2",
+    "is-reference": "^1.1.3",
     "istanbul": "^0.4.5",
-    "lint-staged": "^9.0.0",
+    "lint-staged": "^9.2.0",
     "locate-character": "^2.0.5",
     "magic-string": "^0.25.3",
     "markdownlint-cli": "^0.17.0",
@@ -102,15 +102,15 @@
     "remap-istanbul": "^0.13.0",
     "require-relative": "^0.8.7",
     "requirejs": "^2.3.6",
-    "rollup": "^1.16.3",
+    "rollup": "^1.16.7",
     "rollup-plugin-alias": "^1.5.2",
-    "rollup-plugin-buble": "^0.19.6",
+    "rollup-plugin-buble": "^0.19.8",
     "rollup-plugin-commonjs": "^10.0.1",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-string": "^3.0.0",
-    "rollup-plugin-terser": "^5.0.0",
+    "rollup-plugin-terser": "^5.1.1",
     "rollup-plugin-typescript": "^1.0.1",
     "rollup-pluginutils": "^2.8.1",
     "sander": "^0.6.0",
@@ -118,13 +118,13 @@
     "signal-exit": "^3.0.2",
     "source-map": "^0.6.1",
     "source-map-support": "^0.5.12",
-    "sourcemap-codec": "^1.4.4",
-    "systemjs": "^4.0.0",
-    "terser": "^4.0.2",
+    "sourcemap-codec": "^1.4.6",
+    "systemjs": "^4.0.2",
+    "terser": "^4.1.2",
     "tslib": "^1.10.0",
     "tslint": "^5.18.0",
     "turbocolor": "^2.6.1",
-    "typescript": "^3.5.2",
+    "typescript": "^3.5.3",
     "url-parse": "^1.4.7"
   },
   "files": [