rollup 2.52.3 → 2.52.7

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.3
-	Fri, 25 Jun 2021 13:12:43 GMT - commit 9c436a7c7c368f2ff840735a30119899513ff4bd
+	Rollup.js v2.52.7
+	Fri, 02 Jul 2021 03:59:47 GMT - commit b2218ccda2765c48ae1db8bade9ec6889aaab250
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.3
-	Fri, 25 Jun 2021 13:12:43 GMT - commit 9c436a7c7c368f2ff840735a30119899513ff4bd
+	Rollup.js v2.52.7
+	Fri, 02 Jul 2021 03:59:47 GMT - commit b2218ccda2765c48ae1db8bade9ec6889aaab250
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.3
-	Fri, 25 Jun 2021 13:12:43 GMT - commit 9c436a7c7c368f2ff840735a30119899513ff4bd
+	Rollup.js v2.52.7
+	Fri, 02 Jul 2021 03:59:47 GMT - commit b2218ccda2765c48ae1db8bade9ec6889aaab250
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.3
-	Fri, 25 Jun 2021 13:12:43 GMT - commit 9c436a7c7c368f2ff840735a30119899513ff4bd
+	Rollup.js v2.52.7
+	Fri, 02 Jul 2021 03:59:47 GMT - commit b2218ccda2765c48ae1db8bade9ec6889aaab250
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.3
-	Fri, 25 Jun 2021 13:12:43 GMT - commit 9c436a7c7c368f2ff840735a30119899513ff4bd
+	Rollup.js v2.52.7
+	Fri, 02 Jul 2021 03:59:47 GMT - commit b2218ccda2765c48ae1db8bade9ec6889aaab250
 
 
 	https://github.com/rollup/rollup
@@ -32,7 +32,7 @@ function _interopNamespaceDefault(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
-var version$1 = "2.52.3";
+var version$1 = "2.52.7";
 
 function ensureArray(items) {
     if (Array.isArray(items)) {
@@ -2417,7 +2417,7 @@ function createHasEffectsContext() {
             breaks: false,
             continues: false,
             labels: new Set(),
-            returnAwaitYield: false
+            returnYield: false
         },
         includedLabels: new Set(),
         instantiated: new DiscriminatedPathTracker(),
@@ -5628,6 +5628,7 @@ class RestElement extends NodeBase {
 class FunctionNode extends NodeBase {
     constructor() {
         super(...arguments);
+        this.deoptimizedReturn = false;
         this.isPrototypeDeoptimized = false;
     }
     createScope(parentScope) {
@@ -5658,7 +5659,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 +5713,7 @@ class FunctionNode extends NodeBase {
             breaks: false,
             continues: false,
             labels: new Set(),
-            returnAwaitYield: true
+            returnYield: true
         };
         if (this.body.hasEffects(context))
             return true;
@@ -6420,6 +6432,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 +6449,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 +6494,7 @@ class ArrowFunctionExpression extends NodeBase {
             breaks: false,
             continues: false,
             labels: new Set(),
-            returnAwaitYield: true
+            returnYield: true
         };
         if (this.body.hasEffects(context))
             return true;
@@ -6612,17 +6639,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 +6664,11 @@ class AwaitExpression extends NodeBase {
         }
         this.argument.include(context, includeChildrenRecursively);
     }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        this.argument.deoptimizePath(UNKNOWN_PATH);
+        this.context.requestTreeshakingPass();
+    }
 }
 
 const binaryOperators = {
@@ -8671,7 +8704,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;
@@ -9337,8 +9370,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) {
@@ -10071,7 +10103,10 @@ class Module {
         if (name !== 'default') {
             const foundNamespaceReexport = name in this.namespaceReexportsByName
                 ? this.namespaceReexportsByName[name]
-                : (this.namespaceReexportsByName[name] = this.getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports));
+                : this.getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports);
+            if (!skipExternalNamespaceReexports) {
+                this.namespaceReexportsByName[name] = foundNamespaceReexport;
+            }
             if (foundNamespaceReexport) {
                 return foundNamespaceReexport;
             }
@@ -10410,25 +10445,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)) {
@@ -10463,8 +10501,18 @@ class Module {
     }
     getVariableFromNamespaceReexports(name, importerForSideEffects, searchedNamesAndModules, skipExternalNamespaceReexports = false) {
         let foundSyntheticDeclaration = null;
-        const skipExternalNamespaceValues = new Set([true, skipExternalNamespaceReexports]);
-        for (const skipExternalNamespaces of skipExternalNamespaceValues) {
+        const skipExternalNamespaceValues = [{ searchedNamesAndModules, skipExternalNamespaces: true }];
+        if (!skipExternalNamespaceReexports) {
+            const clonedSearchedNamesAndModules = new Map();
+            for (const [name, modules] of searchedNamesAndModules || []) {
+                clonedSearchedNamesAndModules.set(name, new Set(modules));
+            }
+            skipExternalNamespaceValues.push({
+                searchedNamesAndModules: clonedSearchedNamesAndModules,
+                skipExternalNamespaces: false
+            });
+        }
+        for (const { skipExternalNamespaces, searchedNamesAndModules } of skipExternalNamespaceValues) {
             const foundDeclarations = new Set();
             for (const module of this.exportAllModules) {
                 if (module instanceof Module || !skipExternalNamespaces) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.3
-	Fri, 25 Jun 2021 13:12:43 GMT - commit 9c436a7c7c368f2ff840735a30119899513ff4bd
+	Rollup.js v2.52.7
+	Fri, 02 Jul 2021 03:59:47 GMT - commit b2218ccda2765c48ae1db8bade9ec6889aaab250
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.52.3
-	Fri, 25 Jun 2021 13:12:43 GMT - commit 9c436a7c7c368f2ff840735a30119899513ff4bd
+	Rollup.js v2.52.7
+	Fri, 02 Jul 2021 03:59:47 GMT - commit b2218ccda2765c48ae1db8bade9ec6889aaab250
 
 
 	https://github.com/rollup/rollup

package/package.json

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