Skip to content

Commit a896eb9

Browse files
waynzhwaynzh
authored
Merge pull request #191 from rollup/sync-299cc46f
docs(en): merge rollup/master into rollup-docs-cn/master @ 299cc46
2 parents 63523fa + 2905568 commit a896eb9

File tree

12 files changed

+202
-6
lines changed

12 files changed

+202
-6
lines changed

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ jobs:
160160
sudo apt-get update
161161
sudo apt-get install gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu -y
162162
cross: napi
163+
- host: ubuntu-latest
164+
target: powerpc64le-unknown-linux-musl
165+
cross: zig
163166
- host: ubuntu-latest
164167
target: s390x-unknown-linux-gnu
165168
env:
@@ -183,6 +186,9 @@ jobs:
183186
--slave /usr/bin/loongarch64-linux-gnu-gcov loongarch64-linux-gnu-gcov /usr/bin/loongarch64-linux-gnu-gcov-13
184187
sudo update-alternatives \
185188
--install /usr/bin/loongarch64-linux-gnu-cpp loongarch64-linux-gnu-cpp /usr/bin/loongarch64-linux-gnu-cpp-13 100
189+
- host: ubuntu-latest
190+
target: loongarch64-unknown-linux-musl
191+
cross: zig
186192
- host: ubuntu-latest
187193
target: aarch64-unknown-linux-ohos
188194

@@ -302,6 +308,65 @@ jobs:
302308
if-no-files-found: error
303309
if: ${{ !matrix.settings.is-wasm-build }}
304310

311+
build-openbsd:
312+
name: Build x86_64-unknown-openbsd
313+
runs-on: ubuntu-latest
314+
strategy:
315+
matrix:
316+
os:
317+
- name: openbsd
318+
architecture: x86-64
319+
version: '7.8'
320+
321+
steps:
322+
- name: Checkout Commit
323+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
324+
325+
- name: Restore Cargo cache
326+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
327+
with:
328+
path: |
329+
~/.cargo/registry/index/
330+
~/.cargo/registry/cache/
331+
~/.cargo/git/db/
332+
.cargo-cache
333+
rust/target/
334+
key: x86_64-unknown-openbsd-cargo-ubuntu-latest-${{ hashFiles('rust/Cargo.lock') }}
335+
restore-keys: x86_64-unknown-openbsd-cargo-ubuntu-latest
336+
337+
- name: Install and Cache Node Dependencies
338+
uses: ./.github/actions/install-and-cache-node-deps
339+
340+
- name: Build (OpenBSD)
341+
uses: cross-platform-actions/[email protected]
342+
with:
343+
operating_system: ${{ matrix.os.name }}
344+
architecture: ${{ matrix.os.architecture }}
345+
version: ${{ matrix.os.version }}
346+
run: |
347+
sudo pkg_add rust node cmake
348+
sed -i 's^rustflags.*^^g' rust/bindings_napi/.cargo/config.toml
349+
npm run build:napi
350+
351+
- name: Save Cargo cache
352+
if: github.ref == 'refs/heads/master'
353+
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
354+
with:
355+
path: |
356+
~/.cargo/registry/index/
357+
~/.cargo/registry/cache/
358+
~/.cargo/git/db/
359+
.cargo-cache
360+
rust/target/
361+
key: x86_64-unknown-openbsd-cargo-ubuntu-latest-${{ hashFiles('rust/Cargo.lock') }}
362+
363+
- name: Upload napi artifact
364+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
365+
with:
366+
name: bindings-x86_64-unknown-openbsd
367+
path: ${{ env.APP_NAME }}.*.node
368+
if-no-files-found: error
369+
305370
# smoke test for some architectures that do not receive the full test suite
306371
smoke-test:
307372
permissions:
@@ -392,6 +457,7 @@ jobs:
392457
name: Test${{ matrix.additionalName || '' }} Node ${{ matrix.node }} (${{ matrix.settings.target }})
393458
needs:
394459
- build
460+
- build-openbsd
395461
strategy:
396462
fail-fast: false
397463
matrix:

‎CHANGELOG.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,48 @@
11
# rollup changelog
22

