Skip to content

Commit 83db141

Browse files
JerryWu1234JerryWu1234
committed
solve conflict
2 parents 22a9355 + b8b0046 commit 83db141

File tree

194 files changed

+2540
-1257
lines changed

Some content is hidden

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

194 files changed

+2540
-1257
lines changed

‎.changeset/free-needles-live.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': patch
3+
---
4+
5+
FEAT: All vite.config.mts files got renamed to vite.config.ts files, because all starters are marked as ESM projects

‎.changeset/funny-feet-wish.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'eslint-plugin-qwik': minor
3+
---
4+
5+
feat: add eslint rule for resolving async computed

‎.changeset/mean-webs-try.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': patch
3+
---
4+
5+
fix: backpatches ignore unknown nodes

‎.changeset/nice-teams-grow.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': patch
3+
---
4+
5+
fix: ensure DOM is updated during long running tasks

‎.changeset/polite-parents-win.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': minor
3+
---
4+
5+
feat: add resolve method for async computed

‎.changeset/pre.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"calm-cycles-know",
3030
"chilled-spoons-wonder",
3131
"chilly-fans-shave",
32+
"clear-shoes-cheat",
3233
"clever-flowers-drum",
3334
"cold-moons-follow",
3435
"cold-rice-slide",
@@ -52,6 +53,7 @@
5253
"fluffy-poets-raise",
5354
"fluffy-times-hug",
5455
"forty-garlics-train",
56+
"free-needles-live",
5557
"fresh-rocks-exercise",
5658
"friendly-beers-heal",
5759
"friendly-gorillas-walk",
@@ -60,9 +62,11 @@
6062
"fuzzy-files-kiss",
6163
"fuzzy-jobs-compare",
6264
"fuzzy-worlds-kneel",
65+
"gentle-laws-see",
6366
"gentle-melons-pretend",
6467
"great-news-lie",
6568
"green-drinks-strive",
69+
"happy-banks-dream",
6670
"heavy-kids-wave",
6771
"heavy-maps-wash",
6872
"heavy-radios-dream",
@@ -85,9 +89,11 @@
8589
"mean-dingos-hug",
8690
"mean-parents-buy",
8791
"mean-tires-cover",
92+
"mean-webs-try",
8893
"nervous-terms-explode",
8994
"nine-otters-repeat",
9095
"ninety-crabs-lay",
96+
"ninety-pets-win",
9197
"old-guests-stare",
9298
"old-mangos-return",
9399
"old-mayflies-fetch",
@@ -98,6 +104,7 @@
98104
"plain-eggs-clean",
99105
"polite-sloths-visit",
100106
"pretty-glasses-mate",
107+
"pretty-parents-draw",
101108
"pretty-trees-check",
102109
"proud-houses-fix",
103110
"proud-kangaroos-boil",
@@ -108,21 +115,26 @@
108115
"rare-candies-join",
109116
"red-trains-deny",
110117
"rich-shirts-thank",
118+
"rich-sites-refuse",
111119
"rich-wasps-tease",
112120
"rotten-penguins-cough",
113121
"rotten-weeks-tickle",
114122
"seven-pumpkins-argue",
115123
"shaggy-poems-appear",
116124
"shaggy-poems-return",
125+
"shaky-pianos-wait",
117126
"sharp-apples-relate",
127+
"shiny-readers-double",
118128
"short-suits-bet",
119129
"shy-shirts-glow",
120130
"shy-walls-shake",
121131
"silly-pans-wear",
122132
"silly-symbols-sleep",
133+
"six-breads-rule",
123134
"six-games-float",
124135
"sixty-grapes-beam",
125136
"slick-clowns-relax",
137+
"slick-coats-exist",
126138
"slimy-weeks-hope",
127139
"smooth-cups-press",
128140
"social-lizards-clean",
@@ -140,6 +152,7 @@
140152
"swift-flowers-juggle",
141153
"tall-rivers-appear",
142154
"tame-glasses-explain",
155+
"tasty-glasses-bet",
143156
"tasty-penguins-ring",
144157
"tasty-turkeys-stand",
145158
"ten-emus-jog",
@@ -162,6 +175,7 @@
162175
"wide-boats-pump",
163176
"wild-cooks-pay",
164177
"witty-balloons-thank",
165-
"young-cameras-hang"
178+
"young-cameras-hang",
179+
"yummy-grapes-make"
166180
]
167181
}

‎.changeset/shaky-pianos-wait.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@qwik.dev/core': major
3+
---
4+
5+
BREAKING: (slightly) `-` handling in JSX event handlers has slightly changed. Now, if an event name starts with `-`, the rest of the name will be kept as-is, preserving casing. Otherwise, the event name is made lowercase. Any `-` characters in the middle of the name are preserved as-is. Previously, `-` were considered to mark the next letter as uppercase.
6+
For example, `onCustomEvent$` will match `customevent`, `on-CustomEvent$` will match `CustomEvent`, and `onCustom-Event$` will match `custom-event`. Before, that last one would match `customEvent` instead.

‎.changeset/shy-carpets-switch.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': patch
3+
---
4+
5+
fix: useId should genereate different id for ssr

‎.changeset/slick-coats-exist.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': patch
3+
---
4+
5+
fix: reblocking chores in scheduler

‎.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

0 commit comments

Comments
 (0)