rollup 2.26.1 → 2.26.5

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.1
-	Sun, 16 Aug 2020 04:44:51 GMT - commit 4b432dc48ad10b198a45574da8a56c06ac77dd93
+	Rollup.js v2.26.5
+	Sat, 22 Aug 2020 04:50:56 GMT - commit b2bb960aa5969914e82fd4bcf289bd16eab4a381
 
 
 	https://github.com/rollup/rollup

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.1
-	Sun, 16 Aug 2020 04:44:51 GMT - commit 4b432dc48ad10b198a45574da8a56c06ac77dd93
+	Rollup.js v2.26.5
+	Sat, 22 Aug 2020 04:50:56 GMT - commit b2bb960aa5969914e82fd4bcf289bd16eab4a381
 
 
 	https://github.com/rollup/rollup
@@ -13,7 +13,7 @@ import { createHash as createHash$1 } from 'crypto';
 import { writeFile as writeFile$1, readdirSync, mkdirSync, readFile as readFile$1, lstatSync, realpathSync } from 'fs';
 import { EventEmitter } from 'events';
 
-var version = "2.26.1";
+var version = "2.26.5";
 
 var charToInteger = {};
 var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -4498,26 +4498,19 @@ class NamespaceVariable extends Variable {
                 memberVariables[name] = this.context.traceExport(name);
             }
         }
