Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/rollup/rollup into sync-1…
Browse files Browse the repository at this point in the history
…cbb382b
  • Loading branch information
docschina-bot committed Oct 28, 2023
2 parents 48eea0b + 1cbb382 commit 9f1b253
Show file tree
Hide file tree
Showing 28 changed files with 750 additions and 376 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-and-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Checkout Commit
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
- name: Cache Node Modules
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
- name: Checkout Commit
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: ${{ !matrix.settings.docker }}
with:
node-version: 20
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
- name: Checkout Commit
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
check-latest: true
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
# Necessary to find the commits included in the release
fetch-depth: 0
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
check-latest: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repl-artefacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
key: cargo-cache-${{ hashFiles('rust/Cargo.lock') }}
restore-keys: cargo-cache
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
- name: Cache Node Modules
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# rollup changelog

## 4.1.5

_2023-10-28_

### Bug Fixes

- Fix an issue where actual entries that were also implicit entries could remain implicit (#5220)

### Pull Requests

- [#5209](https://github.com/rollup/rollup/pull/5209): Document Vite workaround for browser build (@curran)
- [#5215](https://github.com/rollup/rollup/pull/5215): chore(deps): update dependency lint-staged to v15 (@renovate[bot])
- [#5216](https://github.com/rollup/rollup/pull/5216): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
- [#5218](https://github.com/rollup/rollup/pull/5218): Update license plugin (@lukastaegert)
- [#5219](https://github.com/rollup/rollup/pull/5219): Fix error highlight in REPL (@lukastaegert)
- [#5220](https://github.com/rollup/rollup/pull/5220): Fix race condition when emitting implicitly dependent entries (@lukastaegert)
- [#5224](https://github.com/rollup/rollup/pull/5224): chore(deps): update actions/setup-node action to v4 (@renovate[bot])
- [#5225](https://github.com/rollup/rollup/pull/5225): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])

## 4.1.4

_2023-10-16_
Expand Down
2 changes: 1 addition & 1 deletion browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rollup/browser",
"version": "4.1.4",
"version": "4.1.5",
"description": "Next-generation ES module bundler browser build",
"main": "dist/rollup.browser.js",
"module": "dist/es/rollup.browser.js",
Expand Down
Loading

1 comment on commit 9f1b253

@vercel
Copy link

@vercel vercel bot commented on 9f1b253 Oct 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.