Merge branch 'main' into upcoming

Author: wmertens

.changeset/breezy-toes-help.md

@@ -0,0 +1,5 @@
+---
+'eslint-plugin-qwik': minor
+---
+
+let eslint-plugin-qwik support Eslint 9 and 8 simultaneously

.changeset/forty-bats-rule.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': patch
+---
+
+updated drizzle to latest version

.changeset/maiieul-manual-changeset.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': patch
+---
+
+✨ Add the ability to see chunks names in preview/production environments to facilitate debugging of production-only bugs

.github/workflows/ci.yml

@@ -54,13 +54,15 @@ jobs:
       hash-insights: ${{ steps.cache-insights.outputs.cache-primary-key }}
       hash-unit: ${{ steps.cache-unit.outputs.cache-primary-key }}
       hash-e2e: ${{ steps.cache-e2e.outputs.cache-primary-key }}
+      hash-cli-e2e: ${{ steps.cache-cli-e2e.outputs.cache-primary-key }}
       build-qwik: ${{ steps.cache-qwik.outputs.cache-hit != 'true' }}
       build-rust: ${{ steps.cache-rust.outputs.cache-hit != 'true' }}
       build-others: ${{ steps.cache-others.outputs.cache-hit != 'true' }}
       build-docs: ${{ steps.cache-docs.outputs.cache-hit != 'true' }}
       build-insights: ${{ steps.cache-insights.outputs.cache-hit != 'true' }}
       build-unit: ${{ steps.cache-unit.outputs.cache-hit != 'true' }}
       build-e2e: ${{ steps.cache-e2e.outputs.cache-hit != 'true' }}
+      build-cli-e2e: ${{ steps.cache-cli-e2e.outputs.cache-hit != 'true' }}
       disttag: ${{ steps.set_dist_tag.outputs.disttag }}
 
     steps:
@@ -174,7 +176,7 @@ jobs:
           path: |
             packages/insights/dist
             packages/insights/.netlify
-          key: ${{ hashfiles('others-key.txt', 'packages/qwik-insights/**/*') }}
+          key: ${{ hashfiles('others-key.txt', 'packages/insights/**/*') }}
       - name: 'check cache: unit tests'
         id: cache-unit
         uses: actions/cache/restore@v4
@@ -189,6 +191,13 @@ jobs:
           lookup-only: true
           path: e2e-tests-completed.txt
           key: ${{ hashfiles('others-key.txt', 'starters/**/*') }}
+      - name: 'check cache: cli e2e tests'
+        id: cache-cli-e2e
+        uses: actions/cache/restore@v4
+        with:
+          lookup-only: true
+          path: cli-e2e-tests-completed.txt
+          key: ${{ hashfiles('others-key.txt', 'e2e/**/*') }}
 
   ############ BUILD Qwik ############
   build-qwik:
@@ -274,6 +283,7 @@ jobs:
           node-version: 20.x
           cache: 'pnpm'
           registry-url: https://registry.npmjs.org/
+
       - run: pnpm install
       - if: matrix.settings.wasm
         run: pnpm install wasm-pack
@@ -717,7 +727,7 @@ jobs:
   ############ E2E CLI TEST ############
   test-cli-e2e:
     name: E2E CLI Tests
-    if: always() && needs.changes.outputs.build-e2e == 'true'
+    if: always() && needs.changes.outputs.build-cli-e2e == 'true'
 
     needs:
       - build-other-packages
@@ -806,6 +816,7 @@ jobs:
       - changes
       - test-unit
       - test-e2e
+      - test-cli-e2e
     # test-unit runs when any packages changes, so we have to release
     # on "upcoming", we always check if we have something to release
     # don't run on forks
@@ -832,6 +843,21 @@ jobs:
           key: ${{ needs.changes.outputs.hash-e2e }}
           path: e2e-tests-completed.txt
 
+      - name: Verify test-cli-e2e
+        if: needs.test-cli-e2e.result != 'skipped'
+        run: |
+          if [ "${{ needs.test-cli-e2e.result }}" != success ] ; then
+            exit 1
+          else
+            echo ok > cli-e2e-tests-completed.txt
+          fi
+      - name: Save cli-e2e tests cache
+        if: needs.test-cli-e2e.result != 'skipped'
+        uses: actions/cache/save@v4
+        with:
+          key: ${{ needs.changes.outputs.hash-cli-e2e }}
+          path: cli-e2e-tests-completed.txt
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -915,6 +941,7 @@ jobs:
     needs:
       - test-unit
       - test-e2e
+      - test-cli-e2e
       - lint-package
       - build-docs
       - build-insights