3+
## 4.55.1
4+
5+
_2026-01-05_
6+
7+
### Bug Fixes
8+
9+
- Fix artifact reference for OpenBSD (#6231)
10+
11+
### Pull Requests
12+
13+
- [#6231](https://github.com/rollup/rollup/pull/6231): Fix OpenBSD artifacts and ensure OIDC is working (@lukastaegert)
14+
15+
## 4.55.0
16+
17+
_2026-01-05_
18+
19+
### Features
20+
21+
- Natively support ppc64 Linux Musl targets (#5997)
22+
- Natively support loong64 Linux Musl targets (#5997)
23+
- Natively support OpenBSD targets (#6224)
24+
25+
### Bug Fixes
26+
27+
- Prevent some cycles when using top-level-await (#6221)
28+
- Warn when generating cycling manual chunks (#6225)
29+
30+
### Pull Requests
31+
32+
- [#5997](https://github.com/rollup/rollup/pull/5997): Add support for ppc64 & loong64 musl linux (@fossdd)
33+
- [#6218](https://github.com/rollup/rollup/pull/6218): fix(deps): update swc monorepo (major) (@renovate[bot], @lukastaegert)
34+
- [#6219](https://github.com/rollup/rollup/pull/6219): fix(deps): lock file maintenance minor/patch updates (@renovate[bot])
35+
- [#6220](https://github.com/rollup/rollup/pull/6220): chore(deps): lock file maintenance (@renovate[bot])
36+
- [#6221](https://github.com/rollup/rollup/pull/6221): Handle TLA dynamic import cycles in chunkAssignment (@TrickyPi)
37+
- [#6222](https://github.com/rollup/rollup/pull/6222): Apply to adjust the description of the command-line parameter 'rollup… (@image-gif, @lukastaegert)
38+
- [#6223](https://github.com/rollup/rollup/pull/6223): Deduplicate CLI help file (@lukastaegert)
39+
- [#6224](https://github.com/rollup/rollup/pull/6224): OpenBSD support (@edshot99, @lukastaegert)
40+
- [#6225](https://github.com/rollup/rollup/pull/6225): Throw a warning for circular chunks (@TrickyPi)
41+
- [#6226](https://github.com/rollup/rollup/pull/6226): fix(deps): update swc monorepo (major) (@renovate[bot])
42+
- [#6227](https://github.com/rollup/rollup/pull/6227): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
43+
- [#6228](https://github.com/rollup/rollup/pull/6228): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
44+
- [#6229](https://github.com/rollup/rollup/pull/6229): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
45+
346
## 4.54.0
447

548
_2025-12-20_

‎browser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rollup/browser",
3-
"version": "4.54.0",
3+
"version": "4.55.1",
44
"description": "Next-generation ES module bundler browser build",
55
"main": "dist/rollup.browser.js",
66
"module": "dist/es/rollup.browser.js",

‎native.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,15 @@ const bindingsByPlatformAndArch = {
3434
linux: {
3535
arm: { base: 'linux-arm-gnueabihf', musl: 'linux-arm-musleabihf' },
3636
arm64: { base: 'linux-arm64-gnu', musl: 'linux-arm64-musl' },
37-
loong64: { base: 'linux-loong64-gnu', musl: null },
38-
ppc64: { base: 'linux-ppc64-gnu', musl: null },
37+
loong64: { base: 'linux-loong64-gnu', musl: 'linux-loong64-musl' },
38+
ppc64: { base: 'linux-ppc64-gnu', musl: 'linux-ppc64-musl' },
3939
riscv64: { base: 'linux-riscv64-gnu', musl: 'linux-riscv64-musl' },
4040
s390x: { base: 'linux-s390x-gnu', musl: null },
4141
x64: { base: 'linux-x64-gnu', musl: 'linux-x64-musl' }
4242
},
43+
openbsd: {
44+
x64: { base: 'openbsd-x64' }
45+
},
4346
openharmony: {
4447
arm64: { base: 'openharmony-arm64' }
4548
},

‎npm/linux-loong64-musl/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# `@rollup/rollup-linux-loong64-musl`
2+
3+
This is the **loongarch64-unknown-linux-musl** binary for `rollup`

‎npm/linux-loong64-musl/package.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "@rollup/rollup-linux-loong64-musl",
3+
"version": "0.0.0",
4+
"os": [
5+
"linux"
6+
],
7+
"cpu": [
8+
"loong64"
9+
],
10+
"files": [
11+
"rollup.linux-loong64-musl.node"
12+
],
13+
"description": "Native bindings for Rollup",
14+
"author": "Lukas Taegert-Atkinson",
15+
"homepage": "https://rollupjs.org/",
16+
"license": "MIT",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
21+
"libc": [
22+
"musl"
23+
],
24+
"main": "./rollup.linux-loong64-musl.node"
25+
}

‎npm/linux-ppc64-musl/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# `@rollup/rollup-linux-ppc64-musl`
2+
3+
This is the **powerpc64le-unknown-linux-musl** binary for `rollup`

‎npm/linux-ppc64-musl/package.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "@rollup/rollup-linux-ppc64-musl",
3+
"version": "0.0.0",
4+
"os": [
5+
"linux"
6+
],
7+
"cpu": [
8+
"ppc64"
9+
],
10+
"files": [
11+
"rollup.linux-ppc64-musl.node"
12+
],
13+
"description": "Native bindings for Rollup",
14+
"author": "Lukas Taegert-Atkinson",
15+
"homepage": "https://rollupjs.org/",
16+
"license": "MIT",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
21+
"libc": [
22+
"musl"
23+
],
24+
"main": "./rollup.linux-ppc64-musl.node"
25+
}

‎npm/openbsd-x64/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# `@rollup/rollup-openbsd-x64`
2+
3+
This is the **x86_64-unknown-openbsd** binary for `rollup`

‎npm/openbsd-x64/package.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"name": "@rollup/rollup-openbsd-x64",
3+
"version": "0.0.0",
4+
"os": [
5+
"openbsd"
6+
],
7+
"cpu": [
8+
"x64"
9+
],
10+
"files": [
11+
"rollup.openbsd-x64.node"
12+
],
13+
"description": "Native bindings for Rollup",
14+
"author": "Lukas Taegert-Atkinson",
15+
"homepage": "https://rollupjs.org/",
16+
"license": "MIT",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
21+
"main": "./rollup.openbsd-x64.node"
22+
}

0 commit comments

Comments
 (0)