docs(en): merging all conflicts

rollup · Nov 19, 2023 · b335140 · b335140
2 parents 6ff8e02 + ce6f492
commit b335140
Show file tree

Hide file tree

Showing 27 changed files with 591 additions and 552 deletions.
diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml
@@ -59,6 +59,7 @@ jobs:
       fail-fast: false
       matrix:
         settings:
+          # WASM
           - host: windows-latest
             target: x86_64-pc-windows-msvc
             name: wasm
@@ -81,12 +82,8 @@ jobs:
             path: |
               wasm-node/
               .empty
-          - host: macos-latest
-            target: x86_64-apple-darwin
-            build: >-
-              set -e &&
-              npm run build:napi -- --release &&
-              strip -x *.node
+
+          # Windows
           - host: windows-latest
             build: npm run build:napi -- --release
             target: x86_64-pc-windows-msvc
@@ -96,6 +93,26 @@ jobs:
               rustup target add i686-pc-windows-msvc &&
               npm run build:napi -- --release --target i686-pc-windows-msvc
             target: i686-pc-windows-msvc
+          - host: windows-latest
+            target: aarch64-pc-windows-msvc
+            build: npm run build:napi -- --release --target aarch64-pc-windows-msvc
+
+          # MacOS
+          - host: macos-latest
+            target: x86_64-apple-darwin
+            build: >-
+              set -e &&
+              npm run build:napi -- --release &&
+              strip -x *.node
+          - host: macos-latest
+            target: aarch64-apple-darwin
+            build: >-
+              set -e &&
+              rustup target add aarch64-apple-darwin &&
+              npm run build:napi -- --release --target aarch64-apple-darwin &&
+              strip -x *.node
+
+          # Linux
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
@@ -110,13 +127,16 @@ jobs:
             build: >-
               set -e &&
               npm run build:napi -- --release && strip *.node
-          - host: macos-latest
-            target: aarch64-apple-darwin
+          - host: ubuntu-latest
+            target: armv7-unknown-linux-gnueabihf
+            zig: true
+            setup: |
+              sudo apt-get update
+              sudo apt-get install gcc-arm-linux-gnueabihf -y
             build: >-
               set -e &&
-              rustup target add aarch64-apple-darwin &&
-              npm run build:napi -- --release --target aarch64-apple-darwin &&
-              strip -x *.node
+              npm run build:napi -- --release --target armv7-unknown-linux-gnueabihf &&
+              arm-linux-gnueabihf-strip *.node
           - host: ubuntu-latest
             target: aarch64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
@@ -128,40 +148,27 @@ jobs:
               npm run build:napi -- --release --target aarch64-unknown-linux-gnu &&
               aarch64-unknown-linux-gnu-strip *.node
           - host: ubuntu-latest
-            target: armv7-unknown-linux-gnueabihf
-            zig: true
-            setup: |
-              sudo apt-get update
-              sudo apt-get install gcc-arm-linux-gnueabihf -y
-            build: >-
-              set -e &&
-              npm run build:napi -- --release --target armv7-unknown-linux-gnueabihf &&
-              arm-linux-gnueabihf-strip *.node
-          - host: ubuntu-latest
-            target: aarch64-linux-android
+            target: aarch64-unknown-linux-musl
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
             build: >-
               set -e &&
-              npm run build:napi -- --release --target aarch64-linux-android &&
-              ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
+              export JEMALLOC_SYS_WITH_LG_PAGE=16 &&
+              rustup default nightly-2023-10-05 &&
+              rustup target add aarch64-unknown-linux-musl &&
+              RUSTFLAGS='-C target-feature=-crt-static -C linker=aarch64-linux-musl-gcc' npm run build:napi -- --release --target aarch64-unknown-linux-musl &&
+              /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
           - host: ubuntu-latest
             target: armv7-linux-androideabi
             build: >-
               set -e &&
               npm run build:napi -- --release --target armv7-linux-androideabi &&
               ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
           - host: ubuntu-latest
-            target: aarch64-unknown-linux-musl
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            target: aarch64-linux-android
             build: >-
               set -e &&
-              export JEMALLOC_SYS_WITH_LG_PAGE=16 &&
-              rustup default nightly-2023-10-05 &&
-              rustup target add aarch64-unknown-linux-musl &&
-              RUSTFLAGS='-C target-feature=-crt-static -C linker=aarch64-linux-musl-gcc' npm run build:napi -- --release --target aarch64-unknown-linux-musl &&
-              /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
-          - host: windows-latest
-            target: aarch64-pc-windows-msvc
-            build: npm run build:napi -- --release --target aarch64-pc-windows-msvc
+              npm run build:napi -- --release --target aarch64-linux-android &&
+              ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
     name: Build ${{ matrix.settings.name || matrix.settings.target }}
     runs-on: ${{ matrix.settings.host }}
     timeout-minutes: 30

diff --git a/.github/workflows/repl-artefacts.yml b/.github/workflows/repl-artefacts.yml
@@ -8,6 +8,10 @@ on:
       - reopened
       - labeled
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # rollup changelog
 
+## 4.5.0
+
+_2023-11-18_
+
+### Bug Fixes
+
+- Show a proper error when using native Rollup on armv7 musl Linux (#5255)
+
+### Pull Requests
+
+- [#5251](https://github.com/rollup/rollup/pull/5251): doc fix import assertions to attributes in API plugin development page (@lhapaipai)
+- [#5253](https://github.com/rollup/rollup/pull/5253): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
+- [#5255](https://github.com/rollup/rollup/pull/5255): Error for armv7 musl build (@lukastaegert)
+
 ## 4.4.1
 
 _2023-11-14_

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