Skip to content

Commit 1f68527

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-74c555c8
2 parents b549ecd + 74c555c commit 1f68527

File tree

6 files changed

+36
-9
lines changed

6 files changed

+36
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
if: ${{ !matrix.settings.docker && matrix.settings.target != 'x86_64-pc-windows-gnu' }}
224224
with:
225225
node-version: 24.8.0
226-
- uses: msys2/setup-msys2@v2
226+
- uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
227227
if: ${{ matrix.settings.target == 'x86_64-pc-windows-gnu' }}
228228
with:
229229
msystem: ${{ matrix.settings.msystem }}

CHANGELOG.md

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

3+
## 4.52.3
4+
5+
_2025-09-27_
6+
7+
### Bug Fixes
8+
9+
- Fix check in native loader for environments that do not support reports (#6123)
10+
11+
### Pull Requests
12+
13+
- [#6123](https://github.com/rollup/rollup/pull/6123): fix(native-loader): safely handle report.getReport() on Termux/Android (@Jobians, @lukastaegert)
14+
- [#6124](https://github.com/rollup/rollup/pull/6124): chore(deps): pin msys2/setup-msys2 action to fb197b7 (@renovate[bot])
15+
- [#6125](https://github.com/rollup/rollup/pull/6125): fix(deps): lock file maintenance minor/patch updates (@renovate[bot])
16+
- [#6126](https://github.com/rollup/rollup/pull/6126): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
17+
318
## 4.52.2
419

520
_2025-09-23_

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.2",
3+
"version": "4.52.3",
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: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,21 @@ const { existsSync } = require('node:fs');
22
const path = require('node:path');
33
const { platform, arch, report } = require('node:process');
44

5-
const isMusl = () => !report.getReport().header.glibcVersionRuntime;
5+
const isMusl = () => {
6+
try {
7+
return !report.getReport().header.glibcVersionRuntime;
8+
} catch {
9+
return false;
10+
}
11+
};
12+
13+
const isMingw32 = () => {
14+
try {
15+
return report.getReport().header.osName.startsWith('MINGW32_NT');
16+
} catch {
17+
return false;
18+
}
19+
};
620

721
const bindingsByPlatformAndArch = {
822
android: {
@@ -33,9 +47,7 @@ const bindingsByPlatformAndArch = {
3347
arm64: { base: 'win32-arm64-msvc' },
3448
ia32: { base: 'win32-ia32-msvc' },
3549
x64: {
36-
base: report.getReport().header.osName.startsWith('MINGW32_NT')
37-
? 'win32-x64-gnu'
38-
: 'win32-x64-msvc'
50+
base: isMingw32() ? 'win32-x64-gnu' : 'win32-x64-msvc'
3951
}
4052
}
4153
};

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

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

0 commit comments

Comments
 (0)