Skip to content

Commit 2e7d934

Browse files
VarixoVarixo
authored
Merge pull request #8408 from QwikDev/v2-merge-main
v2: merge main into v2
2 parents 471e808 + 8750bd2 commit 2e7d934

File tree

19 files changed

+391
-381
lines changed

19 files changed

+391
-381
lines changed

‎package.json‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
],
2222
"pinVersion": ">=5 <8"
2323
},
24-
{
25-
"label": "vite-imagetools >9 creates different assets for ssr and client",
26-
"dependencies": [
27-
"vite-imagetools",
28-
"imagetools-core"
29-
],
30-
"pinVersion": "9.0.0"
31-
},
3224
{
3325
"label": "use workspace protocol for local packages and allow patch versions (used in e.g. qwik-react)",
3426
"dependencies": [
@@ -105,8 +97,8 @@
10597
"@clack/prompts": "0.11.0",
10698
"@eslint/js": "9.39.2",
10799
"@mdx-js/mdx": "3.1.1",
108-
"@microsoft/api-documenter": "7.28.2",
109-
"@microsoft/api-extractor": "7.55.2",
100+
"@microsoft/api-documenter": "7.29.6",
101+
"@microsoft/api-extractor": "7.57.6",
110102
"@napi-rs/cli": "2.18.4",
111103
"@napi-rs/triples": "1.2.0",
112104
"@node-rs/helper": "1.6.0",
@@ -116,7 +108,7 @@
116108
"@qwik.dev/partytown": "0.11.2",
117109
"@qwik.dev/router": "workspace:*",
118110
"@types/brotli": "1.3.4",
119-
"@types/bun": "1.3.5",
111+
"@types/bun": "1.3.10",
120112
"@types/express": "5.0.6",
121113
"@types/node": "24.10.0",
122114
"@types/path-browserify": "1.0.3",
@@ -125,8 +117,8 @@
125117
"@types/semver": "7.7.1",
126118
"@types/tmp": "0.2.6",
127119
"@types/which-pm-runs": "1.0.2",
128-
"@vitejs/plugin-basic-ssl": "2.1.0",
129-
"@vitest/coverage-v8": "4.0.16",
120+
"@vitejs/plugin-basic-ssl": "2.1.4",
121+
"@vitest/coverage-v8": "4.0.18",
130122
"all-contributors-cli": "6.26.1",
131123
"brotli": "1.3.3",
132124
"create-qwik": "workspace:*",
@@ -140,7 +132,7 @@
140132
"execa": "9.6.1",
141133
"express": "4.22.0",
142134
"globals": "17.0.0",
143-
"imagetools-core": "9.0.0",
135+
"imagetools-core": "9.1.0",
144136
"install": "0.13.0",
145137
"memfs": "4.51.1",
146138
"monaco-editor": "0.54.0",
@@ -156,19 +148,19 @@
156148
"simple-git-hooks": "2.13.1",
157149
"snoop": "1.0.4",
158150
"source-map": "0.7.6",
159-
"svgo": "3.3.2",
151+
"svgo": "3.3.3",
160152
"syncpack": "13.0.4",
161-
"terser": "5.44.1",
153+
"terser": "5.46.0",
162154
"tmp": "0.2.5",
163155
"tree-kill": "1.2.2",
164156
"typescript": "5.9.3",
165157
"typescript-eslint": "8.56.1",
166158
"vfile": "6.0.3",
167159
"vite": "7.3.1",
168-
"vite-imagetools": "9.0.0",
160+
"vite-imagetools": "10.0.0",
169161
"vite-plugin-dts": "4.5.4",
170162
"vite-tsconfig-paths": "6.0.4",
171-
"vitest": "4.0.16",
163+
"vitest": "4.0.18",
172164
"watchlist": "0.3.1",
173165
"which-pm-runs": "1.1.0",
174166
"zod": "3.25.48"

‎packages/docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"shiki": "3.21.0",
5151
"snarkdown": "2.0.0",
5252
"tailwindcss": "4.1.18",
53-
"terser": "5.44.1",
53+
"terser": "5.46.0",
5454
"tsm": "2.3.0",
5555
"typescript": "5.9.3",
5656
"valibot": "1.2.0",

‎packages/docs/src/routes/api/qwik-router/api.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
}
279279
],
280280
"kind": "Function",
281-
"content": "```typescript\nForm: <O, I>({ action, spaReset, reloadDocument, onSubmit$, ...rest }: FormProps<O, I>, key: string | null) => import(\"@qwik.dev/core\").JSXOutput\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ action, spaReset, reloadDocument, onSubmit$, ...rest }\n\n\n</td><td>\n\n[FormProps](#formprops)<!-- -->&lt;O, I&gt;\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\nkey\n\n\n</td><td>\n\nstring \\| null\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n\n**Returns:**\n\nimport(\"@qwik.dev/core\").JSXOutput",
281+
"content": "```typescript\nForm: <O, I>(input: FormProps<O, I>, key: string | null) => import(\"@qwik.dev/core\").JSXOutput\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ action, spaReset, reloadDocument, onSubmit$, ...rest }\n\n\n</td><td>\n\n(not declared)\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\ninput\n\n\n</td><td>\n\n[FormProps](#formprops)<!-- -->&lt;O, I&gt;\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\nkey\n\n\n</td><td>\n\nstring \\| null\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n\n**Returns:**\n\nimport(\"@qwik.dev/core\").JSXOutput",
282282
"editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/runtime/src/form-component.tsx",
283283
"mdFile": "router.form.md"
284284
},