@@ -925,6 +952,7 @@ jobs:
           !(
             (needs.test-unit.result == 'success' || needs.test-unit.result == 'skipped') &&
             (needs.test-e2e.result == 'success' || needs.test-e2e.result == 'skipped') &&
+            (needs.test-cli-e2e.result == 'success' || needs.test-cli-e2e.result == 'skipped') &&
             (needs.lint-package.result == 'success' || needs.lint-package.result == 'skipped') &&
             (needs.build-docs.result == 'success' || needs.build-docs.result == 'skipped') &&
             (needs.build-insights.result == 'success' || needs.build-insights.result == 'skipped')

e2e/qwik-cli-e2e/utils/index.ts

@@ -67,10 +67,10 @@ function replacePackagesWithLocalOnes(tmpDir: string) {
   for (const { name, absolutePath } of tarballConfig) {
     patchPackageJsonForPlugin(tmpDir, name, absolutePath);
   }
-  execSync('npm i', {
+  execSync('pnpm i', {
     cwd: tmpDir,
     // only output errors
-    stdio: ['ignore', 'ignore', 'inherit'],
+    stdio: ['ignore', 'inherit', 'inherit'],
   });
 }
 

e2e/qwik-cli-e2e/vite.config.ts

@@ -1,5 +1,15 @@
 import { defineConfig } from 'vitest/config';
 import tsconfigPaths from 'vite-tsconfig-paths';
+import { resolve } from 'path';
+import { mkdirSync } from 'fs';
+
+// if we're running in github CI
+if (process.env.CI) {
+  // Workaround for npm/pnpm crashing in scaffoldQwikProject because "name is too long"
+  const testPath = resolve(process.cwd(), 'e2e-test-tmp');
+  mkdirSync(testPath);
+  process.env.TEMP_E2E_PATH = testPath;
+}
 
 export default defineConfig({
   plugins: [tsconfigPaths({ ignoreConfigErrors: true, root: '../../' })],

flake.lock

@@ -9,6 +9,16 @@
   "config": {
     "syncpack": {
       "versionGroups": [
+        {
+          "label": "Allow ESLint 9 types in eslint-plugin-qwik",
+          "dependencies": [
+            "@types/eslint"
+          ],
+          "packages": [
+            "eslint-plugin-qwik"
+          ],
+          "policy": "[email protected]"
+        },
         {
           "label": "Be lenient in vite versions for prod. v4 is broken, v5 is good",
           "dependencyTypes": [
@@ -47,16 +57,19 @@
             "prod",
             "peer"
           ]
-        }
-      ],
-      "semverGroups": [
+        },
         {
           "label": "Playwright should have the same version as in flake.nix",
           "dependencies": [
             "@playwright/test"
           ],
-          "pinVersion": "1.47.0"
-        },
+          "dependencyTypes": [
+            "dev"
+          ],
+          "pinVersion": "1.48.1"
+        }
+      ],
+      "semverGroups": [
         {
           "label": "Undici should always be * until we remove it",
           "dependencies": [
@@ -110,7 +123,7 @@
     "@napi-rs/triples": "1.2.0",
     "@node-rs/helper": "1.6.0",
     "@octokit/action": "6.1.0",
-    "@playwright/test": "1.47.0",
+    "@playwright/test": "1.48.1",
     "@types/brotli": "1.3.4",
     "@types/bun": "1.1.6",
     "@types/cross-spawn": "6.0.6",
@@ -176,7 +189,7 @@
     "yarn": "please-use-pnpm",
     "pnpm": ">=9.0.5"
   },
-  "packageManager": "pnpm@9.0.5",
+  "packageManager": "pnpm@9.15.5",
   "pnpm": {
     "overrides": {
       "typescript": "5.4.5",
@@ -210,8 +223,8 @@
     "build.wasm": "tsx --require ./scripts/runBefore.ts scripts/index.ts --wasm",
     "build.watch": "tsx --require ./scripts/runBefore.ts scripts/index.ts --build  --qwikcity --watch --dev --platform-binding",
     "change": "changeset",
-    "cli": "pnpm build.cli && node packages/create-qwik/dist/create-qwik.cjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
-    "cli.qwik": "pnpm build.cli && node packages/qwik/dist/qwik-cli.cjs",
+    "cli": "pnpm build.cli && node packages/create-qwik/create-qwik.cjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
+    "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",

package.json

@@ -45,7 +45,6 @@
     "react-dom": "18.3.1",
     "rehype-pretty-code": "0.11.0",
     "shiki": "0.14.7",
-    "shikiji": "0.9.19",
     "snarkdown": "2.0.0",
     "tailwindcss": "3.4.6",
     "terser": "5.31.3",
@@ -76,7 +75,7 @@
     "codesandbox.sync": "tsx codesandbox.sync.ts",
     "contributors": "tsx contributors.ts",
     "deploy": "wrangler pages publish ./dist",
-    "dev": "tsx check-qwik-build.ts && vite --mode ssr --open",
+    "dev": "concurrently \"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",