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

chore: merge 1.17.2 into v2

Author: wmertens

.github/workflows/ci.yml

@@ -660,7 +660,7 @@ jobs:
         settings:
           - host: ubuntu-latest
             browser: chromium
-          # too slow and flaky. Perhaps better in v2?
+          # Some tests are failing on firefox, disable for now
           # - host: ubuntu-latest
           #   browser: firefox
           - host: windows-latest
@@ -822,7 +822,8 @@ jobs:
       always() && 
       github.repository == 'QwikDev/qwik' && (
         github.ref == 'refs/heads/build/v2' ||
-        needs.test-unit.result == 'success'
+        needs.test-unit.result == 'success' || 
+        needs.test-unit.result == 'skipped'
       )
 
     steps:

e2e/adapters-e2e/playwright.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
   },
 
   // Increase global timeout for service worker tests
-  timeout: 30000,
+  timeout: process.env.CI ? 120000 : 30000,
 
   projects: [
     {
@@ -44,6 +44,6 @@ export default defineConfig({
     port: 3000,
     stdout: 'pipe',
     reuseExistingServer: !process.env.CI,
-    timeout: 120000,
+    timeout: process.env.CI ? 120000 : 30000,
   },
 });

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

@@ -205,4 +205,4 @@ export function log(text: string) {
   console.log(yellow('E2E: ' + text));
 }
 
-export const DEFAULT_TIMEOUT = 30000;
+export const DEFAULT_TIMEOUT = process.env.CI ? 120000 : 30000;

e2e/qwik-react-e2e/playwright.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
   },
 
   // Increase global timeout for service worker tests
-  timeout: 30000,
+  timeout: process.env.CI ? 120000 : 30000,
 
   projects: [
     {
@@ -44,5 +44,6 @@ export default defineConfig({
     port: 3000,
     stdout: 'pipe',
     reuseExistingServer: !process.env.CI,
+    timeout: process.env.CI ? 120000 : 30000,
   },
 });

package.json

@@ -154,7 +154,7 @@
     "typescript": "5.9.3",
     "typescript-eslint": "8.45.0",
     "vfile": "6.0.3",
-    "vite": "7.1.11",
+    "vite": "7.2.2",
     "vite-imagetools": "9.0.0",
     "vite-plugin-dts": "4.5.4",
     "vite-tsconfig-paths": "5.1.4",

packages/create-qwik/CHANGELOG.md

@@ -43,7 +43,7 @@
     "prettier": "3.6.2",
     "prism-themes": "1.9.0",
     "prismjs": "1.30.0",
-    "puppeteer": "22.13.1",
+    "playwright": "1.55.1",
     "qwik-image": "0.0.16",
     "react": "19.1.1",
     "react-dom": "19.1.1",
@@ -54,7 +54,7 @@
     "tsm": "2.3.0",
     "typescript": "5.9.3",
     "valibot": "0.33.3",
-    "vite": "7.1.11",
+    "vite": "7.2.2",
     "vite-tsconfig-paths": "5.1.4",
     "wrangler": "3.65.1"
   },
@@ -73,7 +73,7 @@
     "build.preview": "NODE_OPTIONS=--max-old-space-size=8192 vite build --ssr src/entry.preview.tsx",
     "build.repl-sw": "vite --config vite.config-repl-sw build",
     "build.server": "NODE_OPTIONS=--max-old-space-size=8192 vite build -c adapters/cloudflare-pages/vite.config",
-    "build.showcase": "pnpm node scripts/showcase.js",
+    "build.showcase": "pnpm node scripts/showcase.ts",
     "codesandbox.sync": "node codesandbox.sync.ts",
     "contributors": "node contributors.ts",
     "deploy": "wrangler pages publish ./dist",