Skip to content

Commit 052a9ce

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-cd81da74
2 parents 68d7fb2 + cd81da7 commit 052a9ce

File tree

14 files changed

+599
-1663
lines changed

14 files changed

+599
-1663
lines changed

.github/actions/install-and-cache-node-deps/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
steps:
66
- name: Restore Node dependencies cache
77
id: cache-node-modules
8-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
8+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
99
with:
1010
path: |
1111
node_modules
@@ -18,7 +18,7 @@ runs:
1818
shell: bash
1919
- name: Save Node dependencies cache
2020
if: steps.cache-node-modules.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master'
21-
uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
21+
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2222
with:
2323
path: |
2424
node_modules

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Node
3636
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
3737
with:
38-
node-version: 24.8.0
38+
node-version: 24.9.0
3939
- name: Install and Cache Node Dependencies
4040
uses: ./.github/actions/install-and-cache-node-deps
4141
- name: Lint
@@ -222,7 +222,7 @@ jobs:
222222
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
223223
if: ${{ !matrix.settings.docker && matrix.settings.target != 'x86_64-pc-windows-gnu' }}
224224
with:
225-
node-version: 24.8.0
225+
node-version: 24.9.0
226226
- uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
227227
if: ${{ matrix.settings.target == 'x86_64-pc-windows-gnu' }}
228228
with:
@@ -247,7 +247,7 @@ jobs:
247247
if: ${{ contains(matrix.settings.target, 'ohos') }}
248248
uses: openharmony-rs/setup-ohos-sdk@3c181b3244cec76aaec289ab84fb00f55f2fce3f # v0.2.4
249249
- name: Restore Cargo cache
250-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
250+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
251251
if: matrix.settings.cache-cargo != false
252252
with:
253253
path: |
@@ -263,7 +263,7 @@ jobs:
263263
with:
264264
version: 0.14.1
265265
- name: Install cargo-zigbuild
266-
uses: taiki-e/install-action@5597bc27da443ba8bf9a3bc4e5459ea59177de42 # v2.62.4
266+
uses: taiki-e/install-action@d0f4f69b07c0804d1003ca9a5a5f853423872ed9 # v2.62.13
267267
if: ${{ matrix.settings.cross == 'zig' }}
268268
env:
269269
GITHUB_TOKEN: ${{ github.token }}
@@ -302,7 +302,7 @@ jobs:
302302
shell: bash
303303
- name: Save Cargo cache
304304
if: github.ref == 'refs/heads/master' && matrix.settings.cache-cargo != false
305-
uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
305+
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
306306
with:
307307
path: |
308308
~/.cargo/registry/index/
@@ -508,7 +508,7 @@ jobs:
508508
- name: Setup Node
509509
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
510510
with:
511-
node-version: 24
511+
node-version: 24.9.0
512512
registry-url: 'https://registry.npmjs.org'
513513
- name: Update npm for publishing
514514
run: npm install -g npm@latest

.github/workflows/performance-report.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
toolchain: nightly-2025-07-25
4141
components: rust-src
4242
- name: Restore Cargo cache
43-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
43+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4444
with:
4545
path: |
4646
~/.cargo/registry/index/
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Node
5454
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
5555
with:
56-
node-version: 24.8.0
56+
node-version: 24.9.0
5757
- name: Install and Cache Node Dependencies
5858
uses: ./.github/actions/install-and-cache-node-deps
5959
- name: Build artefacts 123
@@ -82,7 +82,7 @@ jobs:
8282
toolchain: nightly-2025-07-25
8383
components: rust-src
8484
- name: Restore Cargo cache
85-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
85+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
8686
with:
8787
path: |
8888
~/.cargo/registry/index/
@@ -95,7 +95,7 @@ jobs:
9595
- name: Setup Node
9696
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
9797
with:
98-
node-version: 24.8.0
98+
node-version: 24.9.0
9999
- name: Install and Cache Node Dependencies
100100
uses: ./.github/actions/install-and-cache-node-deps
101101
- name: Download all artifacts

.github/workflows/repl-artefacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
toolchain: nightly-2025-07-25
4141
components: rust-src
4242
- name: Restore Cargo cache
43-
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
43+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4444
with:
4545
path: |
4646
~/.cargo/registry/index/
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Node
5454
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
5555
with:
56-
node-version: 24.8.0
56+
node-version: 24.9.0
5757
- name: Install and Cache Node Dependencies
5858
uses: ./.github/actions/install-and-cache-node-deps
5959
- name: Build artefacts

CHANGELOG.md

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

3+
## 4.52.4
4+
5+
_2025-10-03_
6+
7+
### Bug Fixes
8+
9+
- Fix an issue where the wrong branch of nullish coalescing was picked (#6133)
10+
11+
### Pull Requests
12+
13+
- [#6128](https://github.com/rollup/rollup/pull/6128): Enable npm OIDC publishing (@lukastaegert)
14+
- [#6133](https://github.com/rollup/rollup/pull/6133): Correct nullish coalescing branch resolution for symbol left value (@TrickyPi)
15+
- [#6134](https://github.com/rollup/rollup/pull/6134): fix(deps): lock file maintenance minor/patch updates (@renovate[bot], @lukastaegert)
16+
317
## 4.52.3
418

519
_2025-09-27_

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.52.4-3",
3+
"version": "4.52.4",
44
"description": "Next-generation ES module bundler browser build",
55
"main": "dist/rollup.browser.js",
66
"module": "dist/es/rollup.browser.js",

0 commit comments

Comments
 (0)