rollup 2.0.3 → 2.1.0

package/dist/rollup.d.ts

@@ -134,6 +134,7 @@ export interface EmittedAsset {
 export interface EmittedChunk {
 	fileName?: string;
 	id: string;
+	importer?: string;
 	name?: string;
 	type: 'chunk';
 }
@@ -175,11 +176,11 @@ export interface PluginContext extends MinimalPluginContext {
 	parse: (input: string, options: any) => AcornNode;
 	resolve: (
 		source: string,
-		importer: string,
+		importer?: string,
 		options?: { skipSelf: boolean }
 	) => Promise<ResolvedId | null>;
 	/** @deprecated Use `this.resolve` instead */
-	resolveId: (source: string, importer: string) => Promise<string | null>;
+	resolveId: (source: string, importer?: string) => Promise<string | null>;
 	setAssetSource: (assetReferenceId: string, source: string | Uint8Array) => void;
 	warn: (warning: RollupWarning | string, pos?: number | { column: number; line: number }) => void;
 }
@@ -216,7 +217,7 @@ export type ResolveIdHook = (
 
 export type IsExternal = (
 	source: string,
-	importer: string,
+	importer: string | undefined,
 	isResolved: boolean
 ) => boolean | null | undefined;
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.0.3
-	Tue, 10 Mar 2020 07:01:48 GMT - commit 3ef6f073e4b54da2b2e61de5e3fd66f9f7352bca
+	Rollup.js v2.1.0
+	Wed, 18 Mar 2020 05:17:01 GMT - commit f8bc01847155ccf69f9e772ee99fc0905848548f
 
 
 	https://github.com/rollup/rollup

package/dist/shared/_events_commonjs-external.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.0.3
-	Tue, 10 Mar 2020 07:01:48 GMT - commit 3ef6f073e4b54da2b2e61de5e3fd66f9f7352bca
+	Rollup.js v2.1.0
+	Wed, 18 Mar 2020 05:17:01 GMT - commit f8bc01847155ccf69f9e772ee99fc0905848548f
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.0.3
-	Tue, 10 Mar 2020 07:01:48 GMT - commit 3ef6f073e4b54da2b2e61de5e3fd66f9f7352bca
+	Rollup.js v2.1.0
+	Wed, 18 Mar 2020 05:17:01 GMT - commit f8bc01847155ccf69f9e772ee99fc0905848548f
 
 
 	https://github.com/rollup/rollup
@@ -28,7 +28,7 @@ var fs = require('fs');
 var crypto = require('crypto');
 var events = require('events');
 
-var version = "2.0.3";
+var version = "2.1.0";
 
 // Reserved word lists for various dialects of the language
 
@@ -12404,10 +12404,13 @@ class LogicalExpression extends NodeBase {
         return usedBranch.getReturnExpressionWhenCalledAtPath(path, recursionTracker, origin);
     }
     hasEffects(context) {
-        if (this.usedBranch === null) {
-            return this.left.hasEffects(context) || this.right.hasEffects(context);
+        if (this.left.hasEffects(context)) {
+            return true;
         }
-        return this.usedBranch.hasEffects(context);
+        if (this.usedBranch !== this.left) {
+            return this.right.hasEffects(context);
+        }
+        return false;
     }
     hasEffectsWhenAccessedAtPath(path, context) {
         if (path.length === 0)
@@ -15193,8 +15196,8 @@ function getCollapsedSourcemap(id, originalCode, originalSourcemap, sourcemapCha
     }
     return sourcemapChain.reduce(linkMap, source);
 }
-function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, excludeContent) {
-    const linkMap = getLinkMap(bundle.graph);
+function collapseSourcemaps(graph, file, map, modules, bundleSourcemapChain, excludeContent) {
+    const linkMap = getLinkMap(graph);
     const moduleSources = modules
         .filter(module => !module.excludeFromSourcemap)
         .map(module => getCollapsedSourcemap(module.id, module.originalCode, module.originalSourcemap, module.sourcemapChain, linkMap));
@@ -15227,7 +15230,7 @@ const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT = {
     cjs: deconflictImportsOther,
     es: deconflictImportsEsm,
     iife: deconflictImportsOther,
-    system: deconflictImportsEsm,
+    system: deconflictImportsEsmOrSystem,
     umd: deconflictImportsOther
 };
 function deconflictChunk(modules, dependencies, imports, usedNames, format, interop, preserveModules) {
@@ -15240,7 +15243,20 @@ function deconflictChunk(modules, dependencies, imports, usedNames, format, inte
         module.scope.deconflict(format);
     }
 }
-function deconflictImportsEsm(usedNames, imports, _dependencies, interop) {
+function deconflictImportsEsm(usedNames, imports, dependencies, interop, preserveModules) {
+    // Deconflict re-exported variables of dependencies when preserveModules is true.
+    // However, this implementation will result in unnecessary variable renaming without
+    // a deeper, wider fix.
+    //
+    // TODO: https://github.com/rollup/rollup/pull/3435#discussion_r390792792
+    if (preserveModules) {
+        for (const chunkOrExternalModule of dependencies) {
+            chunkOrExternalModule.variableName = getSafeName(chunkOrExternalModule.variableName, usedNames);
+        }
+    }
+    deconflictImportsEsmOrSystem(usedNames, imports, dependencies, interop);
+}
+function deconflictImportsEsmOrSystem(usedNames, imports, _dependencies, interop) {
     for (const variable of imports) {
         const module = variable.module;
         const name = variable.name;
@@ -15793,6 +15809,7 @@ class Chunk$1 {
     }
     render(options, addons, outputChunk, outputPluginDriver) {
         timeStart('render format', 3);
+        const chunkId = this.id;
         const format = options.format;
         const finalise = finalisers[format];
         if (options.dynamicImportFunction && format !== 'es') {
@@ -15872,11 +15889,11 @@ class Chunk$1 {
                 if (options.file)
                     file = path.resolve(options.sourcemapFile || options.file);
                 else if (options.dir)
-                    file = path.resolve(options.dir, this.id);
+                    file = path.resolve(options.dir, chunkId);
                 else
-                    file = path.resolve(this.id);
+                    file = path.resolve(chunkId);
                 const decodedMap = magicString.generateDecodedMap({});
-                map = collapseSourcemaps(this, file, decodedMap, this.usedModules, chunkSourcemapChain, options.sourcemapExcludeSources);
+                map = collapseSourcemaps(this.graph, file, decodedMap, this.usedModules, chunkSourcemapChain, options.sourcemapExcludeSources);
                 map.sources = map.sources.map(sourcePath => normalize(options.sourcemapPathTransform ? options.sourcemapPathTransform(sourcePath) : sourcePath));
                 timeEnd('sourcemap', 3);
             }
@@ -16477,8 +16494,12 @@ function transform(graph, source, module) {
     });
 }
 
-function normalizeRelativeExternalId(importer, source) {
-    return isRelative(source) ? path.resolve(importer, '..', source) : source;
+function normalizeRelativeExternalId(source, importer) {
+    return isRelative(source)
+        ? importer
+            ? path.resolve(importer, '..', source)
+            : path.resolve(source)
+        : source;
 }
 function getIdMatcher(option) {
     if (option === true) {
@@ -16519,7 +16540,7 @@ class ModuleLoader {
         this.latestLoadModulesPromise = Promise.resolve();
         this.manualChunkModules = {};
         this.nextEntryModuleIndex = 0;
-        this.loadEntryModule = (unresolvedId, isEntry) => this.pluginDriver.hookFirst('resolveId', [unresolvedId, undefined]).then(resolveIdResult => {
+        this.loadEntryModule = (unresolvedId, isEntry, importer) => this.pluginDriver.hookFirst('resolveId', [unresolvedId, importer]).then(resolveIdResult => {
             if (resolveIdResult === false ||
                 (resolveIdResult && typeof resolveIdResult === 'object' && resolveIdResult.external)) {
                 return error(errEntryCannotBeExternal(unresolvedId));
@@ -16542,7 +16563,7 @@ class ModuleLoader {
     addEntryModules(unresolvedEntryModules, isUserDefined) {
         const firstEntryModuleIndex = this.nextEntryModuleIndex;
         this.nextEntryModuleIndex += unresolvedEntryModules.length;
-        const loadNewEntryModulesPromise = Promise.all(unresolvedEntryModules.map(({ fileName, id, name }) => this.loadEntryModule(id, true).then(module => {
+        const loadNewEntryModulesPromise = Promise.all(unresolvedEntryModules.map(({ fileName, id, name, importer }) => this.loadEntryModule(id, true, importer).then(module => {
             if (fileName !== null) {
                 module.chunkFileNames.add(fileName);
             }
@@ -16585,7 +16606,7 @@ class ModuleLoader {
                 unresolvedManualChunks.push({ id, alias });
             }
         }
-        const loadNewManualChunkModulesPromise = Promise.all(unresolvedManualChunks.map(({ id }) => this.loadEntryModule(id, false))).then(manualChunkModules => {
+        const loadNewManualChunkModulesPromise = Promise.all(unresolvedManualChunks.map(({ id }) => this.loadEntryModule(id, false, undefined))).then(manualChunkModules => {
             for (let index = 0; index < manualChunkModules.length; index++) {
                 this.addModuleToManualChunk(unresolvedManualChunks[index].alias, manualChunkModules[index]);
             }
@@ -16776,11 +16797,11 @@ class ModuleLoader {
                 if (this.isExternal(resolveIdResult, importer, true)) {
                     external = true;
                 }
-                id = external ? normalizeRelativeExternalId(importer, resolveIdResult) : resolveIdResult;
+                id = external ? normalizeRelativeExternalId(resolveIdResult, importer) : resolveIdResult;
             }
         }
         else {
-            id = normalizeRelativeExternalId(importer, source);
+            id = normalizeRelativeExternalId(source, importer);
             if (resolveIdResult !== false && !this.isExternal(id, importer, true)) {
                 return null;
             }
@@ -17130,6 +17151,7 @@ class FileEmitter {
             {
                 fileName: emittedChunk.fileName || null,
                 id: emittedChunk.id,
+                importer: emittedChunk.importer,
                 name: emittedChunk.name || null
             }
         ], false)
@@ -17452,14 +17474,15 @@ class PluginDriver {
 
 function normalizeEntryModules(entryModules) {
     if (typeof entryModules === 'string') {
-        return [{ fileName: null, name: null, id: entryModules }];
+        return [{ fileName: null, name: null, id: entryModules, importer: undefined }];
     }
     if (Array.isArray(entryModules)) {
-        return entryModules.map(id => ({ fileName: null, name: null, id }));
+        return entryModules.map(id => ({ fileName: null, name: null, id, importer: undefined }));
     }
     return Object.keys(entryModules).map(name => ({
         fileName: null,
         id: entryModules[name],
+        importer: undefined,
         name
     }));
 }

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.0.3
-	Tue, 10 Mar 2020 07:01:48 GMT - commit 3ef6f073e4b54da2b2e61de5e3fd66f9f7352bca
+	Rollup.js v2.1.0
+	Wed, 18 Mar 2020 05:17:01 GMT - commit f8bc01847155ccf69f9e772ee99fc0905848548f
 
 
 	https://github.com/rollup/rollup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -70,7 +70,7 @@
     "@rollup/plugin-node-resolve": "^7.1.1",
     "@rollup/plugin-replace": "^2.3.1",
     "@types/micromatch": "^4.0.1",
-    "@types/node": "^13.9.0",
+    "@types/node": "^13.9.1",
     "@types/yargs-parser": "^15.0.0",
     "acorn": "^7.1.1",
     "acorn-export-ns-from": "^0.1.0",
@@ -107,10 +107,10 @@
     "pretty-ms": "^6.0.1",
     "require-relative": "^0.8.7",
     "requirejs": "^2.3.6",
-    "rollup": "^2.0.0",
+    "rollup": "^2.0.6",
     "rollup-plugin-license": "^0.13.0",
     "rollup-plugin-string": "^3.0.0",
-    "rollup-plugin-terser": "^5.2.0",
+    "rollup-plugin-terser": "^5.3.0",
     "rollup-plugin-typescript": "^1.0.1",
     "rollup-pluginutils": "^2.8.2",
     "sander": "^0.6.0",
@@ -119,13 +119,13 @@
     "source-map": "^0.7.3",
     "source-map-support": "^0.5.16",
     "sourcemap-codec": "^1.4.8",
-    "systemjs": "^6.2.5",
-    "terser": "^4.6.6",
+    "systemjs": "^6.2.6",
+    "terser": "^4.6.7",
     "tslib": "^1.11.1",
-    "tslint": "^6.0.0",
+    "tslint": "^6.1.0",
     "typescript": "^3.8.3",
     "url-parse": "^1.4.7",
-    "yargs-parser": "^16.1.0"
+    "yargs-parser": "^18.1.1"
   },
   "files": [
     "dist/**/*.js",