Skip to content

Commit 298995c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into codex/bun-build-websocket-runtime-fix
2 parents 9fa61e0 + 5b0288d commit 298995c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3819
-2831
lines changed

.github/workflows/autofix.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: autofix.ci
2+
3+
on:
4+
push:
5+
branches: [main]
6+
paths:
7+
- 'packages/**'
8+
pull_request:
9+
branches: ['*']
10+
paths:
11+
- 'packages/**'
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
permissions:
18+
contents: read
19+
20+
jobs:
21+
autofix:
22+
name: autofix
23+
runs-on: ubuntu-24.04
24+
if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
25+
steps:
26+
- uses: actions/checkout@v4
27+
- uses: actions/setup-node@v6
28+
with:
29+
node-version-file: .tool-versions
30+
cache: yarn
31+
- run: yarn install --frozen-lockfile
32+
- run: yarn run format:fix
33+
- run: yarn run lint:fix
34+
- uses: autofix-ci/action@v1
35+
with:
36+
commit-message: 'ci: apply automated fixes'

.github/workflows/ci-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
working-directory: ./packages/build
1818
steps:
1919
- uses: actions/checkout@v4
20-
- uses: actions/setup-node@v4
20+
- uses: actions/setup-node@v6
2121
with:
22-
node-version: 20.x
22+
node-version-file: .tool-versions
23+
cache: yarn
2324
- run: yarn install
2425
- run: yarn build
2526
- run: yarn test
@@ -31,8 +32,9 @@ jobs:
3132
working-directory: ./packages/build
3233
steps:
3334
- uses: actions/checkout@v4
34-
- uses: actions/setup-node@v4
35+
- uses: actions/setup-node@v6
3536
with:
36-
node-version: 20.x
37+
node-version-file: .tool-versions
38+
cache: yarn
3739
- run: yarn install
3840
- run: yarn test

.github/workflows/ci-cloudflare-pages.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
working-directory: ./packages/cloudflare-pages
1818
steps:
1919
- uses: actions/checkout@v4
20-
- uses: actions/setup-node@v4
20+
- uses: actions/setup-node@v6
2121
with:
22-
node-version: 20.x
22+
node-version-file: .tool-versions
23+
cache: yarn
2324
- run: yarn install
2425
- run: yarn build
2526
- run: yarn test
@@ -31,8 +32,9 @@ jobs:
3132
working-directory: ./packages/cloudflare-pages
3233
steps:
3334
- uses: actions/checkout@v4
34-
- uses: actions/setup-node@v4
35+
- uses: actions/setup-node@v6
3536
with:
36-
node-version: 20.x
37+
node-version-file: .tool-versions
38+
cache: yarn
3739
- run: yarn install
3840
- run: yarn test

.github/workflows/ci-dev-server.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,16 @@ jobs:
1515
defaults:
1616
run:
1717
working-directory: ./packages/dev-server
18-
strategy:
19-
matrix:
20-
node: [20, 22]
2118
steps:
2219
- uses: actions/checkout@v4
23-
- uses: actions/setup-node@v3
20+
- uses: actions/setup-node@v6
2421
with:
25-
node-version: ${{ matrix.node }}
22+
node-version-file: .tool-versions
23+
cache: yarn
24+
- uses: oven-sh/setup-bun@v2
25+
with:
26+
bun-version-file: .tool-versions
2627
- run: yarn install
2728
- run: yarn build
2829
- run: npx playwright install --with-deps
2930
- run: yarn test
30-
ci-bun:
31-
runs-on: ubuntu-latest
32-
defaults:
33-
run:
34-
working-directory: ./packages/dev-server
35-
steps:
36-
- uses: actions/checkout@v4
37-
- uses: oven-sh/setup-bun@v1
38-
with:
39-
bun-version: '1.0.25'
40-
- run: yarn install
41-
- run: npx playwright install --with-deps
42-
- run: bun run test:e2e:bun

.github/workflows/ci-ssg.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
working-directory: ./packages/ssg
1818
steps:
1919
- uses: actions/checkout@v4
20-
- uses: actions/setup-node@v4
20+
- uses: actions/setup-node@v6
2121
with:
22-
node-version: 20.x
22+
node-version-file: .tool-versions
23+
cache: yarn
2324
- run: yarn install
2425
- run: yarn build
2526
- run: yarn test

.github/workflows/ci.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: ci
2+
on:
3+
push:
4+
branches: [main]
5+
paths:
6+
- 'packages/**'
7+
pull_request:
8+
branches: ['*']
9+
paths:
10+
- 'packages/**'
11+
12+
jobs:
13+
ci:
14+
runs-on: ubuntu-24.04
15+
defaults:
16+
run:
17+
working-directory: ./
18+
strategy:
19+
matrix:
20+
task: [format, lint]
21+
steps:
22+
- uses: actions/checkout@v4
23+
- uses: actions/setup-node@v6
24+
with:
25+
node-version-file: .tool-versions
26+
cache: yarn
27+
- run: yarn install --frozen-lockfile
28+
- name: Run task
29+
run: yarn ${{ matrix.task }}

.github/workflows/release.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@ jobs:
1111
release:
1212
name: Release
1313
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
id-token: write
17+
pull-requests: write
1418
steps:
1519
- name: Checkout Repo
1620
uses: actions/checkout@v4
1721

18-
- name: Setup Node.js 20.x
19-
uses: actions/setup-node@v4
22+
- name: Setup Node.js
23+
uses: actions/setup-node@v6
2024
with:
21-
node-version: 20.x
25+
node-version-file: .tool-versions
26+
cache: yarn
2227

2328
- name: Install Dependencies
2429
run: yarn install --frozen-lockfile
@@ -30,7 +35,7 @@ jobs:
3035
id: changesets
3136
uses: changesets/action@v1
3237
with:
33-
publish: yarn changeset publish
38+
publish: yarn run publish
39+
version: yarn run version
3440
env:
3541
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.tool-versions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node 24.12.0
2+
bun 1.3.5

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 0 additions & 28 deletions
This file was deleted.

.yarn/releases/yarn-3.6.4.cjs

Lines changed: 0 additions & 874 deletions
This file was deleted.

0 commit comments

Comments
 (0)