Skip to content

Commit 2ee90e3

Browse files
maiieulmaiieul
committed
Merge branch 'main' into upcoming
2 parents 8296f56 + f63b764 commit 2ee90e3

File tree

73 files changed

+1743
-1088
lines changed

Some content is hidden

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

73 files changed

+1743
-1088
lines changed

‎.changeset/dirty-tools-travel.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik-city': patch
3+
---
4+
5+
fix: `zod` is now imported as `import * as z from 'zod'`, which vastly improves bundling. The Insights app client code reduced by 12kB.

‎.changeset/dry-snakes-shout.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
fix: the bunding won't lead to circular dependencies in qwik-astro apps anymore.

‎.changeset/true-berries-cough.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
FEAT: The optimizer is now built with a recent Rust toolchain. Fresher bits!

‎.github/workflows/auto-assign-core-team.yml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Auto-assign PRs to core team authors
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened, ready_for_review, converted_to_draft]
6+
7+
permissions:
8+
pull-requests: write
9+
contents: read
10+
11+
jobs:
12+
auto_assign:
13+
name: Assign PR author when core team member
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Check team membership via REST
17+
id: team
18+
env:
19+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
ORG: QwikDev
21+
TEAM_SLUG: qwik-team
22+
AUTHOR: ${{ github.event.pull_request.user.login }}
23+
run: |
24+
RESPONSE=$(curl -s \
25+
-H "Authorization: token ${GH_TOKEN}" \
26+
-H "Accept: application/vnd.github+json" \
27+
"https://api.github.com/orgs/${ORG}/teams/${TEAM_SLUG}/memberships/${AUTHOR}")
28+
29+
STATE=$(echo "$RESPONSE" | jq -r '.state // empty')
30+
if [ "$STATE" = "active" ]; then
31+
echo "isCore=true" >> $GITHUB_OUTPUT
32+
else
33+
echo "isCore=false" >> $GITHUB_OUTPUT
34+
fi
35+
36+
- name: Assign PR to author
37+
if: steps.team.outputs.isCore == 'true'
38+
env:
39+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
run: |
41+
PR_NUMBER=${{ github.event.pull_request.number }}
42+
AUTHOR=${{ github.event.pull_request.user.login }}
43+
curl -s -H "Authorization: token ${GH_TOKEN}" \
44+
-H "Accept: application/vnd.github+json" \
45+
-X POST \
46+
-d "{\"assignees\":[\"${AUTHOR}\"]}" \
47+
https://api.github.com/repos/${{ github.repository }}/issues/${PR_NUMBER}/assignees
48+
49+
- name: Add PR to Qwik Development project
50+
if: steps.team.outputs.isCore == 'true'
51+
uses: actions/add-to-project@v0.6.1
52+
with:
53+
project-url: https://github.com/orgs/QwikDev/projects/1
54+
github-token: ${{ secrets.QWIK_API_TOKEN_GITHUB }}
55+
56+
- name: Ensure project + set Status to "In progress" (draft)
57+
if: steps.team.outputs.isCore == 'true' && github.event.pull_request.draft == true
58+
uses: actions/add-to-project@v0.6.1
59+
with:
60+
project-url: https://github.com/orgs/QwikDev/projects/1
61+
github-token: ${{ secrets.QWIK_API_TOKEN_GITHUB }}
62+
fields: |
63+
Status: In progress
64+
65+
- name: Ensure project + set Status to "Waiting For Review" (ready)
66+
if: steps.team.outputs.isCore == 'true' && github.event.pull_request.draft == false
67+
uses: actions/add-to-project@v0.6.1
68+
with:
69+
project-url: https://github.com/orgs/QwikDev/projects/1
70+
github-token: ${{ secrets.QWIK_API_TOKEN_GITHUB }}
71+
fields: |
72+
Status: Waiting For Review

‎.github/workflows/bench.yml.disabled‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
optimizer: ${{ steps.filter.outputs.optimizer }}
1313

1414
steps:
15-
- uses: actions/checkout@v4.1.1
15+
- uses: actions/checkout@v5
1616
- uses: dorny/paths-filter@v2
1717
id: filter
1818
with:
@@ -26,7 +26,7 @@ jobs:
2626
if: ${{ needs.changes.outputs.optimizer == 'true' }}
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v4.1.1
29+
- uses: actions/checkout@v5
3030

