rollup 2.10.8 → 2.10.9

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.10.8
-	Sat, 23 May 2020 05:52:17 GMT - commit 36a4527473ea1fe678ed866c9f8dfd3c2542cd22
+	Rollup.js v2.10.9
+	Sun, 24 May 2020 05:27:58 GMT - commit 462bff7b1a0c384ecc3e278b1ea877e637c70f41
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.10.8
-	Sat, 23 May 2020 05:52:17 GMT - commit 36a4527473ea1fe678ed866c9f8dfd3c2542cd22
+	Rollup.js v2.10.9
+	Sun, 24 May 2020 05:27:58 GMT - commit 462bff7b1a0c384ecc3e278b1ea877e637c70f41
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.10.8
-	Sat, 23 May 2020 05:52:17 GMT - commit 36a4527473ea1fe678ed866c9f8dfd3c2542cd22
+	Rollup.js v2.10.9
+	Sun, 24 May 2020 05:27:58 GMT - commit 462bff7b1a0c384ecc3e278b1ea877e637c70f41
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.10.8
-	Sat, 23 May 2020 05:52:17 GMT - commit 36a4527473ea1fe678ed866c9f8dfd3c2542cd22
+	Rollup.js v2.10.9
+	Sun, 24 May 2020 05:27:58 GMT - commit 462bff7b1a0c384ecc3e278b1ea877e637c70f41
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.10.8
-	Sat, 23 May 2020 05:52:17 GMT - commit 36a4527473ea1fe678ed866c9f8dfd3c2542cd22
+	Rollup.js v2.10.9
+	Sun, 24 May 2020 05:27:58 GMT - commit 462bff7b1a0c384ecc3e278b1ea877e637c70f41
 
 
 	https://github.com/rollup/rollup
@@ -28,7 +28,7 @@ var crypto = require('crypto');
 var fs = require('fs');
 var events = require('events');
 
