rollup 3.20.6 → 3.21.0

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/node-entry.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/pr
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.20.6";
+var version$1 = "3.21.0";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -10342,9 +10342,9 @@ class FunctionDeclaration extends FunctionNode {
 function getDeclarationStart(code, start) {
     return findNonWhiteSpace(code, findFirstOccurrenceOutsideComment(code, 'default', start) + 7);
 }
-function getIdInsertPosition(code, declarationKeyword, endMarker, start) {
-    const declarationEnd = findFirstOccurrenceOutsideComment(code, declarationKeyword, start) + declarationKeyword.length;
-    code = code.slice(declarationEnd, findFirstOccurrenceOutsideComment(code, endMarker, declarationEnd));
+function getFunctionIdInsertPosition(code, start) {
+    const declarationEnd = findFirstOccurrenceOutsideComment(code, 'function', start) + 'function'.length;
+    code = code.slice(declarationEnd, findFirstOccurrenceOutsideComment(code, '(', declarationEnd));
     const generatorStarPos = findFirstOccurrenceOutsideComment(code, '*');
     if (generatorStarPos === -1) {
         return declarationEnd;
@@ -10369,10 +10369,14 @@ class ExportDefaultDeclaration extends NodeBase {
         const { start, end } = nodeRenderOptions;
         const declarationStart = getDeclarationStart(code.original, this.start);
         if (this.declaration instanceof FunctionDeclaration) {
-            this.renderNamedDeclaration(code, declarationStart, 'function', '(', this.declaration.id === null, options);
+            this.renderNamedDeclaration(code, declarationStart, this.declaration.id === null
+                ? getFunctionIdInsertPosition(code.original, declarationStart)
+                : null, options);
         }
         else if (this.declaration instanceof ClassDeclaration) {
-            this.renderNamedDeclaration(code, declarationStart, 'class', '{', this.declaration.id === null, options);
+            this.renderNamedDeclaration(code, declarationStart, this.declaration.id === null
+                ? findFirstOccurrenceOutsideComment(code.original, 'class', start) + 'class'.length
+                : null, options);
         }
         else if (this.variable.getOriginalVariable() !== this.variable) {
             // Remove altogether to prevent re-declaring the same variable
@@ -10395,13 +10399,13 @@ class ExportDefaultDeclaration extends NodeBase {
         this.declaration.render(code, options);
     }
     applyDeoptimizations() { }
-    renderNamedDeclaration(code, declarationStart, declarationKeyword, endMarker, needsId, options) {
+    renderNamedDeclaration(code, declarationStart, idInsertPosition, options) {
         const { exportNamesByVariable, format, snippets: { getPropertyAccess } } = options;
         const name = this.variable.getName(getPropertyAccess);
         // Remove `export default`
         code.remove(this.start, declarationStart);
-        if (needsId) {
-            code.appendLeft(getIdInsertPosition(code.original, declarationKeyword, endMarker, declarationStart), ` ${name}`);
+        if (idInsertPosition !== null) {
+            code.appendLeft(idInsertPosition, ` ${name}`);
         }
         if (format === 'system' &&
             this.declaration instanceof ClassDeclaration &&
@@ -10529,6 +10533,7 @@ class ForOfStatement extends NodeBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
+        this.right.deoptimizePath(UNKNOWN_PATH);
         this.context.requestTreeshakingPass();
     }
 }
@@ -10980,6 +10985,74 @@ function getToStringTagValue(getObject) {
     });
 }
 
+function isReassignedExportsMember(variable, exportNamesByVariable) {
+    return (variable.renderBaseName !== null && exportNamesByVariable.has(variable) && variable.isReassigned);
+}
+
+class VariableDeclarator extends NodeBase {
+    declareDeclarator(kind) {
+        this.id.declare(kind, this.init || UNDEFINED_EXPRESSION);
+    }
+    deoptimizePath(path) {
+        this.id.deoptimizePath(path);
+    }
+    hasEffects(context) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        const initEffect = this.init?.hasEffects(context);
+        this.id.markDeclarationReached();
+        return initEffect || this.id.hasEffects(context);
+    }
+    include(context, includeChildrenRecursively) {
+        const { deoptimized, id, init } = this;
+        if (!deoptimized)
+            this.applyDeoptimizations();
+        this.included = true;
+        init?.include(context, includeChildrenRecursively);
+        id.markDeclarationReached();
+        if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
+            id.include(context, includeChildrenRecursively);
+        }
+    }
+    render(code, options) {
+        const { exportNamesByVariable, snippets: { _, getPropertyAccess } } = options;
+        const { end, id, init, start } = this;
+        const renderId = id.included;
+        if (renderId) {
+            id.render(code, options);
+        }
+        else {
+            const operatorPos = findFirstOccurrenceOutsideComment(code.original, '=', id.end);
+            code.remove(start, findNonWhiteSpace(code.original, operatorPos + 1));
+        }
+        if (init) {
+            if (id instanceof Identifier && init instanceof ClassExpression && !init.id) {
+                const renderedVariable = id.variable.getName(getPropertyAccess);
+                if (renderedVariable !== id.name) {
+                    code.appendLeft(init.start + 5, ` ${id.name}`);
+                }
+            }
+            init.render(code, options, renderId ? BLANK : { renderedSurroundingElement: ExpressionStatement$1 });
+        }
+        else if (id instanceof Identifier &&
+            isReassignedExportsMember(id.variable, exportNamesByVariable)) {
+            code.appendLeft(end, `${_}=${_}void 0`);
+        }
+    }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        const { id, init } = this;
+        if (init && id instanceof Identifier && init instanceof ClassExpression && !init.id) {
+            const { name, variable } = id;
+            for (const accessedVariable of init.scope.accessedOutsideVariables.values()) {
+                if (accessedVariable !== variable) {
+                    accessedVariable.forbidName(name);
+                }
+            }
+        }
+    }
+}
+
 // TODO once ImportExpression follows official ESTree specs with "null" as
 //  default, keys.ts should be updated
 class ImportExpression extends NodeBase {
@@ -10996,6 +11069,79 @@ class ImportExpression extends NodeBase {
     bind() {
         this.source.bind();
     }
+    /**
+     * Get imported variables for deterministic usage, valid cases are:
+     *
+     * - `const { foo } = await import('bar')`.
+     * - `(await import('bar')).foo`
+     * - `import('bar').then(({ foo }) => {})`
+     *
+     * Returns empty array if it's side-effect only import.
+     * Returns undefined if it's not fully deterministic.
+     */
+    getDeterministicImportedNames() {
+        const parent1 = this.parent;
+        // Side-effect only: import('bar')
+        if (parent1 instanceof ExpressionStatement) {
+            return EMPTY_ARRAY;
+        }
+        if (parent1 instanceof AwaitExpression) {
+            const parent2 = parent1.parent;
+            // Side-effect only: await import('bar')
+            if (parent2 instanceof ExpressionStatement) {
+                return EMPTY_ARRAY;
+            }
+            // Case 1: const { foo } = await import('bar')
+            if (parent2 instanceof VariableDeclarator) {
+                const declaration = parent2.id;
+                return declaration instanceof ObjectPattern
+                    ? getDeterministicObjectDestructure(declaration)
+                    : undefined;
+            }
+            // Case 2: (await import('bar')).foo
+            if (parent2 instanceof MemberExpression) {
+                const id = parent2.property;
+                if (!parent2.computed && id instanceof Identifier) {
+                    return [id.name];
+                }
+            }
+            return;
+        }
+        // Case 3: import('bar').then(({ foo }) => {})
+        if (parent1 instanceof MemberExpression) {
+            const callExpression = parent1.parent;
+            const property = parent1.property;
+            if (!(callExpression instanceof CallExpression) || !(property instanceof Identifier)) {
+                return;
+            }
+            const memberName = property.name;
+            // side-effect only, when only chaining .catch or .finally
+            if (callExpression.parent instanceof ExpressionStatement &&
+                ['catch', 'finally'].includes(memberName)) {
+                return EMPTY_ARRAY;
+            }
+            if (memberName !== 'then')
+                return;
+            // Side-effect only: import('bar').then()
+            if (callExpression.arguments.length === 0) {
+                return EMPTY_ARRAY;
+            }
+            const argument = callExpression.arguments[0];
+            if (callExpression.arguments.length !== 1 ||
+                !(argument instanceof ArrowFunctionExpression || argument instanceof FunctionExpression)) {
+                return;
+            }
+            // Side-effect only: import('bar').then(() => {})
+            if (argument.params.length === 0) {
+                return EMPTY_ARRAY;
+            }
+            const declaration = argument.params[0];
+            if (argument.params.length === 1 && declaration instanceof ObjectPattern) {
+                return getDeterministicObjectDestructure(declaration);
+            }
+            return;
+        }
+    }
     hasEffects() {
         return true;
     }
@@ -11187,6 +11333,15 @@ const accessedImportGlobals = {
     cjs: ['require'],
     system: ['module']
 };
+function getDeterministicObjectDestructure(objectPattern) {
+    const variables = [];
+    for (const property of objectPattern.properties) {
+        if (property.type === 'RestElement' || property.computed || property.key.type !== 'Identifier')
+            return;
+        variables.push(property.key.name);
+    }
+    return variables;
+}
 
 class ImportNamespaceSpecifier extends NodeBase {
     applyDeoptimizations() { }
@@ -12431,10 +12586,6 @@ class UpdateExpression extends NodeBase {
     }
 }
 
-function isReassignedExportsMember(variable, exportNamesByVariable) {
-    return (variable.renderBaseName !== null && exportNamesByVariable.has(variable) && variable.isReassigned);
-}
-
 function areAllDeclarationsIncludedAndNotExported(declarations, exportNamesByVariable) {
     for (const declarator of declarations) {
         if (!declarator.id.included)
@@ -12611,70 +12762,6 @@ function gatherSystemExportsAndGetSingleExport(separatedNodes, options, aggregat
     return singleSystemExport;
 }
 
-class VariableDeclarator extends NodeBase {
-    declareDeclarator(kind) {
-        this.id.declare(kind, this.init || UNDEFINED_EXPRESSION);
-    }
-    deoptimizePath(path) {
-        this.id.deoptimizePath(path);
-    }
-    hasEffects(context) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        const initEffect = this.init?.hasEffects(context);
-        this.id.markDeclarationReached();
-        return initEffect || this.id.hasEffects(context);
-    }
-    include(context, includeChildrenRecursively) {
-        const { deoptimized, id, init } = this;
-        if (!deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
-        init?.include(context, includeChildrenRecursively);
-        id.markDeclarationReached();
-        if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
-            id.include(context, includeChildrenRecursively);
-        }
-    }
-    render(code, options) {
-        const { exportNamesByVariable, snippets: { _, getPropertyAccess } } = options;
-        const { end, id, init, start } = this;
-        const renderId = id.included;
-        if (renderId) {
-            id.render(code, options);
-        }
-        else {
-            const operatorPos = findFirstOccurrenceOutsideComment(code.original, '=', id.end);
-            code.remove(start, findNonWhiteSpace(code.original, operatorPos + 1));
-        }
-        if (init) {
-            if (id instanceof Identifier && init instanceof ClassExpression && !init.id) {
-                const renderedVariable = id.variable.getName(getPropertyAccess);
-                if (renderedVariable !== id.name) {
-                    code.appendLeft(init.start + 5, ` ${id.name}`);
-                }
-            }
-            init.render(code, options, renderId ? BLANK : { renderedSurroundingElement: ExpressionStatement$1 });
-        }
-        else if (id instanceof Identifier &&
-            isReassignedExportsMember(id.variable, exportNamesByVariable)) {
-            code.appendLeft(end, `${_}=${_}void 0`);
-        }
-    }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        const { id, init } = this;
-        if (init && id instanceof Identifier && init instanceof ClassExpression && !init.id) {
-            const { name, variable } = id;
-            for (const accessedVariable of init.scope.accessedOutsideVariables.values()) {
-                if (accessedVariable !== variable) {
-                    accessedVariable.forbidName(name);
-                }
-            }
-        }
-    }
-}
-
 class WhileStatement extends NodeBase {
     hasEffects(context) {
         if (this.test.hasEffects(context))
@@ -12875,7 +12962,9 @@ class NamespaceVariable extends Variable {
     renderBlock(options) {
         const { exportNamesByVariable, format, freeze, indent: t, namespaceToStringTag, snippets: { _, cnst, getObject, getPropertyAccess, n, s } } = options;
         const memberVariables = this.getMemberVariables();
-        const members = Object.entries(memberVariables).map(([name, original]) => {
+        const members = Object.entries(memberVariables)
+            .filter(([_, variable]) => variable.included)
+            .map(([name, original]) => {
             if (this.referencedEarly || original.isReassigned) {
                 return [
                     null,
@@ -13577,6 +13666,28 @@ class Module {
         this.ast.include(createInclusionContext(), true);
         this.includeAllExports(false);
     }
+    includeExportsByNames(names) {
+        if (!this.isExecuted) {
+            markModuleAndImpureDependenciesAsExecuted(this);
+            this.graph.needsTreeshakingPass = true;
+        }
+        let includeNamespaceMembers = false;
+        for (const name of names) {
+            const variable = this.getVariableForExportName(name)[0];
+            if (variable) {
+                variable.deoptimizePath(UNKNOWN_PATH);
+                if (!variable.included) {
+                    this.includeVariable(variable);
+                }
+            }
+            if (!this.exports.has(name) && !this.reexportDescriptions.has(name)) {
+                includeNamespaceMembers = true;
+            }
+        }
+        if (includeNamespaceMembers) {
+            this.namespace.setMergedNamespaces(this.includeAndGetAdditionalMergedNamespaces());
+        }
+    }
     isIncluded() {
         // Modules where this.ast is missing have been loaded via this.load and are
         // not yet fully processed, hence they cannot be included.
@@ -13969,7 +14080,15 @@ class Module {
         const resolution = this.dynamicImports.find(dynamicImport => dynamicImport.node === node).resolution;
         if (resolution instanceof Module) {
             resolution.includedDynamicImporters.push(this);
-            resolution.includeAllExports(true);
+            const importedNames = this.options.treeshake
+                ? node.getDeterministicImportedNames()
+                : undefined;
+            if (importedNames) {
+                resolution.includeExportsByNames(importedNames);
+            }
+            else {
+                resolution.includeAllExports(true);
+            }
         }
     }
     includeVariable(variable) {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/shared/fsevents-importer.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.20.6";
+var version$1 = "3.21.0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -10840,9 +10840,9 @@ class FunctionDeclaration extends FunctionNode {
 function getDeclarationStart(code, start) {
     return findNonWhiteSpace(code, findFirstOccurrenceOutsideComment(code, 'default', start) + 7);
 }
-function getIdInsertPosition(code, declarationKeyword, endMarker, start) {
-    const declarationEnd = findFirstOccurrenceOutsideComment(code, declarationKeyword, start) + declarationKeyword.length;
-    code = code.slice(declarationEnd, findFirstOccurrenceOutsideComment(code, endMarker, declarationEnd));
+function getFunctionIdInsertPosition(code, start) {
+    const declarationEnd = findFirstOccurrenceOutsideComment(code, 'function', start) + 'function'.length;
+    code = code.slice(declarationEnd, findFirstOccurrenceOutsideComment(code, '(', declarationEnd));
     const generatorStarPos = findFirstOccurrenceOutsideComment(code, '*');
     if (generatorStarPos === -1) {
         return declarationEnd;
@@ -10867,10 +10867,14 @@ class ExportDefaultDeclaration extends NodeBase {
         const { start, end } = nodeRenderOptions;
         const declarationStart = getDeclarationStart(code.original, this.start);
         if (this.declaration instanceof FunctionDeclaration) {
-            this.renderNamedDeclaration(code, declarationStart, 'function', '(', this.declaration.id === null, options);
+            this.renderNamedDeclaration(code, declarationStart, this.declaration.id === null
+                ? getFunctionIdInsertPosition(code.original, declarationStart)
+                : null, options);
         }
         else if (this.declaration instanceof ClassDeclaration) {
-            this.renderNamedDeclaration(code, declarationStart, 'class', '{', this.declaration.id === null, options);
+            this.renderNamedDeclaration(code, declarationStart, this.declaration.id === null
+                ? findFirstOccurrenceOutsideComment(code.original, 'class', start) + 'class'.length
+                : null, options);
         }
         else if (this.variable.getOriginalVariable() !== this.variable) {
             // Remove altogether to prevent re-declaring the same variable
@@ -10893,13 +10897,13 @@ class ExportDefaultDeclaration extends NodeBase {
         this.declaration.render(code, options);
     }
     applyDeoptimizations() { }
-    renderNamedDeclaration(code, declarationStart, declarationKeyword, endMarker, needsId, options) {
+    renderNamedDeclaration(code, declarationStart, idInsertPosition, options) {
         const { exportNamesByVariable, format, snippets: { getPropertyAccess } } = options;
         const name = this.variable.getName(getPropertyAccess);
         // Remove `export default`
         code.remove(this.start, declarationStart);
-        if (needsId) {
-            code.appendLeft(getIdInsertPosition(code.original, declarationKeyword, endMarker, declarationStart), ` ${name}`);
+        if (idInsertPosition !== null) {
+            code.appendLeft(idInsertPosition, ` ${name}`);
         }
         if (format === 'system' &&
             this.declaration instanceof ClassDeclaration &&
@@ -11027,6 +11031,7 @@ class ForOfStatement extends NodeBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
+        this.right.deoptimizePath(UNKNOWN_PATH);
         this.context.requestTreeshakingPass();
     }
 }
@@ -11478,6 +11483,74 @@ function getToStringTagValue(getObject) {
     });
 }
 
+function isReassignedExportsMember(variable, exportNamesByVariable) {
+    return (variable.renderBaseName !== null && exportNamesByVariable.has(variable) && variable.isReassigned);
+}
+
+class VariableDeclarator extends NodeBase {
+    declareDeclarator(kind) {
+        this.id.declare(kind, this.init || UNDEFINED_EXPRESSION);
+    }
+    deoptimizePath(path) {
+        this.id.deoptimizePath(path);
+    }
+    hasEffects(context) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        const initEffect = this.init?.hasEffects(context);
+        this.id.markDeclarationReached();
+        return initEffect || this.id.hasEffects(context);
+    }
+    include(context, includeChildrenRecursively) {
+        const { deoptimized, id, init } = this;
+        if (!deoptimized)
+            this.applyDeoptimizations();
+        this.included = true;
+        init?.include(context, includeChildrenRecursively);
+        id.markDeclarationReached();
+        if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
+            id.include(context, includeChildrenRecursively);
+        }
+    }
+    render(code, options) {
+        const { exportNamesByVariable, snippets: { _, getPropertyAccess } } = options;
+        const { end, id, init, start } = this;
+        const renderId = id.included;
+        if (renderId) {
+            id.render(code, options);
+        }
+        else {
+            const operatorPos = findFirstOccurrenceOutsideComment(code.original, '=', id.end);
+            code.remove(start, findNonWhiteSpace(code.original, operatorPos + 1));
+        }
+        if (init) {
+            if (id instanceof Identifier && init instanceof ClassExpression && !init.id) {
+                const renderedVariable = id.variable.getName(getPropertyAccess);
+                if (renderedVariable !== id.name) {
+                    code.appendLeft(init.start + 5, ` ${id.name}`);
+                }
+            }
+            init.render(code, options, renderId ? BLANK : { renderedSurroundingElement: ExpressionStatement$1 });
+        }
+        else if (id instanceof Identifier &&
+            isReassignedExportsMember(id.variable, exportNamesByVariable)) {
+            code.appendLeft(end, `${_}=${_}void 0`);
+        }
+    }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        const { id, init } = this;
+        if (init && id instanceof Identifier && init instanceof ClassExpression && !init.id) {
+            const { name, variable } = id;
+            for (const accessedVariable of init.scope.accessedOutsideVariables.values()) {
+                if (accessedVariable !== variable) {
+                    accessedVariable.forbidName(name);
+                }
+            }
+        }
+    }
+}
+
 // TODO once ImportExpression follows official ESTree specs with "null" as
 //  default, keys.ts should be updated
 class ImportExpression extends NodeBase {
@@ -11494,6 +11567,79 @@ class ImportExpression extends NodeBase {
     bind() {
         this.source.bind();
     }
+    /**
+     * Get imported variables for deterministic usage, valid cases are:
+     *
+     * - `const { foo } = await import('bar')`.
+     * - `(await import('bar')).foo`
+     * - `import('bar').then(({ foo }) => {})`
+     *
+     * Returns empty array if it's side-effect only import.
+     * Returns undefined if it's not fully deterministic.
+     */
+    getDeterministicImportedNames() {
+        const parent1 = this.parent;
+        // Side-effect only: import('bar')
+        if (parent1 instanceof ExpressionStatement) {
+            return EMPTY_ARRAY;
+        }
+        if (parent1 instanceof AwaitExpression) {
+            const parent2 = parent1.parent;
+            // Side-effect only: await import('bar')
+            if (parent2 instanceof ExpressionStatement) {
+                return EMPTY_ARRAY;
+            }
+            // Case 1: const { foo } = await import('bar')
+            if (parent2 instanceof VariableDeclarator) {
+                const declaration = parent2.id;
+                return declaration instanceof ObjectPattern
+                    ? getDeterministicObjectDestructure(declaration)
+                    : undefined;
+            }
+            // Case 2: (await import('bar')).foo
+            if (parent2 instanceof MemberExpression) {
+                const id = parent2.property;
+                if (!parent2.computed && id instanceof Identifier) {
+                    return [id.name];
+                }
+            }
+            return;
+        }
+        // Case 3: import('bar').then(({ foo }) => {})
+        if (parent1 instanceof MemberExpression) {
+            const callExpression = parent1.parent;
+            const property = parent1.property;
+            if (!(callExpression instanceof CallExpression) || !(property instanceof Identifier)) {
+                return;
+            }
+            const memberName = property.name;
+            // side-effect only, when only chaining .catch or .finally
+            if (callExpression.parent instanceof ExpressionStatement &&
+                ['catch', 'finally'].includes(memberName)) {
+                return EMPTY_ARRAY;
+            }
+            if (memberName !== 'then')
+                return;
+            // Side-effect only: import('bar').then()
+            if (callExpression.arguments.length === 0) {
+                return EMPTY_ARRAY;
+            }
+            const argument = callExpression.arguments[0];
+            if (callExpression.arguments.length !== 1 ||
+                !(argument instanceof ArrowFunctionExpression || argument instanceof FunctionExpression)) {
+                return;
+            }
+            // Side-effect only: import('bar').then(() => {})
+            if (argument.params.length === 0) {
+                return EMPTY_ARRAY;
+            }
+            const declaration = argument.params[0];
+            if (argument.params.length === 1 && declaration instanceof ObjectPattern) {
+                return getDeterministicObjectDestructure(declaration);
+            }
+            return;
+        }
+    }
     hasEffects() {
         return true;
     }
@@ -11685,6 +11831,15 @@ const accessedImportGlobals = {
     cjs: ['require'],
     system: ['module']
 };
+function getDeterministicObjectDestructure(objectPattern) {
+    const variables = [];
+    for (const property of objectPattern.properties) {
+        if (property.type === 'RestElement' || property.computed || property.key.type !== 'Identifier')
+            return;
+        variables.push(property.key.name);
+    }
+    return variables;
+}
 
 class ImportNamespaceSpecifier extends NodeBase {
     applyDeoptimizations() { }
@@ -12929,10 +13084,6 @@ class UpdateExpression extends NodeBase {
     }
 }
 
-function isReassignedExportsMember(variable, exportNamesByVariable) {
-    return (variable.renderBaseName !== null && exportNamesByVariable.has(variable) && variable.isReassigned);
-}
-
 function areAllDeclarationsIncludedAndNotExported(declarations, exportNamesByVariable) {
     for (const declarator of declarations) {
         if (!declarator.id.included)
@@ -13109,70 +13260,6 @@ function gatherSystemExportsAndGetSingleExport(separatedNodes, options, aggregat
     return singleSystemExport;
 }
 
-class VariableDeclarator extends NodeBase {
-    declareDeclarator(kind) {
-        this.id.declare(kind, this.init || UNDEFINED_EXPRESSION);
-    }
-    deoptimizePath(path) {
-        this.id.deoptimizePath(path);
-    }
-    hasEffects(context) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        const initEffect = this.init?.hasEffects(context);
-        this.id.markDeclarationReached();
-        return initEffect || this.id.hasEffects(context);
-    }
-    include(context, includeChildrenRecursively) {
-        const { deoptimized, id, init } = this;
-        if (!deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
-        init?.include(context, includeChildrenRecursively);
-        id.markDeclarationReached();
-        if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
-            id.include(context, includeChildrenRecursively);
-        }
-    }
-    render(code, options) {
-        const { exportNamesByVariable, snippets: { _, getPropertyAccess } } = options;
-        const { end, id, init, start } = this;
-        const renderId = id.included;
-        if (renderId) {
-            id.render(code, options);
-        }
-        else {
-            const operatorPos = findFirstOccurrenceOutsideComment(code.original, '=', id.end);
-            code.remove(start, findNonWhiteSpace(code.original, operatorPos + 1));
-        }
-        if (init) {
-            if (id instanceof Identifier && init instanceof ClassExpression && !init.id) {
-                const renderedVariable = id.variable.getName(getPropertyAccess);
-                if (renderedVariable !== id.name) {
-                    code.appendLeft(init.start + 5, ` ${id.name}`);
-                }
-            }
-            init.render(code, options, renderId ? BLANK : { renderedSurroundingElement: ExpressionStatement$1 });
-        }
-        else if (id instanceof Identifier &&
-            isReassignedExportsMember(id.variable, exportNamesByVariable)) {
-            code.appendLeft(end, `${_}=${_}void 0`);
-        }
-    }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        const { id, init } = this;
-        if (init && id instanceof Identifier && init instanceof ClassExpression && !init.id) {
-            const { name, variable } = id;
-            for (const accessedVariable of init.scope.accessedOutsideVariables.values()) {
-                if (accessedVariable !== variable) {
-                    accessedVariable.forbidName(name);
-                }
-            }
-        }
-    }
-}
-
 class WhileStatement extends NodeBase {
     hasEffects(context) {
         if (this.test.hasEffects(context))
@@ -13373,7 +13460,9 @@ class NamespaceVariable extends Variable {
     renderBlock(options) {
         const { exportNamesByVariable, format, freeze, indent: t, namespaceToStringTag, snippets: { _, cnst, getObject, getPropertyAccess, n, s } } = options;
         const memberVariables = this.getMemberVariables();
-        const members = Object.entries(memberVariables).map(([name, original]) => {
+        const members = Object.entries(memberVariables)
+            .filter(([_, variable]) => variable.included)
+            .map(([name, original]) => {
             if (this.referencedEarly || original.isReassigned) {
                 return [
                     null,
@@ -14075,6 +14164,28 @@ class Module {
         this.ast.include(createInclusionContext(), true);
         this.includeAllExports(false);
     }
+    includeExportsByNames(names) {
+        if (!this.isExecuted) {
+            markModuleAndImpureDependenciesAsExecuted(this);
+            this.graph.needsTreeshakingPass = true;
+        }
+        let includeNamespaceMembers = false;
+        for (const name of names) {
+            const variable = this.getVariableForExportName(name)[0];
+            if (variable) {
+                variable.deoptimizePath(UNKNOWN_PATH);
+                if (!variable.included) {
+                    this.includeVariable(variable);
+                }
+            }
+            if (!this.exports.has(name) && !this.reexportDescriptions.has(name)) {
+                includeNamespaceMembers = true;
+            }
+        }
+        if (includeNamespaceMembers) {
+            this.namespace.setMergedNamespaces(this.includeAndGetAdditionalMergedNamespaces());
+        }
+    }
     isIncluded() {
         // Modules where this.ast is missing have been loaded via this.load and are
         // not yet fully processed, hence they cannot be included.
@@ -14467,7 +14578,15 @@ class Module {
         const resolution = this.dynamicImports.find(dynamicImport => dynamicImport.node === node).resolution;
         if (resolution instanceof Module) {
             resolution.includedDynamicImporters.push(this);
-            resolution.includeAllExports(true);
+            const importedNames = this.options.treeshake
+                ? node.getDeterministicImportedNames()
+                : undefined;
+            if (importedNames) {
+                resolution.includeExportsByNames(importedNames);
+            }
+            else {
+                resolution.includeAllExports(true);
+            }
         }
     }
     includeVariable(variable) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch-proxy.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.6
-	Tue, 18 Apr 2023 11:34:41 GMT - commit 911700bc0bc90e5b1b8db01ea77fe3040a05480d
+	Rollup.js v3.21.0
+	Sun, 23 Apr 2023 19:43:51 GMT - commit b79b73cd8bb98c10ab7eedae154bb5c1e03ced7d
 
 	https://github.com/rollup/rollup
 

package/package.json

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