rollup 2.52.4 → 2.52.8

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.4
-	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
+	Rollup.js v2.52.8
+	Wed, 07 Jul 2021 04:39:13 GMT - commit b3d5f7d02d2ac1597801c23e10f10651b158f3c4
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.4
-	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
+	Rollup.js v2.52.8
+	Wed, 07 Jul 2021 04:39:13 GMT - commit b3d5f7d02d2ac1597801c23e10f10651b158f3c4
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.4
-	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
+	Rollup.js v2.52.8
+	Wed, 07 Jul 2021 04:39:13 GMT - commit b3d5f7d02d2ac1597801c23e10f10651b158f3c4
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.4
-	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
+	Rollup.js v2.52.8
+	Wed, 07 Jul 2021 04:39:13 GMT - commit b3d5f7d02d2ac1597801c23e10f10651b158f3c4
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.4
-	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
+	Rollup.js v2.52.8
+	Wed, 07 Jul 2021 04:39:13 GMT - commit b3d5f7d02d2ac1597801c23e10f10651b158f3c4
 
 
 	https://github.com/rollup/rollup
@@ -32,7 +32,7 @@ function _interopNamespaceDefault(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
-var version$1 = "2.52.4";
+var version$1 = "2.52.8";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -2184,8 +2184,10 @@ class Variable extends ExpressionEntity {
         super();
         this.name = name;
         this.alwaysRendered = false;
+        this.initReached = false;
         this.isId = false;
         this.isReassigned = false;
+        this.kind = null;
         this.renderBaseName = null;
         this.renderName = null;
     }
@@ -2417,7 +2419,7 @@ function createHasEffectsContext() {
             breaks: false,
             continues: false,
             labels: new Set(),
-            returnAwaitYield: false
+            returnYield: false
         },
         includedLabels: new Set(),
         instantiated: new DiscriminatedPathTracker(),
@@ -4556,11 +4558,19 @@ class GlobalVariable extends Variable {
     }
 }
 
+const tdzVariableKinds = {
+    __proto__: null,
+    class: true,
+    const: true,
+    let: true,
+    var: true
+};
 class Identifier extends NodeBase {
     constructor() {
         super(...arguments);
         this.variable = null;
         this.deoptimized = false;
+        this.isTDZAccess = null;
     }
     addExportedVariables(variables, exportNamesByVariable) {
         if (this.variable !== null && exportNamesByVariable.has(this.variable)) {
@@ -4601,6 +4611,7 @@ class Identifier extends NodeBase {
                 /* istanbul ignore next */
                 throw new Error(`Internal Error: Unexpected identifier kind ${kind}.`);
         }
+        variable.kind = kind;
         return [(this.variable = variable)];
     }
     deoptimizePath(path) {
@@ -4613,26 +4624,34 @@ class Identifier extends NodeBase {
         this.variable.deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
-        return this.variable.getLiteralValueAtPath(path, recursionTracker, origin);
+        return this.getVariableRespectingTDZ().getLiteralValueAtPath(path, recursionTracker, origin);
     }
     getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin) {
-        return this.variable.getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
+        return this.getVariableRespectingTDZ().getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
     }
     hasEffects() {
         if (!this.deoptimized)
             this.applyDeoptimizations();
+        if (this.isPossibleTDZ() && this.variable.kind !== 'var') {
+            return true;
+        }
         return (this.context.options.treeshake.unknownGlobalSideEffects &&
             this.variable instanceof GlobalVariable &&
             this.variable.hasEffectsWhenAccessedAtPath(EMPTY_PATH));
     }
     hasEffectsWhenAccessedAtPath(path, context) {
-        return this.variable !== null && this.variable.hasEffectsWhenAccessedAtPath(path, context);
+        return (this.variable !== null &&
+            this.getVariableRespectingTDZ().hasEffectsWhenAccessedAtPath(path, context));
     }
     hasEffectsWhenAssignedAtPath(path, context) {
-        return !this.variable || this.variable.hasEffectsWhenAssignedAtPath(path, context);
+        return (!this.variable ||
+            (path.length > 0
+                ? this.getVariableRespectingTDZ()
+                : this.variable).hasEffectsWhenAssignedAtPath(path, context));
     }
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
-        return !this.variable || this.variable.hasEffectsWhenCalledAtPath(path, callOptions, context);
+        return (!this.variable ||
+            this.getVariableRespectingTDZ().hasEffectsWhenCalledAtPath(path, callOptions, context));
     }
     include() {
         if (!this.deoptimized)
@@ -4645,7 +4664,10 @@ class Identifier extends NodeBase {
         }
     }
     includeCallArguments(context, args) {
-        this.variable.includeCallArguments(context, args);
+        this.getVariableRespectingTDZ().includeCallArguments(context, args);
+    }
+    markDeclarationReached() {
+        this.variable.initReached = true;
     }
     render(code, _options, { renderedParentType, isCalleeOfRenderedParent, isShorthandProperty } = BLANK) {
         if (this.variable) {
@@ -4680,6 +4702,28 @@ class Identifier extends NodeBase {
             message: `Illegal reassignment to import '${this.name}'`
         }, this.start);
     }
+    getVariableRespectingTDZ() {
+        if (this.isPossibleTDZ()) {
+            return UNKNOWN_EXPRESSION;
+        }
+        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);
+        }
+        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);
+    }
 }
 
 const EVENT_ACCESSED = 0;
