rollup 2.46.0 → 2.47.0

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.46.0
-	Thu, 29 Apr 2021 05:09:38 GMT - commit 7927f3d0ca51b8346a0bedf09eb8746821fd651e
+	Rollup.js v2.47.0
+	Tue, 04 May 2021 05:02:40 GMT - commit 6cc9d6b5137dd80fef9618e97471f89f8fbc54ad
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.46.0
-	Thu, 29 Apr 2021 05:09:38 GMT - commit 7927f3d0ca51b8346a0bedf09eb8746821fd651e
+	Rollup.js v2.47.0
+	Tue, 04 May 2021 05:02:40 GMT - commit 6cc9d6b5137dd80fef9618e97471f89f8fbc54ad
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.46.0
-	Thu, 29 Apr 2021 05:09:38 GMT - commit 7927f3d0ca51b8346a0bedf09eb8746821fd651e
+	Rollup.js v2.47.0
+	Tue, 04 May 2021 05:02:40 GMT - commit 6cc9d6b5137dd80fef9618e97471f89f8fbc54ad
 
 
 	https://github.com/rollup/rollup
@@ -157,13 +157,7 @@ const immediateHandlers = {
     },
     MISSING_NODE_BUILTINS: warning => {
         title(`Missing shims for Node.js built-ins`);
-        const detail = warning.modules.length === 1
-            ? `'${warning.modules[0]}'`
-            : `${warning
-                .modules.slice(0, -1)
-                .map((name) => `'${name}'`)
-                .join(', ')} and '${warning.modules.slice(-1)}'`;
-        stderr(`Creating a browser bundle that depends on ${detail}. You might need to include https://github.com/ionic-team/rollup-plugin-node-polyfills`);
+        stderr(`Creating a browser bundle that depends on ${rollup.printQuotedStringList(warning.modules)}. You might need to include https://github.com/ionic-team/rollup-plugin-node-polyfills`);
     }
 };
 const deferredHandlers = {
@@ -218,7 +212,7 @@ const deferredHandlers = {
     NAMESPACE_CONFLICT(warnings) {
         title(`Conflicting re-exports`);
         for (const warning of warnings) {
-            stderr(`${bold(rollup.relativeId(warning.reexporter))} re-exports '${warning.name}' from both ${rollup.relativeId(warning.sources[0])} and ${rollup.relativeId(warning.sources[1])} (will be ignored)`);
+            stderr(`"${bold(rollup.relativeId(warning.reexporter))}" re-exports "${warning.name}" from both "${rollup.relativeId(warning.sources[0])}" and "${rollup.relativeId(warning.sources[1])}" (will be ignored)`);
         }
     },
     NON_EXISTENT_EXPORT(warnings) {
@@ -253,14 +247,10 @@ const deferredHandlers = {
     SOURCEMAP_BROKEN(warnings) {
         title(`Broken sourcemap`);
         info('https://rollupjs.org/guide/en/#warning-sourcemap-is-likely-to-be-incorrect');
-        const plugins = Array.from(new Set(warnings.map(w => w.plugin).filter(Boolean)));
-        const detail = plugins.length > 1
-            ? ` (such as ${plugins
-                .slice(0, -1)
-                .map(p => `'${p}'`)
-                .join(', ')} and '${plugins.slice(-1)}')`
-            : ` (such as '${plugins[0]}')`;
-        stderr(`Plugins that transform code${detail} should generate accompanying sourcemaps`);
+        const plugins = [
+            ...new Set(warnings.map(warning => warning.plugin).filter(Boolean))
+        ];
+        stderr(`Plugins that transform code (such as ${rollup.printQuotedStringList(plugins)}) should generate accompanying sourcemaps`);
     },
     THIS_IS_UNDEFINED(warnings) {
         title('`this` has been rewritten to `undefined`');

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.46.0
-	Thu, 29 Apr 2021 05:09:38 GMT - commit 7927f3d0ca51b8346a0bedf09eb8746821fd651e
+	Rollup.js v2.47.0
+	Tue, 04 May 2021 05:02:40 GMT - commit 6cc9d6b5137dd80fef9618e97471f89f8fbc54ad
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.46.0
-	Thu, 29 Apr 2021 05:09:38 GMT - commit 7927f3d0ca51b8346a0bedf09eb8746821fd651e
+	Rollup.js v2.47.0
+	Tue, 04 May 2021 05:02:40 GMT - commit 6cc9d6b5137dd80fef9618e97471f89f8fbc54ad
 
 
 	https://github.com/rollup/rollup
@@ -32,7 +32,7 @@ function _interopNamespaceDefaultOnly(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
-var version$1 = "2.46.0";
+var version$1 = "2.47.0";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -4462,14 +4462,17 @@ class NamespaceVariable extends Variable {
         this.references.push(identifier);
         this.name = identifier.name;
     }
-    // This is only called if "UNKNOWN_PATH" is reassigned as in all other situations, either the
-    // build fails due to an illegal namespace reassignment or MemberExpression already forwards
-    // the reassignment to the right variable. This means we lost track of this variable and thus
-    // need to reassign all exports.
-    deoptimizePath() {
+    deoptimizePath(path) {
         const memberVariables = this.getMemberVariables();
-        for (const key of Object.keys(memberVariables)) {
-            memberVariables[key].deoptimizePath(UNKNOWN_PATH);
+        const memberPath = path.length <= 1 ? UNKNOWN_PATH : path.slice(1);
+        const key = path[0];
+        if (typeof key !== 'string') {
+            for (const key of Object.keys(memberVariables)) {
+                memberVariables[key].deoptimizePath(memberPath);
+            }
+        }
+        else {
+            memberVariables[key].deoptimizePath(memberPath);
         }
     }
     getMemberVariables() {
@@ -4479,7 +4482,10 @@ class NamespaceVariable extends Variable {
         const memberVariables = Object.create(null);
         for (const name of this.context.getExports().concat(this.context.getReexports())) {
             if (name[0] !== '*' && name !== this.module.info.syntheticNamedExports) {
-                memberVariables[name] = this.context.traceExport(name);
+                const exportedVariable = this.context.traceExport(name);
+                if (exportedVariable) {
+                    memberVariables[name] = exportedVariable;
+                }
             }
         }
         return (this.memberVariables = memberVariables);
@@ -4638,6 +4644,18 @@ function makeLegal(str) {
     return str || '_';
 }
 
+function printQuotedStringList(list, verbs) {
+    const isSingleItem = list.length <= 1;
+    const quotedList = list.map(item => `"${item}"`);
+    let output = isSingleItem
+        ? quotedList[0]
+        : `${quotedList.slice(0, -1).join(', ')} and ${quotedList.slice(-1)[0]}`;
+    if (verbs) {
+        output += ` ${isSingleItem ? verbs[0] : verbs[1]}`;
+    }
+    return output;
+}
+
 class ExternalModule {
     constructor(options, id, hasModuleSideEffects, meta, renormalizeRenderPath) {
         this.options = options;
@@ -4715,25 +4733,17 @@ class ExternalModule {
         });
         if (unused.length === 0)
             return;
-        const names = unused.length === 1
-            ? `'${unused[0]}' is`
-            : `${unused
-                .slice(0, -1)
-                .map(name => `'${name}'`)
-                .join(', ')} and '${unused.slice(-1)}' are`;
         const importersSet = new Set();
         for (const name of unused) {
-            const { importers, dynamicImporters } = this.declarations[name].module;
-            if (Array.isArray(importers))
-                importers.forEach(v => importersSet.add(v));
-            if (Array.isArray(dynamicImporters))
-                dynamicImporters.forEach(v => importersSet.add(v));
-        }
-        const importersArray = Array.from(importersSet);
-        const importerList = ' in' + importersArray.map(s => `\n\t${s};`);
+            const { importers } = this.declarations[name].module;
+            for (const importer of importers) {
+                importersSet.add(importer);
+            }
+        }
+        const importersArray = [...importersSet];
         this.options.onwarn({
             code: 'UNUSED_EXTERNAL_IMPORT',
-            message: `${names} imported from external module '${this.id}' but never used${importerList}`,
+            message: `${printQuotedStringList(unused, ['is', 'are'])} imported from external module "${this.id}" but never used in ${printQuotedStringList(importersArray.map(importer => relativeId(importer)))}.`,
             names: unused,
             source: this.id,
             sources: importersArray
@@ -5057,15 +5067,9 @@ function warnOnBuiltins(warn, dependencies) {
     const externalBuiltins = dependencies.map(({ id }) => id).filter(id => id in builtins);
     if (!externalBuiltins.length)
         return;
-    const detail = externalBuiltins.length === 1
-        ? `module ('${externalBuiltins[0]}')`
-        : `modules (${externalBuiltins
-            .slice(0, -1)
-            .map(name => `'${name}'`)
-            .join(', ')} and '${externalBuiltins.slice(-1)}')`;
     warn({
         code: 'MISSING_NODE_BUILTINS',
-        message: `Creating a browser bundle that depends on Node.js built-in ${detail}. You might need to include https://github.com/ionic-team/rollup-plugin-node-polyfills`,
+        message: `Creating a browser bundle that depends on Node.js built-in modules (${printQuotedStringList(externalBuiltins)}). You might need to include https://github.com/ionic-team/rollup-plugin-node-polyfills`,
         modules: externalBuiltins
     });
 }
@@ -5348,6 +5352,7 @@ var Errors;
     Errors["MISSING_IMPLICIT_DEPENDANT"] = "MISSING_IMPLICIT_DEPENDANT";
     Errors["MIXED_EXPORTS"] = "MIXED_EXPORTS";
     Errors["NAMESPACE_CONFLICT"] = "NAMESPACE_CONFLICT";
+    Errors["AMBIGUOUS_EXTERNAL_NAMESPACES"] = "AMBIGUOUS_EXTERNAL_NAMESPACES";
     Errors["NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE"] = "NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE";
     Errors["PLUGIN_ERROR"] = "PLUGIN_ERROR";
     Errors["PREFER_NAMED_EXPORTS"] = "PREFER_NAMED_EXPORTS";
@@ -5513,9 +5518,7 @@ function errImplicitDependantIsNotIncluded(module) {
     const implicitDependencies = Array.from(module.implicitlyLoadedBefore, dependency => relativeId(dependency.id)).sort();
     return {
         code: Errors.MISSING_IMPLICIT_DEPENDANT,
-        message: `Module "${relativeId(module.id)}" that should be implicitly loaded before "${implicitDependencies.length === 1
-            ? implicitDependencies[0]
-            : `${implicitDependencies.slice(0, -1).join('", "')}" and "${implicitDependencies.slice(-1)[0]}`}" is not included in the module graph. Either it was not imported by an included module or only via a tree-shaken dynamic import, or no imported bindings were used and it had otherwise no side-effects.`
+        message: `Module "${relativeId(module.id)}" that should be implicitly loaded before ${printQuotedStringList(implicitDependencies)} is not included in the module graph. Either it was not imported by an included module or only via a tree-shaken dynamic import, or no imported bindings were used and it had otherwise no side-effects.`
     };
 }
 function errMixedExport(facadeModuleId, name) {
@@ -5529,12 +5532,21 @@ function errMixedExport(facadeModuleId, name) {
 function errNamespaceConflict(name, reexportingModule, additionalExportAllModule) {
     return {
         code: Errors.NAMESPACE_CONFLICT,
-        message: `Conflicting namespaces: ${relativeId(reexportingModule.id)} re-exports '${name}' from both ${relativeId(reexportingModule.exportsAll[name])} and ${relativeId(additionalExportAllModule.exportsAll[name])} (will be ignored)`,
+        message: `Conflicting namespaces: "${relativeId(reexportingModule.id)}" re-exports "${name}" from both "${relativeId(reexportingModule.exportsAll[name])}" and "${relativeId(additionalExportAllModule.exportsAll[name])}" (will be ignored)`,
         name,
         reexporter: reexportingModule.id,
         sources: [reexportingModule.exportsAll[name], additionalExportAllModule.exportsAll[name]]
     };
 }
+function errAmbiguousExternalNamespaces(name, reexportingModule, usedExternalModule, externalModules) {
+    return {
+        code: Errors.AMBIGUOUS_EXTERNAL_NAMESPACES,
+        message: `Ambiguous external namespace resolution: "${relativeId(reexportingModule)}" re-exports "${name}" from one of the external modules ${printQuotedStringList(externalModules.map(module => relativeId(module)))}, guessing "${relativeId(usedExternalModule)}".`,
+        name,
+        reexporter: reexportingModule,
+        sources: externalModules
+    };
+}
 function errNoTransformMapOrAstWithoutCode(pluginName) {
     return {
         code: Errors.NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE,
@@ -6600,15 +6612,9 @@ class MemberExpression extends NodeBase {
         if (this.variable) {
             this.variable.deoptimizePath(path);
         }
-        else {
-            const propertyKey = this.getPropertyKey();
-            if (propertyKey === UnknownKey) {
-                this.object.deoptimizePath(UNKNOWN_PATH);
-            }
-            else {
-                this.wasPathDeoptimizedWhileOptimized = true;
-                this.object.deoptimizePath([propertyKey, ...path]);
-            }
+        else if (!this.replacement) {
+            this.wasPathDeoptimizedWhileOptimized = true;
+            this.object.deoptimizePath([this.getPropertyKey(), ...path]);
         }
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
@@ -9606,8 +9612,11 @@ function findSourceMappingURLComments(ast, code) {
         }
         let sourcemappingUrlMatch;
         const interStatmentCode = code.slice(start, end);
-        while (sourcemappingUrlMatch = SOURCEMAPPING_URL_COMMENT_RE.exec(interStatmentCode)) {
-            ret.push([start + sourcemappingUrlMatch.index, start + SOURCEMAPPING_URL_COMMENT_RE.lastIndex]);
+        while ((sourcemappingUrlMatch = SOURCEMAPPING_URL_COMMENT_RE.exec(interStatmentCode))) {
+            ret.push([
+                start + sourcemappingUrlMatch.index,
+                start + SOURCEMAPPING_URL_COMMENT_RE.lastIndex
+            ]);
         }
     };
     let prevStmtEnd = 0;
@@ -9618,7 +9627,7 @@ function findSourceMappingURLComments(ast, code) {
     addCommentsPos(prevStmtEnd, code.length);
     return ret;
 }
-function getVariableForExportNameRecursive(target, name, importerForSideEffects, isExportAllSearch, searchedNamesAndModules = new Map()) {
+function getVariableForExportNameRecursive(target, name, importerForSideEffects, isExportAllSearch, searchedNamesAndModules = new Map(), skipExternalNamespaceReexports) {
     const searchedModules = searchedNamesAndModules.get(name);
     if (searchedModules) {
         if (searchedModules.has(target)) {
@@ -9629,7 +9638,12 @@ function getVariableForExportNameRecursive(target, name, importerForSideEffects,
     else {
         searchedNamesAndModules.set(name, new Set([target]));
     }
-    return target.getVariableForExportName(name, importerForSideEffects, isExportAllSearch, searchedNamesAndModules);
+    return target.getVariableForExportName(name, {
+        importerForSideEffects,
+        isExportAllSearch,
+        searchedNamesAndModules,
+        skipExternalNamespaceReexports
+    });
 }
 function getAndExtendSideEffectModules(variable, module) {
     const sideEffectModules = getOrCreate(module.sideEffectDependenciesByVariable, variable, () => new Set());
@@ -9694,6 +9708,7 @@ class Module {
         this.exportAllModules = [];
         this.exportNamesByVariable = null;
         this.exportShimVariable = new ExportShimVariable(this);
+        this.namespaceReexportsByName = Object.create(null);
         this.relevantDependencies = null;
         this.syntheticExports = new Map();
         this.syntheticNamespace = null;
@@ -9785,7 +9800,10 @@ class Module {
             this.implicitlyLoadedAfter.size > 0) {
             dependencyVariables = new Set(dependencyVariables);
             for (const exportName of [...this.getReexports(), ...this.getExports()]) {
-                dependencyVariables.add(this.getVariableForExportName(exportName));
+                const exportedVariable = this.getVariableForExportName(exportName);
+                if (exportedVariable) {
+                    dependencyVariables.add(exportedVariable);
+                }
             }
         }
         for (let variable of dependencyVariables) {
@@ -9890,7 +9908,7 @@ class Module {
         }
         return this.syntheticNamespace;
     }
-    getVariableForExportName(name, importerForSideEffects, isExportAllSearch, searchedNamesAndModules) {
+    getVariableForExportName(name, { importerForSideEffects, isExportAllSearch, searchedNamesAndModules, skipExternalNamespaceReexports } = EMPTY_OBJECT) {
         if (name[0] === '*') {
             if (name.length === 1) {
                 // export * from './other'
@@ -9905,7 +9923,7 @@ class Module {
         // export { foo } from './other'
         const reexportDeclaration = this.reexportDescriptions[name];
         if (reexportDeclaration) {
-            const variable = getVariableForExportNameRecursive(reexportDeclaration.module, reexportDeclaration.localName, importerForSideEffects, false, searchedNamesAndModules);
+            const variable = getVariableForExportNameRecursive(reexportDeclaration.module, reexportDeclaration.localName, importerForSideEffects, false, searchedNamesAndModules, false);
             if (!variable) {
                 return this.error(errMissingExport(reexportDeclaration.localName, this.id, reexportDeclaration.module.id), reexportDeclaration.start);
             }
@@ -9928,20 +9946,11 @@ class Module {
             return variable;
         }
         if (name !== 'default') {
-            let foundSyntheticDeclaration = null;
-            for (const module of this.exportAllModules) {
-                const declaration = getVariableForExportNameRecursive(module, name, importerForSideEffects, true, searchedNamesAndModules);
-                if (declaration) {
-                    if (!(declaration instanceof SyntheticNamedExportVariable)) {
-                        return declaration;
-                    }
-                    if (!foundSyntheticDeclaration) {
-                        foundSyntheticDeclaration = declaration;
-                    }
-                }
-            }
-            if (foundSyntheticDeclaration) {
-                return foundSyntheticDeclaration;
+            const foundNamespaceReexport = name in this.namespaceReexportsByName
+                ? this.namespaceReexportsByName[name]
+                : (this.namespaceReexportsByName[name] = this.getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports));
+            if (foundNamespaceReexport) {
+                return foundNamespaceReexport;
             }
         }
         if (this.info.syntheticNamedExports) {
@@ -9989,12 +9998,14 @@ class Module {
         }
         for (const name of this.getReexports()) {
             const variable = this.getVariableForExportName(name);
-            variable.deoptimizePath(UNKNOWN_PATH);
-            if (!variable.included) {
-                this.includeVariable(variable);
-            }
-            if (variable instanceof ExternalVariable) {
-                variable.module.reexported = true;
+            if (variable) {
+                variable.deoptimizePath(UNKNOWN_PATH);
+                if (!variable.included) {
+                    this.includeVariable(variable);
+                }
+                if (variable instanceof ExternalVariable) {
+                    variable.module.reexported = true;
+                }
             }
         }
         if (includeNamespaceMembers) {
@@ -10133,7 +10144,9 @@ class Module {
             if (otherModule instanceof Module && importDeclaration.name === '*') {
                 return otherModule.namespace;
             }
-            const declaration = otherModule.getVariableForExportName(importDeclaration.name, importerForSideEffects || this);
+            const declaration = otherModule.getVariableForExportName(importDeclaration.name, {
+                importerForSideEffects: importerForSideEffects || this
+            });
             if (!declaration) {
                 return this.error(errMissingExport(importDeclaration.name, this.id, otherModule.id), importDeclaration.start);
             }
@@ -10331,6 +10344,42 @@ class Module {
         addSideEffectDependencies(this.dependencies);
         addSideEffectDependencies(alwaysCheckedDependencies);
     }
+    getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports = false) {
+        let foundSyntheticDeclaration = null;
+        const skipExternalNamespaceValues = new Set([true, skipExternalNamespaceReexports]);
+        for (const skipExternalNamespaces of skipExternalNamespaceValues) {
+            const foundDeclarations = new Set();
+            for (const module of this.exportAllModules) {
+                if (module instanceof Module || !skipExternalNamespaces) {
+                    const declaration = getVariableForExportNameRecursive(module, name, importerForSideEffects, true, searchedNamesAndModules, skipExternalNamespaces);
+                    if (declaration) {
+                        if (!(declaration instanceof SyntheticNamedExportVariable)) {
+                            foundDeclarations.add(declaration);
+                        }
+                        else if (!foundSyntheticDeclaration) {
+                            foundSyntheticDeclaration = declaration;
+                        }
+                    }
+                }
+            }
+            if (foundDeclarations.size === 1) {
+                return [...foundDeclarations][0];
+            }
+            if (foundDeclarations.size > 1) {
+                if (skipExternalNamespaces) {
+                    return null;
+                }
+                const foundDeclarationList = [...foundDeclarations];
+                const usedDeclaration = foundDeclarationList[0];
+                this.options.onwarn(errAmbiguousExternalNamespaces(name, this.id, usedDeclaration.module.id, foundDeclarationList.map(declaration => declaration.module.id)));
+                return usedDeclaration;
+            }
+        }
+        if (foundSyntheticDeclaration) {
+            return foundSyntheticDeclaration;
+        }
+        return null;
+    }
     includeAndGetAdditionalMergedNamespaces() {
         const mergedNamespaces = [];
         for (const module of this.exportAllModules) {
@@ -20430,6 +20479,7 @@ exports.getAliasName = getAliasName;
 exports.getAugmentedNamespace = getAugmentedNamespace;
 exports.getOrCreate = getOrCreate;
 exports.loadFsEvents = loadFsEvents;
+exports.printQuotedStringList = printQuotedStringList;
 exports.relativeId = relativeId;
 exports.rollup = rollup;
 exports.rollupInternal = rollupInternal;

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.46.0
-	Thu, 29 Apr 2021 05:09:38 GMT - commit 7927f3d0ca51b8346a0bedf09eb8746821fd651e
+	Rollup.js v2.47.0
+	Tue, 04 May 2021 05:02:40 GMT - commit 6cc9d6b5137dd80fef9618e97471f89f8fbc54ad
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.46.0
-	Thu, 29 Apr 2021 05:09:38 GMT - commit 7927f3d0ca51b8346a0bedf09eb8746821fd651e
+	Rollup.js v2.47.0
+	Tue, 04 May 2021 05:02:40 GMT - commit 6cc9d6b5137dd80fef9618e97471f89f8fbc54ad
 
 
 	https://github.com/rollup/rollup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",