rollup 2.77.2 → 2.77.4-0

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.77.2
-	Wed, 27 Jul 2022 05:18:41 GMT - commit 22b2f68aa8638ffaac4de69011e10480f5d50546
+	Rollup.js v2.77.4-0
+	Sun, 04 Dec 2022 18:27:04 GMT - commit 43b5e1cddb8a5b9ae0aa6349112523b5b89db783
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.77.2
-	Wed, 27 Jul 2022 05:18:41 GMT - commit 22b2f68aa8638ffaac4de69011e10480f5d50546
+	Rollup.js v2.77.4-0
+	Sun, 04 Dec 2022 18:27:04 GMT - commit 43b5e1cddb8a5b9ae0aa6349112523b5b89db783
 
 	https://github.com/rollup/rollup
 
@@ -14,7 +14,7 @@ import { createHash as createHash$1 } from 'crypto';
 import { promises } from 'fs';
 import { EventEmitter } from 'events';
 
-var version$1 = "2.77.2";
+var version$1 = "2.77.4-0";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -14604,7 +14604,7 @@ class Chunk {
             });
             const currentPath = `${currentDir}/${fileName}`;
             const { preserveModulesRoot } = options;
-            if (preserveModulesRoot && currentPath.startsWith(preserveModulesRoot)) {
+            if (preserveModulesRoot && resolve(currentPath).startsWith(preserveModulesRoot)) {
                 path = currentPath.slice(preserveModulesRoot.length).replace(/^[\\/]/, '');
             }
             else {
@@ -15658,23 +15658,21 @@ function getChunkAssignments(entryModules, manualChunkAliasByEntry) {
     const modulesInManualChunks = new Set(manualChunkAliasByEntry.keys());
     const manualChunkModulesByAlias = Object.create(null);
     for (const [entry, alias] of manualChunkAliasByEntry) {
-        const chunkModules = (manualChunkModulesByAlias[alias] =
-            manualChunkModulesByAlias[alias] || []);
-        addStaticDependenciesToManualChunk(entry, chunkModules, modulesInManualChunks);
+        addStaticDependenciesToManualChunk(entry, (manualChunkModulesByAlias[alias] || (manualChunkModulesByAlias[alias] = [])), modulesInManualChunks);
     }
     for (const [alias, modules] of Object.entries(manualChunkModulesByAlias)) {
         chunkDefinitions.push({ alias, modules });
     }
     const assignedEntryPointsByModule = new Map();
-    const { dependentEntryPointsByModule, dynamicEntryModules } = analyzeModuleGraph(entryModules);
-    const dynamicallyDependentEntryPointsByDynamicEntry = getDynamicDependentEntryPoints(dependentEntryPointsByModule, dynamicEntryModules);
-    const staticEntries = new Set(entryModules);
-    function assignEntryToStaticDependencies(entry, dynamicDependentEntryPoints) {
+    const { allModules, dependentEntryPointsByModule, dynamicallyDependentEntryPointsByDynamicEntry, dynamicImportsByEntry } = analyzeModuleGraph(entryModules);
+    const alreadyLoadedModulesByDynamicEntry = getAlreadyLoadedModulesByDynamicEntry(allModules, dependentEntryPointsByModule, dynamicImportsByEntry, dynamicallyDependentEntryPointsByDynamicEntry);
+    function assignEntryToStaticDependencies(entry, alreadyLoadedModules) {
         const modulesToHandle = new Set([entry]);
         for (const module of modulesToHandle) {
             const assignedEntryPoints = getOrCreate(assignedEntryPointsByModule, module, () => new Set());
-            if (dynamicDependentEntryPoints &&
-                areEntryPointsContainedOrDynamicallyDependent(dynamicDependentEntryPoints, dependentEntryPointsByModule.get(module))) {
+            // If the module is "already loaded" for this dynamic entry, we do not need
+            // to mark it for this dynamic entry
+            if (alreadyLoadedModules === null || alreadyLoadedModules === void 0 ? void 0 : alreadyLoadedModules.has(module)) {
                 continue;
             }
             else {
@@ -15687,31 +15685,17 @@ function getChunkAssignments(entryModules, manualChunkAliasByEntry) {
             }
         }
     }
-    function areEntryPointsContainedOrDynamicallyDependent(entryPoints, containedIn) {
-        const entriesToCheck = new Set(entryPoints);
-        for (const entry of entriesToCheck) {
-            if (!containedIn.has(entry)) {
-                if (staticEntries.has(entry))
-                    return false;
-                const dynamicallyDependentEntryPoints = dynamicallyDependentEntryPointsByDynamicEntry.get(entry);
-                for (const dependentEntry of dynamicallyDependentEntryPoints) {
-                    entriesToCheck.add(dependentEntry);
-                }
-            }
-        }
-        return true;
-    }
     for (const entry of entryModules) {
         if (!modulesInManualChunks.has(entry)) {
             assignEntryToStaticDependencies(entry, null);
         }
     }
-    for (const entry of dynamicEntryModules) {
+    for (const entry of dynamicallyDependentEntryPointsByDynamicEntry.keys()) {
         if (!modulesInManualChunks.has(entry)) {
-            assignEntryToStaticDependencies(entry, dynamicallyDependentEntryPointsByDynamicEntry.get(entry));
+            assignEntryToStaticDependencies(entry, alreadyLoadedModulesByDynamicEntry.get(entry) || null);
         }
     }
-    chunkDefinitions.push(...createChunks([...entryModules, ...dynamicEntryModules], assignedEntryPointsByModule));
+    chunkDefinitions.push(...createChunks([...entryModules, ...dynamicallyDependentEntryPointsByDynamicEntry.keys()], assignedEntryPointsByModule));
     return chunkDefinitions;
 }
 function addStaticDependenciesToManualChunk(entry, manualChunkModules, modulesInManualChunks) {
@@ -15727,46 +15711,69 @@ function addStaticDependenciesToManualChunk(entry, manualChunkModules, modulesIn
     }
 }
 function analyzeModuleGraph(entryModules) {
-    const dynamicEntryModules = new Set();
+    const allModules = new Set(entryModules);
     const dependentEntryPointsByModule = new Map();
+    const dynamicImportsByEntry = new Map();
+    const dynamicallyDependentEntryPointsByDynamicEntry = new Map();
     const entriesToHandle = new Set(entryModules);
     for (const currentEntry of entriesToHandle) {
         const modulesToHandle = new Set([currentEntry]);
+        const dynamicImports = new Set();
+        dynamicImportsByEntry.set(currentEntry, dynamicImports);
         for (const module of modulesToHandle) {
             getOrCreate(dependentEntryPointsByModule, module, () => new Set()).add(currentEntry);
             for (const dependency of module.getDependenciesToBeIncluded()) {
                 if (!(dependency instanceof ExternalModule)) {
                     modulesToHandle.add(dependency);
+                    allModules.add(dependency);
                 }
             }
             for (const { resolution } of module.dynamicImports) {
                 if (resolution instanceof Module && resolution.includedDynamicImporters.length > 0) {
-                    dynamicEntryModules.add(resolution);
+                    dynamicImports.add(resolution);
+                    getOrCreate(dynamicallyDependentEntryPointsByDynamicEntry, resolution, () => new Set()).add(currentEntry);
                     entriesToHandle.add(resolution);
+                    allModules.add(resolution);
                 }
             }
             for (const dependency of module.implicitlyLoadedBefore) {
-                dynamicEntryModules.add(dependency);
+                dynamicImports.add(dependency);
+                getOrCreate(dynamicallyDependentEntryPointsByDynamicEntry, dependency, () => new Set()).add(currentEntry);
                 entriesToHandle.add(dependency);
+                allModules.add(dependency);
             }
         }
     }
-    return { dependentEntryPointsByModule, dynamicEntryModules };
+    return {
+        allModules,
+        dependentEntryPointsByModule,
+        dynamicallyDependentEntryPointsByDynamicEntry,
+        dynamicImportsByEntry
+    };
 }
-function getDynamicDependentEntryPoints(dependentEntryPointsByModule, dynamicEntryModules) {
-    const dynamicallyDependentEntryPointsByDynamicEntry = new Map();
-    for (const dynamicEntry of dynamicEntryModules) {
-        const dynamicDependentEntryPoints = getOrCreate(dynamicallyDependentEntryPointsByDynamicEntry, dynamicEntry, () => new Set());
-        for (const importer of [
-            ...dynamicEntry.includedDynamicImporters,
-            ...dynamicEntry.implicitlyLoadedAfter
-        ]) {
-            for (const entryPoint of dependentEntryPointsByModule.get(importer)) {
-                dynamicDependentEntryPoints.add(entryPoint);
+function getAlreadyLoadedModulesByDynamicEntry(allModules, dependentEntryPointsByModule, dynamicImportsByEntry, dynamicallyDependentEntryPointsByDynamicEntry) {
+    var _a, _b;
+    const alreadyLoadedModulesByEntry = new Map();
+    for (const module of allModules) {
+        const dependentEntryPoints = dependentEntryPointsByModule.get(module);
+        for (const entry of dependentEntryPoints) {
+            const dynamicEntriesToHandle = [...dynamicImportsByEntry.get(entry)];
+            nextDynamicEntry: for (const dynamicEntry of dynamicEntriesToHandle) {
+                if ((_a = alreadyLoadedModulesByEntry.get(dynamicEntry)) === null || _a === void 0 ? void 0 : _a.has(module)) {
+                    continue;
+                }
+                for (const siblingDependentEntry of dynamicallyDependentEntryPointsByDynamicEntry.get(dynamicEntry)) {
+                    if (!(dependentEntryPoints.has(siblingDependentEntry) ||
+                        ((_b = alreadyLoadedModulesByEntry.get(siblingDependentEntry)) === null || _b === void 0 ? void 0 : _b.has(module)))) {
+                        continue nextDynamicEntry;
+                    }
+                }
+                getOrCreate(alreadyLoadedModulesByEntry, dynamicEntry, () => new Set()).add(module);
+                dynamicEntriesToHandle.push(...dynamicImportsByEntry.get(dynamicEntry));
             }
         }
     }
-    return dynamicallyDependentEntryPointsByDynamicEntry;
+    return alreadyLoadedModulesByEntry;
 }
 function createChunks(allEntryPoints, assignedEntryPointsByModule) {
     const chunkModules = Object.create(null);

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.77.2
-	Wed, 27 Jul 2022 05:18:41 GMT - commit 22b2f68aa8638ffaac4de69011e10480f5d50546
+	Rollup.js v2.77.4-0
+	Sun, 04 Dec 2022 18:27:04 GMT - commit 43b5e1cddb8a5b9ae0aa6349112523b5b89db783
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.77.2
-	Wed, 27 Jul 2022 05:18:41 GMT - commit 22b2f68aa8638ffaac4de69011e10480f5d50546
+	Rollup.js v2.77.4-0
+	Sun, 04 Dec 2022 18:27:04 GMT - commit 43b5e1cddb8a5b9ae0aa6349112523b5b89db783
 
 	https://github.com/rollup/rollup