rollup 2.50.2 → 2.50.6

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.50.2
-	Thu, 27 May 2021 11:12:11 GMT - commit 830827901981d74cee6bec914839e7d4bf7856c3
+	Rollup.js v2.50.6
+	Thu, 03 Jun 2021 04:54:09 GMT - commit 9f69fe3f53ae50dffe932529a3503e619292d31a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.50.2
-	Thu, 27 May 2021 11:12:11 GMT - commit 830827901981d74cee6bec914839e7d4bf7856c3
+	Rollup.js v2.50.6
+	Thu, 03 Jun 2021 04:54:09 GMT - commit 9f69fe3f53ae50dffe932529a3503e619292d31a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.50.2
-	Thu, 27 May 2021 11:12:11 GMT - commit 830827901981d74cee6bec914839e7d4bf7856c3
+	Rollup.js v2.50.6
+	Thu, 03 Jun 2021 04:54:09 GMT - commit 9f69fe3f53ae50dffe932529a3503e619292d31a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.50.2
-	Thu, 27 May 2021 11:12:11 GMT - commit 830827901981d74cee6bec914839e7d4bf7856c3
+	Rollup.js v2.50.6
+	Thu, 03 Jun 2021 04:54:09 GMT - commit 9f69fe3f53ae50dffe932529a3503e619292d31a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.50.2
-	Thu, 27 May 2021 11:12:11 GMT - commit 830827901981d74cee6bec914839e7d4bf7856c3
+	Rollup.js v2.50.6
+	Thu, 03 Jun 2021 04:54:09 GMT - commit 9f69fe3f53ae50dffe932529a3503e619292d31a
 
 
 	https://github.com/rollup/rollup
@@ -32,7 +32,7 @@ function _interopNamespaceDefault(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
-var version$1 = "2.50.2";
+var version$1 = "2.50.6";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -3465,10 +3465,11 @@ const knownGlobals = {
     Promise: {
         __proto__: null,
         [ValueProperties]: IMPURE,
-        all: PF,
+        all: O,
         prototype: O,
-        race: PF,
-        resolve: PF
+        race: O,
+        reject: O,
+        resolve: O
     },
     propertyIsEnumerable: O,
     Proxy: O,
@@ -4262,6 +4263,7 @@ class Identifier extends NodeBase {
         this.deoptimized = true;
         if (this.variable !== null && this.variable instanceof LocalVariable) {
             this.variable.consolidateInitializers();
+            this.context.requestTreeshakingPass();
         }
     }
     disallowImportReassignment() {
@@ -5053,11 +5055,22 @@ class SpreadElement extends NodeBase {
             this.argument.deoptimizeThisOnEventAtPath(event, [UnknownKey, ...path], thisParameter, recursionTracker);
         }
     }
+    hasEffects(context) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        const { propertyReadSideEffects } = this.context.options
+            .treeshake;
+        return (this.argument.hasEffects(context) ||
+            (propertyReadSideEffects &&
+                (propertyReadSideEffects === 'always' ||
+                    this.argument.hasEffectsWhenAccessedAtPath(UNKNOWN_PATH, context))));
+    }
     applyDeoptimizations() {
         this.deoptimized = true;
         // Only properties of properties of the argument could become subject to reassignment
         // This will also reassign the return values of iterators
         this.argument.deoptimizePath([UnknownKey, UnknownKey]);
+        this.context.requestTreeshakingPass();
     }
 }
 
@@ -5207,6 +5220,7 @@ class RestElement extends NodeBase {
         this.deoptimized = true;
         if (this.declarationInit !== null) {
             this.declarationInit.deoptimizePath([UnknownKey, UnknownKey]);
+            this.context.requestTreeshakingPass();
         }
     }
 }
