docs(en): merging all conflicts

rollup · Jan 28, 2025 · b289c79 · b289c79
2 parents 467f961 + abcf4fe
commit b289c79
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 9 deletions.
diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml
@@ -391,10 +391,11 @@ jobs:
 #          - arch: armv7
 #            distro: alpine_latest
 #            target: armv7-unknown-linux-musleabihf
-          - arch: ppc64le
-            distro: ubuntu_latest
-            target: powerpc64le-unknown-linux-gnu
-            use-nvm: true
+# This one has become very flaky as of late
+#          - arch: ppc64le
+#            distro: ubuntu_latest
+#            target: powerpc64le-unknown-linux-gnu
+#            use-nvm: true
           - arch: s390x
             distro: ubuntu_latest
             target: s390x-unknown-linux-gnu

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rollup changelog
 
+## 4.32.1
+
+_2025-01-28_
+
+### Bug Fixes
+
+- Fix possible crash when optimizing logical expressions (#5804)
+
+### Pull Requests
+
+- [#5804](https://github.com/rollup/rollup/pull/5804): fix: set hasDeoptimizedCache to true as early as possible (@TrickyPi)
+- [#5813](https://github.com/rollup/rollup/pull/5813): Fix typo (@kantuni)
+
 ## 4.32.0
 
 _2025-01-24_

diff --git a/browser/package.json b/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.32.0",
+  "version": "4.32.1",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md
@@ -129,8 +129,13 @@ import { fileURLToPath } from 'node:url';
 export default {
 	input: Object.fromEntries(
 		globSync('src/**/*.js').map(file => [
+<<<<<<< HEAD
 			// 这里将删除 `src/` 以及每个文件的扩展名。
 			// 因此，例如 src/nested/foo.js 会变成 nested/foo
+=======
+			// This removes `src/` as well as the file extension from each
+			// file, so e.g. src/nested/foo.js becomes nested/foo
+>>>>>>> abcf4febe11f3d313fae41ddca35fc60670b9ff8
 			path.relative(
 				'src',
 				file.slice(0, file.length - path.extname(file).length)

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.32.0",
+  "version": "4.32.1",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",

diff --git a/src/ast/nodes/LogicalExpression.ts b/src/ast/nodes/LogicalExpression.ts
@@ -69,6 +69,7 @@ export default class LogicalExpression extends NodeBase implements Deoptimizable
 
 	deoptimizeCache(): void {
 		if (this.hasDeoptimizedCache) return;
+		this.hasDeoptimizedCache = true;
 		if (this.usedBranch) {
 			const unusedBranch = this.usedBranch === this.left ? this.right : this.left;
 			this.usedBranch = null;
@@ -85,7 +86,6 @@ export default class LogicalExpression extends NodeBase implements Deoptimizable
 		// Request another pass because we need to ensure "include" runs again if
 		// it is rendered
 		context.requestTreeshakingPass();
-		this.hasDeoptimizedCache = true;
 	}
 
 	deoptimizePath(path: ObjectPath): void {

diff --git a/test/function/samples/deoptimize-logical-expressions-2/_config.js b/test/function/samples/deoptimize-logical-expressions-2/_config.js
@@ -0,0 +1,3 @@
+module.exports = defineTest({
+	description: 'Successfully built despite the deoptimization of a logical expression'
+});
diff --git a/test/function/samples/deoptimize-logical-expressions-2/main.js b/test/function/samples/deoptimize-logical-expressions-2/main.js
@@ -0,0 +1,8 @@
+function foo() {
+	return bar || 'a';
+}
+let bar = true;
+export default function () {
+	bar = false;
+	return foo() !== 'b' || (foo() == 'c' && foo() == 'd');
+}