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

docschina-bot · docschina-bot · commit 55490c515e4c · 2025-09-23T22:14:05.000Z
diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml
@@ -139,8 +139,6 @@ jobs:
           - host: ubuntu-latest
             target: armv7-linux-androideabi
             cross: napi
-            # There are compile issues when using the cache with Android
-            cache-cargo: false
           - host: ubuntu-latest
             target: aarch64-linux-android
             cross: napi
@@ -167,6 +165,8 @@ jobs:
                 -C link-args=-L/sysroot-riscv64/usr/lib
                 -C linker=riscv64-alpine-linux-musl-ld
                 " &&
+              rustup default nightly-2025-07-25 &&
+              rustup target add riscv64gc-unknown-linux-musl &&
               npm run build:napi -- --release --target riscv64gc-unknown-linux-musl
           - host: ubuntu-latest
             target: powerpc64le-unknown-linux-gnu
@@ -206,9 +206,11 @@ jobs:
           - host: ubuntu-latest
             target: x86_64-unknown-freebsd
             cross: cross
+            build-std: true
           - host: ubuntu-latest
             target: aarch64-unknown-freebsd
             cross: cross
+            build-std: true
 
     name: Build ${{ matrix.settings.name || matrix.settings.target }}
     runs-on: ${{ matrix.settings.host }}
@@ -239,7 +241,8 @@ jobs:
         if: ${{ !matrix.settings.docker }}
         with:
           toolchain: nightly-2025-07-25
-          components: rust-src
+          components: ${{ matrix.settings.build-std && 'rust-src' || '' }}
+          targets: ${{ !matrix.settings.build-std && matrix.settings.target || '' }}
       - name: Setup OpenHarmony SDK
         if: ${{ contains(matrix.settings.target, 'ohos') }}
         uses: openharmony-rs/setup-ohos-sdk@3c181b3244cec76aaec289ab84fb00f55f2fce3f # v0.2.4
@@ -294,7 +297,7 @@ jobs:
         if: ${{ !matrix.settings.docker && matrix.settings.build && matrix.settings.target != 'x86_64-pc-windows-gnu' }}
       - name: Build (Classic)
         env: ${{ matrix.settings.env || fromJSON('{}') }}
-        run: npm run build:napi -- --release --target ${{ matrix.settings.target }} ${{ matrix.settings.cross == 'zig' && '-x' || matrix.settings.cross == 'napi' && '--use-napi-cross' || matrix.settings.cross == 'cross' && '--use-cross' || '' }}
+        run: npm run build:napi -- --release --target ${{ matrix.settings.target }} ${{ matrix.settings.cross == 'zig' && '-x' || matrix.settings.cross == 'napi' && '--use-napi-cross' || matrix.settings.cross == 'cross' && '--use-cross' || '' }} -- ${{ matrix.settings.build-std && '-Zbuild-std=std,core,alloc,panic_unwind -Zbuild-std-features=panic-unwind' || '' }}
         if: ${{ !matrix.settings.docker && !matrix.settings.build }}
         shell: bash
       - name: Save Cargo cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # rollup changelog
 
