docs(en): merging all conflicts

CHANGELOG.md

@@ -1,5 +1,25 @@
 # rollup changelog
 
+## 4.9.2
+
+_2023-12-30_
+
+### Bug Fixes
+
+- Extend support for arbitrary namespace identifiers in SystemJS (#5321)
+- Do not wrongly flag functions without side effects as side effects if moduleSideEffects is false (#5322)
+
+### Pull Requests
+
+- [#5305](https://github.com/rollup/rollup/pull/5305): Add JSDoc types to internal scripts (@lukastaegert)
+- [#5309](https://github.com/rollup/rollup/pull/5309): chore(deps): update actions/download-artifact action to v4 (@renovate[bot])
+- [#5311](https://github.com/rollup/rollup/pull/5311): chode: add node badge (@btea)
+- [#5312](https://github.com/rollup/rollup/pull/5312): Remove rollup-plugin-thatworks from devDeps (@TrickyPi)
+- [#5318](https://github.com/rollup/rollup/pull/5318): chore(deps): update dependency eslint-plugin-unicorn to v50 (@renovate[bot])
+- [#5319](https://github.com/rollup/rollup/pull/5319): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
+- [#5321](https://github.com/rollup/rollup/pull/5321): Handle arbitrary namespace identifiers in some SystemJS scenarios (@lukastaegert)
+- [#5322](https://github.com/rollup/rollup/pull/5322): Do not handle declarations in modules without side effects as TDZ (@lukastaegert)
+
 ## 4.9.1
 
 _2023-12-17_

README.md

@@ -6,17 +6,34 @@
   <a href="https://www.npmjs.com/package/rollup">
     <img src="https://img.shields.io/npm/v/rollup.svg" alt="npm version" >
   </a>
+<<<<<<< HEAD
+=======
+  <a href="https://nodejs.org/en/about/previous-releases">
+    <img src="https://img.shields.io/node/v/rollup.svg" alt="node compatibility">
+  </a>
+  <a href="https://packagephobia.now.sh/result?p=rollup">
+    <img src="https://packagephobia.now.sh/badge?p=rollup" alt="install size" >
+  </a>
+  <a href="https://codecov.io/gh/rollup/rollup">
+    <img src="https://codecov.io/gh/rollup/rollup/graph/badge.svg" alt="code coverage" >
+  </a>
+>>>>>>> 347a34745b2679c1192535db3c0f60889861d3ad
   <a href="#backers" alt="sponsors on Open Collective">
-      <img src="https://opencollective.com/rollup/backers/badge.svg" alt="backers" >
+    <img src="https://opencollective.com/rollup/backers/badge.svg" alt="backers" >
   </a> 
   <a href="#sponsors" alt="Sponsors on Open Collective">
     <img src="https://opencollective.com/rollup/sponsors/badge.svg" alt="sponsors" >
   </a> 
   <a href="https://github.com/rollup/rollup/blob/master/LICENSE.md">
     <img src="https://img.shields.io/npm/l/rollup.svg" alt="license">
   </a>
+<<<<<<< HEAD
   <a href='https://rollup-docs-cn.netlify.app'>
     <img src='https://api.netlify.com/api/v1/badges/f1abf685-0ad9-49d6-a16f-02b2ee7ba2a7/deploy-status'>
+=======
+  <a href='https://is.gd/rollup_chat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge'>
+    <img src='https://img.shields.io/discord/466787075518365708?color=778cd1&label=chat' alt='Join the chat at https://is.gd/rollup_chat'>
+>>>>>>> 347a34745b2679c1192535db3c0f60889861d3ad
   </a>
 </p>
 

browser/package.json

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