rollup 3.6.1-0 → 3.7.1-0

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { promises } from 'node:fs';
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.6.1-0";
+var version$1 = "3.7.1-0";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -5031,6 +5031,10 @@ const literalNumberMembers = assembleMemberDescriptions({
     toPrecision: returnsString,
     valueOf: returnsNumber
 }, objectMembers);
+const literalRegExpMembers = assembleMemberDescriptions({
+    exec: returnsUnknown,
+    test: returnsBoolean
+}, objectMembers);
 const literalStringMembers = assembleMemberDescriptions({
     anchor: returnsString,
     at: returnsUnknown,
@@ -5082,6 +5086,9 @@ const literalStringMembers = assembleMemberDescriptions({
     valueOf: returnsString
 }, objectMembers);
 function getLiteralMembersForValue(value) {
+    if (value instanceof RegExp) {
+        return literalRegExpMembers;
+    }
     switch (typeof value) {
         case 'boolean': {
             return literalBooleanMembers;
@@ -15860,19 +15867,15 @@ function getChunkAssignments(entries, manualChunkAliasByEntry, minChunkSize) {
     for (const [alias, modules] of Object.entries(manualChunkModulesByAlias)) {
         chunkDefinitions.push({ alias, modules });
     }
-    const alreadyLoadedModulesByDynamicEntry = getAlreadyLoadedModulesByDynamicEntry(entries);
-    const assignedEntryPointsByModule = new Map();
-    for (const entry of entries) {
-        if (!modulesInManualChunks.has(entry)) {
-            assignEntryToStaticDependencies(entry, undefined, assignedEntryPointsByModule, modulesInManualChunks);
-        }
-    }
-    for (const entry of alreadyLoadedModulesByDynamicEntry.keys()) {
+    const { allEntries, dependentEntriesByModule, dynamicallyDependentEntriesByDynamicEntry } = analyzeModuleGraph(entries);
+    const staticEntries = new Set(entries);
+    const assignedEntriesByModule = new Map();
+    for (const entry of allEntries) {
         if (!modulesInManualChunks.has(entry)) {
-            assignEntryToStaticDependencies(entry, alreadyLoadedModulesByDynamicEntry.get(entry), assignedEntryPointsByModule, modulesInManualChunks);
+            assignEntryToStaticDependencies(entry, dependentEntriesByModule, assignedEntriesByModule, modulesInManualChunks, staticEntries, dynamicallyDependentEntriesByDynamicEntry);
         }
     }
-    chunkDefinitions.push(...createChunks([...entries, ...alreadyLoadedModulesByDynamicEntry.keys()], assignedEntryPointsByModule, minChunkSize));
+    chunkDefinitions.push(...createChunks(allEntries, assignedEntriesByModule, minChunkSize));
     return chunkDefinitions;
 }
 function addStaticDependenciesToManualChunk(entry, manualChunkModules, modulesInManualChunks) {
@@ -15887,80 +15890,67 @@ function addStaticDependenciesToManualChunk(entry, manualChunkModules, modulesIn
         }
     }
 }
-function getAlreadyLoadedModulesByDynamicEntry(entryModules) {
-    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) {
+function analyzeModuleGraph(entries) {
+    const dynamicEntries = new Set();
+    const dependentEntriesByModule = new Map();
+    const allEntries = new Set(entries);
+    for (const currentEntry of allEntries) {
         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);
+            getOrCreate(dependentEntriesByModule, module, getNewSet).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) {
-                    dynamicImports.add(resolution);
-                    getOrCreate(dynamicallyDependentEntryPointsByDynamicEntry, resolution, () => new Set()).add(currentEntry);
-                    entriesToHandle.add(resolution);
-                    allModules.add(resolution);
+                if (resolution instanceof Module &&
+                    resolution.includedDynamicImporters.length > 0 &&
+                    !allEntries.has(resolution)) {
+                    dynamicEntries.add(resolution);
+                    allEntries.add(resolution);
                 }
             }
             for (const dependency of module.implicitlyLoadedBefore) {
-                dynamicImports.add(dependency);
-                getOrCreate(dynamicallyDependentEntryPointsByDynamicEntry, dependency, () => new Set()).add(currentEntry);
-                entriesToHandle.add(dependency);
-                allModules.add(dependency);
+                if (!allEntries.has(dependency)) {
+                    dynamicEntries.add(dependency);
+                    allEntries.add(dependency);
+                }
             }
         }
     }
-    return buildAlreadyLoadedModulesByDynamicEntry(allModules, dependentEntryPointsByModule, dynamicImportsByEntry, dynamicallyDependentEntryPointsByDynamicEntry);
+    return {
+        allEntries,
+        dependentEntriesByModule,
+        dynamicallyDependentEntriesByDynamicEntry: getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries)
+    };
 }
-function buildAlreadyLoadedModulesByDynamicEntry(allModules, dependentEntryPointsByModule, dynamicImportsByEntry, dynamicallyDependentEntryPointsByDynamicEntry) {
-    const alreadyLoadedModulesByDynamicEntry = new Map();
-    for (const dynamicEntry of dynamicallyDependentEntryPointsByDynamicEntry.keys()) {
-        alreadyLoadedModulesByDynamicEntry.set(dynamicEntry, new Set());
-    }
-    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) {
-                const alreadyLoadedModules = alreadyLoadedModulesByDynamicEntry.get(dynamicEntry);
-                if (alreadyLoadedModules.has(module)) {
-                    continue;
-                }
-                for (const siblingDependentEntry of dynamicallyDependentEntryPointsByDynamicEntry.get(dynamicEntry)) {
-                    if (!(dependentEntryPoints.has(siblingDependentEntry) ||
-                        alreadyLoadedModulesByDynamicEntry.get(siblingDependentEntry)?.has(module))) {
-                        continue nextDynamicEntry;
-                    }
-                }
-                alreadyLoadedModules.add(module);
-                dynamicEntriesToHandle.push(...dynamicImportsByEntry.get(dynamicEntry));
+function getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries) {
+    const dynamicallyDependentEntriesByDynamicEntry = new Map();
+    for (const dynamicEntry of dynamicEntries) {
+        const dynamicDependentEntries = getOrCreate(dynamicallyDependentEntriesByDynamicEntry, dynamicEntry, getNewSet);
+        for (const importer of [
+            ...dynamicEntry.includedDynamicImporters,
+            ...dynamicEntry.implicitlyLoadedAfter
+        ]) {
+            for (const entry of dependentEntriesByModule.get(importer)) {
+                dynamicDependentEntries.add(entry);
             }
         }
     }
-    return alreadyLoadedModulesByDynamicEntry;
+    return dynamicallyDependentEntriesByDynamicEntry;
 }
-function assignEntryToStaticDependencies(entry, alreadyLoadedModules, assignedEntryPointsByModule, modulesInManualChunks) {
+function assignEntryToStaticDependencies(entry, dependentEntriesByModule, assignedEntriesByModule, modulesInManualChunks, staticEntries, dynamicallyDependentEntriesByDynamicEntry) {
+    const dynamicDependentEntries = dynamicallyDependentEntriesByDynamicEntry.get(entry);
     const modulesToHandle = new Set([entry]);
     for (const module of modulesToHandle) {
-        const assignedEntryPoints = getOrCreate(assignedEntryPointsByModule, module, () => new Set());
-        // If the module is "already loaded" for this dynamic entry, we do not need
-        // to mark it for this dynamic entry
-        if (alreadyLoadedModules?.has(module)) {
+        const assignedEntries = getOrCreate(assignedEntriesByModule, module, getNewSet);
+        if (dynamicDependentEntries &&
+            areEntriesContainedOrDynamicallyDependent(dynamicDependentEntries, dependentEntriesByModule.get(module), staticEntries, dynamicallyDependentEntriesByDynamicEntry)) {
             continue;
         }
         else {
-            assignedEntryPoints.add(entry);
+            assignedEntries.add(entry);
         }
         for (const dependency of module.getDependenciesToBeIncluded()) {
             if (!(dependency instanceof ExternalModule || modulesInManualChunks.has(dependency))) {
@@ -15969,8 +15959,30 @@ function assignEntryToStaticDependencies(entry, alreadyLoadedModules, assignedEn
         }
     }
 }
-function createChunks(allEntryPoints, assignedEntryPointsByModule, minChunkSize) {
-    const chunkModulesBySignature = getChunkModulesBySignature(assignedEntryPointsByModule, allEntryPoints);
+const MAX_ENTRIES_TO_CHECK_FOR_SHARED_DEPENDENCIES = 3;
+function areEntriesContainedOrDynamicallyDependent(entries, containedIn, staticEntries, dynamicallyDependentEntriesByDynamicEntry) {
+    if (entries.size > MAX_ENTRIES_TO_CHECK_FOR_SHARED_DEPENDENCIES) {
+        return false;
+    }
+    const entriesToCheck = new Set(entries);
+    for (const entry of entriesToCheck) {
+        if (!containedIn.has(entry)) {
+            if (staticEntries.has(entry)) {
+                return false;
+            }
+            const dynamicallyDependentEntries = dynamicallyDependentEntriesByDynamicEntry.get(entry);
+            if (dynamicallyDependentEntries.size > MAX_ENTRIES_TO_CHECK_FOR_SHARED_DEPENDENCIES) {
+                return false;
+            }
+            for (const dependentEntry of dynamicallyDependentEntries) {
+                entriesToCheck.add(dependentEntry);
+            }
+        }
+    }
+    return true;
+}
+function createChunks(allEntries, assignedEntriesByModule, minChunkSize) {
+    const chunkModulesBySignature = getChunkModulesBySignature(assignedEntriesByModule, allEntries);
     return minChunkSize === 0
         ? Object.values(chunkModulesBySignature).map(modules => ({
             alias: null,
@@ -16003,13 +16015,14 @@ function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
 ----- pure  side effects
 small ${`${chunkPartition.small.pure.size}`.padEnd(5, ' ')} ${chunkPartition.small.sideEffect.size}
   big ${`${chunkPartition.big.pure.size}`.padEnd(5, ' ')} ${chunkPartition.big.sideEffect.size}
+Unoptimized chunks contain ${getNumberOfCycles(chunkPartition)} cycles.
 `);
     console.log(`Trying to find merge targets for ${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects...`);
     mergeChunks(chunkPartition.small.sideEffect, [chunkPartition.small.pure, chunkPartition.big.pure], minChunkSize, chunkPartition);
-    console.log(`${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects remaining.\n`);
+    console.log(`${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
     console.log(`Trying to find merge targets for ${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)}...`);
     mergeChunks(chunkPartition.small.pure, [chunkPartition.small.pure, chunkPartition.big.sideEffect, chunkPartition.big.pure], minChunkSize, chunkPartition);
-    console.log(`${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)} remaining.\n`);
+    console.log(`${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)} remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
     timeEnd('optimize chunks', 3);
     const result = [
         ...chunkPartition.small.sideEffect,
@@ -16023,12 +16036,12 @@ small ${`${chunkPartition.small.pure.size}`.padEnd(5, ' ')} ${chunkPartition.sma
 const CHAR_DEPENDENT = 'X';
 const CHAR_INDEPENDENT = '_';
 const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
-function getChunkModulesBySignature(assignedEntryPointsByModule, allEntryPoints) {
+function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     const chunkModules = Object.create(null);
-    for (const [module, assignedEntryPoints] of assignedEntryPointsByModule) {
+    for (const [module, assignedEntries] of assignedEntriesByModule) {
         let chunkSignature = '';
-        for (const entry of allEntryPoints) {
-            chunkSignature += assignedEntryPoints.has(entry) ? CHAR_DEPENDENT : CHAR_INDEPENDENT;
+        for (const entry of allEntries) {
+            chunkSignature += assignedEntries.has(entry) ? CHAR_DEPENDENT : CHAR_INDEPENDENT;
         }
         const chunk = chunkModules[chunkSignature];
         if (chunk) {
@@ -16079,6 +16092,36 @@ function getPartitionedChunks(chunkModulesBySignature, minChunkSize) {
         small: { pure: new Set(smallPureChunks), sideEffect: new Set(smallSideEffectChunks) }
     };
 }
+function getNumberOfCycles(partition) {
+    const parents = new Set();
+    const analysedChunks = new Set();
+    let cycles = 0;
+    const analyseChunk = (chunk) => {
+        for (const dependency of chunk.dependencies) {
+            if (parents.has(dependency)) {
+                if (!analysedChunks.has(dependency)) {
+                    cycles++;
+                }
+                continue;
+            }
+            parents.add(dependency);
+            analyseChunk(dependency);
+        }
+        analysedChunks.add(chunk);
+    };
+    for (const chunk of [
+        ...partition.big.pure,
+        ...partition.big.sideEffect,
+        ...partition.small.pure,
+        ...partition.small.sideEffect
+    ]) {
+        if (!parents.has(chunk)) {
+            parents.add(chunk);
+            analyseChunk(chunk);
+        }
+    }
+    return cycles;
+}
 function sortChunksAndAddDependencies(chunkLists, chunkByModule) {
     for (const chunks of chunkLists) {
         chunks.sort(compareChunks);
@@ -16202,6 +16245,9 @@ function mergeSignatures(sourceSignature, targetSignature) {
     }
     return signature;
 }
+function getNewSet() {
+    return new Set();
+}
 
 // ported from https://github.com/substack/node-commondir
 function commondir(files) {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.6.1-0";
+var version$1 = "3.7.1-0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -5546,6 +5546,10 @@ const literalNumberMembers = assembleMemberDescriptions({
     toPrecision: returnsString,
     valueOf: returnsNumber
 }, objectMembers);
+const literalRegExpMembers = assembleMemberDescriptions({
+    exec: returnsUnknown,
+    test: returnsBoolean
+}, objectMembers);
 const literalStringMembers = assembleMemberDescriptions({
     anchor: returnsString,
     at: returnsUnknown,
@@ -5597,6 +5601,9 @@ const literalStringMembers = assembleMemberDescriptions({
     valueOf: returnsString
 }, objectMembers);
 function getLiteralMembersForValue(value) {
+    if (value instanceof RegExp) {
+        return literalRegExpMembers;
+    }
     switch (typeof value) {
         case 'boolean': {
             return literalBooleanMembers;
@@ -16375,19 +16382,15 @@ function getChunkAssignments(entries, manualChunkAliasByEntry, minChunkSize) {
     for (const [alias, modules] of Object.entries(manualChunkModulesByAlias)) {
         chunkDefinitions.push({ alias, modules });
     }
-    const alreadyLoadedModulesByDynamicEntry = getAlreadyLoadedModulesByDynamicEntry(entries);
-    const assignedEntryPointsByModule = new Map();
-    for (const entry of entries) {
-        if (!modulesInManualChunks.has(entry)) {
-            assignEntryToStaticDependencies(entry, undefined, assignedEntryPointsByModule, modulesInManualChunks);
-        }
-    }
-    for (const entry of alreadyLoadedModulesByDynamicEntry.keys()) {
+    const { allEntries, dependentEntriesByModule, dynamicallyDependentEntriesByDynamicEntry } = analyzeModuleGraph(entries);
+    const staticEntries = new Set(entries);
+    const assignedEntriesByModule = new Map();
+    for (const entry of allEntries) {
         if (!modulesInManualChunks.has(entry)) {
-            assignEntryToStaticDependencies(entry, alreadyLoadedModulesByDynamicEntry.get(entry), assignedEntryPointsByModule, modulesInManualChunks);
+            assignEntryToStaticDependencies(entry, dependentEntriesByModule, assignedEntriesByModule, modulesInManualChunks, staticEntries, dynamicallyDependentEntriesByDynamicEntry);
         }
     }
-    chunkDefinitions.push(...createChunks([...entries, ...alreadyLoadedModulesByDynamicEntry.keys()], assignedEntryPointsByModule, minChunkSize));
+    chunkDefinitions.push(...createChunks(allEntries, assignedEntriesByModule, minChunkSize));
     return chunkDefinitions;
 }
 function addStaticDependenciesToManualChunk(entry, manualChunkModules, modulesInManualChunks) {
@@ -16402,80 +16405,67 @@ function addStaticDependenciesToManualChunk(entry, manualChunkModules, modulesIn
         }
     }
 }
-function getAlreadyLoadedModulesByDynamicEntry(entryModules) {
-    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) {
+function analyzeModuleGraph(entries) {
+    const dynamicEntries = new Set();
+    const dependentEntriesByModule = new Map();
+    const allEntries = new Set(entries);
+    for (const currentEntry of allEntries) {
         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);
+            getOrCreate(dependentEntriesByModule, module, getNewSet).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) {
-                    dynamicImports.add(resolution);
-                    getOrCreate(dynamicallyDependentEntryPointsByDynamicEntry, resolution, () => new Set()).add(currentEntry);
-                    entriesToHandle.add(resolution);
-                    allModules.add(resolution);
+                if (resolution instanceof Module &&
+                    resolution.includedDynamicImporters.length > 0 &&
+                    !allEntries.has(resolution)) {
+                    dynamicEntries.add(resolution);
+                    allEntries.add(resolution);
                 }
             }
             for (const dependency of module.implicitlyLoadedBefore) {
-                dynamicImports.add(dependency);
-                getOrCreate(dynamicallyDependentEntryPointsByDynamicEntry, dependency, () => new Set()).add(currentEntry);
-                entriesToHandle.add(dependency);
-                allModules.add(dependency);
+                if (!allEntries.has(dependency)) {
+                    dynamicEntries.add(dependency);
+                    allEntries.add(dependency);
+                }
             }
         }
     }
-    return buildAlreadyLoadedModulesByDynamicEntry(allModules, dependentEntryPointsByModule, dynamicImportsByEntry, dynamicallyDependentEntryPointsByDynamicEntry);
+    return {
+        allEntries,
+        dependentEntriesByModule,
+        dynamicallyDependentEntriesByDynamicEntry: getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries)
+    };
 }
-function buildAlreadyLoadedModulesByDynamicEntry(allModules, dependentEntryPointsByModule, dynamicImportsByEntry, dynamicallyDependentEntryPointsByDynamicEntry) {
-    const alreadyLoadedModulesByDynamicEntry = new Map();
-    for (const dynamicEntry of dynamicallyDependentEntryPointsByDynamicEntry.keys()) {
-        alreadyLoadedModulesByDynamicEntry.set(dynamicEntry, new Set());
-    }
-    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) {
-                const alreadyLoadedModules = alreadyLoadedModulesByDynamicEntry.get(dynamicEntry);
-                if (alreadyLoadedModules.has(module)) {
-                    continue;
-                }
-                for (const siblingDependentEntry of dynamicallyDependentEntryPointsByDynamicEntry.get(dynamicEntry)) {
-                    if (!(dependentEntryPoints.has(siblingDependentEntry) ||
-                        alreadyLoadedModulesByDynamicEntry.get(siblingDependentEntry)?.has(module))) {
-                        continue nextDynamicEntry;
-                    }
-                }
-                alreadyLoadedModules.add(module);
-                dynamicEntriesToHandle.push(...dynamicImportsByEntry.get(dynamicEntry));
+function getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries) {
+    const dynamicallyDependentEntriesByDynamicEntry = new Map();
+    for (const dynamicEntry of dynamicEntries) {
+        const dynamicDependentEntries = getOrCreate(dynamicallyDependentEntriesByDynamicEntry, dynamicEntry, getNewSet);
+        for (const importer of [
+            ...dynamicEntry.includedDynamicImporters,
+            ...dynamicEntry.implicitlyLoadedAfter
+        ]) {
+            for (const entry of dependentEntriesByModule.get(importer)) {
+                dynamicDependentEntries.add(entry);
             }
         }
     }
-    return alreadyLoadedModulesByDynamicEntry;
+    return dynamicallyDependentEntriesByDynamicEntry;
 }
-function assignEntryToStaticDependencies(entry, alreadyLoadedModules, assignedEntryPointsByModule, modulesInManualChunks) {
+function assignEntryToStaticDependencies(entry, dependentEntriesByModule, assignedEntriesByModule, modulesInManualChunks, staticEntries, dynamicallyDependentEntriesByDynamicEntry) {
+    const dynamicDependentEntries = dynamicallyDependentEntriesByDynamicEntry.get(entry);
     const modulesToHandle = new Set([entry]);
     for (const module of modulesToHandle) {
-        const assignedEntryPoints = getOrCreate(assignedEntryPointsByModule, module, () => new Set());
-        // If the module is "already loaded" for this dynamic entry, we do not need
-        // to mark it for this dynamic entry
-        if (alreadyLoadedModules?.has(module)) {
+        const assignedEntries = getOrCreate(assignedEntriesByModule, module, getNewSet);
+        if (dynamicDependentEntries &&
+            areEntriesContainedOrDynamicallyDependent(dynamicDependentEntries, dependentEntriesByModule.get(module), staticEntries, dynamicallyDependentEntriesByDynamicEntry)) {
             continue;
         }
         else {
-            assignedEntryPoints.add(entry);
+            assignedEntries.add(entry);
         }
         for (const dependency of module.getDependenciesToBeIncluded()) {
             if (!(dependency instanceof ExternalModule || modulesInManualChunks.has(dependency))) {
@@ -16484,8 +16474,30 @@ function assignEntryToStaticDependencies(entry, alreadyLoadedModules, assignedEn
         }
     }
 }
-function createChunks(allEntryPoints, assignedEntryPointsByModule, minChunkSize) {
-    const chunkModulesBySignature = getChunkModulesBySignature(assignedEntryPointsByModule, allEntryPoints);
+const MAX_ENTRIES_TO_CHECK_FOR_SHARED_DEPENDENCIES = 3;
+function areEntriesContainedOrDynamicallyDependent(entries, containedIn, staticEntries, dynamicallyDependentEntriesByDynamicEntry) {
+    if (entries.size > MAX_ENTRIES_TO_CHECK_FOR_SHARED_DEPENDENCIES) {
+        return false;
+    }
+    const entriesToCheck = new Set(entries);
+    for (const entry of entriesToCheck) {
+        if (!containedIn.has(entry)) {
+            if (staticEntries.has(entry)) {
+                return false;
+            }
+            const dynamicallyDependentEntries = dynamicallyDependentEntriesByDynamicEntry.get(entry);
+            if (dynamicallyDependentEntries.size > MAX_ENTRIES_TO_CHECK_FOR_SHARED_DEPENDENCIES) {
+                return false;
+            }
+            for (const dependentEntry of dynamicallyDependentEntries) {
+                entriesToCheck.add(dependentEntry);
+            }
+        }
+    }
+    return true;
+}
+function createChunks(allEntries, assignedEntriesByModule, minChunkSize) {
+    const chunkModulesBySignature = getChunkModulesBySignature(assignedEntriesByModule, allEntries);
     return minChunkSize === 0
         ? Object.values(chunkModulesBySignature).map(modules => ({
             alias: null,
@@ -16518,13 +16530,14 @@ function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
 ----- pure  side effects
 small ${`${chunkPartition.small.pure.size}`.padEnd(5, ' ')} ${chunkPartition.small.sideEffect.size}
   big ${`${chunkPartition.big.pure.size}`.padEnd(5, ' ')} ${chunkPartition.big.sideEffect.size}
+Unoptimized chunks contain ${getNumberOfCycles(chunkPartition)} cycles.
 `);
     console.log(`Trying to find merge targets for ${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects...`);
     mergeChunks(chunkPartition.small.sideEffect, [chunkPartition.small.pure, chunkPartition.big.pure], minChunkSize, chunkPartition);
-    console.log(`${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects remaining.\n`);
+    console.log(`${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
     console.log(`Trying to find merge targets for ${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)}...`);
     mergeChunks(chunkPartition.small.pure, [chunkPartition.small.pure, chunkPartition.big.sideEffect, chunkPartition.big.pure], minChunkSize, chunkPartition);
-    console.log(`${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)} remaining.\n`);
+    console.log(`${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)} remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
     timeEnd('optimize chunks', 3);
     const result = [
         ...chunkPartition.small.sideEffect,
@@ -16538,12 +16551,12 @@ small ${`${chunkPartition.small.pure.size}`.padEnd(5, ' ')} ${chunkPartition.sma
 const CHAR_DEPENDENT = 'X';
 const CHAR_INDEPENDENT = '_';
 const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
-function getChunkModulesBySignature(assignedEntryPointsByModule, allEntryPoints) {
+function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     const chunkModules = Object.create(null);
-    for (const [module, assignedEntryPoints] of assignedEntryPointsByModule) {
+    for (const [module, assignedEntries] of assignedEntriesByModule) {
         let chunkSignature = '';
-        for (const entry of allEntryPoints) {
-            chunkSignature += assignedEntryPoints.has(entry) ? CHAR_DEPENDENT : CHAR_INDEPENDENT;
+        for (const entry of allEntries) {
+            chunkSignature += assignedEntries.has(entry) ? CHAR_DEPENDENT : CHAR_INDEPENDENT;
         }
         const chunk = chunkModules[chunkSignature];
         if (chunk) {
@@ -16594,6 +16607,36 @@ function getPartitionedChunks(chunkModulesBySignature, minChunkSize) {
         small: { pure: new Set(smallPureChunks), sideEffect: new Set(smallSideEffectChunks) }
     };
 }
+function getNumberOfCycles(partition) {
+    const parents = new Set();
+    const analysedChunks = new Set();
+    let cycles = 0;
+    const analyseChunk = (chunk) => {
+        for (const dependency of chunk.dependencies) {
+            if (parents.has(dependency)) {
+                if (!analysedChunks.has(dependency)) {
+                    cycles++;
+                }
+                continue;
+            }
+            parents.add(dependency);
+            analyseChunk(dependency);
+        }
+        analysedChunks.add(chunk);
+    };
+    for (const chunk of [
+        ...partition.big.pure,
+        ...partition.big.sideEffect,
+        ...partition.small.pure,
+        ...partition.small.sideEffect
+    ]) {
+        if (!parents.has(chunk)) {
+            parents.add(chunk);
+            analyseChunk(chunk);
+        }
+    }
+    return cycles;
+}
 function sortChunksAndAddDependencies(chunkLists, chunkByModule) {
     for (const chunks of chunkLists) {
         chunks.sort(compareChunks);
@@ -16717,6 +16760,9 @@ function mergeSignatures(sourceSignature, targetSignature) {
     }
     return signature;
 }
+function getNewSet() {
+    return new Set();
+}
 
 // ported from https://github.com/substack/node-commondir
 function commondir(files) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.6.1-0
-	Tue, 06 Dec 2022 05:39:23 GMT - commit 1bff93da4b04d4e723793dd37607ec7775ba28dd
+	Rollup.js v3.7.1-0
+	Thu, 08 Dec 2022 05:48:12 GMT - commit a3259be5f30c0b2c85c985459782207fb05f50c3
 
 	https://github.com/rollup/rollup
 

package/package.json

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