Merge branch 'master' of https://github.com/rollup/rollup into sync-a6be82b8

Author: docschina-bot

CHANGELOG.md

@@ -1,5 +1,34 @@
 # rollup changelog
 
+## 4.60.2
+
+_2026-04-18_
+
+### Bug Fixes
+
+- Resolve a variable rendering bug when generating different formats from the same build (#6350)
+
+### Pull Requests
+
+- [#6327](https://github.com/rollup/rollup/pull/6327): docs: fix various typos in source and documentation (@Abhi3975, @lukastaegert)
+- [#6331](https://github.com/rollup/rollup/pull/6331): fix(deps): update minor/patch updates (@renovate[bot])
+- [#6332](https://github.com/rollup/rollup/pull/6332): chore(deps): update codecov/codecov-action action to v6 (@renovate[bot])
+- [#6333](https://github.com/rollup/rollup/pull/6333): chore(deps): update dependency eslint-plugin-unicorn to v64 (@renovate[bot])
+- [#6334](https://github.com/rollup/rollup/pull/6334): fix(deps): update rust crate swc_compiler_base to v51 (@renovate[bot])
+- [#6335](https://github.com/rollup/rollup/pull/6335): chore(deps): lock file maintenance (@renovate[bot], @lukastaegert)
+- [#6346](https://github.com/rollup/rollup/pull/6346): fix(deps): update minor/patch updates (@renovate[bot])
+- [#6347](https://github.com/rollup/rollup/pull/6347): chore(deps): update dependency lru-cache to v11 (@renovate[bot])
+- [#6348](https://github.com/rollup/rollup/pull/6348): fix(deps): update swc monorepo (major) (@renovate[bot], @lukastaegert)
+- [#6349](https://github.com/rollup/rollup/pull/6349): chore(deps): lock file maintenance (@renovate[bot], @lukastaegert)
+- [#6350](https://github.com/rollup/rollup/pull/6350): fix: reset variable render names between outputs in the same generate (@barry3406, @lukastaegert)
+- [#6351](https://github.com/rollup/rollup/pull/6351): chore(deps): update minor/patch updates (@renovate[bot])
+- [#6352](https://github.com/rollup/rollup/pull/6352): chore(deps): update cross-platform-actions/action action to v1 (@renovate[bot])
+- [#6353](https://github.com/rollup/rollup/pull/6353): chore(deps): update dependency lru-cache to v11 (@renovate[bot], @lukastaegert)
+- [#6354](https://github.com/rollup/rollup/pull/6354): chore(deps): lock file maintenance (@renovate[bot])
+- [#6355](https://github.com/rollup/rollup/pull/6355): chore(deps): lock file maintenance (@renovate[bot])
+- [#6356](https://github.com/rollup/rollup/pull/6356): chore(deps): lock file maintenance (@renovate[bot])
+- [#6358](https://github.com/rollup/rollup/pull/6358): chore: remove cross-env from devDeps (@K-tecchan)
+
 ## 4.60.1
 
 _2026-03-30_

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.60.1",
+  "version": "4.60.2",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "4.60.1",
+  "version": "4.60.2",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -158,7 +158,6 @@
     "chokidar": "^3.6.0",
     "concurrently": "^9.2.1",
     "core-js": "3.38.1",
-    "cross-env": "^10.1.0",
     "date-time": "^4.0.0",
     "es5-shim": "^4.6.7",
     "es6-shim": "^0.35.8",

package.json

@@ -1454,6 +1454,16 @@ export default class Chunk {
 			preserveModules,
 			externalLiveBindings
 		} = this.outputOptions;
+		// Reset stale render names from previous output renderings of the same
+		// module graph. Without this, variables that were renamed during a prior
+		// output's import deconfliction (e.g. given a chunk-prefixed
+		// `renderBaseName` like `vendor`) would carry that name into the next
+		// output, producing invalid identifiers such as `function vendor.foo()`.
+		for (const module of this.orderedModules) {
+			for (const variable of module.scope.variables.values()) {
+				variable.setRenderNames(null, null);
+			}
+		}
 		const syntheticExports = new Set<SyntheticNamedExportVariable>();
 		for (const exportName of this.getExportNames()) {
 			const exportVariable = this.exportsByName.get(exportName)!;

src/Chunk.ts

@@ -209,6 +209,41 @@ describe('misc', () => {
 				])
 			));
 
+	it('does not leak chunk-prefixed render names from one output into another (#6296)', async () => {
+		const bundle = await rollup.rollup({
+			input: 'main',
+			plugins: [
+				loader({
+					main: `import { _ } from 'helper';\nconsole.log(_);`,
+					helper: `export function _(target, property) { return target[property]; }`
+				})
+			]
+		});
+
+		// Generating the chunked CJS first sets `renderBaseName` on the `_`
+		// variable to the chunk name (`vendor`). Without resetting render names
+		// at the start of each output, the subsequent UMD generate would emit
+		// `function vendor._(...)`, which is invalid JavaScript.
+		const cjs = await bundle.generate({
+			format: 'cjs',
+			dir: 'dist',
+			manualChunks: id => (id === 'helper' ? 'vendor' : undefined)
+		});
+		assert.ok(
+			cjs.output.some(chunk => chunk.fileName.startsWith('vendor')),
+			'CJS output should contain a vendor chunk'
+		);
+
+		const umd = await bundle.generate({ format: 'umd', name: 'main' });
+		const umdCode = umd.output[0].code;
+		assert.ok(
+			!/function\s+vendor\./.test(umdCode),
+			`UMD output should not contain a dotted function declaration:\n${umdCode}`
+		);
+		// And the function should still parse — eval the wrapper to verify.
+		assert.doesNotThrow(() => new Function(umdCode), 'UMD output should be valid JavaScript');
+	});
+
 	it('allows passing the same object to `rollup` and `generate`', () => {
 		const options = {
 			input: 'input',