Merge pull request #7443 from QwikDev/v2-merge-main

chore: merge main into v2

Author: wmertens

.prettierignore

@@ -1,4 +1,4 @@
-**/api.md
+**/*.api.md
 **/*.log
 **/.DS_Store
 *.

package.json

@@ -92,8 +92,8 @@
     "@clack/prompts": "0.7.0",
     "@eslint/eslintrc": "3.1.0",
     "@mdx-js/mdx": "3.0.1",
-    "@microsoft/api-documenter": "7.24.2",
-    "@microsoft/api-extractor": "7.43.1",
+    "@microsoft/api-documenter": "7.26.17",
+    "@microsoft/api-extractor": "7.52.1",
     "@napi-rs/cli": "2.18.4",
     "@napi-rs/triples": "1.2.0",
     "@node-rs/helper": "1.6.0",
@@ -150,12 +150,12 @@
     "tmp": "0.2.3",
     "tree-kill": "1.2.2",
     "tsx": "4.19.2",
-    "typescript": "5.4.5",
+    "typescript": "5.8.2",
     "vfile": "6.0.2",
     "vite": "5.4.10",
     "vite-imagetools": "7.0.4",
     "vite-plugin-dts": "4.3.0",
-    "vite-tsconfig-paths": "5.0.1",
+    "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.0.8",
     "watchlist": "0.3.1",
     "which-pm-runs": "1.1.0",
@@ -170,7 +170,7 @@
   "packageManager": "[email protected]",
   "pnpm": {
     "overrides": {
-      "typescript": "5.4.5",
+      "typescript": "5.8.2",
       "vfile": "6.0.2",
       "@supabase/realtime-js": "2.8.4"
     },
@@ -183,7 +183,7 @@
     "api.update": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev",
     "build": "tsx --require ./scripts/runBefore.ts scripts/index.ts",
     "build.changelog-formatter": "tsc .changeset/changelog-github-custom.ts && mv .changeset/changelog-github-custom.js .changeset/changelog-github-custom.cjs",
-    "build.clean": "rm -rf packages/qwik/dist/ && rm -rf packages/qwik-router/lib/ && rm -rf packages/docs/dist/ && rm -rf packages/insights/dist/",
+    "build.clean": "tsx ./scripts/build-clean.ts",
     "build.cli": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli --dev",
     "build.cli.prod": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli",
     "build.core": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --insights --qwikrouter --api --platform-binding",
@@ -205,8 +205,8 @@
     "cli.qwik": "pnpm build.cli && node packages/qwik/qwik-cli.cjs",
     "cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts",
     "deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe",
-    "docs.dev": "cd packages/docs && pnpm build.repl-sw && pnpm dev",
-    "docs.preview": "cd packages/docs && pnpm preview",
+    "docs.dev": "pnpm -C packages/docs build.repl-sw && pnpm -C packages/docs dev",
+    "docs.preview": "pnpm -C packages/docs preview",
     "docs.sync": "tsx --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt",
     "eslint.update": "tsx --require ./scripts/runBefore.ts scripts/eslint-docs.ts",
     "fmt": "pnpm prettier.fix && pnpm syncpack format",

packages/docs/check-qwik-build.ts

@@ -1,12 +1,22 @@
 // verify that ../qwik/dist/core.d.ts exists or run `pnpm run build.core` in the root directory
 // Also make sure that the repl-sw.js file is present, for dev mode
 // we need it for development and for the REPL
-import fs from 'fs';
-import path from 'path';
-import { spawnSync } from 'child_process';
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'url';
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+let __dirname = path.dirname(fileURLToPath(import.meta.url));
+const isWindows = process.platform === 'win32';
+if (isWindows && __dirname.startsWith('/')) {
+  // in Windows __dirname starts with a / causing errors
+  // before
+  //  /C:/Users/{location stuff}/qwik/packages/docs
+  __dirname = __dirname.substring(1);
+  // after
+  // C:/Users/{location stuff}/qwik/packages/docs
+}
 const qwikPkgDir = path.join(__dirname, '..', 'qwik', 'dist');
 
 if (!fs.existsSync(path.join(qwikPkgDir, 'core-internal.d.ts'))) {

packages/docs/package.json

@@ -22,6 +22,10 @@
     "@qwik.dev/core": "workspace:*",
     "@qwik.dev/react": "workspace:*",
     "@qwik.dev/router": "workspace:*",
+    "@shikijs/colorized-brackets": "3.1.0",
+    "@shikijs/rehype": "3.1.0",
+    "@shikijs/transformers": "3.1.0",
+    "@shikijs/types": "3.1.0",
     "@supabase/supabase-js": "2.44.4",
     "@types/leaflet": "1.9.12",
     "@types/prismjs": "1.26.4",
@@ -44,13 +48,12 @@
     "qwik-image": "0.0.16",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "rehype-pretty-code": "0.14.0",
-    "shiki": "1.29.1",
+    "shiki": "3.1.0",
     "snarkdown": "2.0.0",
     "tailwindcss": "3.4.6",
     "terser": "5.37.0",
     "tsm": "2.3.0",
-    "typescript": "5.4.5",
+    "typescript": "5.8.2",
     "undici": "*",
     "valibot": "0.33.3",
     "vite": "5.4.10",
@@ -76,7 +79,7 @@
     "codesandbox.sync": "tsx codesandbox.sync.ts",
     "contributors": "tsx contributors.ts",
     "deploy": "wrangler pages publish ./dist",
-    "dev": "concurrently \"tsx check-qwik-build.ts\" \"vite --mode ssr --open\"",
+    "dev": "tsx check-qwik-build.ts && vite --mode ssr --open",
     "dev.debug": "node --inspect-brk ../../node_modules/vite/bin/vite.js --mode ssr --force",
     "prebuild.core": "tsx check-qwik-build.ts",
     "preview": "qwik build preview && vite preview --open",

packages/docs/src/components/code-sandbox/index.tsx

@@ -30,12 +30,7 @@ export default component$<{
           ))}
         </div>
       )}
