Merge branch 'master' into fix-wasm-node-crashes-with-xxhash

rollup · Oct 15, 2023 · f516c43 · f516c43
2 parents 9ad519c + d8b31a2
commit f516c43
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # rollup changelog
 
+## 4.1.1
+
+_2023-10-15_
+
+### Bug Fixes
+
+- Improve Node parsing performance (#5201)
+
+### Pull Requests
+
+- [#5201](https://github.com/rollup/rollup/pull/5201): perf: use mimalloc for bindings_napi (@sapphi-red)
+
 ## 4.1.0
 
 _2023-10-14_

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

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

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/bindings_napi/Cargo.toml b/rust/bindings_napi/Cargo.toml
@@ -15,5 +15,11 @@ napi-derive = "2.13.0"
 parse_ast = { path = "../parse_ast" }
 xxhash = { path = "../xxhash" }
 
+[target.'cfg(not(target_os = "linux"))'.dependencies]
+mimalloc-rust = { version = "0.2" }
+
+[target.'cfg(all(target_os = "linux", not(all(target_env = "musl", target_arch = "aarch64"))))'.dependencies]
+mimalloc-rust = { version = "0.2", features = ["local-dynamic-tls"] }
+
 [build-dependencies]
 napi-build = "2.0.1"
diff --git a/rust/bindings_napi/src/lib.rs b/rust/bindings_napi/src/lib.rs
@@ -2,6 +2,13 @@ use napi::bindgen_prelude::*;
 use napi_derive::napi;
 use parse_ast::parse_ast;
 
+#[cfg(all(
+  not(all(target_os = "linux", target_env = "musl", target_arch = "aarch64")),
+  not(debug_assertions)
+))]
+#[global_allocator]
+static ALLOC: mimalloc_rust::GlobalMiMalloc = mimalloc_rust::GlobalMiMalloc;
+
 #[napi]
 pub fn parse(code: String, allow_return_outside_function: bool) -> Buffer {
   parse_ast(code, allow_return_outside_function).into()