‎packages/docs/src/routes/api/qwik-router/index.mdx‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -740,10 +740,8 @@ export type FailReturn<T> = T & Failed;
740740
<h2 id="form">Form</h2>
741741

742742
```typescript
743-
Form: <O, I>(
744-
{ action, spaReset, reloadDocument, onSubmit$, ...rest }: FormProps<O, I>,
745-
key: string | null,
746-
) => import("@qwik.dev/core").JSXOutput;
743+
Form: <O, I>(input: FormProps<O, I>, key: string | null) =>
744+
import("@qwik.dev/core").JSXOutput;
747745
```
748746

749747
<table><thead><tr><th>
@@ -765,6 +763,17 @@ Description
765763

766764
</td><td>
767765

766+
(not declared)
767+
768+
</td><td>
769+
770+
</td></tr>
771+
<tr><td>
772+
773+
input
774+
775+
</td><td>
776+
768777
[FormProps](#formprops)&lt;O, I&gt;
769778

770779
</td><td>

‎packages/docs/src/routes/api/qwik-testing/api.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
}
4444
],
4545
"kind": "Function",
46-
"content": "CreatePlatform and CreateDocument\n\n\n```typescript\ncreateDOM: ({ html }?: {\n html?: string;\n}) => Promise<{\n render: (jsxElement: JSXOutput) => Promise<import(\"@qwik.dev/core\").RenderResult>;\n screen: HTMLElement;\n userEvent: (queryOrElement: string | Element | keyof HTMLElementTagNameMap | null, eventNameCamel: string | keyof WindowEventMap, eventPayload?: any) => Promise<void>;\n}>\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ html }\n\n\n</td><td>\n\n{ html?: string; }\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n</tbody></table>\n\n**Returns:**\n\nPromise&lt;{ render: (jsxElement: JSXOutput) =&gt; Promise&lt;import(\"@qwik.dev/core\").RenderResult&gt;; screen: HTMLElement; userEvent: (queryOrElement: string \\| Element \\| keyof HTMLElementTagNameMap \\| null, eventNameCamel: string \\| keyof WindowEventMap, eventPayload?: any) =&gt; Promise&lt;void&gt;; }&gt;",
46+
"content": "CreatePlatform and CreateDocument\n\n\n```typescript\ncreateDOM: (input?: {\n html?: string;\n}) => Promise<{\n render: (jsxElement: JSXOutput) => Promise<import(\"@qwik.dev/core\").RenderResult>;\n screen: HTMLElement;\n userEvent: (queryOrElement: string | Element | keyof HTMLElementTagNameMap | null, eventNameCamel: string | keyof WindowEventMap, eventPayload?: any) => Promise<void>;\n}>\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ html }\n\n\n</td><td>\n\n(not declared)\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\ninput\n\n\n</td><td>\n\n{ html?: string; }\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n</tbody></table>\n\n**Returns:**\n\nPromise&lt;{ render: (jsxElement: JSXOutput) =&gt; Promise&lt;import(\"@qwik.dev/core\").RenderResult&gt;; screen: HTMLElement; userEvent: (queryOrElement: string \\| Element \\| keyof HTMLElementTagNameMap \\| null, eventNameCamel: string \\| keyof WindowEventMap, eventPayload?: any) =&gt; Promise&lt;void&gt;; }&gt;",
4747
"editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/testing/library.ts",
4848
"mdFile": "core.createdom.md"
4949
},

‎packages/docs/src/routes/api/qwik-testing/index.mdx‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Document
5757
CreatePlatform and CreateDocument
5858

