rollup 2.54.0 → 2.56.1

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.54.0
-	Sun, 25 Jul 2021 05:15:03 GMT - commit f90e1a2d9a1822b70ffb532a25404e2f45f17f5b
+	Rollup.js v2.56.1
+	Sun, 08 Aug 2021 11:58:39 GMT - commit 2a097a809d7976d0684370fb14b61b3c2fa86bca
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.54.0
-	Sun, 25 Jul 2021 05:15:03 GMT - commit f90e1a2d9a1822b70ffb532a25404e2f45f17f5b
+	Rollup.js v2.56.1
+	Sun, 08 Aug 2021 11:58:39 GMT - commit 2a097a809d7976d0684370fb14b61b3c2fa86bca
 
 
 	https://github.com/rollup/rollup
@@ -3508,7 +3508,7 @@ var picomatch_1 = picomatch$3;
 
 var picomatch$2 = picomatch_1;
 
-var chokidar = {};
+var chokidar$1 = {};
 
 const fs$3 = fs$4;
 const { Readable } = require$$1;
@@ -6505,7 +6505,7 @@ _readdirp(root, opts) {
 }
 
 // Export FSWatcher class
-chokidar.FSWatcher = FSWatcher;
+chokidar$1.FSWatcher = FSWatcher;
 
 /**
  * Instantiates watcher with paths to be tracked.
@@ -6519,7 +6519,9 @@ const watch = (paths, options) => {
   return watcher;
 };
 
-chokidar.watch = watch;
+chokidar$1.watch = watch;
+
+var chokidar = chokidar$1;
 
 exports.braces_1 = braces_1;
 exports.chokidar = chokidar;

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.54.0
-	Sun, 25 Jul 2021 05:15:03 GMT - commit f90e1a2d9a1822b70ffb532a25404e2f45f17f5b
+	Rollup.js v2.56.1
+	Sun, 08 Aug 2021 11:58:39 GMT - commit 2a097a809d7976d0684370fb14b61b3c2fa86bca
 
 
 	https://github.com/rollup/rollup
@@ -272,7 +272,11 @@ const deferredHandlers = {
     UNUSED_EXTERNAL_IMPORT(warnings) {
         title('Unused external imports');
         for (const warning of warnings) {
-            stderr(`${warning.names} imported from external module '${warning.source}' but never used`);
+            stderr(warning.names +
+                ' imported from external module "' +
+                warning.source +
+                '" but never used in ' +
+                rollup.printQuotedStringList(warning.sources.map(id => rollup.relativeId(id))));
         }
     }
 };

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.54.0
-	Sun, 25 Jul 2021 05:15:03 GMT - commit f90e1a2d9a1822b70ffb532a25404e2f45f17f5b
+	Rollup.js v2.56.1
+	Sun, 08 Aug 2021 11:58:39 GMT - commit 2a097a809d7976d0684370fb14b61b3c2fa86bca
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.54.0
-	Sun, 25 Jul 2021 05:15:03 GMT - commit f90e1a2d9a1822b70ffb532a25404e2f45f17f5b
+	Rollup.js v2.56.1
+	Sun, 08 Aug 2021 11:58:39 GMT - commit 2a097a809d7976d0684370fb14b61b3c2fa86bca
 
 
 	https://github.com/rollup/rollup
@@ -19,7 +19,7 @@ function _interopNamespaceDefaultOnly(e) {
   return {__proto__: null, 'default': e};
 }
 
-var version$1 = "2.54.0";
+var version$1 = "2.56.1";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -1982,6 +1982,8 @@ Bundle$1.prototype.trimEnd = function trimEnd (charType) {
 	return this;
 };
 
+var MagicString$1 = MagicString;
+
 function relative(from, to) {
     const fromParts = from.split(/[/\\]/).filter(Boolean);
     const toParts = to.split(/[/\\]/).filter(Boolean);
@@ -3164,35 +3166,54 @@ function removeLineBreaks(code, start, end) {
     }
 }
 
-function getSystemExportStatement(exportedVariables, options) {
-    const _ = options.compact ? '' : ' ';
+function getSystemExportStatement(exportedVariables, { compact, exportNamesByVariable }, modifier = '') {
+    const _ = compact ? '' : ' ';
     if (exportedVariables.length === 1 &&
-        options.exportNamesByVariable.get(exportedVariables[0]).length === 1) {
+        exportNamesByVariable.get(exportedVariables[0]).length === 1) {
         const variable = exportedVariables[0];
-        return `exports('${options.exportNamesByVariable.get(variable)}',${_}${variable.getName()})`;
+        return `exports('${exportNamesByVariable.get(variable)}',${_}${variable.getName()}${modifier})`;
     }
     else {
         return `exports({${_}${exportedVariables
             .map(variable => {
-            return options.exportNamesByVariable
+            return exportNamesByVariable
                 .get(variable)
-                .map(exportName => `${exportName}:${_}${variable.getName()}`)
+                .map(exportName => `${exportName}:${_}${variable.getName()}${modifier}`)
                 .join(`,${_}`);
         })
             .join(`,${_}`)}${_}})`;
     }
 }
-function getSystemExportFunctionLeft(exportedVariables, setFromExpression, options) {
+function renderSystemExportExpression(exportedVariable, expressionStart, expressionEnd, code, { compact, exportNamesByVariable }) {
+    const _ = compact ? '' : ' ';
+    code.prependRight(expressionStart, `exports('${exportNamesByVariable.get(exportedVariable)}',${_}`);
+    code.appendLeft(expressionEnd, ')');
+}
+function renderSystemExportFunction(exportedVariables, expressionStart, expressionEnd, needsParens, code, options) {
     const _ = options.compact ? '' : ' ';
     const s = options.compact ? '' : ';';
-    return `function${_}(v)${_}{${_}return exports({${_}${exportedVariables
-        .map(variable => {
-        return options.exportNamesByVariable
-            .get(variable)
-            .map(exportName => `${exportName}:${_}${setFromExpression ? variable.getName() : 'v'}`)
-            .join(`,${_}`);
-    })
-        .join(`,${_}`)}${_}}),${_}v${s}${_}}(`;
+    code.prependRight(expressionStart, `function${_}(v)${_}{${_}return ${getSystemExportStatement(exportedVariables, options)},${_}v${s}${_}}(`);
+    code.appendLeft(expressionEnd, ')');
+    if (needsParens) {
+        code.prependRight(expressionStart, '(');
+        code.appendLeft(expressionEnd, ')');
+    }
+}
+function renderSystemExportSequenceAfterExpression(exportedVariable, expressionStart, expressionEnd, needsParens, code, options) {
+    const _ = options.compact ? '' : ' ';
+    code.appendLeft(expressionEnd, `,${_}${getSystemExportStatement([exportedVariable], options)},${_}${exportedVariable.getName()}`);
+    if (needsParens) {
+        code.prependRight(expressionStart, '(');
+        code.appendLeft(expressionEnd, ')');
+    }
+}
+function renderSystemExportSequenceBeforeExpression(exportedVariable, expressionStart, expressionEnd, needsParens, code, options, modifier) {
+    const _ = options.compact ? '' : ' ';
+    code.prependRight(expressionStart, `${getSystemExportStatement([exportedVariable], options, modifier)},${_}`);
+    if (needsParens) {
+        code.prependRight(expressionStart, '(');
+        code.appendLeft(expressionEnd, ')');
+    }
 }
 
 const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_$';
@@ -4654,6 +4675,32 @@ class Identifier extends NodeBase {
     includeCallArguments(context, args) {
         this.getVariableRespectingTDZ().includeCallArguments(context, args);
     }
+    isPossibleTDZ() {
+        // return cached value to avoid issues with the next tree-shaking pass
+        if (this.isTDZAccess !== null)
+            return this.isTDZAccess;
+        if (!(this.variable instanceof LocalVariable) ||
+            !this.variable.kind ||
+            !(this.variable.kind in tdzVariableKinds)) {
+            return (this.isTDZAccess = false);
+        }
+        let decl_id;
+        if (this.variable.declarations &&
+            this.variable.declarations.length === 1 &&
+            (decl_id = this.variable.declarations[0]) &&
+            this.start < decl_id.start &&
+            closestParentFunctionOrProgram(this) === closestParentFunctionOrProgram(decl_id)) {
+            // a variable accessed before its declaration
+            // in the same function or at top level of module
+            return (this.isTDZAccess = true);
+        }
+        if (!this.variable.initReached) {
+            // Either a const/let TDZ violation or
+            // var use before declaration was encountered.
+            return (this.isTDZAccess = true);
+        }
+        return (this.isTDZAccess = false);
+    }
     markDeclarationReached() {
         this.variable.initReached = true;
     }
@@ -4696,32 +4743,6 @@ class Identifier extends NodeBase {
         }
         return this.variable;
     }
-    isPossibleTDZ() {
-        // return cached value to avoid issues with the next tree-shaking pass
-        if (this.isTDZAccess !== null)
-            return this.isTDZAccess;
-        if (!(this.variable instanceof LocalVariable) ||
-            !this.variable.kind ||
-            !(this.variable.kind in tdzVariableKinds)) {
-            return (this.isTDZAccess = false);
-        }
-        let decl_id;
-        if (this.variable.declarations &&
-            this.variable.declarations.length === 1 &&
-            (decl_id = this.variable.declarations[0]) &&
-            this.start < decl_id.start &&
-            closestParentFunctionOrProgram(this) === closestParentFunctionOrProgram(decl_id)) {
-            // a variable accessed before its declaration
-            // in the same function or at top level of module
-            return (this.isTDZAccess = true);
-        }
-        if (!this.variable.initReached) {
-            // Either a const/let TDZ violation or
-            // var use before declaration was encountered.
-            return (this.isTDZAccess = true);
-        }
-        return (this.isTDZAccess = false);
-    }
 }
 function closestParentFunctionOrProgram(node) {
     while (node && !/^Program|Function/.test(node.type)) {
@@ -6128,12 +6149,14 @@ class VariableDeclaration extends NodeBase {
         let isInDeclaration = false;
         let hasRenderedContent = false;
         let separatorString = '', leadingString, nextSeparatorString;
-        const systemPatternExports = [];
+        const aggregatedSystemExports = [];
+        const singleSystemExport = gatherSystemExportsAndGetSingleExport(separatedNodes, options, aggregatedSystemExports);
         for (const { node, start, separator, contentEnd, end } of separatedNodes) {
             if (!node.included) {
                 code.remove(start, end);
                 continue;
             }
+            node.render(code, options);
             leadingString = '';
             nextSeparatorString = '';
             if (!node.id.included ||
@@ -6145,21 +6168,9 @@ class VariableDeclaration extends NodeBase {
                 isInDeclaration = false;
             }
             else {
-                if (options.format === 'system' && node.init !== null) {
-                    if (node.id.type !== Identifier$1) {
-                        node.id.addExportedVariables(systemPatternExports, options.exportNamesByVariable);
-                    }
-                    else {
-                        const exportNames = options.exportNamesByVariable.get(node.id.variable);
-                        if (exportNames) {
-                            const _ = options.compact ? '' : ' ';
-                            const operatorPos = findFirstOccurrenceOutsideComment(code.original, '=', node.id.end);
-                            code.prependLeft(findNonWhiteSpace(code.original, operatorPos + 1), exportNames.length === 1
-                                ? `exports('${exportNames[0]}',${_}`
-                                : getSystemExportFunctionLeft([node.id.variable], false, options));
-                            nextSeparatorString += ')';
-                        }
-                    }
+                if (singleSystemExport && singleSystemExport === node.id.variable) {
+                    const operatorPos = findFirstOccurrenceOutsideComment(code.original, '=', node.id.end);
+                    renderSystemExportExpression(singleSystemExport, findNonWhiteSpace(code.original, operatorPos + 1), separator === null ? contentEnd : separator, code, options);
                 }
                 if (isInDeclaration) {
                     separatorString += ',';
@@ -6179,15 +6190,39 @@ class VariableDeclaration extends NodeBase {
                 code.overwrite(lastSeparatorPos, lastSeparatorPos + 1, separatorString);
                 code.appendLeft(renderedContentEnd, leadingString);
             }
-            node.render(code, options);
             actualContentEnd = contentEnd;
             renderedContentEnd = end;
             hasRenderedContent = true;
             lastSeparatorPos = separator;
             separatorString = nextSeparatorString;
         }
-        this.renderDeclarationEnd(code, separatorString, lastSeparatorPos, actualContentEnd, renderedContentEnd, systemPatternExports, options, isNoStatement);
+        this.renderDeclarationEnd(code, separatorString, lastSeparatorPos, actualContentEnd, renderedContentEnd, aggregatedSystemExports, options, isNoStatement);
+    }
+}
+function gatherSystemExportsAndGetSingleExport(separatedNodes, options, aggregatedSystemExports) {
+    var _a;
+    let singleSystemExport = null;
+    if (options.format === 'system') {
+        for (const { node } of separatedNodes) {
+            if (node.id instanceof Identifier &&
+                node.init &&
+                aggregatedSystemExports.length === 0 &&
+                ((_a = options.exportNamesByVariable.get(node.id.variable)) === null || _a === void 0 ? void 0 : _a.length) === 1) {
+                singleSystemExport = node.id.variable;
+                aggregatedSystemExports.push(singleSystemExport);
+            }
+            else {
+                node.id.addExportedVariables(aggregatedSystemExports, options.exportNamesByVariable);
+            }
+        }
+        if (aggregatedSystemExports.length > 1) {
+            singleSystemExport = null;
+        }
+        else if (singleSystemExport) {
+            aggregatedSystemExports.length = 0;
+        }
     }
+    return singleSystemExport;
 }
 
 const NEW_ARRAY_PROPERTIES = [
@@ -6641,7 +6676,7 @@ class AssignmentExpression extends NodeBase {
         }
         this.right.include(context, includeChildrenRecursively);
     }
-    render(code, options, { preventASI, renderedParentType } = BLANK) {
+    render(code, options, { preventASI, renderedParentType, renderedSurroundingElement } = BLANK) {
         if (this.left.included) {
             this.left.render(code, options);
             this.right.render(code, options);
@@ -6653,26 +6688,27 @@ class AssignmentExpression extends NodeBase {
                 removeLineBreaks(code, inclusionStart, this.right.start);
             }
             this.right.render(code, options, {
-                renderedParentType: renderedParentType || this.parent.type
+                renderedParentType: renderedParentType || renderedSurroundingElement || this.parent.type
             });
         }
         if (options.format === 'system') {
-            const exportNames = this.left.variable && options.exportNamesByVariable.get(this.left.variable);
-            if (this.left.type === 'Identifier' && exportNames) {
-                const _ = options.compact ? '' : ' ';
-                const operatorPos = findFirstOccurrenceOutsideComment(code.original, this.operator, this.left.end);
-                const operation = this.operator.length > 1 ? `${exportNames[0]}${_}${this.operator.slice(0, -1)}${_}` : '';
-                code.overwrite(operatorPos, findNonWhiteSpace(code.original, operatorPos + this.operator.length), `=${_}${exportNames.length === 1
-                    ? `exports('${exportNames[0]}',${_}`
-                    : getSystemExportFunctionLeft([this.left.variable], false, options)}${operation}`);
-                code.appendLeft(this.right.end, ')');
+            if (this.left instanceof Identifier) {
+                const variable = this.left.variable;
+                const exportNames = options.exportNamesByVariable.get(variable);
+                if (exportNames) {
+                    if (exportNames.length === 1) {
+                        renderSystemExportExpression(variable, this.start, this.end, code, options);
+                    }
+                    else {
+                        renderSystemExportSequenceAfterExpression(variable, this.start, this.end, this.parent.type !== ExpressionStatement$1, code, options);
+                    }
+                }
             }
             else {
                 const systemPatternExports = [];
                 this.left.addExportedVariables(systemPatternExports, options.exportNamesByVariable);
                 if (systemPatternExports.length > 0) {
-                    code.prependRight(this.start, `(${getSystemExportFunctionLeft(systemPatternExports, true, options)}`);
-                    code.appendLeft(this.end, '))');
+                    renderSystemExportFunction(systemPatternExports, this.start, this.end, (renderedParentType || renderedSurroundingElement) === ExpressionStatement$1, code, options);
                 }
             }
         }
@@ -8125,12 +8161,12 @@ class ImportExpression extends NodeBase {
         if (this.inlineNamespace) {
             const _ = options.compact ? '' : ' ';
             const s = options.compact ? '' : ';';
-            code.overwrite(this.start, this.end, `Promise.resolve().then(function${_}()${_}{${_}return ${this.inlineNamespace.getName()}${s}${_}})`);
+            code.overwrite(this.start, this.end, `Promise.resolve().then(function${_}()${_}{${_}return ${this.inlineNamespace.getName()}${s}${_}})`, { contentOnly: true });
             return;
         }
         if (this.mechanism) {
-            code.overwrite(this.start, findFirstOccurrenceOutsideComment(code.original, '(', this.start + 6) + 1, this.mechanism.left);
-            code.overwrite(this.end - 1, this.end, this.mechanism.right);
+            code.overwrite(this.start, findFirstOccurrenceOutsideComment(code.original, '(', this.start + 6) + 1, this.mechanism.left, { contentOnly: true });
+            code.overwrite(this.end - 1, this.end, this.mechanism.right, { contentOnly: true });
         }
         this.source.render(code, options);
     }
@@ -9137,7 +9173,8 @@ class ExportDefaultVariable extends LocalVariable {
     getDirectOriginalVariable() {
         return this.originalId &&
             (this.hasId ||
-                !(this.originalId.variable.isReassigned ||
+                !(this.originalId.isPossibleTDZ() ||
+                    this.originalId.variable.isReassigned ||
                     this.originalId.variable instanceof UndefinedVariable ||
                     // this avoids a circular dependency
                     'syntheticNamespace' in this.originalId.variable))
@@ -9378,31 +9415,19 @@ class UpdateExpression extends NodeBase {
         if (options.format === 'system') {
             const variable = this.argument.variable;
             const exportNames = options.exportNamesByVariable.get(variable);
-            if (exportNames && exportNames.length) {
+            if (exportNames) {
                 const _ = options.compact ? '' : ' ';
-                const name = variable.getName();
                 if (this.prefix) {
                     if (exportNames.length === 1) {
-                        code.overwrite(this.start, this.end, `exports('${exportNames[0]}',${_}${this.operator}${name})`);
+                        renderSystemExportExpression(variable, this.start, this.end, code, options);
                     }
                     else {
-                        code.overwrite(this.start, this.end, `(${this.operator}${name},${_}${getSystemExportStatement([variable], options)},${_}${name})`);
+                        renderSystemExportSequenceAfterExpression(variable, this.start, this.end, this.parent.type !== ExpressionStatement$1, code, options);
                     }
                 }
-                else if (exportNames.length > 1) {
-                    code.overwrite(this.start, this.end, `(${getSystemExportFunctionLeft([variable], false, options)}${this.operator}${name}))`);
-                }
                 else {
-                    let op;
-                    switch (this.operator) {
-                        case '++':
-                            op = `${name}${_}+${_}1`;
-                            break;
-                        case '--':
-                            op = `${name}${_}-${_}1`;
-                            break;
-                    }
-                    code.overwrite(this.start, this.end, `(exports('${exportNames[0]}',${_}${op}),${_}${name}${this.operator})`);
+                    const operator = this.operator[0];
+                    renderSystemExportSequenceBeforeExpression(variable, this.start, this.end, this.parent.type !== ExpressionStatement$1, code, options, `${_}${operator}${_}1`);
                 }
             }
         }
@@ -10351,7 +10376,7 @@ class Module {
         // By default, `id` is the file name. Custom resolvers and loaders
         // can change that, but it makes sense to use it for the source file name
         const fileName = this.id;
-        this.magicString = new MagicString(code, {
+        this.magicString = new MagicString$1(code, {
             filename: (this.excludeFromSourcemap ? null : fileName),
             indentExclusionRanges: []
         });
@@ -10785,9 +10810,9 @@ function getExportBlock$1(exports, dependencies, namedExportsMode, interop, comp
             }
         }
     }
-    for (const chunkExport of exports) {
-        const lhs = `exports.${chunkExport.exported}`;
-        const rhs = chunkExport.local;
+    for (const { exported, local } of exports) {
+        const lhs = `exports${RESERVED_NAMES[exported] ? `['${exported}']` : `.${exported}`}`;
+        const rhs = local;
         if (lhs !== rhs) {
             if (exportBlock)
                 exportBlock += n;
@@ -11154,17 +11179,12 @@ function getExportBlock(exports, _, varOrConst) {
     const exportBlock = [];
     const exportDeclaration = [];
     for (const specifier of exports) {
-        if (specifier.exported === 'default') {
-            exportBlock.push(`export default ${specifier.local};`);
-        }
-        else {
-            if (specifier.expression) {
-                exportBlock.push(`${varOrConst} ${specifier.local}${_}=${_}${specifier.expression};`);
-            }
-            exportDeclaration.push(specifier.exported === specifier.local
-                ? specifier.local
-                : `${specifier.local} as ${specifier.exported}`);
+        if (specifier.expression) {
+            exportBlock.push(`${varOrConst} ${specifier.local}${_}=${_}${specifier.expression};`);
         }
+        exportDeclaration.push(specifier.exported === specifier.local
+            ? specifier.local
+            : `${specifier.local} as ${specifier.exported}`);
     }
     if (exportDeclaration.length) {
         exportBlock.push(`export${_}{${_}${exportDeclaration.join(`,${_}`)}${_}};`);
@@ -11282,13 +11302,11 @@ function iife(magicString, { accessedGlobals, dependencies, exports, hasExports,
 
 function getStarExcludes({ dependencies, exports }) {
     const starExcludes = new Set(exports.map(expt => expt.exported));
-    if (!starExcludes.has('default'))
-        starExcludes.add('default');
-    // also include reexport names
+    starExcludes.add('default');
     for (const { reexports } of dependencies) {
         if (reexports) {
             for (const reexport of reexports) {
-                if (reexport.imported !== '*' && !starExcludes.has(reexport.reexported))
+                if (reexport.imported !== '*')
                     starExcludes.add(reexport.reexported);
             }
         }
@@ -11312,9 +11330,7 @@ function getExportsBlock(exports, _, t, n) {
         exports.map(({ name, value }) => `${t}${t}${t}${t}${name}:${_}${value}`).join(`,${n}`) +
         `${n}${t}${t}${t}});${n}${n}`);
 }
-const getHoistedExportsBlock = (exports, _, t, n) => getExportsBlock(exports
-    .filter(expt => expt.hoisted || expt.uninitialized)
-    .map(expt => ({ name: expt.exported, value: expt.uninitialized ? 'void 0' : expt.local })), _, t, n);
+const getHoistedExportsBlock = (exports, _, t, n) => getExportsBlock(exports.filter(expt => expt.hoisted).map(expt => ({ name: expt.exported, value: expt.local })), _, t, n);
 const getMissingExportsBlock = (exports, _, t, n) => getExportsBlock(exports
     .filter(expt => expt.local === MISSING_EXPORT_SHIM_VARIABLE)
     .map(expt => ({ name: expt.exported, value: MISSING_EXPORT_SHIM_VARIABLE })), _, t, n);
@@ -11355,10 +11371,8 @@ function system(magicString, { accessedGlobals, dependencies, exports, hasExport
                     if (!starExcludes) {
                         starExcludes = getStarExcludes({ dependencies, exports });
                     }
-                    if (!createdSetter) {
-                        setter.push(`${varOrConst} _setter${_}=${_}{};`);
-                        createdSetter = true;
-                    }
+                    createdSetter = true;
+                    setter.push(`${varOrConst} _setter${_}=${_}{};`);
                     setter.push(`for${_}(var _$p${_}in${_}module)${_}{`);
                     setter.push(`${t}if${_}(!_starExcludes[_$p])${_}_setter[_$p]${_}=${_}module[_$p];`);
                     setter.push('}');
@@ -12388,7 +12402,7 @@ class Chunk {
                     if (namespace.renderFirst())
                         hoistedSource += n + rendered;
                     else
-                        magicString.addSource(new MagicString(rendered));
+                        magicString.addSource(new MagicString$1(rendered));
                 }
             }
             const { renderedExports, removedExports } = module.getRenderedExports();
@@ -12701,12 +12715,8 @@ class Chunk {
             }
             let expression = null;
             let hoisted = false;
-            let uninitialized = false;
             let local = variable.getName();
             if (variable instanceof LocalVariable) {
-                if (variable.init === UNDEFINED_EXPRESSION) {
-                    uninitialized = true;
-                }
                 for (const declaration of variable.declarations) {
                     if (declaration.parent instanceof FunctionDeclaration ||
                         (declaration instanceof ExportDefaultDeclaration &&
@@ -12718,7 +12728,7 @@ class Chunk {
             }
             else if (variable instanceof SyntheticNamedExportVariable) {
                 expression = local;
-                if (format === 'es' && exportName !== 'default') {
+                if (format === 'es') {
                     local = variable.renderName;
                 }
             }
@@ -12726,8 +12736,7 @@ class Chunk {
                 exported: exportName,
                 expression,
                 hoisted,
-                local,
-                uninitialized
+                local
             });
         }
         return exports;
@@ -19520,7 +19529,7 @@ function transform(source, module, pluginDriver, warn) {
             getCombinedSourcemap() {
                 const combinedMap = collapseSourcemap(id, originalCode, originalSourcemap, sourcemapChain, warn);
                 if (!combinedMap) {
-                    const magicString = new MagicString(originalCode);
+                    const magicString = new MagicString$1(originalCode);
                     return magicString.generateMap({ hires: true, includeContent: true, source: id });
                 }
                 if (originalSourcemap !== combinedMap) {
@@ -19671,12 +19680,10 @@ class ModuleLoader {
         }));
     }
     async addModuleSource(id, importer, module) {
-        var _a;
         timeStart('load modules', 3);
         let source;
         try {
-            source =
-                (_a = (await this.pluginDriver.hookFirst('load', [id]))) !== null && _a !== void 0 ? _a : (await this.readQueue.run(async () => readFile(id)));
+            source = await this.readQueue.run(async () => { var _a; return (_a = (await this.pluginDriver.hookFirst('load', [id]))) !== null && _a !== void 0 ? _a : (await readFile(id)); });
         }
         catch (err) {
             timeEnd('load modules', 3);

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.54.0
-	Sun, 25 Jul 2021 05:15:03 GMT - commit f90e1a2d9a1822b70ffb532a25404e2f45f17f5b
+	Rollup.js v2.56.1
+	Sun, 08 Aug 2021 11:58:39 GMT - commit 2a097a809d7976d0684370fb14b61b3c2fa86bca
 
 
 	https://github.com/rollup/rollup
@@ -406,7 +406,7 @@ async function watch(command) {
                 case 'BUNDLE_END':
                     warnings.flush();
                     if (!silent)
-                        loadConfigFile_js.stderr(loadConfigFile_js.green(`created ${loadConfigFile_js.bold(event.output.map(rollup.relativeId).join(', '))} in ${loadConfigFile_js.bold(cli.prettyMs(event.duration))}`));
+                        loadConfigFile_js.stderr(loadConfigFile_js.green(`created ${loadConfigFile_js.bold(event.output.map(rollup.relativeId).join(', '))} in ${loadConfigFile_js.bold(cli.ms(event.duration))}`));
                     if (event.result && event.result.getTimings) {
                         cli.printTimings(event.result.getTimings());
                     }

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.54.0
-	Sun, 25 Jul 2021 05:15:03 GMT - commit f90e1a2d9a1822b70ffb532a25404e2f45f17f5b
+	Rollup.js v2.56.1
+	Sun, 08 Aug 2021 11:58:39 GMT - commit 2a097a809d7976d0684370fb14b61b3c2fa86bca
 
 
 	https://github.com/rollup/rollup
@@ -500,6 +500,8 @@ micromatch.braceExpand = (pattern, options) => {
 
 var micromatch_1 = micromatch;
 
+var mm = micromatch_1;
+
 function ensureArray(thing) {
     if (Array.isArray(thing))
         return thing;
@@ -520,7 +522,7 @@ const createFilter = function createFilter(include, exclude, options) {
         return id instanceof RegExp
             ? id
             : {
-                test: micromatch_1.matcher(getMatcherString(id, resolutionBase)
+                test: mm.matcher(getMatcherString(id, resolutionBase)
                     .split(path.sep)
                     .join('/'), { dot: true })
             };

package/package.json

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