Skip to content

Commit 68d7fb2

Browse files
committed
Merge branch 'master' of https://github.com/rollup/rollup into sync-bef29f48
2 parents 1f68527 + bef29f4 commit 68d7fb2

File tree

27 files changed

+121
-48
lines changed

27 files changed

+121
-48
lines changed

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
target: i686-pc-windows-msvc
8383
- host: windows-latest
8484
target: aarch64-pc-windows-msvc
85-
- host: windows-latest
85+
- host: windows-latest
8686
target: x86_64-pc-windows-gnu
8787
msystem: ucrt64
8888
toolchain: ucrt-x86_64
@@ -343,23 +343,23 @@ jobs:
343343
- arch: armv7
344344
distro: ubuntu_latest
345345
target: armv7-unknown-linux-gnueabihf
346-
# There is a bug that hangs the build when running npm
347-
# - arch: armv7
348-
# distro: alpine_latest
349-
# target: armv7-unknown-linux-musleabihf
350-
# This one has become very flaky as of late
351-
# - arch: ppc64le
352-
# distro: ubuntu_latest
353-
# target: powerpc64le-unknown-linux-gnu
354-
# use-nvm: true
346+
# There is a bug that hangs the build when running npm
347+
# - arch: armv7
348+
# distro: alpine_latest
349+
# target: armv7-unknown-linux-musleabihf
350+
# This one has become very flaky as of late
351+
# - arch: ppc64le
352+
# distro: ubuntu_latest
353+
# target: powerpc64le-unknown-linux-gnu
354+
# use-nvm: true
355355
- arch: s390x
356356
distro: ubuntu_latest
357357
target: s390x-unknown-linux-gnu
358358
use-nvm: true
359-
# I could not find a way to install Node without compiling from source
360-
# - arch: riscv64
361-
# distro: ubuntu_latest
362-
# target: riscv64gc-unknown-linux-gnu
359+
# I could not find a way to install Node without compiling from source
360+
# - arch: riscv64
361+
# distro: ubuntu_latest
362+
# target: riscv64gc-unknown-linux-gnu
363363
runs-on: ubuntu-latest
364364
timeout-minutes: 120
365365
steps:
@@ -489,6 +489,7 @@ jobs:
489489
pull-requests: write # for writing comments
490490
issues: write # for writing comments
491491
contents: write # for creating a release
492+
id-token: write # Required for OIDC
492493
name: Publish
493494
runs-on: ubuntu-latest
494495
timeout-minutes: 15
@@ -507,8 +508,10 @@ jobs:
507508
- name: Setup Node
508509
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
509510
with:
510-
node-version: ${{ matrix.node }}
511-
check-latest: true
511+
node-version: 24
512+
registry-url: 'https://registry.npmjs.org'
513+
- name: Update npm for publishing
514+
run: npm install -g npm@latest
512515
- name: Install and Cache Node Dependencies
513516
uses: ./.github/actions/install-and-cache-node-deps
514517
- name: Download all artifacts
@@ -526,12 +529,10 @@ jobs:
526529
if git --no-pager log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$";
527530
then
528531
echo "Publishing regular release"
529-
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
530532
npm publish --access public
531533
elif git --no-pager log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+-[0-9]\+$";
532534
then
533535
echo "Publishing beta release"
534-
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
535536
npm publish --tag beta --access public
536537
else
537538
echo "Not a release, skipping publish"

browser/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
{
22
"name": "@rollup/browser",
3-
"version": "4.52.3",
3+
"version": "4.52.4-3",
44
"description": "Next-generation ES module bundler browser build",
55
"main": "dist/rollup.browser.js",
66
"module": "dist/es/rollup.browser.js",
77
"types": "dist/rollup.browser.d.ts",
8-
"repository": "rollup/rollup",
8+
"repository": {
9+
"type": "git",
10+
"url": "git+https://github.com/rollup/rollup.git"
11+
},
912
"keywords": [
1013
"modules",
1114
"bundler",

npm/android-arm-eabi/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"main": "./rollup.android-arm-eabi.node"
1922
}

npm/android-arm64/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"main": "./rollup.android-arm64.node"
1922
}

npm/darwin-arm64/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"main": "./rollup.darwin-arm64.node"
1922
}

npm/darwin-x64/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"main": "./rollup.darwin-x64.node"
1922
}

npm/freebsd-arm64/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"main": "./rollup.freebsd-arm64.node"
1922
}

npm/freebsd-x64/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"main": "./rollup.freebsd-x64.node"
1922
}

npm/linux-arm-gnueabihf/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"libc": [
1922
"glibc"
2023
],

npm/linux-arm-musleabihf/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
"author": "Lukas Taegert-Atkinson",
1515
"homepage": "https://rollupjs.org/",
1616
"license": "MIT",
17-
"repository": "rollup/rollup",
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/rollup/rollup.git"
20+
},
1821
"libc": [
1922
"musl"
2023
],

0 commit comments

Comments
 (0)