-      <div
-        class="overflow-auto slot-container mb-4"
-        style={{
-          '--pretty-code-fragment-max-height': maxHeight ? maxHeight + 'px' : 'none',
-        }}
-      >
+      <div class="overflow-auto slot-container mb-4">
         <Slot name={tabs ? String(activeTab.value) : ''} />
       </div>
       <div class="browser shadow-xl">

packages/docs/src/components/qwik-gpt/index.tsx

@@ -1,7 +1,7 @@
 import { component$, useComputed$, useSignal } from '@qwik.dev/core';
 // import { qwikGPT, rateResponse } from './search';
 import { CodeBlock } from '../code-block/code-block';
-// import { isBrowser } from '@builder.io/qwik';
+// import { isBrowser } from '@qwik.dev/core';
 import snarkdown from 'snarkdown';
 
 const snarkdownEnhanced = (md: string) => {

packages/docs/src/routes/(blog)/blog/(articles)/astro-qwik/index.mdx

@@ -90,7 +90,7 @@ For example, here's how we use a Qwik counter component in Astro.
 **counter.tsx**
 
 ```tsx
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export const Counter = component$(() => {
   const counter = useSignal(0);

packages/docs/src/routes/api/qwik-router-middleware-aws-lambda/api.json

@@ -26,7 +26,7 @@
         }
       ],
       "kind": "Function",
-      "content": "```typescript\nexport declare function createQwikRouter(opts: AwsOpt): {\n    fixPath: (pathT: string) => string;\n    router: (req: import(\"http\").IncomingMessage | import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse<import(\"http\").IncomingMessage>, next: import(\"@qwik.dev/router/middleware/node\").NodeRequestNextFunction) => Promise<void>;\n    staticFile: (req: import(\"http\").IncomingMessage | import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse<import(\"http\").IncomingMessage>, next: (e?: any) => void) => Promise<void>;\n    notFound: (req: import(\"http\").IncomingMessage | import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse<import(\"http\").IncomingMessage>, next: (e: any) => void) => Promise<void>;\n    handle: (req: any, res: any) => 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\nopts\n\n\n</td><td>\n\nAwsOpt\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\n{ fixPath: (pathT: string) =&gt; string; router: (req: import(\"http\").IncomingMessage \\| import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse&lt;import(\"http\").IncomingMessage&gt;, next: import(\"@qwik.dev/router/middleware/node\").NodeRequestNextFunction) =&gt; Promise&lt;void&gt;; staticFile: (req: import(\"http\").IncomingMessage \\| import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse&lt;import(\"http\").IncomingMessage&gt;, next: (e?: any) =&gt; void) =&gt; Promise&lt;void&gt;; notFound: (req: import(\"http\").IncomingMessage \\| import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse&lt;import(\"http\").IncomingMessage&gt;, next: (e: any) =&gt; void) =&gt; Promise&lt;void&gt;; handle: (req: any, res: any) =&gt; void; }",
+      "content": "```typescript\nexport declare function createQwikRouter(opts: AwsOpt): {\n    fixPath: (pathT: string) => string;\n    router: (req: import(\"http\").IncomingMessage | import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse, next: import(\"@qwik.dev/router/middleware/node\").NodeRequestNextFunction) => Promise<void>;\n    staticFile: (req: import(\"http\").IncomingMessage | import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse, next: (e?: any) => void) => Promise<void>;\n    notFound: (req: import(\"http\").IncomingMessage | import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse, next: (e: any) => void) => Promise<void>;\n    handle: (req: any, res: any) => 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\nopts\n\n\n</td><td>\n\nAwsOpt\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\n{ fixPath: (pathT: string) =&gt; string; router: (req: import(\"http\").IncomingMessage \\| import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse, next: import(\"@qwik.dev/router/middleware/node\").NodeRequestNextFunction) =&gt; Promise&lt;void&gt;; staticFile: (req: import(\"http\").IncomingMessage \\| import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse, next: (e?: any) =&gt; void) =&gt; Promise&lt;void&gt;; notFound: (req: import(\"http\").IncomingMessage \\| import(\"http2\").Http2ServerRequest, res: import(\"http\").ServerResponse, next: (e: any) =&gt; void) =&gt; Promise&lt;void&gt;; handle: (req: any, res: any) =&gt; void; }",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/aws-lambda/index.ts",
       "mdFile": "router.createqwikrouter.md"
     },

packages/docs/src/routes/api/qwik-router-middleware-aws-lambda/index.md

@@ -23,17 +23,17 @@ export declare function createQwikRouter(opts: AwsOpt): {
   fixPath: (pathT: string) => string;
   router: (
     req: import("http").IncomingMessage | import("http2").Http2ServerRequest,
-    res: import("http").ServerResponse<import("http").IncomingMessage>,
+    res: import("http").ServerResponse,
     next: import("@qwik.dev/router/middleware/node").NodeRequestNextFunction,
   ) => Promise<void>;
   staticFile: (
     req: import("http").IncomingMessage | import("http2").Http2ServerRequest,
-    res: import("http").ServerResponse<import("http").IncomingMessage>,
+    res: import("http").ServerResponse,
     next: (e?: any) => void,
   ) => Promise<void>;
   notFound: (
     req: import("http").IncomingMessage | import("http2").Http2ServerRequest,
-    res: import("http").ServerResponse<import("http").IncomingMessage>,
+    res: import("http").ServerResponse,
     next: (e: any) => void,
   ) => Promise<void>;
   handle: (req: any, res: any) => void;
@@ -67,7 +67,7 @@ AwsOpt
 </tbody></table>
 **Returns:**
 
-{ fixPath: (pathT: string) =&gt; string; router: (req: import("http").IncomingMessage \| import("http2").Http2ServerRequest, res: import("http").ServerResponse&lt;import("http").IncomingMessage&gt;, next: import("@qwik.dev/router/middleware/node").NodeRequestNextFunction) =&gt; Promise&lt;void&gt;; staticFile: (req: import("http").IncomingMessage \| import("http2").Http2ServerRequest, res: import("http").ServerResponse&lt;import("http").IncomingMessage&gt;, next: (e?: any) =&gt; void) =&gt; Promise&lt;void&gt;; notFound: (req: import("http").IncomingMessage \| import("http2").Http2ServerRequest, res: import("http").ServerResponse&lt;import("http").IncomingMessage&gt;, next: (e: any) =&gt; void) =&gt; Promise&lt;void&gt;; handle: (req: any, res: any) =&gt; void; }
+{ fixPath: (pathT: string) =&gt; string; router: (req: import("http").IncomingMessage \| import("http2").Http2ServerRequest, res: import("http").ServerResponse, next: import("@qwik.dev/router/middleware/node").NodeRequestNextFunction) =&gt; Promise&lt;void&gt;; staticFile: (req: import("http").IncomingMessage \| import("http2").Http2ServerRequest, res: import("http").ServerResponse, next: (e?: any) =&gt; void) =&gt; Promise&lt;void&gt;; notFound: (req: import("http").IncomingMessage \| import("http2").Http2ServerRequest, res: import("http").ServerResponse, next: (e: any) =&gt; void) =&gt; Promise&lt;void&gt;; handle: (req: any, res: any) =&gt; void; }
 
 [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/aws-lambda/index.ts)
 

packages/docs/src/routes/api/qwik-router-middleware-cloudflare-pages/api.json

@@ -26,7 +26,7 @@
         }
       ],
       "kind": "Function",
-      "content": "```typescript\nexport declare function createQwikRouter(opts: QwikRouterCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: PlatformCloudflarePages['env'] & {\n    ASSETS: {\n        fetch: (req: Request) => Response;\n    };\n}, ctx: PlatformCloudflarePages['ctx']) => Promise<Response>;\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\nopts\n\n\n</td><td>\n\n[QwikRouterCloudflarePagesOptions](#qwikroutercloudflarepagesoptions)\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\n(request: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['request'\\], env: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['env'\\] &amp; { ASSETS: { fetch: (req: Request) =&gt; Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['ctx'\\]) =&gt; Promise&lt;Response&gt;",
+      "content": "```typescript\nexport declare function createQwikRouter(opts: QwikRouterCloudflarePagesOptions): (request: PlatformCloudflarePages[\"request\"], env: PlatformCloudflarePages[\"env\"] & {\n    ASSETS: {\n        fetch: (req: Request) => Response;\n    };\n}, ctx: PlatformCloudflarePages[\"ctx\"]) => Promise<Response>;\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\nopts\n\n\n</td><td>\n\n[QwikRouterCloudflarePagesOptions](#qwikroutercloudflarepagesoptions)\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\n(request: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\[\"request\"\\], env: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\[\"env\"\\] &amp; { ASSETS: { fetch: (req: Request) =&gt; Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\[\"ctx\"\\]) =&gt; Promise&lt;Response&gt;",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/cloudflare-pages/index.ts",
       "mdFile": "router.createqwikrouter.md"
     },