-        this.memberVariables = memberVariables;
         return (this.memberVariables = memberVariables);
     }
     include() {
-        if (!this.included) {
-            this.included = true;
-            for (const identifier of this.references) {
-                if (identifier.context.getModuleExecIndex() <= this.context.getModuleExecIndex()) {
-                    this.referencedEarly = true;
-                    break;
-                }
-            }
-            this.mergedNamespaces = this.context.includeAndGetAdditionalMergedNamespaces();
-            const memberVariables = this.getMemberVariables();
-            // We directly include the variables instead of context.include to not automatically
-            // generate imports for members from other modules
-            for (const memberName of Object.keys(memberVariables))
-                memberVariables[memberName].include();
-            if (typeof this.syntheticNamedExports === 'string') {
-                this.context.traceExport(this.syntheticNamedExports).include();
+        this.included = true;
+        this.context.includeAllExports();
+    }
+    prepareNamespace(mergedNamespaces) {
+        this.mergedNamespaces = mergedNamespaces;
+        const moduleExecIndex = this.context.getModuleExecIndex();
+        for (const identifier of this.references) {
+            if (identifier.context.getModuleExecIndex() <= moduleExecIndex) {
+                this.referencedEarly = true;
+                break;
             }
         }
     }
@@ -4789,7 +4782,9 @@ function getReexportedImportName(moduleVariableName, imported, depNamedExportsMo
         return depNamedExportsMode ? `${moduleVariableName}['default']` : moduleVariableName;
     }
     if (imported === '*') {
-        return !isChunk && namespaceInteropHelpersByInteropType[String(interop(moduleId))]
+        return (isChunk
+            ? !depNamedExportsMode
+            : namespaceInteropHelpersByInteropType[String(interop(moduleId))])
             ? namespaceVariableName
             : moduleVariableName;
     }
@@ -4799,8 +4794,25 @@ function getReexportedImportName(moduleVariableName, imported, depNamedExportsMo
 function getInteropBlock(dependencies, varOrConst, interop, externalLiveBindings, freeze, accessedGlobals, _, n, s, t) {
     const neededInteropHelpers = new Set();
     const interopStatements = [];
-    for (const { defaultVariableName, imports, id, isChunk, name, namespaceVariableName, reexports } of dependencies) {
-        if (!isChunk) {
+    const addInteropStatement = (helperVariableName, helper, dependencyVariableName) => {
+        neededInteropHelpers.add(helper);
+        interopStatements.push(`${varOrConst} ${helperVariableName}${_}=${_}/*#__PURE__*/${helper}(${dependencyVariableName});`);
+    };
+    for (const { defaultVariableName, imports, id, isChunk, name, namedExportsMode, namespaceVariableName, reexports } of dependencies) {
+        if (isChunk) {
+            for (const { imported, reexported } of [
+                ...(imports || []),
+                ...(reexports || [])
+            ]) {
+                if (imported === '*' && reexported !== '*') {
+                    if (!namedExportsMode) {
+                        addInteropStatement(namespaceVariableName, getDefaultOnlyHelper(), name);
+                    }
+                    break;
+                }
+            }
+        }
+        else {
             const moduleInterop = String(interop(id));
             let hasDefault = false;
             let hasNamespace = false;
@@ -4808,7 +4820,7 @@ function getInteropBlock(dependencies, varOrConst, interop, externalLiveBindings
                 ...(imports || []),
                 ...(reexports || [])
             ]) {
-                let helper = null;
+                let helper;
                 let variableName;
                 if (imported === 'default') {
                     if (!hasDefault) {
@@ -4827,8 +4839,7 @@ function getInteropBlock(dependencies, varOrConst, interop, externalLiveBindings
                     }
                 }
                 if (helper) {
-                    neededInteropHelpers.add(helper);
-                    interopStatements.push(`${varOrConst} ${variableName}${_}=${_}/*#__PURE__*/${helper}(${name});`);
+                    addInteropStatement(variableName, helper, name);
                 }
             }
         }
@@ -6941,6 +6952,7 @@ class ConditionalExpression extends NodeBase {
                 isCalleeOfRenderedParent: renderedParentType
                     ? isCalleeOfRenderedParent
                     : this.parent.callee === this,
+                preventASI: true,
                 renderedParentType: renderedParentType || this.parent.type
             });
         }
@@ -7630,11 +7642,13 @@ class LogicalExpression extends NodeBase {
                 isCalleeOfRenderedParent: renderedParentType
                     ? isCalleeOfRenderedParent
                     : this.parent.callee === this,
+                preventASI,
                 renderedParentType: renderedParentType || this.parent.type
             });
         }
         else {
-            super.render(code, options);
+            this.left.render(code, options, { preventASI });
+            this.right.render(code, options);
         }
     }
     getUsedBranch() {
@@ -8976,7 +8990,7 @@ class YieldExpression extends NodeBase {
     }
     render(code, options) {
         if (this.argument) {
-            this.argument.render(code, options);
+            this.argument.render(code, options, { preventASI: true });
             if (this.argument.start === this.start + 5 /* 'yield'.length */) {
                 code.prependLeft(this.start + 5, ' ');
             }
@@ -9834,17 +9848,19 @@ class Module {
         if (this.ast.shouldBeIncluded(context))
             this.ast.include(context, false);
     }
-    includeAllExports() {
+    includeAllExports(includeNamespaceMembers) {
         if (!this.isExecuted) {
             this.graph.needsTreeshakingPass = true;
             markModuleAndImpureDependenciesAsExecuted(this);
         }
         for (const exportName of this.getExports()) {
-            const variable = this.getVariableForExportName(exportName);
-            variable.deoptimizePath(UNKNOWN_PATH);
-            if (!variable.included) {
-                variable.include();
-                this.graph.needsTreeshakingPass = true;
+            if (includeNamespaceMembers || exportName !== this.syntheticNamedExports) {
+                const variable = this.getVariableForExportName(exportName);
+                variable.deoptimizePath(UNKNOWN_PATH);
+                if (!variable.included) {
+                    variable.include();
+                    this.graph.needsTreeshakingPass = true;
+                }
             }
         }
         for (const name of this.getReexports()) {
@@ -9858,6 +9874,9 @@ class Module {
                 variable.module.reexported = true;
             }
         }
+        if (includeNamespaceMembers) {
+            this.namespace.prepareNamespace(this.includeAndGetAdditionalMergedNamespaces());
+        }
     }
     includeAllInBundle() {
         this.ast.include(createInclusionContext(), true);
@@ -9955,7 +9974,7 @@ class Module {
             getModuleName: this.basename.bind(this),
             getReexports: this.getReexports.bind(this),
             importDescriptions: this.importDescriptions,
-            includeAndGetAdditionalMergedNamespaces: this.includeAndGetAdditionalMergedNamespaces.bind(this),
+            includeAllExports: () => this.includeAllExports(true),
             includeDynamicImport: this.includeDynamicImport.bind(this),
             includeVariable: this.includeVariable.bind(this),
             magicString: this.magicString,
@@ -10167,7 +10186,7 @@ class Module {
         const resolution = this.dynamicImports.find(dynamicImport => dynamicImport.node === node).resolution;
         if (resolution instanceof Module) {
             resolution.includedDynamicImporters.push(this);
-            resolution.includeAllExports();
+            resolution.includeAllExports(true);
         }
     }
     includeVariable(variable) {
@@ -10359,27 +10378,28 @@ const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT = {
     system: deconflictImportsEsmOrSystem,
     umd: deconflictImportsOther
 };
-function deconflictChunk(modules, dependenciesToBeDeconflicted, imports, usedNames, format, interop, preserveModules, externalLiveBindings, chunkByModule, syntheticExports, exportNamesByVariable, accessedGlobalsByScope) {
+function deconflictChunk(modules, dependenciesToBeDeconflicted, imports, usedNames, format, interop, preserveModules, externalLiveBindings, chunkByModule, syntheticExports, exportNamesByVariable, accessedGlobalsByScope, includedNamespaces) {
     for (const module of modules) {
         module.scope.addUsedOutsideNames(usedNames, format, exportNamesByVariable, accessedGlobalsByScope);
     }
-    deconflictTopLevelVariables(usedNames, modules);
+    deconflictTopLevelVariables(usedNames, modules, includedNamespaces);
     DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT[format](usedNames, imports, dependenciesToBeDeconflicted, interop, preserveModules, externalLiveBindings, chunkByModule, syntheticExports);
     for (const module of modules) {
         module.scope.deconflict(format, exportNamesByVariable, accessedGlobalsByScope);
     }
 }
-function deconflictImportsEsmOrSystem(usedNames, imports, dependenciesToBeDeconflicted, _interop, _preserveModules, _externalLiveBindings, _chunkByModule, syntheticExports) {
-    // All namespace imports are contained here;
-    // this is needed for synthetic exports and namespace reexports
+function deconflictImportsEsmOrSystem(usedNames, imports, dependenciesToBeDeconflicted, _interop, preserveModules, _externalLiveBindings, chunkByModule, syntheticExports) {
+    // This is needed for namespace reexports
     for (const dependency of dependenciesToBeDeconflicted.dependencies) {
-        dependency.variableName = getSafeName(dependency.suggestedVariableName, usedNames);
+        if (preserveModules || dependency instanceof ExternalModule) {
+            dependency.variableName = getSafeName(dependency.suggestedVariableName, usedNames);
+        }
     }
     for (const variable of imports) {
         const module = variable.module;
         const name = variable.name;
-        if (module instanceof ExternalModule && name === '*') {
-            variable.setRenderNames(null, module.variableName);
+        if (variable.isNamespace && (preserveModules || module instanceof ExternalModule)) {
+            variable.setRenderNames(null, (module instanceof ExternalModule ? module : chunkByModule.get(module)).variableName);
         }
         else if (module instanceof ExternalModule && name === 'default') {
             variable.setRenderNames(null, getSafeName([...module.exportedVariables].some(([exportedVariable, exportedName]) => exportedName === '*' && exportedVariable.included)
@@ -10398,8 +10418,8 @@ function deconflictImportsOther(usedNames, imports, { deconflictedDefault, decon
     for (const chunkOrExternalModule of dependencies) {
         chunkOrExternalModule.variableName = getSafeName(chunkOrExternalModule.suggestedVariableName, usedNames);
     }
-    for (const externalModule of deconflictedNamespace) {
-        externalModule.namespaceVariableName = getSafeName(`${externalModule.suggestedVariableName}__namespace`, usedNames);
+    for (const externalModuleOrChunk of deconflictedNamespace) {
+        externalModuleOrChunk.namespaceVariableName = getSafeName(`${externalModuleOrChunk.suggestedVariableName}__namespace`, usedNames);
     }
     for (const externalModule of deconflictedDefault) {
         if (deconflictedNamespace.has(externalModule) &&
@@ -10438,7 +10458,10 @@ function deconflictImportsOther(usedNames, imports, { deconflictedDefault, decon
         }
         else {
             const chunk = chunkByModule.get(module);
-            if (chunk.exportMode === 'default' || (preserveModules && variable.isNamespace)) {
+            if (preserveModules && variable.isNamespace) {
+                variable.setRenderNames(null, chunk.exportMode === 'default' ? chunk.namespaceVariableName : chunk.variableName);
+            }
+            else if (chunk.exportMode === 'default') {
                 variable.setRenderNames(null, chunk.variableName);
             }
             else {
@@ -10447,7 +10470,7 @@ function deconflictImportsOther(usedNames, imports, { deconflictedDefault, decon
         }
     }
 }
-function deconflictTopLevelVariables(usedNames, modules) {
+function deconflictTopLevelVariables(usedNames, modules, includedNamespaces) {
     for (const module of modules) {
         for (const variable of module.scope.variables.values()) {
             if (variable.included &&
@@ -10457,8 +10480,8 @@ function deconflictTopLevelVariables(usedNames, modules) {
                 variable.setRenderNames(null, getSafeName(variable.name, usedNames));
             }
         }
-        const namespace = module.namespace;
-        if (namespace.included) {
+        if (includedNamespaces.has(module)) {
+            const namespace = module.namespace;
             namespace.setRenderNames(null, getSafeName(namespace.name, usedNames));
         }
     }
@@ -10714,7 +10737,7 @@ function getGlobalName(module, globals, hasExports, warn) {
     }
 }
 class Chunk$1 {
-    constructor(orderedModules, inputOptions, outputOptions, unsetOptions, pluginDriver, modulesById, chunkByModule, facadeChunkByModule, manualChunkAlias) {
+    constructor(orderedModules, inputOptions, outputOptions, unsetOptions, pluginDriver, modulesById, chunkByModule, facadeChunkByModule, includedNamespaces, manualChunkAlias) {
         this.orderedModules = orderedModules;
         this.inputOptions = inputOptions;
         this.outputOptions = outputOptions;
@@ -10723,11 +10746,13 @@ class Chunk$1 {
         this.modulesById = modulesById;
         this.chunkByModule = chunkByModule;
         this.facadeChunkByModule = facadeChunkByModule;
+        this.includedNamespaces = includedNamespaces;
         this.manualChunkAlias = manualChunkAlias;
         this.entryModules = [];
         this.exportMode = 'named';
         this.facadeModule = null;
         this.id = null;
+        this.namespaceVariableName = '';
         this.variableName = '';
         this.accessedGlobalsByScope = new Map();
         this.dependencies = new Set();
@@ -10756,6 +10781,9 @@ class Chunk$1 {
         this.execIndex = orderedModules.length > 0 ? orderedModules[0].execIndex : Infinity;
         const chunkModules = new Set(orderedModules);
         for (const module of orderedModules) {
+            if (module.namespace.included) {
+                includedNamespaces.add(module);
+            }
             if (this.isEmpty && module.isIncluded()) {
                 this.isEmpty = false;
             }
@@ -10766,8 +10794,8 @@ class Chunk$1 {
                 if (!chunkModules.has(importer)) {
                     this.dynamicEntryModules.push(module);
                     // Modules with synthetic exports need an artificial namespace for dynamic imports
-                    if (module.syntheticNamedExports) {
-                        module.namespace.include();
+                    if (module.syntheticNamedExports && !outputOptions.preserveModules) {
+                        includedNamespaces.add(module);
                         this.exports.add(module.namespace);
                     }
                 }
@@ -10778,8 +10806,8 @@ class Chunk$1 {
         }
         this.suggestedVariableName = makeLegal(this.generateVariableName());
     }
-    static generateFacade(inputOptions, outputOptions, unsetOptions, pluginDriver, modulesById, chunkByModule, facadeChunkByModule, facadedModule, facadeName) {
-        const chunk = new Chunk$1([], inputOptions, outputOptions, unsetOptions, pluginDriver, modulesById, chunkByModule, facadeChunkByModule, null);
+    static generateFacade(inputOptions, outputOptions, unsetOptions, pluginDriver, modulesById, chunkByModule, facadeChunkByModule, includedNamespaces, facadedModule, facadeName) {
+        const chunk = new Chunk$1([], inputOptions, outputOptions, unsetOptions, pluginDriver, modulesById, chunkByModule, facadeChunkByModule, includedNamespaces, null);
         chunk.assignFacadeName(facadeName, facadedModule);
         if (!facadeChunkByModule.has(facadedModule)) {
             facadeChunkByModule.set(facadedModule, chunk);
@@ -10881,7 +10909,7 @@ class Chunk$1 {
                 this.assignFacadeName(requiredFacades.shift(), module);
             }
             for (const facadeName of requiredFacades) {
-                facades.push(Chunk$1.generateFacade(this.inputOptions, this.outputOptions, this.unsetOptions, this.pluginDriver, this.modulesById, this.chunkByModule, this.facadeChunkByModule, module, facadeName));
+                facades.push(Chunk$1.generateFacade(this.inputOptions, this.outputOptions, this.unsetOptions, this.pluginDriver, this.modulesById, this.chunkByModule, this.facadeChunkByModule, this.includedNamespaces, module, facadeName));
             }
         }
         for (const module of this.dynamicEntryModules) {
@@ -10899,7 +10927,7 @@ class Chunk$1 {
                 this.strictFacade = true;
             }
             else if (!((_a = this.facadeChunkByModule.get(module)) === null || _a === void 0 ? void 0 : _a.strictFacade)) {
-                module.namespace.include();
+                this.includedNamespaces.add(module);
                 this.exports.add(module.namespace);
             }
         }
@@ -11047,7 +11075,7 @@ class Chunk$1 {
         const renderedModules = this.renderedModules;
         for (const module of this.orderedModules) {
             let renderedLength = 0;
-            if (module.isIncluded()) {
+            if (module.isIncluded() || this.includedNamespaces.has(module)) {
                 const source = module.render(renderOptions).trim();
                 renderedLength = source.length();
                 if (renderedLength) {
@@ -11058,7 +11086,7 @@ class Chunk$1 {
                     this.usedModules.push(module);
                 }
                 const namespace = module.namespace;
-                if (namespace.included && !this.outputOptions.preserveModules) {
+                if (this.includedNamespaces.has(module) && !this.outputOptions.preserveModules) {
                     const rendered = namespace.renderBlock(renderOptions);
                     if (namespace.renderFirst())
                         hoistedSource += n + rendered;
@@ -11404,6 +11432,11 @@ class Chunk$1 {
                     const chunk = this.chunkByModule.get(module);
                     if (chunk !== this) {
                         dependencies.add(chunk);
+                        if (addNonNamespacesAndInteropHelpers &&
+                            chunk.exportMode === 'default' &&
+                            variable.isNamespace) {
+                            deconflictedNamespace.add(chunk);
+                        }
                     }
                 }
             }
@@ -11618,16 +11651,15 @@ class Chunk$1 {
                     usedNames.add(helper);
                 }
         }
-        deconflictChunk(this.orderedModules, this.getDependenciesToBeDeconflicted(format !== 'es' && format !== 'system', format !== 'system', format === 'amd' || format === 'umd' || format === 'iife', interop), this.imports, usedNames, format, interop, this.outputOptions.preserveModules, this.outputOptions.externalLiveBindings, this.chunkByModule, syntheticExports, this.exportNamesByVariable, this.accessedGlobalsByScope);
+        deconflictChunk(this.orderedModules, this.getDependenciesToBeDeconflicted(format !== 'es' && format !== 'system', format !== 'system', format === 'amd' || format === 'umd' || format === 'iife', interop), this.imports, usedNames, format, interop, this.outputOptions.preserveModules, this.outputOptions.externalLiveBindings, this.chunkByModule, syntheticExports, this.exportNamesByVariable, this.accessedGlobalsByScope, this.includedNamespaces);
     }
     setUpChunkImportsAndExportsForModule(module) {
         const moduleImports = new Set(module.imports);
         // when we are not preserving modules, we need to make all namespace variables available for
         // rendering the namespace object
         if (!this.outputOptions.preserveModules) {
-            const namespace = module.namespace;
-            if (namespace.included) {
-                const memberVariables = namespace.getMemberVariables();
+            if (this.includedNamespaces.has(module)) {
+                const memberVariables = module.namespace.getMemberVariables();
                 for (const name of Object.keys(memberVariables)) {
                     moduleImports.add(memberVariables[name]);
                 }
@@ -11649,7 +11681,7 @@ class Chunk$1 {
                 }
             }
         }
-        if (module.namespace.included ||
+        if (this.includedNamespaces.has(module) ||
             (module.isEntryPoint && module.preserveSignature !== false) ||
             module.includedDynamicImporters.some(importer => this.chunkByModule.get(importer) !== this)) {
             this.ensureReexportsAreAvailableForModule(module);
@@ -11658,8 +11690,8 @@ class Chunk$1 {
             if (node.included &&
                 resolution instanceof Module &&
                 this.chunkByModule.get(resolution) === this &&
-                !resolution.namespace.included) {
-                resolution.namespace.include();
+                !this.includedNamespaces.has(resolution)) {
+                this.includedNamespaces.add(resolution);
                 this.ensureReexportsAreAvailableForModule(resolution);
             }
         }
@@ -12100,6 +12132,7 @@ class Bundle$1 {
         this.pluginDriver = pluginDriver;
         this.graph = graph;
         this.facadeChunkByModule = new Map();
+        this.includedNamespaces = new Set();
     }
     async generate(isWrite) {
         timeStart('GENERATE', 1);
@@ -12223,7 +12256,7 @@ class Bundle$1 {
                 }))
                 : getChunkAssignments(this.graph.entryModules, manualChunkAliasByEntry)) {
             sortByExecutionOrder(modules);
-            const chunk = new Chunk$1(modules, this.inputOptions, this.outputOptions, this.unsetOptions, this.pluginDriver, this.graph.modulesById, chunkByModule, this.facadeChunkByModule, alias);
+            const chunk = new Chunk$1(modules, this.inputOptions, this.outputOptions, this.unsetOptions, this.pluginDriver, this.graph.modulesById, chunkByModule, this.facadeChunkByModule, this.includedNamespaces, alias);
             chunks.push(chunk);
             for (const module of modules) {
                 chunkByModule.set(module, chunk);
@@ -18673,7 +18706,7 @@ class Graph {
     includeStatements() {
         for (const module of [...this.entryModules, ...this.implicitEntryModules]) {
             if (module.preserveSignature !== false) {
-                module.includeAllExports();
+                module.includeAllExports(false);
             }
             else {
                 markModuleAndImpureDependenciesAsExecuted(module);

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.1
-	Sun, 16 Aug 2020 04:44:51 GMT - commit 4b432dc48ad10b198a45574da8a56c06ac77dd93
+	Rollup.js v2.26.5
+	Sat, 22 Aug 2020 04:50:56 GMT - commit b2bb960aa5969914e82fd4bcf289bd16eab4a381
 
 
 	https://github.com/rollup/rollup

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.26.1
-	Sun, 16 Aug 2020 04:44:51 GMT - commit 4b432dc48ad10b198a45574da8a56c06ac77dd93
+	Rollup.js v2.26.5
+	Sat, 22 Aug 2020 04:50:56 GMT - commit b2bb960aa5969914e82fd4bcf289bd16eab4a381
 
 
 	https://github.com/rollup/rollup