rollup 4.34.9 → 4.36.0

package/dist/bin/rollup

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/es/getLogFilter.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/es/parseAst.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/node-entry.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 
@@ -15,7 +15,7 @@ import process$1, { env } from 'node:process';
 import { performance } from 'node:perf_hooks';
 import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/promises';
 
-var version = "4.34.9";
+var version = "4.36.0";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -8297,58 +8297,114 @@ function updateExtensionForRelativeAmdId(id, forceJsExtensionForImports) {
 }
 
 const builtinModules = [
+	"node:assert",
 	"assert",
+	"node:assert/strict",
 	"assert/strict",
+	"node:async_hooks",
 	"async_hooks",
+	"node:buffer",
 	"buffer",
+	"node:child_process",
 	"child_process",
+	"node:cluster",
 	"cluster",
+	"node:console",
 	"console",
+	"node:constants",
 	"constants",
+	"node:crypto",
 	"crypto",
+	"node:dgram",
 	"dgram",
+	"node:diagnostics_channel",
 	"diagnostics_channel",
+	"node:dns",
 	"dns",
+	"node:dns/promises",
 	"dns/promises",
+	"node:domain",
 	"domain",
+	"node:events",
 	"events",
+	"node:fs",
 	"fs",
+	"node:fs/promises",
 	"fs/promises",
+	"node:http",
 	"http",
+	"node:http2",
 	"http2",
+	"node:https",
 	"https",
+	"node:inspector",
 	"inspector",
+	"node:inspector/promises",
 	"inspector/promises",
+	"node:module",
 	"module",
+	"node:net",
 	"net",
+	"node:os",
 	"os",
+	"node:path",
 	"path",
+	"node:path/posix",
 	"path/posix",
+	"node:path/win32",
 	"path/win32",
+	"node:perf_hooks",
 	"perf_hooks",
+	"node:process",
 	"process",
-	"punycode",
+	"node:querystring",
 	"querystring",
+	"node:quic",
+	"node:readline",
 	"readline",
+	"node:readline/promises",
 	"readline/promises",
+	"node:repl",
 	"repl",
+	"node:sea",
+	"node:sqlite",
+	"node:stream",
 	"stream",
+	"node:stream/consumers",
 	"stream/consumers",
+	"node:stream/promises",
 	"stream/promises",
+	"node:stream/web",
 	"stream/web",
+	"node:string_decoder",
 	"string_decoder",
+	"node:test",
+	"node:test/reporters",
+	"node:timers",
 	"timers",
+	"node:timers/promises",
 	"timers/promises",
+	"node:tls",
 	"tls",
+	"node:trace_events",
 	"trace_events",
+	"node:tty",
 	"tty",
+	"node:url",
 	"url",
+	"node:util",
 	"util",
+	"node:util/types",
 	"util/types",
+	"node:v8",
 	"v8",
+	"node:vm",
 	"vm",
+	"node:wasi",
 	"wasi",
+	"node:worker_threads",
 	"worker_threads",
+	"node:zlib",
 	"zlib"
 ];
 