-var version = "2.10.8";
+var version = "2.10.9";
 
 function unwrapExports (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -10478,9 +10478,14 @@ class SyntheticNamedExportVariable extends Variable {
         this.defaultVariable = defaultVariable;
     }
     getBaseVariable() {
-        return this.defaultVariable instanceof SyntheticNamedExportVariable
-            ? this.defaultVariable.getBaseVariable()
-            : this.defaultVariable;
+        let baseVariable = this.defaultVariable;
+        if (baseVariable instanceof ExportDefaultVariable) {
+            baseVariable = baseVariable.getOriginalVariable();
+        }
+        if (baseVariable instanceof SyntheticNamedExportVariable) {
+            baseVariable = baseVariable.getBaseVariable();
+        }
+        return baseVariable;
     }
     getName() {
         const name = this.name;
@@ -16209,11 +16214,12 @@ class Chunk$1 {
             facadedModule.hasEffects()) {
             chunk.dependencies.add(facadedModule.chunk);
         }
+        chunk.ensureReexportsAreAvailableForModule(facadedModule);
         chunk.facadeModule = facadedModule;
         chunk.strictFacade = true;
         return chunk;
     }
-    canModuleBeFacade(module, exposedNamespaces) {
+    canModuleBeFacade(module, exposedVariables) {
         const moduleExportNamesByVariable = module.getExportNamesByVariable();
         for (const exposedVariable of this.exports) {
             if (!moduleExportNamesByVariable.has(exposedVariable)) {
@@ -16231,7 +16237,7 @@ class Chunk$1 {
                 return false;
             }
         }
-        for (const exposedVariable of exposedNamespaces) {
+        for (const exposedVariable of exposedVariables) {
             if (!(moduleExportNamesByVariable.has(exposedVariable) || exposedVariable.module === module)) {
                 return false;
             }
@@ -16265,7 +16271,14 @@ class Chunk$1 {
         const facades = [];
         const dynamicEntryModules = this.dynamicEntryModules.filter(module => module.includedDynamicImporters.some(importingModule => importingModule.chunk !== this));
         this.isDynamicEntry = dynamicEntryModules.length > 0;
-        const exposedNamespaces = dynamicEntryModules.map(module => module.namespace);
+        const exposedVariables = new Set(dynamicEntryModules.map(module => module.namespace));
+        for (const module of this.entryModules) {
+            if (module.preserveSignature) {
+                for (const exportedVariable of module.getExportNamesByVariable().keys()) {
+                    exposedVariables.add(exportedVariable);
+                }
+            }
+        }
         for (const module of this.entryModules) {
             const requiredFacades = [...module.userChunkNames].map(name => ({
                 name
@@ -16280,10 +16293,13 @@ class Chunk$1 {
             if (!this.facadeModule &&
                 (this.graph.preserveModules ||
                     module.preserveSignature !== 'strict' ||
-                    this.canModuleBeFacade(module, exposedNamespaces))) {
+                    this.canModuleBeFacade(module, exposedVariables))) {
                 this.facadeModule = module;
                 module.facadeChunk = this;
-                this.strictFacade = module.preserveSignature === 'strict';
+                if (module.preserveSignature) {
+                    this.strictFacade = module.preserveSignature === 'strict';
+                    this.ensureReexportsAreAvailableForModule(module);
+                }
                 this.assignFacadeName(requiredFacades.shift(), module);
             }
             for (const facadeName of requiredFacades) {
@@ -16291,7 +16307,7 @@ class Chunk$1 {
             }
         }
         for (const module of dynamicEntryModules) {
-            if (!this.facadeModule && this.canModuleBeFacade(module, exposedNamespaces)) {
+            if (!this.facadeModule && this.canModuleBeFacade(module, exposedVariables)) {
                 this.facadeModule = module;
                 module.facadeChunk = this;
                 this.strictFacade = true;
@@ -16299,7 +16315,7 @@ class Chunk$1 {
             }
             else if (this.facadeModule === module &&
                 !this.strictFacade &&
-                this.canModuleBeFacade(module, exposedNamespaces)) {
+                this.canModuleBeFacade(module, exposedVariables)) {
                 this.strictFacade = true;
             }
             else if (!(module.facadeChunk && module.facadeChunk.strictFacade)) {
@@ -16631,6 +16647,25 @@ class Chunk$1 {
         }
         return hash.digest('hex').substr(0, 8);
     }
+    ensureReexportsAreAvailableForModule(module) {
+        const map = module.getExportNamesByVariable();
+        for (const exportedVariable of map.keys()) {
+            const isSynthetic = exportedVariable instanceof SyntheticNamedExportVariable;
+            const importedVariable = isSynthetic
+                ? exportedVariable.getBaseVariable()
+                : exportedVariable;
+            const exportingModule = importedVariable.module;
+            if (exportingModule &&
+                exportingModule.chunk &&
+                exportingModule.chunk !== this &&
+                !(importedVariable instanceof NamespaceVariable && this.graph.preserveModules)) {
+                exportingModule.chunk.exports.add(importedVariable);
+                if (isSynthetic) {
+                    this.imports.add(importedVariable);
+                }
+            }
+        }
+    }
     finaliseDynamicImports(options) {
         const stripKnownJsExtensions = options.format === 'amd';
         for (const [module, code] of this.renderedModuleSources) {
@@ -16902,11 +16937,8 @@ class Chunk$1 {
             if (variable instanceof ExportDefaultVariable) {
                 variable = variable.getOriginalVariable();
             }
-            while (variable instanceof SyntheticNamedExportVariable) {
+            if (variable instanceof SyntheticNamedExportVariable) {
                 variable = variable.getBaseVariable();
-                if (variable instanceof ExportDefaultVariable) {
-                    variable = variable.getOriginalVariable();
-                }
             }
             if (variable.module && variable.module.chunk !== this) {
                 this.imports.add(variable);
@@ -16917,41 +16949,18 @@ class Chunk$1 {
             }
         }
         if ((module.isEntryPoint && module.preserveSignature !== false) ||
-            module.includedDynamicImporters.some(importer => importer.chunk !== this)) {
-            const map = module.getExportNamesByVariable();
-            for (const exportedVariable of map.keys()) {
-                if (module.isEntryPoint && module.preserveSignature !== false) {
-                    this.exports.add(exportedVariable);
-                }
-                const isSynthetic = exportedVariable instanceof SyntheticNamedExportVariable;
-                const importedVariable = isSynthetic
-                    ? exportedVariable.getBaseVariable()
-                    : exportedVariable;
-                const exportingModule = importedVariable.module;
-                if (exportingModule &&
-                    exportingModule.chunk &&
-                    exportingModule.chunk !== this &&
-                    !(importedVariable instanceof NamespaceVariable && this.graph.preserveModules)) {
-                    exportingModule.chunk.exports.add(importedVariable);
-                    if (isSynthetic) {
-                        this.imports.add(importedVariable);
-                    }
-                }
-            }
-        }
-        if (module.namespace.included) {
-            for (const reexportName of Object.keys(module.reexportDescriptions)) {
-                const reexport = module.reexportDescriptions[reexportName];
-                const variable = reexport.module.getVariableForExportName(reexport.localName);
-                if (variable.module.chunk && variable.module.chunk !== this) {
-                    this.imports.add(variable);
-                    variable.module.chunk.exports.add(variable);
-                }
-            }
+            module.includedDynamicImporters.some(importer => importer.chunk !== this) ||
+            module.namespace.included) {
+            this.ensureReexportsAreAvailableForModule(module);
         }
         for (const { node, resolution } of module.dynamicImports) {
-            if (node.included && resolution instanceof Module && resolution.chunk === this)
+            if (node.included &&
+                resolution instanceof Module &&
+                resolution.chunk === this &&
+                !resolution.namespace.included) {
                 resolution.namespace.include();
+                this.ensureReexportsAreAvailableForModule(resolution);
+            }
         }
     }
 }

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.10.8
-	Sat, 23 May 2020 05:52:17 GMT - commit 36a4527473ea1fe678ed866c9f8dfd3c2542cd22
+	Rollup.js v2.10.9
+	Sun, 24 May 2020 05:27:58 GMT - commit 462bff7b1a0c384ecc3e278b1ea877e637c70f41
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.10.8
-	Sat, 23 May 2020 05:52:17 GMT - commit 36a4527473ea1fe678ed866c9f8dfd3c2542cd22
+	Rollup.js v2.10.9
+	Sun, 24 May 2020 05:27:58 GMT - commit 462bff7b1a0c384ecc3e278b1ea877e637c70f41
 
 
 	https://github.com/rollup/rollup

package/package.json

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