@@ -5244,7 +5258,7 @@ class FunctionNode extends NodeBase {
         }
     }
     getReturnExpressionWhenCalledAtPath(path) {
-        return path.length === 0 ? this.scope.getReturnExpression() : UNKNOWN_EXPRESSION;
+        return !this.async && path.length === 0 ? this.scope.getReturnExpression() : UNKNOWN_EXPRESSION;
     }
     hasEffects() {
         return this.id !== null && this.id.hasEffects();
@@ -5263,6 +5277,17 @@ class FunctionNode extends NodeBase {
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
         if (path.length > 0)
             return true;
+        if (this.async) {
+            const { propertyReadSideEffects } = this.context.options
+                .treeshake;
+            const returnExpression = this.scope.getReturnExpression();
+            if (returnExpression.hasEffectsWhenCalledAtPath(['then'], { args: NO_ARGS, thisParam: null, withNew: false }, context) ||
+                (propertyReadSideEffects &&
+                    (propertyReadSideEffects === 'always' ||
+                        returnExpression.hasEffectsWhenAccessedAtPath(['then'], context)))) {
+                return true;
+            }
+        }
         for (const param of this.params) {
             if (param.hasEffects(context))
                 return true;
@@ -6002,7 +6027,7 @@ class ArrowFunctionExpression extends NodeBase {
     // Arrow functions do not mutate their context
     deoptimizeThisOnEventAtPath() { }
     getReturnExpressionWhenCalledAtPath(path) {
-        return path.length === 0 ? this.scope.getReturnExpression() : UNKNOWN_EXPRESSION;
+        return !this.async && path.length === 0 ? this.scope.getReturnExpression() : UNKNOWN_EXPRESSION;
     }
     hasEffects() {
         return false;
@@ -6016,6 +6041,17 @@ class ArrowFunctionExpression extends NodeBase {
     hasEffectsWhenCalledAtPath(path, _callOptions, context) {
         if (path.length > 0)
             return true;
+        if (this.async) {
+            const { propertyReadSideEffects } = this.context.options
+                .treeshake;
+            const returnExpression = this.scope.getReturnExpression();
+            if (returnExpression.hasEffectsWhenCalledAtPath(['then'], { args: NO_ARGS, thisParam: null, withNew: false }, context) ||
+                (propertyReadSideEffects &&
+                    (propertyReadSideEffects === 'always' ||
+                        returnExpression.hasEffectsWhenAccessedAtPath(['then'], context)))) {
+                return true;
+            }
+        }
         for (const param of this.params) {
             if (param.hasEffects(context))
                 return true;
@@ -6136,6 +6172,7 @@ class AssignmentExpression extends NodeBase {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
         this.right.deoptimizePath(UNKNOWN_PATH);
+        this.context.requestTreeshakingPass();
     }
 }
 
@@ -6164,12 +6201,20 @@ class AssignmentPattern extends NodeBase {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
         this.right.deoptimizePath(UNKNOWN_PATH);
+        this.context.requestTreeshakingPass();
     }
 }
 
 class AwaitExpression extends NodeBase {
     hasEffects(context) {
-        return !context.ignore.returnAwaitYield || this.argument.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))));
     }
     include(context, includeChildrenRecursively) {
         if (!this.included) {
@@ -6450,10 +6495,9 @@ class MemberExpression extends NodeBase {
         this.propertyKey = getResolvablePropertyKey(this);
     }
     render(code, options, { renderedParentType, isCalleeOfRenderedParent, renderedSurroundingElement } = BLANK) {
-        const isCalleeOfDifferentParent = renderedParentType === CallExpression$1 && isCalleeOfRenderedParent;
         if (this.variable || this.replacement) {
             let replacement = this.variable ? this.variable.getName() : this.replacement;
-            if (isCalleeOfDifferentParent)
+            if (renderedParentType && isCalleeOfRenderedParent)
                 replacement = '0, ' + replacement;
             code.overwrite(this.start, this.end, replacement, {
                 contentOnly: true,
@@ -6461,7 +6505,7 @@ class MemberExpression extends NodeBase {
             });
         }
         else {
-            if (isCalleeOfDifferentParent) {
+            if (renderedParentType && isCalleeOfRenderedParent) {
                 code.appendRight(this.start, '0, ');
             }
             const surroundingElement = renderedParentType || renderedSurroundingElement;
@@ -6485,6 +6529,7 @@ class MemberExpression extends NodeBase {
             if (this.parent instanceof AssignmentExpression) {
                 this.object.deoptimizeThisOnEventAtPath(EVENT_ASSIGNED, [this.propertyKey], this.object, SHARED_RECURSION_TRACKER);
             }
+            this.context.requestTreeshakingPass();
         }
     }
     disallowNamespaceReassignment() {
@@ -6669,7 +6714,10 @@ class CallExpression extends NodeBase {
     }
     render(code, options, { renderedParentType, renderedSurroundingElement } = BLANK) {
         const surroundingELement = renderedParentType || renderedSurroundingElement;
-        this.callee.render(code, options, surroundingELement ? { renderedSurroundingElement: surroundingELement } : BLANK);
+        this.callee.render(code, options, {
+            isCalleeOfRenderedParent: true,
+            renderedSurroundingElement: surroundingELement
+        });
         if (this.arguments.length > 0) {
             if (this.arguments[this.arguments.length - 1].included) {
                 for (const arg of this.arguments) {
@@ -6703,6 +6751,7 @@ class CallExpression extends NodeBase {
             // This will make sure all properties of parameters behave as "unknown"
             argument.deoptimizePath(UNKNOWN_PATH);
         }
+        this.context.requestTreeshakingPass();
     }
     getReturnExpression(recursionTracker = SHARED_RECURSION_TRACKER) {
         if (this.returnExpression === null) {
@@ -6715,12 +6764,14 @@ class CallExpression extends NodeBase {
 
 class CatchScope extends ParameterScope {
     addDeclaration(identifier, context, init, isHoisted) {
-        if (isHoisted) {
-            return this.parent.addDeclaration(identifier, context, init, isHoisted);
-        }
-        else {
-            return super.addDeclaration(identifier, context, init, false);
+        const existingParameter = this.variables.get(identifier.name);
+        if (existingParameter) {
+            existingParameter.addDeclaration(identifier, init);
+            return existingParameter;
         }
+        // as parameters are handled differently, all remaining declarations are
+        // hoisted
+        return this.parent.addDeclaration(identifier, context, init, isHoisted);
     }
 }
 
@@ -6728,17 +6779,19 @@ class CatchClause extends NodeBase {
     createScope(parentScope) {
         this.scope = new CatchScope(parentScope, this.context);
     }
-    initialise() {
-        if (this.param) {
+    parseNode(esTreeNode) {
+        // Parameters need to be declared first as the logic is that hoisted body
+        // variables are associated with outside vars unless there is a parameter,
+        // in which case they are associated with the parameter
+        const { param } = esTreeNode;
+        if (param) {
+            this.param = new (this.context.nodeConstructors[param.type] ||
+                this.context.nodeConstructors.UnknownNode)(param, this, this.scope);
             this.param.declare('parameter', UNKNOWN_EXPRESSION);
         }
-    }
-    parseNode(esTreeNode) {
-        this.body = new this.context.nodeConstructors.BlockStatement(esTreeNode.body, this, this.scope);
         super.parseNode(esTreeNode);
     }
 }
-CatchClause.prototype.preventChildBlockScope = true;
 
 class ChainExpression extends NodeBase {
 }
@@ -6935,7 +6988,7 @@ class ConditionalExpression extends NodeBase {
             usedBranch.includeCallArguments(context, args);
         }
     }
-    render(code, options, { isCalleeOfRenderedParent, renderedParentType, preventASI } = BLANK) {
+    render(code, options, { isCalleeOfRenderedParent, preventASI, renderedParentType, renderedSurroundingElement } = BLANK) {
         const usedBranch = this.getUsedBranch();
         if (!this.test.included) {
             const colonPos = findFirstOccurrenceOutsideComment(code.original, ':', this.consequent.end);
@@ -6951,16 +7004,16 @@ class ConditionalExpression extends NodeBase {
             }
             removeAnnotations(this, code);
             usedBranch.render(code, options, {
-                isCalleeOfRenderedParent: renderedParentType
-                    ? isCalleeOfRenderedParent
-                    : this.parent.callee === this,
+                isCalleeOfRenderedParent,
                 preventASI: true,
-                renderedParentType: renderedParentType || this.parent.type
+                ...(renderedSurroundingElement
+                    ? { renderedSurroundingElement }
+                    : { renderedParentType: renderedParentType || this.parent.type })
             });
         }
         else {
             this.test.render(code, options, {
-                renderedSurroundingElement: renderedParentType
+                renderedSurroundingElement: renderedParentType || renderedSurroundingElement
             });
             this.consequent.render(code, options);
             this.alternate.render(code, options);
@@ -7108,6 +7161,7 @@ class ForInStatement extends NodeBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
+        this.context.requestTreeshakingPass();
     }
 }
 
@@ -7147,6 +7201,7 @@ class ForOfStatement extends NodeBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
+        this.context.requestTreeshakingPass();
     }
 }
 
@@ -7788,11 +7843,11 @@ class LogicalExpression extends NodeBase {
             }
             removeAnnotations(this, code);
             this.getUsedBranch().render(code, options, {
-                isCalleeOfRenderedParent: renderedParentType
-                    ? isCalleeOfRenderedParent
-                    : this.parent.callee === this,
+                isCalleeOfRenderedParent,
                 preventASI,
-                renderedParentType: renderedParentType || this.parent.type
+                ...(renderedSurroundingElement
+                    ? { renderedSurroundingElement }
+                    : { renderedParentType: renderedParentType || this.parent.type })
             });
         }
         else {
@@ -8396,6 +8451,7 @@ class NewExpression extends NodeBase {
             // This will make sure all properties of parameters behave as "unknown"
             argument.deoptimizePath(UNKNOWN_PATH);
         }
+        this.context.requestTreeshakingPass();
     }
 }
 
@@ -8441,6 +8497,7 @@ class ObjectExpression extends NodeBase {
         if (this.objectEntity !== null) {
             return this.objectEntity;
         }
+        let prototype = OBJECT_PROTOTYPE;
         const properties = [];
         for (const property of this.properties) {
             if (property instanceof SpreadElement) {
@@ -8464,13 +8521,16 @@ class ObjectExpression extends NodeBase {
                         ? property.key.name
                         : String(property.key.value);
                 if (key === '__proto__' && property.kind === 'init') {
-                    properties.unshift({ key: UnknownKey, kind: 'init', property: UNKNOWN_EXPRESSION });
+                    prototype =
+                        property.value instanceof Literal && property.value.value === null
+                            ? null
+                            : property.value;
                     continue;
                 }
             }
             properties.push({ key, kind: property.kind, property });
         }
-        return (this.objectEntity = new ObjectEntity(properties, OBJECT_PROTOTYPE));
+        return (this.objectEntity = new ObjectEntity(properties, prototype));
     }
 }
 
@@ -8542,6 +8602,7 @@ class Property extends MethodBase {
         this.deoptimized = true;
         if (this.declarationInit !== null) {
             this.declarationInit.deoptimizePath([UnknownKey, UnknownKey]);
+            this.context.requestTreeshakingPass();
         }
     }
 }
@@ -8610,13 +8671,10 @@ class ReturnStatement extends NodeBase {
 
 class SequenceExpression extends NodeBase {
     deoptimizePath(path) {
-        if (path.length > 0)
-            this.expressions[this.expressions.length - 1].deoptimizePath(path);
+        this.expressions[this.expressions.length - 1].deoptimizePath(path);
     }
     deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker) {
-        if (event === EVENT_CALLED || path.length > 0) {
-            this.expressions[this.expressions.length - 1].deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
-        }
+        this.expressions[this.expressions.length - 1].deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
         return this.expressions[this.expressions.length - 1].getLiteralValueAtPath(path, recursionTracker, origin);
@@ -8633,8 +8691,7 @@ class SequenceExpression extends NodeBase {
             this.expressions[this.expressions.length - 1].hasEffectsWhenAccessedAtPath(path, context));
     }
     hasEffectsWhenAssignedAtPath(path, context) {
-        return (path.length === 0 ||
-            this.expressions[this.expressions.length - 1].hasEffectsWhenAssignedAtPath(path, context));
+        return this.expressions[this.expressions.length - 1].hasEffectsWhenAssignedAtPath(path, context);
     }
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
         return this.expressions[this.expressions.length - 1].hasEffectsWhenCalledAtPath(path, callOptions, context);
@@ -8663,13 +8720,18 @@ class SequenceExpression extends NodeBase {
             if (includedNodes === 1 && preventASI) {
                 removeLineBreaks(code, start, node.start);
             }
-            if (node === lastNode && includedNodes === 1) {
-                node.render(code, options, {
-                    isCalleeOfRenderedParent: renderedParentType
-                        ? isCalleeOfRenderedParent
-                        : this.parent.callee === this,
-                    renderedParentType: renderedParentType || this.parent.type
-                });
+            if (includedNodes === 1) {
+                if (node === lastNode) {
+                    node.render(code, options, {
+                        isCalleeOfRenderedParent,
+                        renderedParentType: renderedParentType || this.parent.type
+                    });
+                }
+                else {
+                    node.render(code, options, {
+                        renderedSurroundingElement: renderedParentType || this.parent.type
+                    });
+                }
             }
             else {
                 node.render(code, options);
@@ -8816,13 +8878,6 @@ class TaggedTemplateExpression extends NodeBase {
                     message: `Cannot call a namespace ('${name}')`
                 }, this.start);
             }
-            if (name === 'eval') {
-                this.context.warn({
-                    code: 'EVAL',
-                    message: `Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification`,
-                    url: 'https://rollupjs.org/guide/en/#avoiding-eval'
-                }, this.start);
-            }
         }
     }
     hasEffects(context) {
@@ -8836,6 +8891,10 @@ class TaggedTemplateExpression extends NodeBase {
             withNew: false
         };
     }
+    render(code, options) {
+        this.tag.render(code, options, { isCalleeOfRenderedParent: true });
+        this.quasi.render(code, options);
+    }
 }
 
 class TemplateElement extends NodeBase {
@@ -9107,6 +9166,7 @@ class UnaryExpression extends NodeBase {
         this.deoptimized = true;
         if (this.operator === 'delete') {
             this.argument.deoptimizePath(EMPTY_PATH);
+            this.context.requestTreeshakingPass();
         }
     }
 }
@@ -9175,6 +9235,7 @@ class UpdateExpression extends NodeBase {
             const variable = this.scope.findVariable(this.argument.name);
             variable.isReassigned = true;
         }
+        this.context.requestTreeshakingPass();
     }
 }
 
@@ -9260,9 +9321,12 @@ class YieldExpression extends NodeBase {
         }
     }
     applyDeoptimizations() {
-        var _a;
         this.deoptimized = true;
-        (_a = this.argument) === null || _a === void 0 ? void 0 : _a.deoptimizePath(UNKNOWN_PATH);
+        const { argument } = this;
+        if (argument) {
+            argument.deoptimizePath(UNKNOWN_PATH);
+            this.context.requestTreeshakingPass();
+        }
     }
 }
 
@@ -10128,6 +10192,7 @@ class Module {
             moduleContext: this.context,
             nodeConstructors,
             options: this.options,
+            requestTreeshakingPass: () => (this.graph.needsTreeshakingPass = true),
             traceExport: this.getVariableForExportName.bind(this),
             traceVariable: this.traceVariable.bind(this),
             usesTopLevelAwait: false,

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.50.2
-	Thu, 27 May 2021 11:12:11 GMT - commit 830827901981d74cee6bec914839e7d4bf7856c3
+	Rollup.js v2.50.6
+	Thu, 03 Jun 2021 04:54:09 GMT - commit 9f69fe3f53ae50dffe932529a3503e619292d31a
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.50.2
-	Thu, 27 May 2021 11:12:11 GMT - commit 830827901981d74cee6bec914839e7d4bf7856c3
+	Rollup.js v2.50.6
+	Thu, 03 Jun 2021 04:54:09 GMT - commit 9f69fe3f53ae50dffe932529a3503e619292d31a
 
 
 	https://github.com/rollup/rollup

package/package.json

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