Skip to content

Commit 7b70032

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-0928185c
2 parents 68ce330 + 0928185 commit 7b70032

File tree

8 files changed

+36
-14
lines changed

8 files changed

+36
-14
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Node
3636
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
3737
with:
38-
node-version: 22
38+
node-version: 24
3939
- name: Restore Node dependencies cache
4040
id: cache-node-modules
4141
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -232,7 +232,7 @@ jobs:
232232
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
233233
if: ${{ !matrix.settings.docker }}
234234
with:
235-
node-version: 22
235+
node-version: 24
236236
- name: Install Toolchain
237237
uses: dtolnay/rust-toolchain@stable
238238
if: ${{ !matrix.settings.docker }}
@@ -497,13 +497,12 @@ jobs:
497497
target: aarch64-apple-darwin
498498
node:
499499
- '18.20.0'
500-
# There is a bug in 22.12.0 that sometimes makes the loadConfigFile tests fail
501-
- '22.11.0'
500+
- 24
502501
include:
503502
- settings:
504503
host: ubuntu-latest
505504
target: x86_64-unknown-linux-gnu
506-
node: '22.11.0'
505+
node: 24
507506
command: 'ci:coverage'
508507
additionalName: ' with Coverage'
509508
coverage: true

.github/workflows/performance-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Setup Node
5252
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
5353
with:
54-
node-version: 22
54+
node-version: 24
5555
- name: Restore Node dependencies cache
5656
id: cache-node-modules
5757
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -102,7 +102,7 @@ jobs:
102102
- name: Setup Node
103103
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
104104
with:
105-
node-version: 22
105+
node-version: 24
106106
- name: Restore Node dependencies cache
107107
id: cache-node-modules
108108
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

.github/workflows/repl-artefacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Setup Node
4747
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
4848
with:
49-
node-version: 22
49+
node-version: 24
5050
- name: Restore Node dependencies cache
5151
id: cache-node-modules
5252
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

CHANGELOG.md

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

3+
## 4.41.0
4+
5+
_2025-05-18_
6+
7+
### Features
8+
9+
- Detect named exports in more dynamic import scenarios (#5954)
10+
11+
### Pull Requests
12+
13+
- [#5949](https://github.com/rollup/rollup/pull/5949): ci: use node 24 (@btea, @lukastaegert)
14+
- [#5951](https://github.com/rollup/rollup/pull/5951): chore(deps): update dependency pretty-bytes to v7 (@renovate[bot])
15+
- [#5952](https://github.com/rollup/rollup/pull/5952): fix(deps): update swc monorepo (major) (@renovate[bot], @lukastaegert)
16+
- [#5953](https://github.com/rollup/rollup/pull/5953): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
17+
- [#5954](https://github.com/rollup/rollup/pull/5954): enhance tree-shaking for dynamic imports (@TrickyPi, @renovate[bot], @lukastaegert)
18+
- [#5957](https://github.com/rollup/rollup/pull/5957): chore(deps): update dependency lint-staged to v16 (@renovate[bot], @lukastaegert)
19+
- [#5958](https://github.com/rollup/rollup/pull/5958): fix(deps): update rust crate swc_compiler_base to v20 (@renovate[bot], @lukastaegert)
20+
- [#5959](https://github.com/rollup/rollup/pull/5959): fix(deps): lock file maintenance minor/patch updates (@renovate[bot], @lukastaegert)
21+
- [#5960](https://github.com/rollup/rollup/pull/5960): Use spawn to run CLI tests (@lukastaegert)
22+
323
## 4.40.2
424

525
_2025-05-06_

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

cli/run/loadConfigFile.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ async function getConfigFileExport(
6161
}
6262
let cannotLoadEsm = false;
6363
const handleWarning = (warning: Error): void => {
64-
if (warning.message.includes('To load an ES module')) {
64+
if (
65+
warning.message?.includes('To load an ES module') ||
66+
warning.message?.includes('Failed to load the ES module')
67+
) {
6568
cannotLoadEsm = true;
6669
}
6770
};

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rollup",
3-
"version": "4.40.2",
3+
"version": "4.41.0",
44
"description": "Next-generation ES module bundler",
55
"main": "dist/rollup.js",
66
"module": "dist/es/rollup.js",
@@ -62,7 +62,7 @@
6262
"ci:lint": "concurrently -c red,yellow,green,blue 'npm:lint:js:nofix' 'npm:lint:native-js' 'npm:lint:markdown:nofix' 'npm:lint:rust:nofix'",
6363
"ci:test:only": "npm run build:cjs && npm run build:copy-native && npm run build:bootstrap && npm run build:copy-native && npm run test:only",
6464
"ci:test:all": "npm run build:cjs && npm run build:copy-native && npm run build:bootstrap && npm run build:copy-native && concurrently --kill-others-on-fail -c green,blue,magenta,cyan 'npm:test:only' 'npm:test:typescript' 'npm:test:leak' 'npm:test:browser'",
65-
"ci:coverage": "npm run build:cjs && npm run build:copy-native && npm run build:bootstrap && npm run build:copy-native && NODE_OPTIONS=--no-experimental-detect-module nyc --reporter lcovonly mocha",
65+
"ci:coverage": "npm run build:cjs && npm run build:copy-native && npm run build:bootstrap && npm run build:copy-native && NODE_OPTIONS=--no-experimental-require-module nyc --reporter lcovonly mocha",
6666
"lint": "concurrently -c red,yellow,green,blue 'npm:lint:js' 'npm:lint:native-js' 'npm:lint:markdown' 'npm:lint:rust'",
6767
"lint:js": "eslint . --fix --cache",
6868
"lint:js:nofix": "eslint . --cache",

0 commit comments

Comments
 (0)