Skip to content
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d8cab78
fix: ssg build windows error
Varixo Oct 18, 2025
e696be1
chore: reenable windows e2e tests on CI
Varixo Oct 18, 2025
0ceb396
chore: reenable react e2e tests on windows
Varixo Oct 18, 2025
cc6ae9d
chore(router): better error handling for SSG
wmertens Oct 22, 2025
f1e501a
fix: ssg on windows
Varixo Oct 23, 2025
a9b5678
chore: increment timeout for adapters e2e
Varixo Oct 23, 2025
8b3c7d3
fix: worker exit code, force terminate only after timeout
Varixo Oct 25, 2025
47a3b9f
chore: fixup
Varixo Oct 25, 2025
6e866a0
Merge pull request #8072 from QwikDev/fix-ssg-windows
wmertens Oct 25, 2025
5ac92f4
Revert "fix: ssg on windows"
Varixo Oct 25, 2025
cf894dc
Merge pull request #8088 from QwikDev/revert-8072-fix-ssg-windows
wmertens Oct 25, 2025
04907a9
chore: trigger docs build
Varixo Oct 25, 2025
6cc1d22
Merge pull request #8089 from QwikDev/trigger-docs-build
wmertens Oct 25, 2025
9a44958
fix: SPA routing is broken unless origin matches value in in vite.config
termermc Oct 28, 2025
b1b63f1
chore: add changeset
termermc Oct 28, 2025
f263433
Merge pull request #8097 from termermc/fix-spa-routing
wmertens Oct 29, 2025
2a587f8
Merge remote-tracking branch 'origin/main' into v2-merge-main
wmertens Oct 29, 2025
e0f764c
fix(router): properly init state browser-side
wmertens Oct 30, 2025
2807b3b
fix(docs): make Root non-reactive
wmertens Oct 31, 2025
c052a4c
refactor(router): make spa-init more compressible
wmertens Oct 31, 2025
e3cbdd7
fix(serdes): inflate store target, not store
wmertens Oct 31, 2025
3eb3ca5
fix(docs): move reactive head to own component
wmertens Oct 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions packages/docs/src/repl/ui/repl-commands.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { createPlaygroundShareUrl } from './repl-share-url';
import type { ReplAppInput } from '../types';

export const ReplCommands = ({
input,
enableCopyToPlayground,
enableDownload,
}: ReplCommandProps) => {
export const ReplCommands = ({ input, enableCopyToPlayground }: ReplCommandProps) => {
return (
<div class="repl-commands">
{enableCopyToPlayground ? (
Expand Down
34 changes: 9 additions & 25 deletions packages/docs/src/root.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { component$, useContextProvider, useStore } from '@qwik.dev/core';
import { component$, untrack, useContextProvider, useStore } from '@qwik.dev/core';
import { Insights } from '@qwik.dev/core/insights';
import {
DocumentHeadTags,
RouterOutlet,
ServiceWorkerRegister,
useDocumentHead,
useLocation,
useQwikRouter,
Expand Down Expand Up @@ -52,6 +52,7 @@ export default component$(() => {
useQwikRouter();
const head = useDocumentHead();
const { url } = useLocation();
const href = head.frontmatter?.canonical || untrack(() => url.href);

const store = useStore<SiteStore>({
headerMenuOpen: false,
Expand Down Expand Up @@ -108,9 +109,8 @@ export default component$(() => {
<head>
<meta charset="utf-8" />

<title>{title}</title>
<meta name="description" content={description} />
<link rel="canonical" href={head.frontmatter?.canonical || url.href} />
<link rel="canonical" href={href} />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="apple-mobile-web-app-title" content="Qwik" />
<meta name="application-name" content="Qwik" />
Expand All @@ -123,36 +123,20 @@ export default component$(() => {

{import.meta.env.PROD && (
<>
<Social title={title} description={description} href={url.href} ogImage={OGImage.URL} />
<Social title={title} description={description} href={href} ogImage={OGImage.URL} />
<Vendor />
</>
)}

{/* The below are tags that were collected from all the `head` exports in the current route. */}
{head.meta
<DocumentHeadTags
title={title}
// Skip description because that was already added at the top
.filter((s) => s.name !== 'description')
.map((m, key) => (
<meta key={key} {...m} />
))}

{head.links.map((l, key) => (
<link key={key} {...l} />
))}

{head.styles.map((s, key) => (
<style key={key} {...s.props} dangerouslySetInnerHTML={s.style} />
))}

{head.scripts.map((s, key) => (
<script key={key} {...s.props} dangerouslySetInnerHTML={s.script} />
))}
meta={head.meta.filter((s) => s.name !== 'description')}
/>

<InjectThemeScript />
<script dangerouslySetInnerHTML={uwu} />

<ServiceWorkerRegister />

<script dangerouslySetInnerHTML={`(${collectSymbols})()`} />
<Insights />
</head>
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/routes/api/qwik-router/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@
}
],
"kind": "Variable",
"content": "This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component.\n\n\n```typescript\nQwikRouterProvider: import(\"@qwik.dev/core\").Component<QwikRouterProps>\n```",
"content": "This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive.\n\n\n```typescript\nQwikRouterProvider: import(\"@qwik.dev/core\").Component<QwikRouterProps>\n```",
"editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/runtime/src/qwik-router-component.tsx",
"mdFile": "router.qwikrouterprovider.md"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/routes/api/qwik-router/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -1796,7 +1796,7 @@ Default: `true`

## QwikRouterProvider

This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component.
This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive.

```typescript
QwikRouterProvider: import("@qwik.dev/core").Component<QwikRouterProps>;
Expand Down
4 changes: 0 additions & 4 deletions packages/qwik-router/src/runtime/src/contexts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import type {
RouteLocation,
RouteNavigate,
RoutePreventNavigate,
RouteStateInternal,
} from './types';

export const RouteStateContext =
Expand All @@ -25,8 +24,5 @@ export const RouteNavigateContext = /*#__PURE__*/ createContextId<RouteNavigate>

export const RouteActionContext = /*#__PURE__*/ createContextId<RouteAction>('qc-a');

export const RouteInternalContext =
/*#__PURE__*/ createContextId<Signal<RouteStateInternal>>('qc-ir');

export const RoutePreventNavigateContext =
/*#__PURE__*/ createContextId<RoutePreventNavigate>('qc-p');
Loading
Loading