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

chore: merge main into v2

Author: wmertens

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM cimg/rust:1.73-node
+FROM cimg/rust:1.88.0-node
 
 RUN rustup --version; \
     cargo --version; \

.husky/pre-commit

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$SKIP_SIMPLE_GIT_HOOKS" = "1" ]; then
+    echo "[INFO] SKIP_SIMPLE_GIT_HOOKS is set to 1, skipping hook."
+    exit 0
+fi
+
+if [ -f "$SIMPLE_GIT_HOOKS_RC" ]; then
+    . "$SIMPLE_GIT_HOOKS_RC"
+fi
+
+pnpm pretty-quick --staged

CONTRIBUTING.md

@@ -69,7 +69,7 @@ You need to have these tools up and running in your local machine:
 - one of the following:
   - [Nix](https://nixos.org)
   - [Docker](https://www.docker.com/)
-  - Locally installed NodeJS v18+ and optionally Rust
+  - Locally installed NodeJS v22+ and optionally Rust
 
 #### Nix
 
@@ -95,6 +95,15 @@ Alternatively you can use [devcontainers/cli](https://github.com/devcontainers/c
 - In your terminal navigate to the Qwik's project root directory.
 - Then run `devcontainer up --workspace-folder .`. This command will start a Docker container with all required environment dependencies.
 
+> [!TIP]
+> If you are using Podman, be sure to update the [VSCode dev container settings](https://code.visualstudio.com/remote/advancedcontainers/docker-options#_podman). Don't forget to allocate enough resources to the Podman machine to avoid slow builds.
+
+> [!NOTE]
+> You may run into an `EEXISTS` error when the Dev Container runs the "updateContentCommand" script. This may happen if pnpm gets installed automatically during the setup process. You can ignore the error because the container will be setup correctly, then run `pnpm install` in the project root once the container is connected and the terminal is available.
+
+> [!CAUTION]
+> The Dev Container may not work on Windows properly due to a difference with Windows container host volume permissions and ownership. It's recommended to use Mac or Linux instead, or configure your environment to build the project without Dev Containers.
+
 ##### Using development container without Dev Containers and VSCode
 
 If you would like to make use of the development container solution, but don't use VSCode or Dev Containers, you still can do so, by following steps:
@@ -145,7 +154,7 @@ Furthermore, to build the optimizer you optionally need Rust.
 
 1. Make sure [Rust](https://www.rust-lang.org/tools/install) is installed.
 2. Install [wasm-pack](https://rustwasm.github.io/wasm-pack/installer/) with `cargo install wasm-pack` .
-3. Node version >= `18`.
+3. Node version >= `22`.
 4. Make sure you have [pnpm](https://pnpm.io/installation) installed.
 5. run `pnpm install`
 
@@ -164,6 +173,9 @@ pnpm install && pnpm build.local
 
 If you want to work on the Rust code, use `build.full` instead of `build.local`.
 
+> [!NOTE]
+> After running `build.local`, you may see Git diffs for API-related files and `JSXNode`. You should run the `api.update` script to resolve them.
+
 ### Fast build
 
 This will build only Qwik and Qwik Router and their types. This is not enough to run the docs.
@@ -320,7 +332,6 @@ For larger PRs, it would really help if you follow these guidelines.
   For example: `feat(qwik-router): confetti animations` or `chore: pnpm api.update`
 
   Common types include:
-
   - feat: A new feature
   - fix: A bug fix
   - docs: Documentation only changes

e2e/qwik-cli-e2e/README.md

@@ -13,7 +13,6 @@ E2E project does the following internally:
 0. Vitest is configured to run a setup function once **PRIOR TO ALL** tests. During the setup `@qwik.dev/core`, `@qwik.dev/router` and `eslint-plugin-qwik` packages will be packed with `pnpm pack` Those will be used at a step 2 for every test. Tarballs are located in `temp/tarballs` folder within this repo. It is assumed that packages are built before E2E is executed.
 
 1. Simulates `npm create qwik` locally using direct command `node packages/create-qwik/create-qwik.cjs playground {outputDir}`
-
    - By default `outputDir` is an auto-generated one using `tmp` npm package. The application that is created here will be removed after the test is executed
    - It is possible to install into custom folder using environment variable `TEMP_E2E_PATH`. Here's how the command would look like in this case:
    - with absolute path `TEMP_E2E_PATH=/Users/name/projects/tests pnpm run test.e2e.cli`

package.json

@@ -68,87 +68,103 @@
           ],
           "range": ""
         }
+      ],
+      "sortExports": [
+        "types",
+        "node-addons",
+        "node",
+        "browser",
+        "module",
+        "import",
+        "require",
+        "svelte",
+        "development",
+        "production",
+        "script",
+        "min",
+        "default"
       ]
     }
   },
   "dependencies": {
-    "esbuild-plugin-raw": "^0.1.8"
+    "esbuild-plugin-raw": "^0.2.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.29.3",
+    "@changesets/cli": "2.29.5",
     "@changesets/get-github-info": "0.6.0",
     "@changesets/types": "6.1.0",
     "@clack/prompts": "0.7.0",
-    "@eslint/js": "9.25.1",
-    "@mdx-js/mdx": "3.0.1",
-    "@microsoft/api-documenter": "7.26.22",
-    "@microsoft/api-extractor": "7.52.4",
+    "@eslint/js": "9.33.0",
+    "@mdx-js/mdx": "3.1.0",
+    "@microsoft/api-documenter": "7.26.31",
+    "@microsoft/api-extractor": "7.52.10",
     "@napi-rs/cli": "2.18.4",
     "@napi-rs/triples": "1.2.0",
     "@node-rs/helper": "1.6.0",
     "@octokit/action": "6.1.0",
     "@playwright/test": "1.50.1",
     "@qwik.dev/core": "workspace:*",
-    "@qwik.dev/partytown": "0.11.1",
+    "@qwik.dev/partytown": "0.11.2",
     "@qwik.dev/router": "workspace:*",
     "@types/brotli": "1.3.4",
-    "@types/bun": "1.1.6",
+    "@types/bun": "1.2.20",
     "@types/cross-spawn": "6.0.6",
-    "@types/express": "4.17.21",
-    "@types/node": "24.0.4",
-    "@types/path-browserify": "1.0.2",
+    "@types/express": "5.0.3",
+    "@types/node": "24.2.1",
+    "@types/path-browserify": "1.0.3",
     "@types/prompts": "2.4.9",
-    "@types/react": "18.3.3",
-    "@types/semver": "7.5.8",
+    "@types/react": "19.1.10",
+    "@types/semver": "7.7.0",
     "@types/tmp": "0.2.6",
     "@types/which-pm-runs": "1.0.2",
-    "@vitejs/plugin-basic-ssl": "2.0.0",
+    "@vitejs/plugin-basic-ssl": "2.1.0",
     "@vitest/coverage-v8": "3.2.4",
     "all-contributors-cli": "6.26.1",
     "brotli": "1.3.3",
     "create-qwik": "workspace:*",
-    "cross-spawn": "7.0.3",
+    "cross-spawn": "7.0.6",
     "csstype": "3.1.3",
-    "dotenv": "16.4.5",
-    "esbuild": "0.25.5",
-    "eslint": "9.25.1",
-    "eslint-plugin-import": "2.29.1",
+    "dotenv": "16.5.0",
+    "esbuild": "0.25.8",
+    "eslint": "9.33.0",
+    "eslint-plugin-import": "2.32.0",
     "eslint-plugin-no-only-tests": "3.3.0",
     "eslint-plugin-qwik": "workspace:*",
     "execa": "8.0.1",
     "express": "4.20.0",
-    "globals": "16.0.0",
+    "globals": "16.3.0",
     "install": "0.13.0",
-    "memfs": "4.14.0",
+    "memfs": "4.34.0",
     "monaco-editor": "0.45.0",
     "mri": "1.2.0",
     "path-browserify": "1.0.1",
-    "prettier": "3.5.3",
-    "prettier-plugin-jsdoc": "1.3.2",
-    "pretty-quick": "4.0.0",
+    "prettier": "3.6.2",
+    "prettier-plugin-jsdoc": "1.3.3",
+    "prettier-plugin-tailwindcss": "0.6.14",
+    "pretty-quick": "4.2.2",
     "prompts": "2.4.2",
-    "rollup": "4.44.0",
-    "semver": "7.6.3",
-    "simple-git-hooks": "2.11.1",
+    "rollup": ">= 4.44.0",
+    "semver": "7.7.2",
+    "simple-git-hooks": "2.13.1",
     "snoop": "1.0.4",
     "source-map": "0.7.4",
     "svgo": "3.3.2",
-    "syncpack": "12.3.3",
+    "syncpack": "13.0.4",
     "terser": "5.43.1",
     "tmp": "0.2.3",
     "tree-kill": "1.2.2",
-    "tsx": "4.19.2",
+    "tsx": "4.20.3",
     "typescript": "5.8.3",
-    "typescript-eslint": "8.26.1",
-    "vfile": "6.0.2",
-    "vite": "7.0.0",
+    "typescript-eslint": "8.39.1",
+    "vfile": "6.0.3",
+    "vite": "7.1.0",
     "vite-imagetools": "7.1.0",
     "vite-plugin-dts": "4.5.4",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.2.4",
     "watchlist": "0.3.1",
     "which-pm-runs": "1.1.0",
-    "zod": "3.22.4"
+    "zod": "3.25.48"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
@@ -159,13 +175,14 @@
   "packageManager": "[email protected]",
   "pnpm": {
     "overrides": {
-      "prettier": "3.5.3",
+      "@builder.io/qwik": "npm:@qwik.dev/core@*",
+      "@builder.io/qwik-city": "npm:@qwik.dev/router",
+      "prettier": "3.6.2",
       "typescript": "5.8.3",
-      "vfile": "6.0.2"
+      "vfile": "6.0.3"
     },
     "patchedDependencies": {
-      "[email protected]": "patches/[email protected]",
-      "@auth/qwik": "patches/@auth__qwik.patch"
+      "[email protected]": "patches/[email protected]"
     }
   },
   "private": true,
@@ -177,7 +194,6 @@
     "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",
-    "build.router": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikrouter --api",
     "build.eslint": "tsx --require ./scripts/runBefore.ts scripts/index.ts --eslint",
     "build.full": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --qwik --insights --supabaseauthhelpers --api --eslint --qwikrouter --qwikworker --qwikreact --cli --platform-binding --wasm",
     "build.local": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --qwik --insights --supabaseauthhelpers --api --eslint --qwikrouter --qwikworker --qwikreact --cli --platform-binding-wasm-copy",
@@ -187,6 +203,7 @@
     "build.platform": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding",
     "build.platform.copy": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy",
     "build.qwik-router": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikrouter",
+    "build.router": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikrouter --api",
     "build.validate": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --api --eslint --qwikrouter --platform-binding --wasm --validate",
     "build.vite": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --insights --api --qwikrouter --eslint --platform-binding-wasm-copy",
     "build.wasm": "tsx --require ./scripts/runBefore.ts scripts/index.ts --wasm",

packages/create-qwik/package.json

@@ -7,7 +7,7 @@
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "devDependencies": {
     "@clack/prompts": "0.7.0",
-    "@types/yargs": "17.0.32",
+    "@types/yargs": "17.0.33",
     "kleur": "4.1.5",
     "yargs": "17.7.2"
   },

packages/docs/package.json

@@ -7,53 +7,53 @@
   "devDependencies": {
     "@algolia/autocomplete-core": "1.7.4",
     "@algolia/client-search": "4.14.3",
-    "@builder.io/qwik": "1.14.1",
-    "@emotion/react": "11.13.0",
-    "@emotion/styled": "11.13.0",
+    "@builder.io/qwik": "npm:@qwik.dev/core@*",
+    "@emotion/react": "11.14.0",
+    "@emotion/styled": "11.14.1",
     "@modular-forms/qwik": "0.23.1",
     "@mui/material": "5.16.4",
     "@mui/system": "5.16.4",
     "@mui/x-data-grid": "6.20.4",
     "@qwik-ui/headless": "0.6.7",
     "@qwik.dev/core": "workspace:*",
-    "@qwik.dev/partytown": "0.11.1",
+    "@qwik.dev/partytown": "0.11.2",
     "@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.49.4",
-    "@tailwindcss/vite": "4.0.12",
-    "@types/leaflet": "1.9.12",
-    "@types/prismjs": "1.26.4",
-    "@types/react": "18.3.3",
+    "@shikijs/colorized-brackets": "3.9.1",
+    "@shikijs/rehype": "3.9.1",
+    "@shikijs/transformers": "3.9.1",
+    "@shikijs/types": "3.9.1",
+    "@supabase/supabase-js": "2.53.0",
+    "@tailwindcss/vite": "4.1.11",
+    "@types/leaflet": "1.9.20",
+    "@types/prismjs": "1.26.5",
+    "@types/react": "19.1.10",
     "@types/react-dom": "18.3.0",
     "@unpic/core": "0.0.42",
     "@unpic/qwik": "0.0.38",
     "algoliasearch": "4.16.0",
     "fflate": "0.8.2",
     "gray-matter": "4.0.3",
     "leaflet": "1.9.4",
-    "magic-string": "0.30.11",
+    "magic-string": "0.30.17",
     "openai": "3.3.0",
-    "prettier": "3.5.3",
+    "prettier": "3.6.2",
     "prism-themes": "1.9.0",
-    "prismjs": "1.29.0",
+    "prismjs": "1.30.0",
     "puppeteer": "22.13.1",
     "qwik-image": "0.0.16",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "shiki": "3.1.0",
+    "shiki": "3.9.1",
     "snarkdown": "2.0.0",
-    "tailwindcss": "4.0.12",
+    "tailwindcss": "4.1.11",
     "terser": "5.43.1",
     "tsm": "2.3.0",
     "typescript": "5.8.3",
     "undici": "*",
     "valibot": "0.33.3",
-    "vite": "7.0.0",
-    "vite-plugin-inspect": "0.8.5",
+    "vite": "7.1.0",
+    "vite-plugin-inspect": "11.3.2",
     "vite-tsconfig-paths": "5.1.4",
     "wrangler": "3.65.1"
   },

packages/docs/src/repl/repl.css

@@ -341,6 +341,7 @@
 }
 
 .detail-options select {
+  background-color: var(--repl-tab-bg-color);
   border: 1px solid var(--repl-tab-bg-color);
   border-radius: 3px;
 }

packages/docs/src/repl/repl.tsx

@@ -185,6 +185,8 @@ const getDependencies = (input: ReplAppInput) => {
       `${prefix}server.cjs`,
       `/bindings/qwik.wasm.cjs`,
       `/bindings/qwik_wasm_bg.wasm`,
+      `${prefix}qwikloader.js`,
+      `${prefix}preloader.mjs`,
     ]) {
       bundles[p] = getNpmCdnUrl(bundled, QWIK_PKG_NAME, input.version, p);
     }

packages/docs/src/routes/(ecosystem)/ecosystem/index.tsx

@@ -234,10 +234,6 @@ export default component$(() => {
                   thumbnailBg={true}
                 />
               ))}
-              <AddIntegrationItem
-                title="Add A Showcase"
-                href="https://github.com/QwikDev/qwik/edit/main/packages/docs/scripts/pages.json"
-              />
             </ul>
           </section>