Skip to content

chore: merge main into v2 #8101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 22 commits into from
Oct 31, 2025
Merged

chore: merge main into v2 #8101

merged 22 commits into from
Oct 31, 2025
+151 −232

Conversation

@wmertens
Copy link
Member

No description provided.

Varixo and others added 17 commits October 18, 2025 22:26
@Varixo
fix: ssg build windows error
d8cab78
@Varixo
chore: reenable windows e2e tests on CI
e696be1
@Varixo
chore: reenable react e2e tests on windows
0ceb396
@wmertens @Varixo
chore(router): better error handling for SSG
cc6ae9d
@Varixo
fix: ssg on windows
f1e501a
@Varixo
chore: increment timeout for adapters e2e
a9b5678
@Varixo
fix: worker exit code, force terminate only after timeout
8b3c7d3
@Varixo
chore: fixup
47a3b9f
@wmertens
Merge pull request #8072 from QwikDev/fix-ssg-windows
6e866a0 
fix: ssg on windows
@Varixo
Revert "fix: ssg on windows"
5ac92f4
@wmertens
Merge pull request #8088 from QwikDev/revert-8072-fix-ssg-windows
cf894dc 
Revert "fix: ssg on windows"
@Varixo
chore: trigger docs build
04907a9
@wmertens
Merge pull request #8089 from QwikDev/trigger-docs-build
6cc1d22 
chore: trigger docs build
@termermc
fix: SPA routing is broken unless origin matches value in in vite.config
9a44958
@termermc
chore: add changeset
b1b63f1
@wmertens
Merge pull request #8097 from termermc/fix-spa-routing
f263433 
fix: SPA routing is broken unless origin matches value in in vite.config #8093
@wmertens
Merge remote-tracking branch 'origin/main' into v2-merge-main
2a587f8
@wmertens wmertens requested review from a team as code owners October 29, 2025 19:25
@changeset-bot
Copy link

changeset-bot bot commented Oct 29, 2025 •
edited
Loading

⚠️ No Changeset found

Latest commit: 3eb3ca5

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions
Copy link
Contributor

github-actions bot commented Oct 29, 2025 •
edited
Loading

built with Refined Cloudflare Pages Action

⚡ Cloudflare Pages Deployment

Name Status Preview Last Commit
qwik-docs ✅ Ready (View Log) Visit Preview 3eb3ca5

gioboa
gioboa approved these changes Oct 29, 2025
View reviewed changes
Copy link
Member

@gioboa gioboa left a comment

Choose a reason for hiding this comment

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

💪🙏

@pkg-pr-new
Copy link

pkg-pr-new bot commented Oct 30, 2025 •
edited
Loading

Open in StackBlitz

npm i https://pkg.pr.new/QwikDev/qwik/@qwik.dev/core@8101

npm i https://pkg.pr.new/QwikDev/qwik/@qwik.dev/router@8101

npm i https://pkg.pr.new/QwikDev/qwik/eslint-plugin-qwik@8101

npm i https://pkg.pr.new/QwikDev/qwik/create-qwik@8101

commit: 3eb3ca5

@wmertens wmertens force-pushed the v2-merge-main branch 2 times, most recently from 5aa8e2d to b472cdf Compare October 31, 2025 10:34
@wmertens
fix(router): properly init state browser-side
e0f764c 
+ remove the unused context
@wmertens
fix(docs): make Root non-reactive
2807b3b
@wmertens
refactor(router): make spa-init more compressible
c052a4c 
keeping the window and attributes as-is actually compresses better than using string indexing
@wmertens wmertens requested a review from a team as a code owner October 31, 2025 13:51
gioboa
gioboa approved these changes Oct 31, 2025
View reviewed changes
Copy link
Member

@gioboa gioboa left a comment

Choose a reason for hiding this comment

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

LGTM

@wmertens wmertens marked this pull request as draft October 31, 2025 14:56
@wmertens wmertens marked this pull request as ready for review October 31, 2025 15:39
@wmertens wmertens merged commit 3748a24 into build/v2 Oct 31, 2025
21 checks passed
@wmertens wmertens deleted the v2-merge-main branch October 31, 2025 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gioboa gioboa gioboa approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@wmertens @gioboa @Varixo @termermc