Skip to content

Commit 47afd43

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-cca6454c
2 parents f86b0af + cca6454 commit 47afd43

36 files changed

Lines changed: 320 additions & 281 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252
with:
253253
version: 0.14.1
254254
- name: Install cargo-zigbuild
255-
uses: taiki-e/install-action@7ea35f098a7369cd23488403f58be9c491a6c55f # v2.77.0
255+
uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6
256256
if: ${{ matrix.settings.cross == 'zig' }}
257257
env:
258258
GITHUB_TOKEN: ${{ github.token }}

CHANGELOG.md

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

3+
## 4.60.4
4+
5+
_2026-05-14_
6+
7+
### Bug Fixes
8+
9+
- Improve stability of chunk hashes (#6362)
10+
11+
### Pull Requests
12+
13+
- [#6362](https://github.com/rollup/rollup/pull/6362): fix: stabilize chunk assignment across parallel file reads (@sonukapoor, @Sonu Kapoor, @TrickyPi, @lukastaegert)
14+
- [#6370](https://github.com/rollup/rollup/pull/6370): fix(deps): update minor/patch updates (@renovate[bot])
15+
- [#6371](https://github.com/rollup/rollup/pull/6371): chore(deps): update dependency lru-cache to v11 (@renovate[bot], @lukastaegert)
16+
- [#6372](https://github.com/rollup/rollup/pull/6372): chore(deps): update react monorepo to v19 (major) (@renovate[bot])
17+
- [#6373](https://github.com/rollup/rollup/pull/6373): chore(deps): lock file maintenance (@renovate[bot], @lukastaegert)
18+
- [#6375](https://github.com/rollup/rollup/pull/6375): Resolve vulnerabilities (@lukastaegert)
19+
320
## 4.60.3
421

522
_2026-05-04_

audit-resolve.json

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,28 @@
22
"decisions": {
33
"1112706|mocha>diff": {
44
"decision": "ignore",
5-
"madeAt": 1775969901927,
6-
"expiresAt": 1778561884409
5+
"madeAt": 1778736367601,
6+
"expiresAt": 1781328337045
77
},
88
"1113686|mocha>diff>serialize-javascript": {
99
"decision": "ignore",
10-
"madeAt": 1775969896563,
11-
"expiresAt": 1778561884409
10+
"madeAt": 1778736362001,
11+
"expiresAt": 1781328337045
1212
},
1313
"1113686|@rollup/plugin-terser>serialize-javascript": {
1414
"decision": "ignore",
15-
"madeAt": 1775969896563,
16-
"expiresAt": 1778561884409
17-
},
18-
"1115519|@rollup/plugin-terser>serialize-javascript": {
19-
"decision": "ignore",
20-
"madeAt": 1774678997033,
21-
"expiresAt": 1777270978460
22-
},
23-
"1115519|mocha>diff>serialize-javascript": {
24-
"decision": "ignore",
25-
"madeAt": 1774678997033,
26-
"expiresAt": 1777270978460
15+
"madeAt": 1778736362001,
16+
"expiresAt": 1781328337045
2717
},
2818
"1115723|@rollup/plugin-terser>serialize-javascript": {
2919
"decision": "ignore",
30-
"madeAt": 1777881312934,
31-
"expiresAt": 1780473295252
20+
"madeAt": 1778737445950,
21+
"expiresAt": 1781329420005
3222
},
3323
"1115723|mocha>diff>serialize-javascript": {
3424
"decision": "ignore",
35-
"madeAt": 1777881312934,
36-
"expiresAt": 1780473295252
37-
},
38-
"1116970|@mermaid-js/mermaid-cli>@mermaid-js/layout-elk>mermaid>uuid": {
39-
"decision": "ignore",
40-
"madeAt": 1777608910885,
41-
"expiresAt": 1780200878843
42-
},
43-
"1116970|nyc>istanbul-lib-processinfo>uuid": {
44-
"decision": "ignore",
45-
"madeAt": 1777608910885,
46-
"expiresAt": 1780200878843
25+
"madeAt": 1778737445950,
26+
"expiresAt": 1781329420005
4727
}
4828
},
4929
"rules": {},

browser/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rollup/browser",
3-
"version": "4.60.3",
3+
"version": "4.60.4",
44
"description": "Next-generation ES module bundler browser build",
55
"main": "dist/rollup.browser.js",
66
"module": "dist/es/rollup.browser.js",
@@ -23,7 +23,7 @@
2323
},
2424
"homepage": "https://rollupjs.org/",
2525
"dependencies": {
26-
"@types/estree": "1.0.8"
26+
"@types/estree": "1.0.9"
2727
},
2828
"files": [
2929
"dist/**/*.wasm",

0 commit comments

Comments
 (0)