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

Author: docschina-bot

CHANGELOG.md

@@ -1,5 +1,24 @@
 # rollup changelog
 
+## 4.45.0
+
+_2025-07-12_
+
+### Features
+
+- Improve tree-shaking when both branches of a conditional expression return the same boolean value (#6000)
+- In environments that support both CJS and ESM, prefer the ESM build of Rollup (#6005)
+
+### Bug Fixes
+
+- Ensure static blocks do not prevent tree-shaking if they access `this` (#6001)
+
+### Pull Requests
+
+- [#6000](https://github.com/rollup/rollup/pull/6000): feat: improve get literal value for conditional expression (@ahabhgk, @lukastaegert)
+- [#6001](https://github.com/rollup/rollup/pull/6001): Correct the parent scope for static blocks (@TrickyPi, @lukastaegert)
+- [#6005](https://github.com/rollup/rollup/pull/6005): fix: export field order prefer esm (@DylanPiercey)
+
 ## 4.44.2
 
 _2025-07-04_

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.44.2",
+  "version": "4.45.0",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",
@@ -32,8 +32,8 @@
   "exports": {
     ".": {
       "types": "./dist/rollup.browser.d.ts",
-      "require": "./dist/rollup.browser.js",
-      "import": "./dist/es/rollup.browser.js"
+      "import": "./dist/es/rollup.browser.js",
+      "require": "./dist/rollup.browser.js"
     },
     "./dist/*": "./dist/*"
   }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "4.44.2",
+  "version": "4.45.0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -227,8 +227,8 @@
   "exports": {
     ".": {
       "types": "./dist/rollup.d.ts",
-      "require": "./dist/rollup.js",
-      "import": "./dist/es/rollup.js"
+      "import": "./dist/es/rollup.js",
+      "require": "./dist/rollup.js"
     },
     "./loadConfigFile": {
       "types": "./dist/loadConfigFile.d.ts",
@@ -237,13 +237,13 @@
     },
     "./getLogFilter": {
       "types": "./dist/getLogFilter.d.ts",
-      "require": "./dist/getLogFilter.js",
-      "import": "./dist/es/getLogFilter.js"
+      "import": "./dist/es/getLogFilter.js",
+      "require": "./dist/getLogFilter.js"
     },
     "./parseAst": {
       "types": "./dist/parseAst.d.ts",
-      "require": "./dist/parseAst.js",
-      "import": "./dist/es/parseAst.js"
+      "import": "./dist/es/parseAst.js",
+      "require": "./dist/parseAst.js"
     },
     "./dist/*": "./dist/*",
     "./package.json": "./package.json"

package.json

@@ -16,7 +16,7 @@ import { tryCastLiteralValueToBoolean } from '../utils/tryCastLiteralValueToBool
 import type * as NodeType from './NodeType';
 import { Flag, isFlagSet, setFlag } from './shared/BitFlags';
 import type { ExpressionEntity, LiteralValueOrUnknown } from './shared/Expression';
-import { UnknownValue } from './shared/Expression';
+import { UnknownFalsyValue, UnknownTruthyValue, UnknownValue } from './shared/Expression';
 import { MultiExpression } from './shared/MultiExpression';
 import type { ExpressionNode, IncludeChildren } from './shared/Node';
 import { doNotDeoptimize, NodeBase, onlyIncludeSelfNoDeoptimize } from './shared/Node';
@@ -78,7 +78,18 @@ export default class ConditionalExpression extends NodeBase implements Deoptimiz
 		origin: DeoptimizableEntity
 	): LiteralValueOrUnknown {
 		const usedBranch = this.getUsedBranch();
-		if (!usedBranch) return UnknownValue;
+		if (!usedBranch) {
+			const consequentValue = this.consequent.getLiteralValueAtPath(path, recursionTracker, origin);
+			const castedConsequentValue = tryCastLiteralValueToBoolean(consequentValue);
+			if (castedConsequentValue === UnknownValue) return UnknownValue;
+			const alternateValue = this.alternate.getLiteralValueAtPath(path, recursionTracker, origin);
+			const castedAlternateValue = tryCastLiteralValueToBoolean(alternateValue);
+			if (castedConsequentValue !== castedAlternateValue) return UnknownValue;
+			this.expressionsToBeDeoptimized.push(origin);
+			if (consequentValue !== alternateValue)
+				return castedConsequentValue ? UnknownTruthyValue : UnknownFalsyValue;
+			return consequentValue;
+		}
 		this.expressionsToBeDeoptimized.push(origin);
 		return usedBranch.getLiteralValueAtPath(path, recursionTracker, origin);
 	}

src/ast/nodes/ConditionalExpression.ts

@@ -5,3 +5,9 @@
 if (typeof parseInt === 'function' ?? 'a' === 'a') {
 	assert.ok(true);
 }
+
+if (!(unknownGlobal ? 'asdf' : true)) ;
+
+if (unknownGlobal ? 0 : false) ;
+
+if (!(unknownGlobal ? 'a' === 'a' : true)) ;

test/form/samples/treeshake-if-statement/_expected.js

@@ -9,3 +9,15 @@ if (typeof parseInt === 'function' || 'a' === 'a') {
 if (typeof parseInt === 'function' ?? 'a' === 'a') {
 	assert.ok(true);
 }
+
+if (!(unknownGlobal ? 'asdf' : true)) {
+	assert.ok(false);
+}
+
+if (unknownGlobal ? 0 : false) {
+	assert.ok(false);
+}
+
+if (!(unknownGlobal ? 'a' === 'a' : true)) {
+	assert.ok(false);
+}