+## 4.52.2
+
+_2025-09-23_
+
+### Bug Fixes
+
+- Fix Android build crashing due to failed dlopen (#6109)
+
+### Pull Requests
+
+- [#6109](https://github.com/rollup/rollup/pull/6109): fix(rust): use prebuilt std when it is available (@cyyynthia)
+
+## 4.52.1
+
+_2025-09-23_
+
+### Bug Fixes
+
+- Opt-out of dynamic import optimization when using top-level await to effectively prevent deadlocks (#6121)
+
+### Pull Requests
+
+- [#6121](https://github.com/rollup/rollup/pull/6121): Simplify top-level await deadlock prevention (@lukastaegert)
+
 ## 4.52.0
 
 _2025-09-19_
diff --git a/browser/package.json b/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.52.0",
+  "version": "4.52.2",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "4.52.0",
+  "version": "4.52.2",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
diff --git a/rust/bindings_napi/.cargo/config.toml b/rust/bindings_napi/.cargo/config.toml
@@ -1,10 +1,6 @@
 [build]
 rustflags = "-Z location-detail=none"
 
-[unstable]
-build-std = ["std", "core", "alloc", "panic_unwind"]
-build-std-features = ["panic-unwind"]
-
 [target.loongarch64-unknown-linux-gnu]
 linker = "loongarch64-linux-gnu-gcc"
 
diff --git a/src/Module.ts b/src/Module.ts
@@ -240,7 +240,7 @@ export default class Module {
 	shebang: undefined | string;
 	readonly importers: string[] = [];
 	readonly includedDynamicImporters: Module[] = [];
-	readonly includedDirectTopLevelAwaitingDynamicImporters = new Set<Module>();
+	readonly includedTopLevelAwaitingDynamicImporters = new Set<Module>();
 	readonly includedImports = new Set<Variable>();
 	readonly info: ModuleInfo;
 	isExecuted = false;
@@ -1379,8 +1379,10 @@ export default class Module {
 		if (resolution instanceof Module) {
 			if (!resolution.includedDynamicImporters.includes(this)) {
 				resolution.includedDynamicImporters.push(this);
-				if (node.withinTopLevelAwait) {
-					resolution.includedDirectTopLevelAwaitingDynamicImporters.add(this);
+				// If a module has a top-level await, removing this entry can create
+				// deadlocks.
+				if (this.astContext.usesTopLevelAwait) {
+					resolution.includedTopLevelAwaitingDynamicImporters.add(this);
 				}
 			}
 
diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts
@@ -33,8 +33,6 @@ import MemberExpression from './MemberExpression';
 import type * as NodeType from './NodeType';
 import ObjectPattern from './ObjectPattern';
 import { Flag, isFlagSet, setFlag } from './shared/BitFlags';
-import FunctionNode from './shared/FunctionNode';
-import type { Node } from './shared/Node';
 import {
 	doNotDeoptimize,
 	type ExpressionNode,
@@ -76,14 +74,6 @@ export default class ImportExpression extends NodeBase {
 		this.flags = setFlag(this.flags, Flag.shouldIncludeDynamicAttributes, value);
 	}
 
-	get withinTopLevelAwait() {
-		return isFlagSet(this.flags, Flag.withinTopLevelAwait);
-	}
-
-	set withinTopLevelAwait(value: boolean) {
-		this.flags = setFlag(this.flags, Flag.withinTopLevelAwait, value);
-	}
-
 	bind(): void {
 		this.source.bind();
 		this.options?.bind();
@@ -110,7 +100,7 @@ export default class ImportExpression extends NodeBase {
 		if (parent1 instanceof AwaitExpression) {
 			const parent2 = parent1.parent;
 
-			// Side-effect only: await import('bar')
+			// Side effect only: await import('bar')
 			if (parent2 instanceof ExpressionStatement) {
 				return EMPTY_ARRAY;
 			}
@@ -222,25 +212,6 @@ export default class ImportExpression extends NodeBase {
 	initialise(): void {
 		super.initialise();
 		this.scope.context.addDynamicImport(this);
-		let parent = this.parent;
-		let withinAwaitExpression = false;
-		let withinTopLevelAwait = false;
-		do {
-			if (
-				withinAwaitExpression &&
-				(parent instanceof FunctionNode || parent instanceof ArrowFunctionExpression)
-			) {
-				withinTopLevelAwait = false;
-			}
-			if (parent instanceof AwaitExpression) {
-				withinAwaitExpression = true;
-				withinTopLevelAwait = true;
-			}
-		} while ((parent = (parent as Node).parent as Node));
-
-		if (withinAwaitExpression && withinTopLevelAwait) {
-			this.withinTopLevelAwait = true;
-		}
 	}
 
 	parseNode(esTreeNode: GenericEsTreeNode): this {
diff --git a/src/ast/nodes/shared/BitFlags.ts b/src/ast/nodes/shared/BitFlags.ts
@@ -26,9 +26,8 @@ export const enum Flag {
 	destructuringDeoptimized = 1 << 24,
 	hasDeoptimizedCache = 1 << 25,
 	hasEffects = 1 << 26,
-	withinTopLevelAwait = 1 << 27,
-	checkedForWarnings = 1 << 28,
-	shouldIncludeDynamicAttributes = 1 << 29
+	checkedForWarnings = 1 << 27,
+	shouldIncludeDynamicAttributes = 1 << 28
 }
 
 export function isFlagSet(flags: number, flag: Flag): boolean {
diff --git a/src/utils/chunkAssignment.ts b/src/utils/chunkAssignment.ts
@@ -296,8 +296,8 @@ function analyzeModuleGraph(entries: Iterable<Module>): {
 					dynamicEntryModules.add(resolution);
 					allEntriesSet.add(resolution);
 					dynamicImportsForCurrentEntry.add(resolution);
-					for (const includedDirectTopLevelAwaitingDynamicImporter of resolution.includedDirectTopLevelAwaitingDynamicImporters) {
-						if (staticDependencies.has(includedDirectTopLevelAwaitingDynamicImporter)) {
+					for (const includedTopLevelAwaitingDynamicImporter of resolution.includedTopLevelAwaitingDynamicImporters) {
+						if (staticDependencies.has(includedTopLevelAwaitingDynamicImporter)) {
 							awaitedDynamicEntryModules.add(resolution);
 							awaitedDynamicImportsForCurrentEntry.add(resolution);
 							break;
@@ -335,7 +335,7 @@ function analyzeModuleGraph(entries: Iterable<Module>): {
 			dependentEntriesByModule,
 			awaitedDynamicEntries,
 			allEntries,
-			dynamicEntry => dynamicEntry.includedDirectTopLevelAwaitingDynamicImporters
+			dynamicEntry => dynamicEntry.includedTopLevelAwaitingDynamicImporters
 		),
 		dynamicallyDependentEntriesByDynamicEntry: getDynamicallyDependentEntriesByDynamicEntry(
 			dependentEntriesByModule,
@@ -526,7 +526,7 @@ function removeUnnecessaryDependentEntries(
 	awaitedAlreadyLoadedAtomsByEntry: bigint[]
 ) {
 	// Remove entries from dependent entries if a chunk is already loaded without
-	// that entry. Do not remove already loaded atoms where all dynamic imports
+	// that entry. Do not remove already loaded atoms where some dynamic imports
 	// are awaited to avoid cycles in the output.
 	let chunkMask = 1n;
 	for (const { dependentEntries } of chunkAtoms) {
diff --git a/src/utils/executionOrder.ts b/src/utils/executionOrder.ts
@@ -52,7 +52,7 @@ export function analyseModuleExecution(entryModules: readonly Module[]): {
 			}
 			for (const { resolution, node } of module.dynamicImports) {
 				if (resolution instanceof Module) {
-					if (node.withinTopLevelAwait) {
+					if (node.scope.context.usesTopLevelAwait) {
 						handleSyncLoadedModule(resolution, module);
 					} else {
 						dynamicImports.add(resolution);
diff --git a/test/chunking-form/samples/top-level-await-import-3/_config.js b/test/chunking-form/samples/top-level-await-import-3/_config.js
@@ -0,0 +1,5 @@
+module.exports = defineTest({
+	description:
+		'avoids circular TLA dynamic imports between chunks even when import is wrapped in a function',
+	formats: ['es', 'system']
+});
diff --git a/test/chunking-form/samples/top-level-await-import-3/_expected/es/generated-maths.js b/test/chunking-form/samples/top-level-await-import-3/_expected/es/generated-maths.js
@@ -0,0 +1,5 @@
+import { s as square } from './generated-square.js';
+
+const cube = x => square(x) * x;
+
+export { cube, square };
diff --git a/test/chunking-form/samples/top-level-await-import-3/_expected/es/generated-square.js b/test/chunking-form/samples/top-level-await-import-3/_expected/es/generated-square.js
@@ -0,0 +1,3 @@
+var square = x => x * x;
+
+export { square as s };
diff --git a/test/chunking-form/samples/top-level-await-import-3/_expected/es/main.js b/test/chunking-form/samples/top-level-await-import-3/_expected/es/main.js
@@ -0,0 +1,10 @@
+import { s as square } from './generated-square.js';
+
+async function doMaths() {
+	const maths = await import('./generated-maths.js');
+	assert.equal(maths.square(5), 25);
+	assert.equal(maths.cube(5), 125);
+}
+
+assert.equal(square(2), 4);
+await doMaths();
diff --git a/test/chunking-form/samples/top-level-await-import-3/_expected/system/generated-maths.js b/test/chunking-form/samples/top-level-await-import-3/_expected/system/generated-maths.js
@@ -0,0 +1,15 @@
+System.register(['./generated-square.js'], (function (exports) {
+	'use strict';
+	var square;
+	return {
+		setters: [function (module) {
+			square = module.s;
+			exports("square", module.s);
+		}],
+		execute: (function () {
+
+			const cube = exports("cube", x => square(x) * x);
+
+		})
+	};
+}));
diff --git a/test/chunking-form/samples/top-level-await-import-3/_expected/system/generated-square.js b/test/chunking-form/samples/top-level-await-import-3/_expected/system/generated-square.js
@@ -0,0 +1,10 @@
+System.register([], (function (exports) {
+	'use strict';
+	return {
+		execute: (function () {
+
+			var square = exports("s", x => x * x);
+
+		})
+	};
+}));
diff --git a/test/chunking-form/samples/top-level-await-import-3/_expected/system/main.js b/test/chunking-form/samples/top-level-await-import-3/_expected/system/main.js
@@ -0,0 +1,21 @@
+System.register(['./generated-square.js'], (function (exports, module) {
+	'use strict';
+	var square;
+	return {
+		setters: [function (module) {
+			square = module.s;
+		}],
+		execute: (async function () {
+
+			async function doMaths() {
+				const maths = await module.import('./generated-maths.js');
+				assert.equal(maths.square(5), 25);
+				assert.equal(maths.cube(5), 125);
+			}
+
+			assert.equal(square(2), 4);
+			await doMaths();
+
+		})
+	};
+}));
diff --git a/test/chunking-form/samples/top-level-await-import-3/main.js b/test/chunking-form/samples/top-level-await-import-3/main.js
@@ -0,0 +1,10 @@
+import square from './square.js';
+
+async function doMaths() {
+	const maths = await import('./maths.js');
+	assert.equal(maths.square(5), 25);
+	assert.equal(maths.cube(5), 125);
+}
+
+assert.equal(square(2), 4);
+await doMaths();
diff --git a/test/chunking-form/samples/top-level-await-import-3/maths.js b/test/chunking-form/samples/top-level-await-import-3/maths.js
@@ -0,0 +1,5 @@
+import square from './square.js';
+
+export { default as square } from './square.js';
+
+export const cube = x => square(x) * x;
diff --git a/test/chunking-form/samples/top-level-await-import-3/square.js b/test/chunking-form/samples/top-level-await-import-3/square.js
@@ -0,0 +1 @@
+export default x => x * x;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@rollup/browser",`
`3`		`- "version": "4.52.0",`
	`3`	`+ "version": "4.52.2",`
`4`	`4`	`"description": "Next-generation ES module bundler browser build",`
`5`	`5`	`"main": "dist/rollup.browser.js",`
`6`	`6`	`"module": "dist/es/rollup.browser.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rollup",`
`3`		`- "version": "4.52.0",`
	`3`	`+ "version": "4.52.2",`
`4`	`4`	`"description": "Next-generation ES module bundler",`
`5`	`5`	`"main": "dist/rollup.js",`
`6`	`6`	`"module": "dist/es/rollup.js",`