rollup 2.56.2 → 2.56.3

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.56.2
-	Tue, 10 Aug 2021 05:26:43 GMT - commit 2f74020e2c2988e670a2744d4b6c0607ab997e2c
+	Rollup.js v2.56.3
+	Mon, 23 Aug 2021 05:06:39 GMT - commit c41d17ceedfa6c1d7430da70c6c80d86a91e9434
 
 
 	https://github.com/rollup/rollup

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.56.2
-	Tue, 10 Aug 2021 05:26:43 GMT - commit 2f74020e2c2988e670a2744d4b6c0607ab997e2c
+	Rollup.js v2.56.3
+	Mon, 23 Aug 2021 05:06:39 GMT - commit c41d17ceedfa6c1d7430da70c6c80d86a91e9434
 
 
 	https://github.com/rollup/rollup
@@ -13,7 +13,7 @@ import { createHash as createHash$1 } from 'crypto';
 import fs, { lstatSync, realpathSync, readdirSync } from 'fs';
 import { EventEmitter } from 'events';
 
-var version$1 = "2.56.2";
+var version$1 = "2.56.3";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -9934,9 +9934,9 @@ class Module {
             code: null,
             get dynamicallyImportedIds() {
                 const dynamicallyImportedIds = [];
-                for (const { resolution } of module.dynamicImports) {
-                    if (resolution instanceof Module || resolution instanceof ExternalModule) {
-                        dynamicallyImportedIds.push(resolution.id);
+                for (const { id } of module.dynamicImports) {
+                    if (id) {
+                        dynamicallyImportedIds.push(id);
                     }
                 }
                 return dynamicallyImportedIds;
@@ -10409,7 +10409,7 @@ class Module {
         else if (argument instanceof Literal && typeof argument.value === 'string') {
             argument = argument.value;
         }
-        this.dynamicImports.push({ argument, node, resolution: null });
+        this.dynamicImports.push({ argument, id: null, node, resolution: null });
     }
     addExport(node) {
         if (node instanceof ExportDefaultDeclaration) {
@@ -19643,11 +19643,8 @@ class ModuleLoader {
         });
         return loadNewModulesPromise;
     }
-    async fetchDynamicDependencies(module) {
-        const dependencies = await Promise.all(module.dynamicImports.map(async (dynamicImport) => {
-            const resolvedId = await this.resolveDynamicImport(module, typeof dynamicImport.argument === 'string'
-                ? dynamicImport.argument
-                : dynamicImport.argument.esTreeNode, module.id);
+    async fetchDynamicDependencies(module, resolveDynamicImportPromises) {
+        const dependencies = await Promise.all(resolveDynamicImportPromises.map(resolveDynamicImportPromise => resolveDynamicImportPromise.then(async ([dynamicImport, resolvedId]) => {
             if (resolvedId === null)
                 return null;
             if (typeof resolvedId === 'string') {
@@ -19655,7 +19652,7 @@ class ModuleLoader {
                 return null;
             }
             return (dynamicImport.resolution = await this.fetchResolvedDependency(relativeId(resolvedId.id), module.id, resolvedId));
-        }));
+        })));
         for (const dependency of dependencies) {
             if (dependency) {
                 module.dynamicDependencies.add(dependency);
@@ -19680,10 +19677,15 @@ class ModuleLoader {
         this.modulesById.set(id, module);
         this.graph.watchFiles[id] = true;
         await this.addModuleSource(id, importer, module);
-        await this.pluginDriver.hookParallel('moduleParsed', [module.info]);
+        const resolveStaticDependencyPromises = this.getResolveStaticDependencyPromises(module);
+        const resolveDynamicImportPromises = this.getResolveDynamicImportPromises(module);
+        Promise.all([
+            ...resolveStaticDependencyPromises,
+            ...resolveDynamicImportPromises
+        ]).then(() => this.pluginDriver.hookParallel('moduleParsed', [module.info]));
         await Promise.all([
-            this.fetchStaticDependencies(module),
-            this.fetchDynamicDependencies(module)
+            this.fetchStaticDependencies(module, resolveStaticDependencyPromises),
+            this.fetchDynamicDependencies(module, resolveDynamicImportPromises)
         ]);
         module.linkImports();
         return module;
@@ -19704,10 +19706,8 @@ class ModuleLoader {
             return this.fetchModule(resolvedId, importer, false);
         }
     }
-    async fetchStaticDependencies(module) {
-        for (const dependency of await Promise.all(Array.from(module.sources, async (source) => this.fetchResolvedDependency(source, module.id, (module.resolvedIds[source] =
-            module.resolvedIds[source] ||
-                this.handleResolveId(await this.resolveId(source, module.id, EMPTY_OBJECT), source, module.id)))))) {
+    async fetchStaticDependencies(module, resolveStaticDependencyPromises) {
+        for (const dependency of await Promise.all(resolveStaticDependencyPromises.map(resolveStaticDependencyPromise => resolveStaticDependencyPromise.then(([source, resolvedId]) => this.fetchResolvedDependency(source, module.id, resolvedId))))) {
             module.dependencies.add(dependency);
             dependency.importers.push(module.id);
         }
@@ -19755,6 +19755,25 @@ class ModuleLoader {
             id
         };
     }
+    getResolveDynamicImportPromises(module) {
+        return module.dynamicImports.map(async (dynamicImport) => {
+            const resolvedId = await this.resolveDynamicImport(module, typeof dynamicImport.argument === 'string'
+                ? dynamicImport.argument
+                : dynamicImport.argument.esTreeNode, module.id);
+            if (resolvedId && typeof resolvedId === 'object') {
+                dynamicImport.id = resolvedId.id;
+            }
+            return [dynamicImport, resolvedId];
+        });
+    }
+    getResolveStaticDependencyPromises(module) {
+        return Array.from(module.sources, async (source) => [
+            source,
+            (module.resolvedIds[source] =
+                module.resolvedIds[source] ||
+                    this.handleResolveId(await this.resolveId(source, module.id, EMPTY_OBJECT), source, module.id))
+        ]);
+    }
     handleResolveId(resolvedId, source, importer) {
         if (resolvedId === null) {
             if (isRelative(source)) {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.56.2
-	Tue, 10 Aug 2021 05:26:43 GMT - commit 2f74020e2c2988e670a2744d4b6c0607ab997e2c
+	Rollup.js v2.56.3
+	Mon, 23 Aug 2021 05:06:39 GMT - commit c41d17ceedfa6c1d7430da70c6c80d86a91e9434
 
 
 	https://github.com/rollup/rollup

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.56.2
-	Tue, 10 Aug 2021 05:26:43 GMT - commit 2f74020e2c2988e670a2744d4b6c0607ab997e2c
+	Rollup.js v2.56.3
+	Mon, 23 Aug 2021 05:06:39 GMT - commit c41d17ceedfa6c1d7430da70c6c80d86a91e9434
 
 
 	https://github.com/rollup/rollup