Skip to content

Commit 2c79529

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-d37675f2
2 parents adb24e8 + d37675f commit 2c79529

File tree

13 files changed

+455
-394
lines changed

13 files changed

+455
-394
lines changed

.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@542cebaaed782771e619bd5609d97659d109c492 # v2.66.7
255+
uses: taiki-e/install-action@710817a1645ef40daad5bcde7431ceccf6cc3528 # v2.67.13
256256
if: ${{ matrix.settings.cross == 'zig' }}
257257
env:
258258
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/repl-artefacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
or load it into the REPL:
122122
https://rollupjs.org/repl/?pr=${{ github.event.number }}
123123
- name: Find Vercel preview URL
124-
uses: patrickedqvist/wait-for-vercel-preview@06c79330064b0e6ef7a2574603b62d3c98789125 # v1.3.2
124+
uses: patrickedqvist/wait-for-vercel-preview@d7982701e6fcd3ae073bff929e408e004404d38d # v1.3.3
125125
id: waitForVercel
126126
with:
127127
token: ${{ secrets.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.57.1
4+
5+
_2026-01-30_
6+
7+
### Bug Fixes
8+
9+
- Fix heap corruption issue in Windows (#6251)
10+
- Ensure exports of a dynamic import are fully included when called from a try...catch (#6254)
11+
12+
### Pull Requests
13+
14+
- [#6251](https://github.com/rollup/rollup/pull/6251): fix: Isolate and cache `process.report.getReport()` calls in a child process for robust environment detection (@alan-agius4, @lukastaegert)
15+
- [#6252](https://github.com/rollup/rollup/pull/6252): chore(deps): update dependency lru-cache to v11 (@renovate[bot])
16+
- [#6253](https://github.com/rollup/rollup/pull/6253): chore(deps): lock file maintenance minor/patch updates (@renovate[bot], @lukastaegert)
17+
- [#6254](https://github.com/rollup/rollup/pull/6254): Fully include dynamic imports in a try-catch (@lukastaegert)
18+
- [#6255](https://github.com/rollup/rollup/pull/6255): chore(deps): lock file maintenance (@renovate[bot])
19+
320
## 4.57.0
421

522
_2026-01-27_

audit-resolve.json

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,41 @@
11
{
22
"decisions": {
3-
"1112255|wasm-pack>binary-install>tar": {
4-
"decision": "ignore",
5-
"madeAt": 1768632226326,
6-
"expiresAt": 1771224205911
7-
},
8-
"1112329|wasm-pack>binary-install>tar": {
9-
"decision": "ignore",
10-
"madeAt": 1768971958748,
11-
"expiresAt": 1771563932286
12-
},
133
"1112453|@chevrotain/cst-dts-gen>@chevrotain/gast>lodash-es": {
144
"decision": "ignore",
15-
"madeAt": 1769058929105,
16-
"expiresAt": 1771650881209
5+
"madeAt": 1769750174830,
6+
"expiresAt": 1772342161715
177
},
188
"1112453|@chevrotain/gast>lodash-es": {
199
"decision": "ignore",
20-
"madeAt": 1769058929105,
21-
"expiresAt": 1771650881209
10+
"madeAt": 1769750174830,
11+
"expiresAt": 1772342161715
2212
},
2313
"1112453|@mermaid-js/mermaid-cli>mermaid>@mermaid-js/parser>langium>chevrotain>@chevrotain/cst-dts-gen>@chevrotain/gast>lodash-es": {
2414
"decision": "ignore",
25-
"madeAt": 1769058929105,
26-
"expiresAt": 1771650881209
15+
"madeAt": 1769750174830,
16+
"expiresAt": 1772342161715
2717
},
28-
"1112453|chevrotain-allstar>chevrotain>@chevrotain/cst-dts-gen>@chevrotain/gast>lodash-es": {
18+
"1112491|mocha>diff": {
2919
"decision": "ignore",
30-
"madeAt": 1769058929105,
31-
"expiresAt": 1771650881209
20+
"madeAt": 1769750179445,
21+
"expiresAt": 1772342161715
3222
},
33-
"1112455|lodash": {
23+
"1112255|wasm-pack>binary-install>tar": {
3424
"decision": "ignore",
35-
"madeAt": 1769058974064,
36-
"expiresAt": 1771650881209
25+
"madeAt": 1769750182528,
26+
"expiresAt": 1772342161715
3727
},
38-
"1112491|mocha>diff": {
28+
"1112329|wasm-pack>binary-install>tar": {
29+
"decision": "ignore",
30+
"madeAt": 1769750185212,
31+
"expiresAt": 1772342161715
32+
},
33+
"1112659|wasm-pack>binary-install>tar": {
3934
"decision": "ignore",
40-
"madeAt": 1769058983758,
41-
"expiresAt": 1771650881209
35+
"madeAt": 1769750187962,
36+
"expiresAt": 1772342161715
4237
}
4338
},
4439
"rules": {},
4540
"version": 1
46-
}
41+
}

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.57.0",
3+
"version": "4.57.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: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,50 @@
11
const { existsSync } = require('node:fs');
22
const path = require('node:path');
33
const { platform, arch, report } = require('node:process');
4+
const { spawnSync } = require('node:child_process');
45

5-
const isMusl = () => {
6+
const getReportHeader = () => {
67
try {
7-
return !report.getReport().header.glibcVersionRuntime;
8+
if (platform !== 'win32') {
9+
return report.getReport().header;
10+
}
11+
12+
// This is needed because report.getReport() crashes the process on Windows sometimes.
13+
const script =
14+
"console.log(JSON.stringify(require('node:process').report.getReport().header));";
15+
const child = spawnSync(process.execPath, ['-p', script], {
16+
encoding: 'utf8',
17+
timeout: 3000,
18+
windowsHide: true
19+
});
20+
21+
if (child.status !== 0) {
22+
return null;
23+
}
24+
25+
// The output from node -p might include a trailing 'undefined' and newline
26+
const stdout = child.stdout?.replace(/undefined\r?\n?$/, '').trim();
27+
if (!stdout) {
28+
return null;
29+
}
30+
31+
return JSON.parse(stdout);
832
} catch {
9-
return false;
33+
return null;
1034
}
1135
};
1236

37+
let reportHeader;
1338
const isMingw32 = () => {
14-
try {
15-
return report.getReport().header.osName.startsWith('MINGW32_NT');
16-
} catch {
17-
return false;
18-
}
39+
reportHeader ??= getReportHeader();
40+
41+
return reportHeader?.osName?.startsWith('MINGW32_NT') ?? false;
42+
};
43+
44+
const isMusl = () => {
45+
reportHeader ??= getReportHeader();
46+
47+
return reportHeader ? !reportHeader.glibcVersionRuntime : false;
1948
};
2049

2150
const bindingsByPlatformAndArch = {

0 commit comments

Comments
 (0)