rollup 2.0.3 → 2.1.0

package/dist/es/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/es/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
@@ -13,7 +13,7 @@ import { writeFile as writeFile$1, readdirSync, mkdirSync, readFile as readFile$
 import { createHash as createHash$1 } from 'crypto';
 import { EventEmitter } from 'events';
 
-var version = "2.0.3";
+var version = "2.1.0";
 
 // Reserved word lists for various dialects of the language
 
@@ -12385,10 +12385,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)
@@ -15174,8 +15177,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));
@@ -15208,7 +15211,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) {
@@ -15221,7 +15224,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;
@@ -15774,6 +15790,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') {
@@ -15853,11 +15870,11 @@ class Chunk$1 {
                 if (options.file)
                     file = resolve(options.sourcemapFile || options.file);
                 else if (options.dir)
-                    file = resolve(options.dir, this.id);
+                    file = resolve(options.dir, chunkId);
                 else
-                    file = resolve(this.id);
+                    file = 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);
             }
@@ -16458,8 +16475,12 @@ function transform(graph, source, module) {
     });
 }
 
-function normalizeRelativeExternalId(importer, source) {
-    return isRelative(source) ? resolve(importer, '..', source) : source;
+function normalizeRelativeExternalId(source, importer) {
+    return isRelative(source)
+        ? importer
+            ? resolve(importer, '..', source)
+            : resolve(source)
+        : source;
 }
 function getIdMatcher(option) {
     if (option === true) {
@@ -16500,7 +16521,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));
@@ -16523,7 +16544,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);
             }
@@ -16566,7 +16587,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]);
             }
@@ -16757,11 +16778,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;
             }
@@ -17111,6 +17132,7 @@ class FileEmitter {
             {
                 fileName: emittedChunk.fileName || null,
                 id: emittedChunk.id,
+                importer: emittedChunk.importer,
                 name: emittedChunk.name || null
             }
         ], false)
@@ -17433,14 +17455,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/es/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