3131
- name: Cache
3232
uses: actions/cache@v4

‎.github/workflows/ci.yml‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: echo event_name=${{ github.event_name }}
7575

7676
- name: Checkout
77-
uses: actions/checkout@v4
77+
uses: actions/checkout@v5
7878

7979
- name: Set Dist Tag
8080
id: set_dist_tag
@@ -207,13 +207,13 @@ jobs:
207207
runs-on: ubuntu-latest
208208
steps:
209209
- name: Checkout
210-
uses: actions/checkout@v4
210+
uses: actions/checkout@v5
211211

212212
- uses: pnpm/action-setup@v4
213213
- name: Setup Node
214-
uses: actions/setup-node@v4
214+
uses: actions/setup-node@v5
215215
with:
216-
node-version: 20.x
216+
node-version: 24.x
217217
cache: 'pnpm'
218218
registry-url: https://registry.npmjs.org/
219219

@@ -261,8 +261,7 @@ jobs:
261261
- host: macos-latest
262262
target: aarch64-apple-darwin
263263

264-
# Note: 2025 image breaks rollup
265-
- host: windows-2022
264+
- host: windows-latest
266265
target: x86_64-pc-windows-msvc
267266

268267
name: Build optimizer ${{ matrix.settings.target }}
@@ -272,7 +271,7 @@ jobs:
272271

273272
steps:
274273
- name: Checkout
275-
uses: actions/checkout@v4
274+
uses: actions/checkout@v5
276275

277276
- name: Install Rust toolchain
278277
uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -281,15 +280,15 @@ jobs:
281280

282281
- uses: pnpm/action-setup@v4
283282
- name: Setup Node
284-
uses: actions/setup-node@v4
283+
uses: actions/setup-node@v5
285284
with:
286-
node-version: 20.x
285+
node-version: 24.x
287286
cache: 'pnpm'
288287
registry-url: https://registry.npmjs.org/
289288

290289
- run: pnpm install
291290
- if: matrix.settings.wasm
292-
run: pnpm install wasm-pack
291+
run: pnpm install -w wasm-pack
293292

294293
- name: Lint check
295294
if: matrix.settings.wasm
@@ -391,15 +390,15 @@ jobs:
391390

392391
- name: Checkout
393392
if: needs.changes.outputs.build-others == 'true'
394-
uses: actions/checkout@v4
393+
uses: actions/checkout@v5
395394

396395
- uses: pnpm/action-setup@v4
397396
if: needs.changes.outputs.build-others == 'true'
398397
- name: Setup Node
399398
if: needs.changes.outputs.build-others == 'true'
400-
uses: actions/setup-node@v4
399+
uses: actions/setup-node@v5
401400
with:
402-
node-version: 20.x
401+
node-version: 24.x
403402
cache: 'pnpm'
404403
registry-url: https://registry.npmjs.org/
405404

@@ -517,7 +516,7 @@ jobs:
517516
run: exit 1
518517

519518
- name: Checkout
520-
uses: actions/checkout@v4
519+
uses: actions/checkout@v5
521520

522521
- name: Download Build Artifacts
523522
uses: actions/download-artifact@v4
@@ -536,9 +535,9 @@ jobs:
536535
537536
- uses: pnpm/action-setup@v4
538537
- name: Setup Node
539-
uses: actions/setup-node@v4
538+
uses: actions/setup-node@v5
540539
with:
541-
node-version: 20.x
540+
node-version: 24.x
542541
cache: 'pnpm'
543542
registry-url: https://registry.npmjs.org/
544543

@@ -569,13 +568,13 @@ jobs:
569568
run: exit 1
570569

571570
- name: Checkout
572-
uses: actions/checkout@v4
571+
uses: actions/checkout@v5
573572

574573
- uses: pnpm/action-setup@v4
575574
- name: Setup Node
576-
uses: actions/setup-node@v4
575+
uses: actions/setup-node@v5
577576
with:
578-
node-version: 20.x
577+
node-version: 24.x
579578
cache: 'pnpm'
580579
registry-url: https://registry.npmjs.org/
581580

@@ -629,13 +628,13 @@ jobs:
629628
run: exit 1
630629