@@ -5280,6 +5324,12 @@ class ClassNode extends NodeBase {
     getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin) {
         return this.getObjectEntity().getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
     }
+    hasEffects(context) {
+        var _a, _b;
+        const initEffect = ((_a = this.superClass) === null || _a === void 0 ? void 0 : _a.hasEffects(context)) || this.body.hasEffects(context);
+        (_b = this.id) === null || _b === void 0 ? void 0 : _b.markDeclarationReached();
+        return initEffect || super.hasEffects(context);
+    }
     hasEffectsWhenAccessedAtPath(path, context) {
         return this.getObjectEntity().hasEffectsWhenAccessedAtPath(path, context);
     }
@@ -5298,10 +5348,19 @@ class ClassNode extends NodeBase {
             return this.getObjectEntity().hasEffectsWhenCalledAtPath(path, callOptions, context);
         }
     }
-    initialise() {
-        if (this.id !== null) {
-            this.id.declare('class', this);
+    include(context, includeChildrenRecursively) {
+        var _a;
+        this.included = true;
+        (_a = this.superClass) === null || _a === void 0 ? void 0 : _a.include(context, includeChildrenRecursively);
+        this.body.include(context, includeChildrenRecursively);
+        if (this.id) {
+            this.id.markDeclarationReached();
+            this.id.include();
         }
+    }
+    initialise() {
+        var _a;
+        (_a = this.id) === null || _a === void 0 ? void 0 : _a.declare('class', this);
         for (const method of this.body.body) {
             if (method instanceof MethodDefinition && method.kind === 'constructor') {
                 this.classConstructor = method;
@@ -5616,6 +5675,9 @@ class RestElement extends NodeBase {
     hasEffectsWhenAssignedAtPath(path, context) {
         return path.length > 0 || this.argument.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context);
     }
+    markDeclarationReached() {
+        this.argument.markDeclarationReached();
+    }
     applyDeoptimizations() {
         this.deoptimized = true;
         if (this.declarationInit !== null) {
@@ -5628,6 +5690,7 @@ class RestElement extends NodeBase {
 class FunctionNode extends NodeBase {
     constructor() {
         super(...arguments);
+        this.deoptimizedReturn = false;
         this.isPrototypeDeoptimized = false;
     }
     createScope(parentScope) {
@@ -5658,7 +5721,18 @@ class FunctionNode extends NodeBase {
         }
     }
     getReturnExpressionWhenCalledAtPath(path) {
-        return !this.async && path.length === 0 ? this.scope.getReturnExpression() : UNKNOWN_EXPRESSION;
+        if (path.length !== 0) {
+            return UNKNOWN_EXPRESSION;
+        }
+        if (this.async) {
+            if (!this.deoptimizedReturn) {
+                this.deoptimizedReturn = true;
+                this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
+                this.context.requestTreeshakingPass();
+            }
+            return UNKNOWN_EXPRESSION;
+        }
+        return this.scope.getReturnExpression();
     }
     hasEffects() {
         return this.id !== null && this.id.hasEffects();
@@ -5701,7 +5775,7 @@ class FunctionNode extends NodeBase {
             breaks: false,
             continues: false,
             labels: new Set(),
-            returnAwaitYield: true
+            returnYield: true
         };
         if (this.body.hasEffects(context))
             return true;
@@ -6324,13 +6398,21 @@ class ArrayPattern extends NodeBase {
         }
         return false;
     }
+    markDeclarationReached() {
+        for (const element of this.elements) {
+            if (element !== null) {
+                element.markDeclarationReached();
+            }
+        }
+    }
 }
 
 class BlockScope extends ChildScope {
     addDeclaration(identifier, context, init, isHoisted) {
         if (isHoisted) {
             this.parent.addDeclaration(identifier, context, init, isHoisted);
-            // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here.
+            // Necessary to make sure the init is deoptimized for conditional declarations.
+            // We cannot call deoptimizePath here.
             return this.parent.addDeclaration(identifier, context, UNDEFINED_EXPRESSION, isHoisted);
         }
         else {
@@ -6420,6 +6502,10 @@ class BlockStatement extends NodeBase {
 }
 
 class ArrowFunctionExpression extends NodeBase {
+    constructor() {
+        super(...arguments);
+        this.deoptimizedReturn = false;
+    }
     createScope(parentScope) {
         this.scope = new ReturnValueScope(parentScope, this.context);
     }
@@ -6433,7 +6519,18 @@ class ArrowFunctionExpression extends NodeBase {
     // Arrow functions do not mutate their context
     deoptimizeThisOnEventAtPath() { }
     getReturnExpressionWhenCalledAtPath(path) {
-        return !this.async && path.length === 0 ? this.scope.getReturnExpression() : UNKNOWN_EXPRESSION;
+        if (path.length !== 0) {
+            return UNKNOWN_EXPRESSION;
+        }
+        if (this.async) {
+            if (!this.deoptimizedReturn) {
+                this.deoptimizedReturn = true;
+                this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
+                this.context.requestTreeshakingPass();
+            }
+            return UNKNOWN_EXPRESSION;
+        }
+        return this.scope.getReturnExpression();
     }
     hasEffects() {
         return false;
@@ -6467,7 +6564,7 @@ class ArrowFunctionExpression extends NodeBase {
             breaks: false,
             continues: false,
             labels: new Set(),
-            returnAwaitYield: true
+            returnYield: true
         };
         if (this.body.hasEffects(context))
             return true;
@@ -6599,6 +6696,9 @@ class AssignmentPattern extends NodeBase {
     hasEffectsWhenAssignedAtPath(path, context) {
         return path.length > 0 || this.left.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context);
     }
+    markDeclarationReached() {
+        this.left.markDeclarationReached();
+    }
     render(code, options, { isShorthandProperty } = BLANK) {
         this.left.render(code, options, { isShorthandProperty });
         this.right.render(code, options);
@@ -6612,17 +6712,18 @@ class AssignmentPattern extends NodeBase {
 }
 
 class AwaitExpression extends NodeBase {
-    hasEffects(context) {
-        const { propertyReadSideEffects } = this.context.options
-            .treeshake;
-        return (!context.ignore.returnAwaitYield ||
-            this.argument.hasEffects(context) ||
-            this.argument.hasEffectsWhenCalledAtPath(['then'], { args: NO_ARGS, thisParam: null, withNew: false }, context) ||
-            (propertyReadSideEffects &&
-                (propertyReadSideEffects === 'always' ||
-                    this.argument.hasEffectsWhenAccessedAtPath(['then'], context))));
+    constructor() {
+        super(...arguments);
+        this.deoptimized = false;
+    }
+    hasEffects() {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        return true;
     }
     include(context, includeChildrenRecursively) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
         if (!this.included) {
             this.included = true;
             checkTopLevelAwait: if (!this.context.usesTopLevelAwait) {
@@ -6636,6 +6737,11 @@ class AwaitExpression extends NodeBase {
         }
         this.argument.include(context, includeChildrenRecursively);
     }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        this.argument.deoptimizePath(UNKNOWN_PATH);
+        this.context.requestTreeshakingPass();
+    }
 }
 
 const binaryOperators = {
@@ -7071,17 +7177,21 @@ class CallExpression extends NodeBase {
         }, UNKNOWN_EXPRESSION);
     }
     hasEffects(context) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        for (const argument of this.arguments) {
-            if (argument.hasEffects(context))
-                return true;
+        try {
+            for (const argument of this.arguments) {
+                if (argument.hasEffects(context))
+                    return true;
+            }
+            if (this.context.options.treeshake.annotations &&
+                this.annotations)
+                return false;
+            return (this.callee.hasEffects(context) ||
+                this.callee.hasEffectsWhenCalledAtPath(EMPTY_PATH, this.callOptions, context));
+        }
+        finally {
+            if (!this.deoptimized)
+                this.applyDeoptimizations();
         }
-        if (this.context.options.treeshake.annotations &&
-            this.annotations)
-            return false;
-        return (this.callee.hasEffects(context) ||
-            this.callee.hasEffectsWhenCalledAtPath(EMPTY_PATH, this.callOptions, context));
     }
     hasEffectsWhenAccessedAtPath(path, context) {
         return (!context.accessed.trackEntityAtPathAndGetIfTracked(path, this) &&
@@ -8596,6 +8706,11 @@ class ObjectPattern extends NodeBase {
         }
         return false;
     }
+    markDeclarationReached() {
+        for (const property of this.properties) {
+            property.markDeclarationReached();
+        }
+    }
 }
 
 class PrivateIdentifier extends NodeBase {
@@ -8620,6 +8735,9 @@ class Property extends MethodBase {
             this.key.hasEffects(context) ||
             this.value.hasEffects(context));
     }
+    markDeclarationReached() {
+        this.value.markDeclarationReached();
+    }
     render(code, options) {
         if (!this.shorthand) {
             this.key.render(code, options);
@@ -8671,7 +8789,7 @@ class PropertyDefinition extends NodeBase {
 
 class ReturnStatement extends NodeBase {
     hasEffects(context) {
-        if (!context.ignore.returnAwaitYield ||
+        if (!context.ignore.returnYield ||
             (this.argument !== null && this.argument.hasEffects(context)))
             return true;
         context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
@@ -9275,16 +9393,19 @@ class VariableDeclarator extends NodeBase {
         this.id.deoptimizePath(path);
     }
     hasEffects(context) {
-        return this.id.hasEffects(context) || (this.init !== null && this.init.hasEffects(context));
+        const initEffect = this.init !== null && this.init.hasEffects(context);
+        this.id.markDeclarationReached();
+        return initEffect || this.id.hasEffects(context);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
-        if (includeChildrenRecursively || this.id.shouldBeIncluded(context)) {
-            this.id.include(context, includeChildrenRecursively);
-        }
         if (this.init) {
             this.init.include(context, includeChildrenRecursively);
         }
+        this.id.markDeclarationReached();
+        if (includeChildrenRecursively || this.id.shouldBeIncluded(context)) {
+            this.id.include(context, includeChildrenRecursively);
+        }
     }
     render(code, options) {
         const renderId = this.id.included;
@@ -9337,8 +9458,7 @@ class YieldExpression extends NodeBase {
     hasEffects(context) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        return (!context.ignore.returnAwaitYield ||
-            (this.argument !== null && this.argument.hasEffects(context)));
+        return (!context.ignore.returnYield || (this.argument !== null && this.argument.hasEffects(context)));
     }
     render(code, options) {
         if (this.argument) {
@@ -10110,8 +10230,8 @@ class Module {
     }
     includeAllExports(includeNamespaceMembers) {
         if (!this.isExecuted) {
-            this.graph.needsTreeshakingPass = true;
             markModuleAndImpureDependenciesAsExecuted(this);
+            this.graph.needsTreeshakingPass = true;
         }
         for (const exportName of this.getExports()) {
             if (includeNamespaceMembers || exportName !== this.info.syntheticNamedExports) {
@@ -10413,25 +10533,28 @@ class Module {
         props.id = this.id;
         props.pos = pos;
         let code = this.info.code;
-        let { column, line } = locate(code, pos, { offsetLine: 1 });
-        try {
-            ({ column, line } = getOriginalLocation(this.sourcemapChain, { column, line }));
-            code = this.originalCode;
-        }
-        catch (e) {
-            this.options.onwarn({
-                code: 'SOURCEMAP_ERROR',
-                id: this.id,
-                loc: {
-                    column,
-                    file: this.id,
-                    line
-                },
-                message: `Error when using sourcemap for reporting an error: ${e.message}`,
-                pos
-            });
+        const location = locate(code, pos, { offsetLine: 1 });
+        if (location) {
+            let { column, line } = location;
+            try {
+                ({ column, line } = getOriginalLocation(this.sourcemapChain, { column, line }));
+                code = this.originalCode;
+            }
+            catch (e) {
+                this.options.onwarn({
+                    code: 'SOURCEMAP_ERROR',
+                    id: this.id,
+                    loc: {
+                        column,
+                        file: this.id,
+                        line
+                    },
+                    message: `Error when using sourcemap for reporting an error: ${e.message}`,
+                    pos
+                });
+            }
+            augmentCodeLocation(props, { column, line }, code, this.id);
         }
-        augmentCodeLocation(props, { column, line }, code, this.id);
     }
     addModulesToImportDescriptions(importDescription) {
         for (const specifier of Object.values(importDescription)) {
@@ -20178,12 +20301,7 @@ class Graph {
     }
     includeStatements() {
         for (const module of [...this.entryModules, ...this.implicitEntryModules]) {
-            if (module.preserveSignature !== false) {
-                module.includeAllExports(false);
-            }
-            else {
-                markModuleAndImpureDependenciesAsExecuted(module);
-            }
+            markModuleAndImpureDependenciesAsExecuted(module);
         }
         if (this.options.treeshake) {
             let treeshakingPass = 1;
@@ -20200,6 +20318,16 @@ class Graph {
                         }
                     }
                 }
+                if (treeshakingPass === 1) {
+                    // We only include exports after the first pass to avoid issues with
+                    // the TDZ detection logic
+                    for (const module of [...this.entryModules, ...this.implicitEntryModules]) {
+                        if (module.preserveSignature !== false) {
+                            module.includeAllExports(false);
+                            this.needsTreeshakingPass = true;
+                        }
+                    }
+                }
                 timeEnd(`treeshaking pass ${treeshakingPass++}`, 3);
             } while (this.needsTreeshakingPass);
         }

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.4
-	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
+	Rollup.js v2.52.8
+	Wed, 07 Jul 2021 04:39:13 GMT - commit b3d5f7d02d2ac1597801c23e10f10651b158f3c4
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.4
-	Wed, 30 Jun 2021 04:06:36 GMT - commit c3ad218caeeafa8a1b6ff8d4dde0db2556a3309a
+	Rollup.js v2.52.8
+	Wed, 07 Jul 2021 04:39:13 GMT - commit b3d5f7d02d2ac1597801c23e10f10651b158f3c4
 
 
 	https://github.com/rollup/rollup

package/package.json

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