5959
```typescript
60-
createDOM: ({ html }?: { html?: string }) =>
60+
createDOM: (input?: { html?: string }) =>
6161
Promise<{
6262
render: (
6363
jsxElement: JSXOutput,
@@ -90,6 +90,19 @@ Description
9090

9191
</td><td>
9292

93+
(not declared)
94+
95+
</td><td>
96+
97+
_(Optional)_
98+
99+
</td></tr>
100+
<tr><td>
101+
102+
input
103+
104+
</td><td>
105+
93106
\{ html?: string; }
94107

95108
</td><td>

‎packages/docs/src/routes/api/qwik/api.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1845,7 +1845,7 @@
18451845
}
18461846
],
18471847
"kind": "Function",
1848-
"content": "> Warning: This API is now obsolete.\n> \n> Use `useAsync$` instead, which is more efficient, and has a more flexible API. Just read the `loading` and `error` properties from the returned signal to determine the status.\n> \n\n```tsx\nconst Cmp = component$(() => {\n const city = useSignal('');\n\n const weather = useAsync$(async ({ track, cleanup, abortSignal }) => {\n const cityName = track(city);\n const res = await fetch(`http://weatherdata.com?city=${cityName}`, {\n signal: abortSignal,\n });\n const temp = (await res.json()) as { temp: number };\n return temp;\n });\n\n return (\n <div>\n <input name=\"city\" bind:value={city} />\n <div>\n Temperature:{' '}\n {weather.loading\n ? 'Loading...'\n : weather.error\n ? `Error: ${weather.error.message}`\n : weather.value.temp}\n </div>\n </div>\n );\n});\n```\n\n\n```typescript\nResource: <T>({ value, onResolved, onPending, onRejected, }: ResourceProps<T>) => JSXOutput\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ value, onResolved, onPending, onRejected, }\n\n\n</td><td>\n\n[ResourceProps](#resourceprops)<!-- -->&lt;T&gt;\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n\n**Returns:**\n\n[JSXOutput](#jsxoutput)",
1848+
"content": "> Warning: This API is now obsolete.\n> \n> Use `useAsync$` instead, which is more efficient, and has a more flexible API. Just read the `loading` and `error` properties from the returned signal to determine the status.\n> \n\n```tsx\nconst Cmp = component$(() => {\n const city = useSignal('');\n\n const weather = useAsync$(async ({ track, cleanup, abortSignal }) => {\n const cityName = track(city);\n const res = await fetch(`http://weatherdata.com?city=${cityName}`, {\n signal: abortSignal,\n });\n const temp = (await res.json()) as { temp: number };\n return temp;\n });\n\n return (\n <div>\n <input name=\"city\" bind:value={city} />\n <div>\n Temperature:{' '}\n {weather.loading\n ? 'Loading...'\n : weather.error\n ? `Error: ${weather.error.message}`\n : weather.value.temp}\n </div>\n </div>\n );\n});\n```\n\n\n```typescript\nResource: <T>(input: ResourceProps<T>) => JSXOutput\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ value, onResolved, onPending, onRejected, }\n\n\n</td><td>\n\n(not declared)\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\ninput\n\n\n</td><td>\n\n[ResourceProps](#resourceprops)<!-- -->&lt;T&gt;\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n\n**Returns:**\n\n[JSXOutput](#jsxoutput)",
18491849
"editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/core/use/use-resource.ts",
18501850
"mdFile": "core.resource.md"
18511851
},

‎packages/docs/src/routes/api/qwik/index.mdx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3979,8 +3979,7 @@ const Cmp = component$(() => {
39793979
```
39803980
39813981
```typescript
3982-
Resource: <T>({ value, onResolved, onPending, onRejected }: ResourceProps<T>) =>
3983-
JSXOutput;
3982+
Resource: <T>(input: ResourceProps<T>) => JSXOutput;
39843983
```
39853984
39863985
<table><thead><tr><th>
@@ -4002,6 +4001,17 @@ Description
40024001
40034002
</td><td>
40044003
4004+
(not declared)
4005+
4006+
</td><td>
4007+
4008+
</td></tr>
4009+
<tr><td>
4010+
4011+
input
4012+
4013+
</td><td>
4014+
40054015
[ResourceProps](#resourceprops)&lt;T&gt;
40064016
40074017
</td><td>

‎packages/insights/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"typescript-eslint": "8.56.1",
3636
"vite": "7.3.1",
3737
"vite-tsconfig-paths": "6.0.4",
38-
"vitest": "4.0.16",
38+
"vitest": "4.0.18",
3939
"zod": "3.25.48"
4040
},
4141
"engines": {

‎packages/qwik-router/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
"remark-gfm": "^4.0.1",
2222
"set-cookie-parser": "^2.7.2",
2323
"source-map": "^0.7.6",
24-
"svgo": "^3.3.2",
24+
"svgo": "^3.3.3",
2525
"unified": "^11.0.5",
2626
"unist-util-visit": "^5.0.0",
2727
"valibot": ">=0.36.0 <2",
2828
"vfile": "6.0.3",
2929
"vite": ">=5 <8",
30-
"vite-imagetools": "9.0.0",
30+
"vite-imagetools": "10.0.0",
3131
"yaml": "^2.8.2",
3232
"zod": "^3.25.48"
3333
},
3434
"devDependencies": {
35-
"@microsoft/api-extractor": "7.55.2",
35+
"@microsoft/api-extractor": "7.57.6",
3636
"@qwik.dev/core": "workspace:*",
3737
"@types/mdast": "4.0.4",
3838
"@types/node": "24.10.0",

0 commit comments

Comments
 (0)