631630
- name: Checkout
632-
uses: actions/checkout@v4
631+
uses: actions/checkout@v5
633632

634633
- uses: pnpm/action-setup@v4
635634
- name: Setup Node
636-
uses: actions/setup-node@v4
635+
uses: actions/setup-node@v5
637636
with:
638-
node-version: 20.x
637+
node-version: 24.x
639638
cache: 'pnpm'
640639
registry-url: https://registry.npmjs.org/
641640

@@ -685,21 +684,20 @@ jobs:
685684
# browser: firefox
686685
- host: macos-latest
687686
browser: webkit
688-
# flaky. Updating node version or sharp/sqlite3 related deps might help.
689-
# - host: windows-2022
687+
# - host: windows-latest
690688
# browser: chromium
691689

692690
runs-on: ${{ matrix.settings.host }}
693691

694692
steps:
695693
- name: Checkout
696-
uses: actions/checkout@v4
694+
uses: actions/checkout@v5
697695

698696
- uses: pnpm/action-setup@v4
699697
- name: Setup Node
700-
uses: actions/setup-node@v4
698+
uses: actions/setup-node@v5
701699
with:
702-
node-version: 20.x
700+
node-version: 24.x
703701
cache: 'pnpm'
704702
registry-url: https://registry.npmjs.org/
705703

@@ -733,7 +731,7 @@ jobs:
733731
run: pnpm run test.e2e.qwik-react.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
734732

735733
- name: Validate Create Qwik Cli
736-
if: matrix.settings.host != 'windows-2022'
734+
if: matrix.settings.host != 'windows-latest'
737735
run: pnpm cli.validate
738736

739737
############ E2E CLI TEST ############
@@ -751,19 +749,19 @@ jobs:
751749
settings:
752750
- host: ubuntu-latest
753751
- host: macos-latest
754-
- host: windows-2022
752+
- host: windows-latest
755753

756754
runs-on: ${{ matrix.settings.host }}
757755

758756
steps:
759757
- name: Checkout
760-
uses: actions/checkout@v4
758+
uses: actions/checkout@v5
761759

762760
- uses: pnpm/action-setup@v4
763761
- name: Setup Node
764-
uses: actions/setup-node@v4
762+
uses: actions/setup-node@v5
765763
with:
766-
node-version: 20.x
764+
node-version: 24.x
767765
cache: 'pnpm'
768766
registry-url: https://registry.npmjs.org/
769767

@@ -791,13 +789,13 @@ jobs:
791789
runs-on: ubuntu-latest
792790
steps:
793791
- name: Checkout
794-
uses: actions/checkout@v4
792+
uses: actions/checkout@v5
795793

796794
- uses: pnpm/action-setup@v4
797795
- name: Setup Node
798-
uses: actions/setup-node@v4
796+
uses: actions/setup-node@v5
799797
with:
800-
node-version: 20.x
798+
node-version: 24.x
801799
cache: 'pnpm'
802800
registry-url: https://registry.npmjs.org/
803801

@@ -871,13 +869,13 @@ jobs:
871869
path: cli-e2e-tests-completed.txt
872870

873871
- name: Checkout
874-
uses: actions/checkout@v4
872+
uses: actions/checkout@v5
875873

876874
- uses: pnpm/action-setup@v4
877875
- name: Setup Node
878-
uses: actions/setup-node@v4
876+
uses: actions/setup-node@v5
879877
with:
880-
node-version: 20.x
878+
node-version: 24.x
881879
cache: 'pnpm'
882880
registry-url: https://registry.npmjs.org/
883881

‎.github/workflows/deploy-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Checkout code
4545
if: ${{ steps.check-artifact.outputs.has-docs == 'true' }}
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v5
4747

4848
- name: Download docs artifact
4949
if: ${{ steps.check-artifact.outputs.has-docs == 'true' }}

‎Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ resolver = "2"
1111

1212
[profile.release]
1313
debug = 0
14+
lto = true
15+
codegen-units = 1
16+
opt-level = "z"
17+
panic = "abort"
1418

‎e2e/docs-e2e/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"author": "",
66
"devDependencies": {
7-
"@playwright/test": "1.50.1",
7+
"@playwright/test": "1.54.1",
88
"@types/node": "20.19.0"
99
},
1010
"keywords": [],

0 commit comments

Comments
 (0)