docs(en): merging all conflicts

CHANGELOG.md

@@ -1,5 +1,48 @@
 # rollup changelog
 
+## 4.27.2
+
+_2024-11-15_
+
+### Bug Fixes
+
+- Ensure unused variables in patterns are always deconflicted if rendered (#5728)
+
+### Pull Requests
+
+- [#5728](https://github.com/rollup/rollup/pull/5728): Fix more variable deconflicting issues (@lukastaegert)
+
+## 4.27.1
+
+_2024-11-15_
+
+### Bug Fixes
+
+- Fix some situations where parameter declarations could put Rollup into an infinite loop (#5727)
+
+### Pull Requests
+
+- [#5727](https://github.com/rollup/rollup/pull/5727): Debug out-of-memory issues with Rollup v4.27.0 (@lukastaegert)
+
+## 4.27.0
+
+_2024-11-15_
+
+### Features
+
+- Tree-shake unused properties in object literals (#5420)
+
+### Bug Fixes
+
+- Change hash length limit to 21 to avoid inconsistent hash length (#5423)
+
+### Pull Requests
+
+- [#5420](https://github.com/rollup/rollup/pull/5420): feat: implement object tree-shaking (@TrickyPi, @lukastaegert)
+- [#5723](https://github.com/rollup/rollup/pull/5723): Reduce max hash size to 21 (@lukastaegert)
+- [#5724](https://github.com/rollup/rollup/pull/5724): fix(deps): update swc monorepo (major) (@renovate[bot])
+- [#5725](https://github.com/rollup/rollup/pull/5725): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
+
 ## 4.26.0
 
 _2024-11-13_

browser/package.json

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

docs/migration/index.md

@@ -24,7 +24,11 @@ Rollup 现在包含了自动安装（和删除）的原生代码，如果你的
 
 面向浏览器的构建（NPM 上的 `@rollup/browser`）现在依赖于一个需要提供的 WASM 文件。如果你正在使用 Vite 的浏览器构建，你需要将 `"@rollup/browser"` 添加到 `optimizeDeps.exclude` 中，否则 `npm run dev` 将因为 `.wasm` 文件的无效路径而失败（请参阅 [vitejs #14609](https://github.com/vitejs/vite/issues/14609)）。否则，它应该可以正常工作，无需任何特定的干预。
 
+<<<<<<< HEAD
 否则，一个明显的变化是 Rollup 现在在文件名中使用 url 安全的 base64 哈希，而不是旧的 base16 哈希。这提供了更多的哈希安全性，但意味着由于技术原因，哈希长度现在最多限制为 22 个字符。
+=======
+Otherwise, an obvious change is that Rollup now uses url-safe base64 hashes in file names instead of the older base16 hashes. This provides more hash safety but means that hash length is now limited to at most 21 characters for technical reasons.
+>>>>>>> a503a4dd9982bf20fd38aeb171882a27828906ae
 
 当打包 CLI 应用程序时，如果输出 [`format`](../configuration-options/index.md#output-format) 为 `es` 或 `cjs`，Rollup 现在将自动保留入口文件中的 shebang 注释。以前，你需要通过插件添加注释。