rollup 3.12.0 → 3.13.0

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/pr
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.12.0";
+var version$1 = "3.13.0";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -222,7 +222,7 @@ let Chunk$1 = class Chunk {
 	}
 
 	clone() {
-		const chunk = new Chunk$1(this.start, this.end, this.original);
+		const chunk = new Chunk(this.start, this.end, this.original);
 
 		chunk.intro = this.intro;
 		chunk.outro = this.outro;
@@ -282,7 +282,7 @@ let Chunk$1 = class Chunk {
 
 		this.original = originalBefore;
 
-		const newChunk = new Chunk$1(index, this.end, originalAfter);
+		const newChunk = new Chunk(index, this.end, originalAfter);
 		newChunk.outro = this.outro;
 		this.outro = '';
 
@@ -1380,7 +1380,7 @@ let Bundle$1 = class Bundle {
 	}
 
 	clone() {
-		const bundle = new Bundle$1({
+		const bundle = new Bundle({
 			intro: this.intro,
 			separator: this.separator,
 		});
@@ -1898,7 +1898,10 @@ class Variable extends ExpressionEntity {
     getBaseVariableName() {
         return this.renderBaseName || this.renderName || this.name;
     }
-    getName(getPropertyAccess) {
+    getName(getPropertyAccess, useOriginalName) {
+        if (useOriginalName?.(this)) {
+            return this.name;
+        }
         const name = this.renderName || this.name;
         return this.renderBaseName ? `${this.renderBaseName}${getPropertyAccess(name)}` : name;
     }
@@ -2206,12 +2209,12 @@ function errorCircularReexport(exportName, exporter) {
         message: `"${exportName}" cannot be exported from "${relativeId(exporter)}" as it is a reexport that references itself.`
     };
 }
-function errorCyclicCrossChunkReexport(exportName, exporter, reexporter, importer) {
+function errorCyclicCrossChunkReexport(exportName, exporter, reexporter, importer, preserveModules) {
     return {
         code: CYCLIC_CROSS_CHUNK_REEXPORT,
         exporter,
         id: importer,
-        message: `Export "${exportName}" of module "${relativeId(exporter)}" was reexported through module "${relativeId(reexporter)}" while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in "${relativeId(importer)}" to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.`,
+        message: `Export "${exportName}" of module "${relativeId(exporter)}" was reexported through module "${relativeId(reexporter)}" while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in "${relativeId(importer)}" to point directly to the exporting module or ${preserveModules ? 'do not use "output.preserveModules"' : 'reconfigure "output.manualChunks"'} to ensure these modules end up in the same chunk.`,
         reexporter
     };
 }
@@ -8034,9 +8037,9 @@ class Identifier extends NodeBase {
     markDeclarationReached() {
         this.variable.initReached = true;
     }
-    render(code, { snippets: { getPropertyAccess } }, { renderedParentType, isCalleeOfRenderedParent, isShorthandProperty } = BLANK) {
+    render(code, { snippets: { getPropertyAccess }, useOriginalName }, { renderedParentType, isCalleeOfRenderedParent, isShorthandProperty } = BLANK) {
         if (this.variable) {
-            const name = this.variable.getName(getPropertyAccess);
+            const name = this.variable.getName(getPropertyAccess, useOriginalName);
             if (name !== this.name) {
                 code.overwrite(this.start, this.end, name, {
                     contentOnly: true,
@@ -9835,7 +9838,10 @@ class ClassDeclaration extends ClassNode {
             const renderedVariable = variable.getName(getPropertyAccess);
             if (renderedVariable !== name) {
                 this.superClass?.render(code, options);
-                this.body.render(code, options);
+                this.body.render(code, {
+                    ...options,
+                    useOriginalName: (_variable) => _variable === variable
+                });
                 code.prependRight(this.start, `let ${renderedVariable}${_}=${_}`);
                 code.prependLeft(this.end, ';');
                 return;
@@ -11413,12 +11419,14 @@ class PrivateIdentifier extends NodeBase {
 class Program extends NodeBase {
     constructor() {
         super(...arguments);
-        this.hasCachedEffect = false;
+        this.hasCachedEffect = null;
+    }
+    hasCachedEffects() {
+        return this.hasCachedEffect === null
+            ? (this.hasCachedEffect = this.hasEffects(createHasEffectsContext()))
+            : this.hasCachedEffect;
     }
     hasEffects(context) {
-        // We are caching here to later more efficiently identify side-effect-free modules
-        if (this.hasCachedEffect)
-            return true;
         for (const node of this.body) {
             if (node.hasEffects(context)) {
                 return (this.hasCachedEffect = true);
@@ -13316,8 +13324,7 @@ class Module {
         return [null];
     }
     hasEffects() {
-        return (this.info.moduleSideEffects === 'no-treeshake' ||
-            (this.ast.included && this.ast.hasEffects(createHasEffectsContext())));
+        return this.info.moduleSideEffects === 'no-treeshake' || this.ast.hasCachedEffects();
     }
     include() {
         const context = createInclusionContext();
@@ -15428,8 +15435,10 @@ class Chunk {
                 alternativeReexportModule = importingModule.alternativeReexportModules.get(variable);
                 if (alternativeReexportModule) {
                     const exportingChunk = this.chunkByModule.get(alternativeReexportModule);
-                    if (exportingChunk && exportingChunk !== exportChunk) {
-                        this.inputOptions.onwarn(errorCyclicCrossChunkReexport(variableModule.getExportNamesByVariable().get(variable)[0], variableModule.id, alternativeReexportModule.id, importingModule.id));
+                    if (exportingChunk !== exportChunk) {
+                        this.inputOptions.onwarn(errorCyclicCrossChunkReexport(
+                        // Namespaces do not have an export name
+                        variableModule.getExportNamesByVariable().get(variable)?.[0] || '*', variableModule.id, alternativeReexportModule.id, importingModule.id, this.outputOptions.preserveModules));
                     }
                     importingModule = alternativeReexportModule;
                 }
@@ -15442,8 +15451,10 @@ class Chunk {
         for (const exportedVariable of map.keys()) {
             const isSynthetic = exportedVariable instanceof SyntheticNamedExportVariable;
             const importedVariable = isSynthetic ? exportedVariable.getBaseVariable() : exportedVariable;
+            this.checkCircularDependencyImport(importedVariable, module);
+            // When preserving modules, we do not create namespace objects but directly
+            // use the actual namespaces, which would be broken by this logic.
             if (!(importedVariable instanceof NamespaceVariable && this.outputOptions.preserveModules)) {
-                this.checkCircularDependencyImport(importedVariable, module);
                 const exportingModule = importedVariable.module;
                 if (exportingModule instanceof Module) {
                     const chunk = this.chunkByModule.get(exportingModule);
@@ -15814,7 +15825,8 @@ class Chunk {
             indent,
             namespaceToStringTag,
             pluginDriver,
-            snippets
+            snippets,
+            useOriginalName: null
         };
         let usesTopLevelAwait = false;
         for (const module of orderedModules) {
@@ -15972,10 +15984,13 @@ class Chunk {
             const chunk = this.chunkByModule.get(variable.module);
             if (chunk !== this) {
                 this.imports.add(variable);
-                if (!(variable instanceof NamespaceVariable && this.outputOptions.preserveModules) &&
-                    variable.module instanceof Module) {
-                    chunk.exports.add(variable);
+                if (variable.module instanceof Module) {
                     this.checkCircularDependencyImport(variable, module);
+                    // When preserving modules, we do not create namespace objects but directly
+                    // use the actual namespaces, which would be broken by this logic.
+                    if (!(variable instanceof NamespaceVariable && this.outputOptions.preserveModules)) {
+                        chunk.exports.add(variable);
+                    }
                 }
             }
         }
@@ -16027,7 +16042,7 @@ const resolveFileName = (dependency) => dependency.getFileName();
  * their iterators. Useful when e.g. working with large sets or lists and when
  * there is a chance that the iterators will not be fully exhausted.
  */
-function* concatLazy(...iterables) {
+function* concatLazy(iterables) {
     for (const iterable of iterables) {
         yield* iterable;
     }
@@ -16168,47 +16183,11 @@ function createChunks(allEntries, assignedEntriesByModule, minChunkSize) {
             alias: null,
             modules
         }))
-        : getOptimizedChunks(chunkModulesBySignature, minChunkSize);
-}
-function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
-    timeStart('optimize chunks', 3);
-    const { chunksToBeMerged, unmergeableChunks } = getMergeableChunks(chunkModulesBySignature, minChunkSize);
-    for (const sourceChunk of chunksToBeMerged) {
-        chunksToBeMerged.delete(sourceChunk);
-        let closestChunk = null;
-        let closestChunkDistance = Infinity;
-        const { signature, size, modules } = sourceChunk;
-        for (const targetChunk of concatLazy(chunksToBeMerged, unmergeableChunks)) {
-            const distance = getSignatureDistance(signature, targetChunk.signature, !chunksToBeMerged.has(targetChunk));
-            if (distance === 1) {
-                closestChunk = targetChunk;
-                break;
-            }
-            else if (distance < closestChunkDistance) {
-                closestChunk = targetChunk;
-                closestChunkDistance = distance;
-            }
-        }
-        if (closestChunk) {
-            closestChunk.modules.push(...modules);
-            if (chunksToBeMerged.has(closestChunk)) {
-                closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
-                if ((closestChunk.size += size) > minChunkSize) {
-                    chunksToBeMerged.delete(closestChunk);
-                    unmergeableChunks.push(closestChunk);
-                }
-            }
-        }
-        else {
-            unmergeableChunks.push(sourceChunk);
-        }
-    }
-    timeEnd('optimize chunks', 3);
-    return unmergeableChunks;
+        : getOptimizedChunks(chunkModulesBySignature, minChunkSize).map(({ modules }) => ({
+            alias: null,
+            modules
+        }));
 }
-const CHAR_DEPENDENT = 'X';
-const CHAR_INDEPENDENT = '_';
-const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
 function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     const chunkModules = Object.create(null);
     for (const [module, assignedEntries] of assignedEntriesByModule) {
@@ -16226,28 +16205,167 @@ function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     }
     return chunkModules;
 }
-function getMergeableChunks(chunkModulesBySignature, minChunkSize) {
-    const chunksToBeMerged = new Set();
-    const unmergeableChunks = [];
-    const alias = null;
+/**
+ * This function tries to get rid of small chunks by merging them with other
+ * chunks. In order to merge chunks, one must obey the following rule:
+ * - When merging several chunks, at most one of the chunks can have side
+ *   effects
+ * - When one of the chunks has side effects, the entry points depending on that
+ *   chunk need to be a super set of the entry points depending on the other
+ *   chunks
+ * - Pure chunks can always be merged
+ * - We use the entry point dependence signature to calculate "chunk distance",
+ *   i.e. how likely it is that two chunks are loaded together
+ */
+function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
+    timeStart('optimize chunks', 3);
+    const chunkPartition = getPartitionedChunks(chunkModulesBySignature, minChunkSize);
+    if (chunkPartition.small.sideEffect.size > 0) {
+        mergeChunks(chunkPartition.small.sideEffect, [chunkPartition.small.pure, chunkPartition.big.pure], minChunkSize, chunkPartition);
+    }
+    if (chunkPartition.small.pure.size > 0) {
+        mergeChunks(chunkPartition.small.pure, [chunkPartition.small.pure, chunkPartition.big.sideEffect, chunkPartition.big.pure], minChunkSize, chunkPartition);
+    }
+    timeEnd('optimize chunks', 3);
+    return [
+        ...chunkPartition.small.sideEffect,
+        ...chunkPartition.small.pure,
+        ...chunkPartition.big.sideEffect,
+        ...chunkPartition.big.pure
+    ];
+}
+const CHAR_DEPENDENT = 'X';
+const CHAR_INDEPENDENT = '_';
+const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
+function getPartitionedChunks(chunkModulesBySignature, minChunkSize) {
+    const smallPureChunks = [];
+    const bigPureChunks = [];
+    const smallSideEffectChunks = [];
+    const bigSideEffectChunks = [];
+    const chunkByModule = new Map();
     for (const [signature, modules] of Object.entries(chunkModulesBySignature)) {
+        const chunkDescription = {
+            dependencies: new Set(),
+            dependentChunks: new Set(),
+            modules,
+            pure: true,
+            signature,
+            size: 0
+        };
         let size = 0;
-        checkModules: {
+        let pure = true;
+        for (const module of modules) {
+            chunkByModule.set(module, chunkDescription);
+            pure && (pure = !module.hasEffects());
+            // Unfortunately, we cannot take tree-shaking into account here because
+            // rendering did not happen yet
+            size += module.originalCode.length;
+        }
+        chunkDescription.pure = pure;
+        chunkDescription.size = size;
+        (size < minChunkSize
+            ? pure
+                ? smallPureChunks
+                : smallSideEffectChunks
+            : pure
+                ? bigPureChunks
+                : bigSideEffectChunks).push(chunkDescription);
+    }
+    sortChunksAndAddDependencies([bigPureChunks, bigSideEffectChunks, smallPureChunks, smallSideEffectChunks], chunkByModule);
+    return {
+        big: { pure: new Set(bigPureChunks), sideEffect: new Set(bigSideEffectChunks) },
+        small: { pure: new Set(smallPureChunks), sideEffect: new Set(smallSideEffectChunks) }
+    };
+}
+function sortChunksAndAddDependencies(chunkLists, chunkByModule) {
+    for (const chunks of chunkLists) {
+        chunks.sort(compareChunks);
+        for (const chunk of chunks) {
+            const { dependencies, modules } = chunk;
             for (const module of modules) {
-                if (module.hasEffects()) {
-                    break checkModules;
+                for (const dependency of module.getDependenciesToBeIncluded()) {
+                    const dependencyChunk = chunkByModule.get(dependency);
+                    if (dependencyChunk && dependencyChunk !== chunk) {
+                        dependencies.add(dependencyChunk);
+                        dependencyChunk.dependentChunks.add(chunk);
+                    }
                 }
-                size += module.magicString.toString().length;
-                if (size > minChunkSize) {
-                    break checkModules;
+            }
+        }
+    }
+}
+function compareChunks({ size: sizeA }, { size: sizeB }) {
+    return sizeA - sizeB;
+}
+function mergeChunks(chunksToBeMerged, targetChunks, minChunkSize, chunkPartition) {
+    for (const mergedChunk of chunksToBeMerged) {
+        let closestChunk = null;
+        let closestChunkDistance = Infinity;
+        const { signature, modules, pure, size } = mergedChunk;
+        for (const targetChunk of concatLazy(targetChunks)) {
+            if (mergedChunk === targetChunk)
+                continue;
+            // Possible improvement:
+            // For dynamic entries depending on a pure chunk, it is safe to merge that
+            // chunk into the chunk doing the dynamic import (i.e. into an "already
+            // loaded chunk") even if it is not pure.
+            // One way of handling this could be to add all "already loaded entries"
+            // of the dynamic importers into the signature as well. That could also
+            // change the way we do code-splitting for already loaded entries.
+            const distance = pure
+                ? getSignatureDistance(signature, targetChunk.signature, !targetChunk.pure)
+                : getSignatureDistance(targetChunk.signature, signature, true);
+            if (distance < closestChunkDistance && isValidMerge(mergedChunk, targetChunk)) {
+                if (distance === 1) {
+                    closestChunk = targetChunk;
+                    break;
                 }
+                closestChunk = targetChunk;
+                closestChunkDistance = distance;
             }
-            chunksToBeMerged.add({ alias, modules, signature, size });
-            continue;
         }
-        unmergeableChunks.push({ alias, modules, signature, size: null });
+        if (closestChunk) {
+            chunksToBeMerged.delete(mergedChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).delete(closestChunk);
+            closestChunk.modules.push(...modules);
+            closestChunk.size += size;
+            closestChunk.pure && (closestChunk.pure = pure);
+            closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
+            const { dependencies, dependentChunks } = closestChunk;
+            for (const dependency of mergedChunk.dependencies) {
+                dependencies.add(dependency);
+            }
+            for (const dependentChunk of mergedChunk.dependentChunks) {
+                dependentChunks.add(dependentChunk);
+                dependentChunk.dependencies.delete(mergedChunk);
+                dependentChunk.dependencies.add(closestChunk);
+            }
+            dependencies.delete(closestChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).add(closestChunk);
+        }
     }
-    return { chunksToBeMerged, unmergeableChunks };
+}
+// Merging will not produce cycles if none of the direct non-merged dependencies
+// of a chunk have the other chunk as a transitive dependency
+function isValidMerge(mergedChunk, targetChunk) {
+    return !(hasTransitiveDependency(mergedChunk, targetChunk) ||
+        hasTransitiveDependency(targetChunk, mergedChunk));
+}
+function hasTransitiveDependency(dependentChunk, dependencyChunk) {
+    const chunksToCheck = new Set(dependentChunk.dependencies);
+    for (const { dependencies } of chunksToCheck) {
+        for (const dependency of dependencies) {
+            if (dependency === dependencyChunk) {
+                return true;
+            }
+            chunksToCheck.add(dependency);
+        }
+    }
+    return false;
+}
+function getChunksInPartition(chunk, minChunkSize, chunkPartition) {
+    const subPartition = chunk.size < minChunkSize ? chunkPartition.small : chunkPartition.big;
+    return chunk.pure ? subPartition.pure : subPartition.sideEffect;
 }
 function getSignatureDistance(sourceSignature, targetSignature, enforceSubset) {
     let distance = 0;

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.12.0";
+var version$1 = "3.13.0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -378,12 +378,12 @@ function errorCircularReexport(exportName, exporter) {
         message: `"${exportName}" cannot be exported from "${relativeId(exporter)}" as it is a reexport that references itself.`
     };
 }
-function errorCyclicCrossChunkReexport(exportName, exporter, reexporter, importer) {
+function errorCyclicCrossChunkReexport(exportName, exporter, reexporter, importer, preserveModules) {
     return {
         code: CYCLIC_CROSS_CHUNK_REEXPORT,
         exporter,
         id: importer,
-        message: `Export "${exportName}" of module "${relativeId(exporter)}" was reexported through module "${relativeId(reexporter)}" while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in "${relativeId(importer)}" to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.`,
+        message: `Export "${exportName}" of module "${relativeId(exporter)}" was reexported through module "${relativeId(reexporter)}" while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in "${relativeId(importer)}" to point directly to the exporting module or ${preserveModules ? 'do not use "output.preserveModules"' : 'reconfigure "output.manualChunks"'} to ensure these modules end up in the same chunk.`,
         reexporter
     };
 }
@@ -1492,7 +1492,7 @@ let Chunk$1 = class Chunk {
 	}
 
 	clone() {
-		const chunk = new Chunk$1(this.start, this.end, this.original);
+		const chunk = new Chunk(this.start, this.end, this.original);
 
 		chunk.intro = this.intro;
 		chunk.outro = this.outro;
@@ -1552,7 +1552,7 @@ let Chunk$1 = class Chunk {
 
 		this.original = originalBefore;
 
-		const newChunk = new Chunk$1(index, this.end, originalAfter);
+		const newChunk = new Chunk(index, this.end, originalAfter);
 		newChunk.outro = this.outro;
 		this.outro = '';
 
@@ -2650,7 +2650,7 @@ let Bundle$1 = class Bundle {
 	}
 
 	clone() {
-		const bundle = new Bundle$1({
+		const bundle = new Bundle({
 			intro: this.intro,
 			separator: this.separator,
 		});
@@ -3104,7 +3104,10 @@ class Variable extends ExpressionEntity {
     getBaseVariableName() {
         return this.renderBaseName || this.renderName || this.name;
     }
-    getName(getPropertyAccess) {
+    getName(getPropertyAccess, useOriginalName) {
+        if (useOriginalName?.(this)) {
+            return this.name;
+        }
         const name = this.renderName || this.name;
         return this.renderBaseName ? `${this.renderBaseName}${getPropertyAccess(name)}` : name;
     }
@@ -8552,9 +8555,9 @@ class Identifier extends NodeBase {
     markDeclarationReached() {
         this.variable.initReached = true;
     }
-    render(code, { snippets: { getPropertyAccess } }, { renderedParentType, isCalleeOfRenderedParent, isShorthandProperty } = BLANK) {
+    render(code, { snippets: { getPropertyAccess }, useOriginalName }, { renderedParentType, isCalleeOfRenderedParent, isShorthandProperty } = BLANK) {
         if (this.variable) {
-            const name = this.variable.getName(getPropertyAccess);
+            const name = this.variable.getName(getPropertyAccess, useOriginalName);
             if (name !== this.name) {
                 code.overwrite(this.start, this.end, name, {
                     contentOnly: true,
@@ -10353,7 +10356,10 @@ class ClassDeclaration extends ClassNode {
             const renderedVariable = variable.getName(getPropertyAccess);
             if (renderedVariable !== name) {
                 this.superClass?.render(code, options);
-                this.body.render(code, options);
+                this.body.render(code, {
+                    ...options,
+                    useOriginalName: (_variable) => _variable === variable
+                });
                 code.prependRight(this.start, `let ${renderedVariable}${_}=${_}`);
                 code.prependLeft(this.end, ';');
                 return;
@@ -11931,12 +11937,14 @@ class PrivateIdentifier extends NodeBase {
 class Program extends NodeBase {
     constructor() {
         super(...arguments);
-        this.hasCachedEffect = false;
+        this.hasCachedEffect = null;
+    }
+    hasCachedEffects() {
+        return this.hasCachedEffect === null
+            ? (this.hasCachedEffect = this.hasEffects(createHasEffectsContext()))
+            : this.hasCachedEffect;
     }
     hasEffects(context) {
-        // We are caching here to later more efficiently identify side-effect-free modules
-        if (this.hasCachedEffect)
-            return true;
         for (const node of this.body) {
             if (node.hasEffects(context)) {
                 return (this.hasCachedEffect = true);
@@ -13834,8 +13842,7 @@ class Module {
         return [null];
     }
     hasEffects() {
-        return (this.info.moduleSideEffects === 'no-treeshake' ||
-            (this.ast.included && this.ast.hasEffects(createHasEffectsContext())));
+        return this.info.moduleSideEffects === 'no-treeshake' || this.ast.hasCachedEffects();
     }
     include() {
         const context = createInclusionContext();
@@ -15946,8 +15953,10 @@ class Chunk {
                 alternativeReexportModule = importingModule.alternativeReexportModules.get(variable);
                 if (alternativeReexportModule) {
                     const exportingChunk = this.chunkByModule.get(alternativeReexportModule);
-                    if (exportingChunk && exportingChunk !== exportChunk) {
-                        this.inputOptions.onwarn(errorCyclicCrossChunkReexport(variableModule.getExportNamesByVariable().get(variable)[0], variableModule.id, alternativeReexportModule.id, importingModule.id));
+                    if (exportingChunk !== exportChunk) {
+                        this.inputOptions.onwarn(errorCyclicCrossChunkReexport(
+                        // Namespaces do not have an export name
+                        variableModule.getExportNamesByVariable().get(variable)?.[0] || '*', variableModule.id, alternativeReexportModule.id, importingModule.id, this.outputOptions.preserveModules));
                     }
                     importingModule = alternativeReexportModule;
                 }
@@ -15960,8 +15969,10 @@ class Chunk {
         for (const exportedVariable of map.keys()) {
             const isSynthetic = exportedVariable instanceof SyntheticNamedExportVariable;
             const importedVariable = isSynthetic ? exportedVariable.getBaseVariable() : exportedVariable;
+            this.checkCircularDependencyImport(importedVariable, module);
+            // When preserving modules, we do not create namespace objects but directly
+            // use the actual namespaces, which would be broken by this logic.
             if (!(importedVariable instanceof NamespaceVariable && this.outputOptions.preserveModules)) {
-                this.checkCircularDependencyImport(importedVariable, module);
                 const exportingModule = importedVariable.module;
                 if (exportingModule instanceof Module) {
                     const chunk = this.chunkByModule.get(exportingModule);
@@ -16332,7 +16343,8 @@ class Chunk {
             indent,
             namespaceToStringTag,
             pluginDriver,
-            snippets
+            snippets,
+            useOriginalName: null
         };
         let usesTopLevelAwait = false;
         for (const module of orderedModules) {
@@ -16490,10 +16502,13 @@ class Chunk {
             const chunk = this.chunkByModule.get(variable.module);
             if (chunk !== this) {
                 this.imports.add(variable);
-                if (!(variable instanceof NamespaceVariable && this.outputOptions.preserveModules) &&
-                    variable.module instanceof Module) {
-                    chunk.exports.add(variable);
+                if (variable.module instanceof Module) {
                     this.checkCircularDependencyImport(variable, module);
+                    // When preserving modules, we do not create namespace objects but directly
+                    // use the actual namespaces, which would be broken by this logic.
+                    if (!(variable instanceof NamespaceVariable && this.outputOptions.preserveModules)) {
+                        chunk.exports.add(variable);
+                    }
                 }
             }
         }
@@ -16545,7 +16560,7 @@ const resolveFileName = (dependency) => dependency.getFileName();
  * their iterators. Useful when e.g. working with large sets or lists and when
  * there is a chance that the iterators will not be fully exhausted.
  */
-function* concatLazy(...iterables) {
+function* concatLazy(iterables) {
     for (const iterable of iterables) {
         yield* iterable;
     }
@@ -16686,47 +16701,11 @@ function createChunks(allEntries, assignedEntriesByModule, minChunkSize) {
             alias: null,
             modules
         }))
-        : getOptimizedChunks(chunkModulesBySignature, minChunkSize);
-}
-function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
-    timeStart('optimize chunks', 3);
-    const { chunksToBeMerged, unmergeableChunks } = getMergeableChunks(chunkModulesBySignature, minChunkSize);
-    for (const sourceChunk of chunksToBeMerged) {
-        chunksToBeMerged.delete(sourceChunk);
-        let closestChunk = null;
-        let closestChunkDistance = Infinity;
-        const { signature, size, modules } = sourceChunk;
-        for (const targetChunk of concatLazy(chunksToBeMerged, unmergeableChunks)) {
-            const distance = getSignatureDistance(signature, targetChunk.signature, !chunksToBeMerged.has(targetChunk));
-            if (distance === 1) {
-                closestChunk = targetChunk;
-                break;
-            }
-            else if (distance < closestChunkDistance) {
-                closestChunk = targetChunk;
-                closestChunkDistance = distance;
-            }
-        }
-        if (closestChunk) {
-            closestChunk.modules.push(...modules);
-            if (chunksToBeMerged.has(closestChunk)) {
-                closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
-                if ((closestChunk.size += size) > minChunkSize) {
-                    chunksToBeMerged.delete(closestChunk);
-                    unmergeableChunks.push(closestChunk);
-                }
-            }
-        }
-        else {
-            unmergeableChunks.push(sourceChunk);
-        }
-    }
-    timeEnd('optimize chunks', 3);
-    return unmergeableChunks;
+        : getOptimizedChunks(chunkModulesBySignature, minChunkSize).map(({ modules }) => ({
+            alias: null,
+            modules
+        }));
 }
-const CHAR_DEPENDENT = 'X';
-const CHAR_INDEPENDENT = '_';
-const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
 function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     const chunkModules = Object.create(null);
     for (const [module, assignedEntries] of assignedEntriesByModule) {
@@ -16744,28 +16723,167 @@ function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     }
     return chunkModules;
 }
-function getMergeableChunks(chunkModulesBySignature, minChunkSize) {
-    const chunksToBeMerged = new Set();
-    const unmergeableChunks = [];
-    const alias = null;
+/**
+ * This function tries to get rid of small chunks by merging them with other
+ * chunks. In order to merge chunks, one must obey the following rule:
+ * - When merging several chunks, at most one of the chunks can have side
+ *   effects
+ * - When one of the chunks has side effects, the entry points depending on that
+ *   chunk need to be a super set of the entry points depending on the other
+ *   chunks
+ * - Pure chunks can always be merged
+ * - We use the entry point dependence signature to calculate "chunk distance",
+ *   i.e. how likely it is that two chunks are loaded together
+ */
+function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
+    timeStart('optimize chunks', 3);
+    const chunkPartition = getPartitionedChunks(chunkModulesBySignature, minChunkSize);
+    if (chunkPartition.small.sideEffect.size > 0) {
+        mergeChunks(chunkPartition.small.sideEffect, [chunkPartition.small.pure, chunkPartition.big.pure], minChunkSize, chunkPartition);
+    }
+    if (chunkPartition.small.pure.size > 0) {
+        mergeChunks(chunkPartition.small.pure, [chunkPartition.small.pure, chunkPartition.big.sideEffect, chunkPartition.big.pure], minChunkSize, chunkPartition);
+    }
+    timeEnd('optimize chunks', 3);
+    return [
+        ...chunkPartition.small.sideEffect,
+        ...chunkPartition.small.pure,
+        ...chunkPartition.big.sideEffect,
+        ...chunkPartition.big.pure
+    ];
+}
+const CHAR_DEPENDENT = 'X';
+const CHAR_INDEPENDENT = '_';
+const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
+function getPartitionedChunks(chunkModulesBySignature, minChunkSize) {
+    const smallPureChunks = [];
+    const bigPureChunks = [];
+    const smallSideEffectChunks = [];
+    const bigSideEffectChunks = [];
+    const chunkByModule = new Map();
     for (const [signature, modules] of Object.entries(chunkModulesBySignature)) {
+        const chunkDescription = {
+            dependencies: new Set(),
+            dependentChunks: new Set(),
+            modules,
+            pure: true,
+            signature,
+            size: 0
+        };
         let size = 0;
-        checkModules: {
+        let pure = true;
+        for (const module of modules) {
+            chunkByModule.set(module, chunkDescription);
+            pure && (pure = !module.hasEffects());
+            // Unfortunately, we cannot take tree-shaking into account here because
+            // rendering did not happen yet
+            size += module.originalCode.length;
+        }
+        chunkDescription.pure = pure;
+        chunkDescription.size = size;
+        (size < minChunkSize
+            ? pure
+                ? smallPureChunks
+                : smallSideEffectChunks
+            : pure
+                ? bigPureChunks
+                : bigSideEffectChunks).push(chunkDescription);
+    }
+    sortChunksAndAddDependencies([bigPureChunks, bigSideEffectChunks, smallPureChunks, smallSideEffectChunks], chunkByModule);
+    return {
+        big: { pure: new Set(bigPureChunks), sideEffect: new Set(bigSideEffectChunks) },
+        small: { pure: new Set(smallPureChunks), sideEffect: new Set(smallSideEffectChunks) }
+    };
+}
+function sortChunksAndAddDependencies(chunkLists, chunkByModule) {
+    for (const chunks of chunkLists) {
+        chunks.sort(compareChunks);
+        for (const chunk of chunks) {
+            const { dependencies, modules } = chunk;
             for (const module of modules) {
-                if (module.hasEffects()) {
-                    break checkModules;
+                for (const dependency of module.getDependenciesToBeIncluded()) {
+                    const dependencyChunk = chunkByModule.get(dependency);
+                    if (dependencyChunk && dependencyChunk !== chunk) {
+                        dependencies.add(dependencyChunk);
+                        dependencyChunk.dependentChunks.add(chunk);
+                    }
                 }
-                size += module.magicString.toString().length;
-                if (size > minChunkSize) {
-                    break checkModules;
+            }
+        }
+    }
+}
+function compareChunks({ size: sizeA }, { size: sizeB }) {
+    return sizeA - sizeB;
+}
+function mergeChunks(chunksToBeMerged, targetChunks, minChunkSize, chunkPartition) {
+    for (const mergedChunk of chunksToBeMerged) {
+        let closestChunk = null;
+        let closestChunkDistance = Infinity;
+        const { signature, modules, pure, size } = mergedChunk;
+        for (const targetChunk of concatLazy(targetChunks)) {
+            if (mergedChunk === targetChunk)
+                continue;
+            // Possible improvement:
+            // For dynamic entries depending on a pure chunk, it is safe to merge that
+            // chunk into the chunk doing the dynamic import (i.e. into an "already
+            // loaded chunk") even if it is not pure.
+            // One way of handling this could be to add all "already loaded entries"
+            // of the dynamic importers into the signature as well. That could also
+            // change the way we do code-splitting for already loaded entries.
+            const distance = pure
+                ? getSignatureDistance(signature, targetChunk.signature, !targetChunk.pure)
+                : getSignatureDistance(targetChunk.signature, signature, true);
+            if (distance < closestChunkDistance && isValidMerge(mergedChunk, targetChunk)) {
+                if (distance === 1) {
+                    closestChunk = targetChunk;
+                    break;
                 }
+                closestChunk = targetChunk;
+                closestChunkDistance = distance;
             }
-            chunksToBeMerged.add({ alias, modules, signature, size });
-            continue;
         }
-        unmergeableChunks.push({ alias, modules, signature, size: null });
+        if (closestChunk) {
+            chunksToBeMerged.delete(mergedChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).delete(closestChunk);
+            closestChunk.modules.push(...modules);
+            closestChunk.size += size;
+            closestChunk.pure && (closestChunk.pure = pure);
+            closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
+            const { dependencies, dependentChunks } = closestChunk;
+            for (const dependency of mergedChunk.dependencies) {
+                dependencies.add(dependency);
+            }
+            for (const dependentChunk of mergedChunk.dependentChunks) {
+                dependentChunks.add(dependentChunk);
+                dependentChunk.dependencies.delete(mergedChunk);
+                dependentChunk.dependencies.add(closestChunk);
+            }
+            dependencies.delete(closestChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).add(closestChunk);
+        }
     }
-    return { chunksToBeMerged, unmergeableChunks };
+}
+// Merging will not produce cycles if none of the direct non-merged dependencies
+// of a chunk have the other chunk as a transitive dependency
+function isValidMerge(mergedChunk, targetChunk) {
+    return !(hasTransitiveDependency(mergedChunk, targetChunk) ||
+        hasTransitiveDependency(targetChunk, mergedChunk));
+}
+function hasTransitiveDependency(dependentChunk, dependencyChunk) {
+    const chunksToCheck = new Set(dependentChunk.dependencies);
+    for (const { dependencies } of chunksToCheck) {
+        for (const dependency of dependencies) {
+            if (dependency === dependencyChunk) {
+                return true;
+            }
+            chunksToCheck.add(dependency);
+        }
+    }
+    return false;
+}
+function getChunksInPartition(chunk, minChunkSize, chunkPartition) {
+    const subPartition = chunk.size < minChunkSize ? chunkPartition.small : chunkPartition.big;
+    return chunk.pure ? subPartition.pure : subPartition.sideEffect;
 }
 function getSignatureDistance(sourceSignature, targetSignature, enforceSubset) {
     let distance = 0;

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.12.0
-	Sat, 28 Jan 2023 05:55:49 GMT - commit 01ddea09dfdf1c396c1c24ba3d97743698fe1508
+	Rollup.js v3.13.0
+	Fri, 03 Feb 2023 12:52:06 GMT - commit 45980b51bc13f52a9583d6c898814040f4ee9128
 
 	https://github.com/rollup/rollup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -62,12 +62,12 @@
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@codemirror/commands": "^6.1.3",
+    "@codemirror/commands": "^6.2.0",
     "@codemirror/lang-javascript": "^6.1.2",
-    "@codemirror/language": "^6.3.2",
+    "@codemirror/language": "^6.4.0",
     "@codemirror/search": "^6.2.3",
     "@codemirror/state": "^6.2.0",
-    "@codemirror/view": "^6.7.2",
+    "@codemirror/view": "^6.7.3",
     "@jridgewell/sourcemap-codec": "^1.4.14",
     "@rollup/plugin-alias": "^4.0.2",
     "@rollup/plugin-buble": "^1.0.1",
@@ -82,8 +82,8 @@
     "@types/node": "^14.18.36",
     "@types/signal-exit": "^3.0.1",
     "@types/yargs-parser": "^21.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.48.0",
+    "@typescript-eslint/eslint-plugin": "^5.50.0",
+    "@typescript-eslint/parser": "^5.50.0",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^11.0.2",
     "acorn": "^8.8.1",
@@ -99,12 +99,12 @@
     "date-time": "^4.0.0",
     "es5-shim": "^4.6.7",
     "es6-shim": "^0.35.7",
-    "eslint": "^8.31.0",
+    "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-unicorn": "^45.0.2",
-    "eslint-plugin-vue": "^9.8.0",
+    "eslint-plugin-vue": "^9.9.0",
     "fixturify": "^3.0.0",
     "flru": "^1.0.2",
     "fs-extra": "^11.1.0",
@@ -116,11 +116,10 @@
     "lint-staged": "^13.1.0",
     "locate-character": "^2.0.5",
     "magic-string": "^0.27.0",
-    "mermaid": "~9.1.7",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "pinia": "^2.0.28",
-    "prettier": "^2.8.2",
+    "pinia": "^2.0.29",
+    "prettier": "^2.8.3",
     "pretty-bytes": "^6.0.0",
     "pretty-ms": "^8.0.0",
     "requirejs": "^2.3.6",
@@ -137,7 +136,7 @@
     "terser": "^5.16.1",
     "tslib": "^2.4.1",
     "typescript": "^4.9.4",
-    "vitepress": "^1.0.0-alpha.35",
+    "vitepress": "^1.0.0-alpha.44",
     "vitepress-plugin-mermaid": "^2.0.8",
     "vue": "^3.2.45",
     "weak-napi": "^2.0.2",