@@ -8933,7 +8989,7 @@ function getDefaultExportFromCjs (x) {
 }
 
 function getAugmentedNamespace(n) {
-  if (n.__esModule) return n;
+  if (Object.prototype.hasOwnProperty.call(n, '__esModule')) return n;
   var f = n.default;
 	if (typeof f == "function") {
 		var a = function a () {
@@ -11601,6 +11657,12 @@ class AssignmentPattern extends NodeBase {
 }
 
 class AwaitExpression extends NodeBase {
+    get isTopLevelAwait() {
+        return isFlagSet(this.flags, 134217728 /* Flag.isTopLevelAwait */);
+    }
+    set isTopLevelAwait(value) {
+        this.flags = setFlag(this.flags, 134217728 /* Flag.isTopLevelAwait */, value);
+    }
     hasEffects() {
         if (!this.deoptimized)
             this.applyDeoptimizations();
@@ -11615,13 +11677,14 @@ class AwaitExpression extends NodeBase {
         this.included = true;
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        checkTopLevelAwait: if (!this.scope.context.usesTopLevelAwait) {
+        checkTopLevelAwait: {
             let parent = this.parent;
             do {
                 if (parent instanceof FunctionNode || parent instanceof ArrowFunctionExpression)
                     break checkTopLevelAwait;
             } while ((parent = parent.parent));
             this.scope.context.usesTopLevelAwait = true;
+            this.isTopLevelAwait = true;
         }
         // Thenables need to be included
         this.argument.includePath(THEN_PATH, context);
@@ -12831,6 +12894,9 @@ class VariableDeclarator extends NodeBase {
 }
 VariableDeclarator.prototype.applyDeoptimizations = doNotDeoptimize;
 
+function getChunkInfoWithPath(chunk) {
+    return { fileName: chunk.getFileName(), ...chunk.getPreRenderedChunkInfo() };
+}
 class ImportExpression extends NodeBase {
     constructor() {
         super(...arguments);
@@ -12847,6 +12913,9 @@ class ImportExpression extends NodeBase {
     bind() {
         this.source.bind();
     }
+    get isFollowingTopLevelAwait() {
+        return this.parent instanceof AwaitExpression && this.parent.isTopLevelAwait;
+    }
     /**
      * Get imported variables for deterministic usage, valid cases are:
      *
@@ -12999,7 +13068,7 @@ class ImportExpression extends NodeBase {
             }
         }
     }
-    setExternalResolution(exportMode, resolution, options, snippets, pluginDriver, accessedGlobalsByScope, resolutionString, namespaceExportName, attributes) {
+    setExternalResolution(exportMode, resolution, options, snippets, pluginDriver, accessedGlobalsByScope, resolutionString, namespaceExportName, attributes, ownChunk, targetChunk) {
         const { format } = options;
         this.inlineNamespace = null;
         this.resolution = resolution;
@@ -13008,7 +13077,7 @@ class ImportExpression extends NodeBase {
         this.attributes = attributes;
         const accessedGlobals = [...(accessedImportGlobals[format] || [])];
         let helper;
-        ({ helper, mechanism: this.mechanism } = this.getDynamicImportMechanismAndHelper(resolution, exportMode, options, snippets, pluginDriver));
+        ({ helper, mechanism: this.mechanism } = this.getDynamicImportMechanismAndHelper(resolution, exportMode, options, snippets, pluginDriver, ownChunk, targetChunk));
         if (helper) {
             accessedGlobals.push(helper);
         }
@@ -13019,12 +13088,39 @@ class ImportExpression extends NodeBase {
     setInternalResolution(inlineNamespace) {
         this.inlineNamespace = inlineNamespace;
     }
-    getDynamicImportMechanismAndHelper(resolution, exportMode, { compact, dynamicImportInCjs, format, generatedCode: { arrowFunctions }, interop }, { _, getDirectReturnFunction, getDirectReturnIifeLeft }, pluginDriver) {
+    getDynamicImportMechanismAndHelper(resolution, exportMode, { compact, dynamicImportInCjs, format, generatedCode: { arrowFunctions }, interop }, { _, getDirectReturnFunction, getDirectReturnIifeLeft }, pluginDriver, ownChunk, targetChunk) {
         const mechanism = pluginDriver.hookFirstSync('renderDynamicImport', [
             {
+                chunk: getChunkInfoWithPath(ownChunk),
                 customResolution: typeof this.resolution === 'string' ? this.resolution : null,
                 format,
+                getTargetChunkImports() {
+                    if (targetChunk === null)
+                        return null;
+                    const chunkInfos = [];
+                    const importerPath = ownChunk.getFileName();
+                    for (const dep of targetChunk.dependencies) {
+                        const resolvedImportPath = `'${dep.getImportPath(importerPath)}'`;
+                        if (dep instanceof ExternalChunk) {
+                            chunkInfos.push({
+                                fileName: dep.getFileName(),
+                                resolvedImportPath,
+                                type: 'external'
+                            });
+                        }
+                        else {
+                            chunkInfos.push({
+                                chunk: dep.getPreRenderedChunkInfo(),
+                                fileName: dep.getFileName(),
+                                resolvedImportPath,
+                                type: 'internal'
+                            });
+                        }
+                    }
+                    return chunkInfos;
+                },
                 moduleId: this.scope.context.module.id,
+                targetChunk: targetChunk ? getChunkInfoWithPath(targetChunk) : null,
                 targetModuleId: this.resolution && typeof this.resolution !== 'string' ? this.resolution.id : null
             }
         ]);
@@ -16474,6 +16570,7 @@ class Module {
         this.importedFromNotTreeshaken = false;
         this.importers = [];
         this.includedDynamicImporters = [];
+        this.includedDirectTopLevelAwaitingDynamicImporters = new Set();
         this.includedImports = new Set();
         this.isExecuted = false;
         this.isUserDefinedEntryPoint = false;
@@ -17330,6 +17427,9 @@ class Module {
         if (resolution instanceof Module) {
             if (!resolution.includedDynamicImporters.includes(this)) {
                 resolution.includedDynamicImporters.push(this);
+                if (node.isFollowingTopLevelAwait) {
+                    resolution.includedDirectTopLevelAwaitingDynamicImporters.add(this);
+                }
             }
             const importedNames = this.options.treeshake
                 ? node.getDeterministicImportedNames()
@@ -17823,13 +17923,13 @@ class Chunk {
         this.bundle = bundle;
         this.inputBase = inputBase;
         this.snippets = snippets;
+        this.dependencies = new Set();
         this.entryModules = [];
         this.exportMode = 'named';
         this.facadeModule = null;
         this.namespaceVariableName = '';
         this.variableName = '';
         this.accessedGlobalsByScope = new Map();
-        this.dependencies = new Set();
         this.dynamicEntryModules = [];
         this.dynamicName = null;
         this.exportNamesByVariable = new Map();
@@ -18134,9 +18234,9 @@ class Chunk {
             this.setUpChunkImportsAndExportsForModule(module);
         }
     }
-    async render() {
-        const { dependencies, exportMode, facadeModule, inputOptions: { onLog }, outputOptions, pluginDriver, snippets } = this;
-        const { format, hoistTransitiveImports, preserveModules } = outputOptions;
+    inlineTransitiveImports() {
+        const { facadeModule, dependencies, outputOptions } = this;
+        const { hoistTransitiveImports, preserveModules } = outputOptions;
         // for static and dynamic entry points, add transitive dependencies to this
         // chunk's dependencies to avoid loading latency
         if (hoistTransitiveImports && !preserveModules && facadeModule !== null) {
@@ -18145,6 +18245,10 @@ class Chunk {
                     this.inlineChunkDependencies(dep);
             }
         }
+    }
+    async render() {
+        const { exportMode, facadeModule, inputOptions: { onLog }, outputOptions, pluginDriver, snippets } = this;
+        const { format, preserveModules } = outputOptions;
         const preliminaryFileName = this.getPreliminaryFileName();
         const preliminarySourcemapFileName = this.getPreliminarySourcemapFileName();
         const { accessedGlobals, indent, magicString, renderedSource, usedModules, usesTopLevelAwait } = this.renderModules(preliminaryFileName.fileName);
@@ -18727,13 +18831,13 @@ class Chunk {
                     node.setInternalResolution(resolution.namespace);
                 }
                 else {
-                    node.setExternalResolution((facadeChunk || chunk).exportMode, resolution, outputOptions, snippets, pluginDriver, accessedGlobalsByScope, `'${(facadeChunk || chunk).getImportPath(fileName)}'`, !facadeChunk?.strictFacade && chunk.exportNamesByVariable.get(resolution.namespace)[0], null);
+                    node.setExternalResolution((facadeChunk || chunk).exportMode, resolution, outputOptions, snippets, pluginDriver, accessedGlobalsByScope, `'${(facadeChunk || chunk).getImportPath(fileName)}'`, !facadeChunk?.strictFacade && chunk.exportNamesByVariable.get(resolution.namespace)[0], null, this, facadeChunk || chunk);
                 }
             }
             else {
                 const { node, resolution } = resolvedDynamicImport;
                 const [resolutionString, attributes] = this.getDynamicImportStringAndAttributes(resolution, fileName, node);
-                node.setExternalResolution('external', resolution, outputOptions, snippets, pluginDriver, accessedGlobalsByScope, resolutionString, false, attributes);
+                node.setExternalResolution('external', resolution, outputOptions, snippets, pluginDriver, accessedGlobalsByScope, resolutionString, false, attributes, this, null);
             }
         }
     }
@@ -18999,15 +19103,16 @@ function* concatLazy(iterables) {
  */
 function getChunkAssignments(entries, manualChunkAliasByEntry, minChunkSize, log) {
     const { chunkDefinitions, modulesInManualChunks } = getChunkDefinitionsFromManualChunks(manualChunkAliasByEntry);
-    const { allEntries, dependentEntriesByModule, dynamicallyDependentEntriesByDynamicEntry, dynamicImportsByEntry } = analyzeModuleGraph(entries);
+    const { allEntries, dependentEntriesByModule, dynamicallyDependentEntriesByDynamicEntry, dynamicImportsByEntry, dynamicallyDependentEntriesByAwaitedDynamicEntry, awaitedDynamicImportsByEntry } = analyzeModuleGraph(entries);
     // Each chunk is identified by its position in this array
     const chunkAtoms = getChunksWithSameDependentEntries(getModulesWithDependentEntries(dependentEntriesByModule, modulesInManualChunks));
     const staticDependencyAtomsByEntry = getStaticDependencyAtomsByEntry(allEntries, chunkAtoms);
     // Warning: This will consume dynamicallyDependentEntriesByDynamicEntry.
     // If we no longer want this, we should make a copy here.
     const alreadyLoadedAtomsByEntry = getAlreadyLoadedAtomsByEntry(staticDependencyAtomsByEntry, dynamicallyDependentEntriesByDynamicEntry, dynamicImportsByEntry, allEntries);
+    const awaitedAlreadyLoadedAtomsByEntry = getAlreadyLoadedAtomsByEntry(staticDependencyAtomsByEntry, dynamicallyDependentEntriesByAwaitedDynamicEntry, awaitedDynamicImportsByEntry, allEntries);
     // This mutates the dependentEntries in chunkAtoms
-    removeUnnecessaryDependentEntries(chunkAtoms, alreadyLoadedAtomsByEntry);
+    removeUnnecessaryDependentEntries(chunkAtoms, alreadyLoadedAtomsByEntry, awaitedAlreadyLoadedAtomsByEntry);
     const { chunks, sideEffectAtoms, sizeByAtom } = getChunksWithSameDependentEntriesAndCorrelatedAtoms(chunkAtoms, staticDependencyAtomsByEntry, alreadyLoadedAtomsByEntry, minChunkSize);
     chunkDefinitions.push(...getOptimizedChunks(chunks, minChunkSize, sideEffectAtoms, sizeByAtom, log).map(({ modules }) => ({
         alias: null,
@@ -19043,13 +19148,17 @@ function addStaticDependenciesToManualChunk(entry, manualChunkModules, modulesIn
 }
 function analyzeModuleGraph(entries) {
     const dynamicEntryModules = new Set();
+    const awaitedDynamicEntryModules = new Set();
     const dependentEntriesByModule = new Map();
     const allEntriesSet = new Set(entries);
     const dynamicImportModulesByEntry = new Array(allEntriesSet.size);
+    const awaitedDynamicImportModulesByEntry = new Array(allEntriesSet.size);
     let entryIndex = 0;
     for (const currentEntry of allEntriesSet) {
         const dynamicImportsForCurrentEntry = new Set();
+        const awaitedDynamicImportsForCurrentEntry = new Set();
         dynamicImportModulesByEntry[entryIndex] = dynamicImportsForCurrentEntry;
+        awaitedDynamicImportModulesByEntry[entryIndex] = awaitedDynamicImportsForCurrentEntry;
         const modulesToHandle = new Set([currentEntry]);
         for (const module of modulesToHandle) {
             getOrCreate(dependentEntriesByModule, module, (getNewSet)).add(entryIndex);
@@ -19065,6 +19174,10 @@ function analyzeModuleGraph(entries) {
                     dynamicEntryModules.add(resolution);
                     allEntriesSet.add(resolution);
                     dynamicImportsForCurrentEntry.add(resolution);
+                    if (resolution.includedDirectTopLevelAwaitingDynamicImporters.has(currentEntry)) {
+                        awaitedDynamicEntryModules.add(resolution);
+                        awaitedDynamicImportsForCurrentEntry.add(resolution);
+                    }
                 }
             }
             for (const dependency of module.implicitlyLoadedBefore) {
@@ -19077,23 +19190,39 @@ function analyzeModuleGraph(entries) {
         entryIndex++;
     }
     const allEntries = [...allEntriesSet];
-    const { dynamicEntries, dynamicImportsByEntry } = getDynamicEntries(allEntries, dynamicEntryModules, dynamicImportModulesByEntry);
+    const { awaitedDynamicEntries, awaitedDynamicImportsByEntry, dynamicEntries, dynamicImportsByEntry } = getDynamicEntries(allEntries, dynamicEntryModules, dynamicImportModulesByEntry, awaitedDynamicEntryModules, awaitedDynamicImportModulesByEntry);
     return {
         allEntries,
+        awaitedDynamicImportsByEntry,
         dependentEntriesByModule,
-        dynamicallyDependentEntriesByDynamicEntry: getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries, allEntries),
+        dynamicallyDependentEntriesByAwaitedDynamicEntry: getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, awaitedDynamicEntries, allEntries, dynamicEntry => dynamicEntry.includedDirectTopLevelAwaitingDynamicImporters),
+        dynamicallyDependentEntriesByDynamicEntry: getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries, allEntries, dynamicEntry => dynamicEntry.includedDynamicImporters),
         dynamicImportsByEntry
     };
 }
-function getDynamicEntries(allEntries, dynamicEntryModules, dynamicImportModulesByEntry) {
+function getDynamicEntries(allEntries, dynamicEntryModules, dynamicImportModulesByEntry, awaitedDynamicEntryModules, awaitedDynamicImportModulesByEntry) {
     const entryIndexByModule = new Map();
     const dynamicEntries = new Set();
+    const awaitedDynamicEntries = new Set();
     for (const [entryIndex, entry] of allEntries.entries()) {
         entryIndexByModule.set(entry, entryIndex);
         if (dynamicEntryModules.has(entry)) {
             dynamicEntries.add(entryIndex);
         }
+        if (awaitedDynamicEntryModules.has(entry)) {
+            awaitedDynamicEntries.add(entryIndex);
+        }
     }
+    const dynamicImportsByEntry = getDynamicImportsByEntry(dynamicImportModulesByEntry, entryIndexByModule);
+    const awaitedDynamicImportsByEntry = getDynamicImportsByEntry(awaitedDynamicImportModulesByEntry, entryIndexByModule);
+    return {
+        awaitedDynamicEntries,
+        awaitedDynamicImportsByEntry,
+        dynamicEntries,
+        dynamicImportsByEntry
+    };
+}
+function getDynamicImportsByEntry(dynamicImportModulesByEntry, entryIndexByModule) {
     const dynamicImportsByEntry = new Array(dynamicImportModulesByEntry.length);
     let index = 0;
     for (const dynamicImportModules of dynamicImportModulesByEntry) {
@@ -19103,15 +19232,15 @@ function getDynamicEntries(allEntries, dynamicEntryModules, dynamicImportModules
         }
         dynamicImportsByEntry[index++] = dynamicImports;
     }
-    return { dynamicEntries, dynamicImportsByEntry };
+    return dynamicImportsByEntry;
 }
-function getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries, allEntries) {
+function getDynamicallyDependentEntriesByDynamicEntry(dependentEntriesByModule, dynamicEntries, allEntries, getDynamicImporters) {
     const dynamicallyDependentEntriesByDynamicEntry = new Map();
     for (const dynamicEntryIndex of dynamicEntries) {
         const dynamicallyDependentEntries = getOrCreate(dynamicallyDependentEntriesByDynamicEntry, dynamicEntryIndex, (getNewSet));
         const dynamicEntry = allEntries[dynamicEntryIndex];
         for (const importer of concatLazy([
-            dynamicEntry.includedDynamicImporters,
+            getDynamicImporters(dynamicEntry),
             dynamicEntry.implicitlyLoadedAfter
         ])) {
             for (const entry of dependentEntriesByModule.get(importer)) {
@@ -19190,13 +19319,15 @@ function getAlreadyLoadedAtomsByEntry(staticDependencyAtomsByEntry, dynamicallyD
  * This removes all unnecessary dynamic entries from the dependentEntries in its
  * first argument if a chunk is already loaded without that entry.
  */
-function removeUnnecessaryDependentEntries(chunkAtoms, alreadyLoadedAtomsByEntry) {
+function removeUnnecessaryDependentEntries(chunkAtoms, alreadyLoadedAtomsByEntry, awaitedAlreadyLoadedAtomsByEntry) {
     // Remove entries from dependent entries if a chunk is already loaded without
-    // that entry.
+    // that entry. Do not remove already loaded atoms where all dynamic imports
+    // are awaited to avoid cycles in the output.
     let chunkMask = 1n;
     for (const { dependentEntries } of chunkAtoms) {
         for (const entryIndex of dependentEntries) {
-            if ((alreadyLoadedAtomsByEntry[entryIndex] & chunkMask) === chunkMask) {
+            if ((alreadyLoadedAtomsByEntry[entryIndex] & chunkMask) === chunkMask &&
+                (awaitedAlreadyLoadedAtomsByEntry[entryIndex] & chunkMask) === 0n) {
                 dependentEntries.delete(entryIndex);
             }
         }
@@ -20103,6 +20234,7 @@ class Bundle {
             this.pluginDriver.setChunkInformation(this.facadeChunkByModule);
             for (const chunk of chunks) {
                 chunk.generateExports();
+                chunk.inlineTransitiveImports();
             }
             timeEnd('generate chunks', 2);
             await renderChunks(chunks, outputBundle, this.pluginDriver, this.outputOptions, this.inputOptions.onLog);
@@ -22725,11 +22857,28 @@ async function rollupInternal(rawInputOptions, watcher) {
             if (watchFiles.length > 0) {
                 error_.watchFiles = watchFiles;
             }
-            await graph.pluginDriver.hookParallel('buildEnd', [error_]);
-            await graph.pluginDriver.hookParallel('closeBundle', []);
+            try {
+                await graph.pluginDriver.hookParallel('buildEnd', [error_]);
+            }
+            catch (buildEndError) {
+                // Create a compound error object to include both errors, based on the original error
+                const compoundError = getRollupError({
+                    ...error_,
+                    message: `There was an error during the build:\n  ${error_.message}\nAdditionally, handling the error in the 'buildEnd' hook caused the following error:\n  ${buildEndError.message}`
+                });
+                await graph.pluginDriver.hookParallel('closeBundle', [compoundError]);
+                throw compoundError;
+            }
+            await graph.pluginDriver.hookParallel('closeBundle', [error_]);
             throw error_;
         }
-        await graph.pluginDriver.hookParallel('buildEnd', []);
+        try {
+            await graph.pluginDriver.hookParallel('buildEnd', []);
+        }
+        catch (buildEndError) {
+            await graph.pluginDriver.hookParallel('closeBundle', [buildEndError]);
+            throw buildEndError;
+        }
     });
     timeEnd('BUILD', 1);
     const result = {

package/dist/es/shared/parseAst.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/getLogFilter.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/parseAst.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.d.ts

@@ -190,7 +190,7 @@ export type EmittedFile = EmittedAsset | EmittedChunk | EmittedPrebuiltChunk;
 
 export type EmitFile = (emittedFile: EmittedFile) => string;
 
-interface ModuleInfo extends ModuleOptions {
+export interface ModuleInfo extends ModuleOptions {
 	ast: ProgramNode | null;
 	code: string | null;
 	dynamicImporters: readonly string[];
@@ -280,7 +280,7 @@ export interface ResolvedId extends ModuleOptions {
 
 export type ResolvedIdMap = Record<string, ResolvedId>;
 
-interface PartialResolvedId extends Partial<PartialNull<ModuleOptions>> {
+export interface PartialResolvedId extends Partial<PartialNull<ModuleOptions>> {
 	external?: boolean | 'absolute' | 'relative';
 	id: string;
 	resolvedBy?: string;
@@ -400,11 +400,28 @@ export type PluginImpl<O extends object = object, A = any> = (options?: O) => Pl
 
 export type OutputBundle = Record<string, OutputAsset | OutputChunk>;
 
+export type PreRenderedChunkWithFileName = PreRenderedChunk & { fileName: string };
+
+export interface ImportedInternalChunk {
+	type: 'internal';
+	fileName: string;
+	resolvedImportPath: string;
+	chunk: PreRenderedChunk;
+}
+
+export interface ImportedExternalChunk {
+	type: 'external';
+	fileName: string;
+	resolvedImportPath: string;
+}
+
+export type DynamicImportTargetChunk = ImportedInternalChunk | ImportedExternalChunk;
+
 export interface FunctionPluginHooks {
 	augmentChunkHash: (this: PluginContext, chunk: RenderedChunk) => string | void;
 	buildEnd: (this: PluginContext, error?: Error) => void;
 	buildStart: (this: PluginContext, options: NormalizedInputOptions) => void;
-	closeBundle: (this: PluginContext) => void;
+	closeBundle: (this: PluginContext, error?: Error) => void;
 	closeWatcher: (this: PluginContext) => void;
 	generateBundle: (
 		this: PluginContext,
@@ -425,6 +442,9 @@ export interface FunctionPluginHooks {
 			format: InternalModuleFormat;
 			moduleId: string;
 			targetModuleId: string | null;
+			chunk: PreRenderedChunkWithFileName;
+			targetChunk: PreRenderedChunkWithFileName | null;
+			getTargetChunkImports: () => DynamicImportTargetChunk[] | null;
 		}
 	) => { left: string; right: string } | NullValue;
 	renderError: (this: PluginContext, error?: Error) => void;
@@ -504,7 +524,7 @@ type MakeAsync<Function_> = Function_ extends (
 	: never;
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-type ObjectHook<T, O = {}> = T | ({ handler: T; order?: 'pre' | 'post' | null } & O);
+export type ObjectHook<T, O = {}> = T | ({ handler: T; order?: 'pre' | 'post' | null } & O);
 
 export type PluginHooks = {
 	[K in keyof FunctionPluginHooks]: ObjectHook<

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.34.9
-	Sat, 01 Mar 2025 07:32:06 GMT - commit 0ab9b9772e24dfe9ef08bfce3132e99a15b793f6
+	Rollup.js v4.36.0
+	Mon, 17 Mar 2025 08:35:11 GMT - commit ab7bfa8fe9c25e41cc62058fa2dcde6b321fd51d
 
 	https://github.com/rollup/rollup