docs(en): merging all conflicts

Author: docschina-bot

.github/workflows/build-and-tests.yml

@@ -339,7 +339,7 @@ jobs:
           key: node-modules-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
           restore-keys: node-modules-${{ runner.os }}
       - name: Build
-        uses: cross-platform-actions/action@v0.26.0
+        uses: cross-platform-actions/action@v0.27.0
         with:
           operating_system: ${{ matrix.settings.name }}
           architecture: ${{ matrix.settings.architecture }}
@@ -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

CHANGELOG.md

@@ -1,5 +1,64 @@
 # rollup changelog
 
+## 4.34.1
+
+_2025-02-03_
+
+### Bug Fixes
+
+- Ensure throwing objects includes the entire object (#5825)
+
+### Pull Requests
+
+- [#5825](https://github.com/rollup/rollup/pull/5825): Ensure that all properties of throw statements are included (@lukastaegert)
+
+## 4.34.0
+
+_2025-02-01_
+
+### Features
+
+- Tree-shake unused properties in object literals (re-implements #5420) (#5737)
+
+### Pull Requests
+
+- [#5737](https://github.com/rollup/rollup/pull/5737): Reapply object tree-shaking (@lukastaegert, @TrickyPi)
+
+## 4.33.0
+
+_2025-02-01_
+
+### Features
+
+- Correctly detect literal value of more negated expressions (#5812)
+
+### Bug Fixes
+
+- Use the correct with/assert attribute key in dynamic imports (#5818)
+- Fix an issue where logical expressions were considered to have the wrong value (#5819)
+
+### Pull Requests
+
+- [#5812](https://github.com/rollup/rollup/pull/5812): feat: optimize the literal value of unary expressions (@TrickyPi)
+- [#5816](https://github.com/rollup/rollup/pull/5816): fix(deps): update swc monorepo (major) (@renovate[bot], @lukastaegert)
+- [#5817](https://github.com/rollup/rollup/pull/5817): fix(deps): lock file maintenance minor/patch updates (@renovate[bot], @lukastaegert)
+- [#5818](https://github.com/rollup/rollup/pull/5818): support for changing the attributes key for dynamic imports (@TrickyPi)
+- [#5819](https://github.com/rollup/rollup/pull/5819): Return UnknownValue if getLiteralValueAtPath is called recursively within logical expressions (@TrickyPi)
+- [#5820](https://github.com/rollup/rollup/pull/5820): return null (@kingma-sbw)
+
+## 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_

browser/package.json

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

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
+>>>>>>> 0f20524ad9ecd166a900d43af93f05a3405d2a45
 			path.relative(
 				'src',
 				file.slice(0, file.length - path.extname(file).length)
@@ -1465,6 +1470,8 @@ function manualChunks(id) {
 	if (id.includes('node_modules')) {
 		return 'vendor';
 	}
+
+	return null;
 }
 ```