chore: merge 1.16.1 into v2

.changeset/bright-cloths-film.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+Fix: Better configuration of Vite's optimizeDeps, preventing false duplication warnings, and verifying that Qwik dependencies are not in optimizeDeps.

.changeset/config.json

@@ -9,7 +9,13 @@
   "access": "public",
   "baseBranch": "origin/build/v2",
   "updateInternalDependencies": "minor",
-  "ignore": ["qwik-docs", "insights", "qwik-cli-e2e", "docs-e2e"],
+  "ignore": [
+    "qwik-docs",
+    "insights",
+    "qwik-cli-e2e",
+    "qwik-react-test-app",
+    "docs-e2e"
+  ],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
   }

.changeset/tidy-chefs-tickle.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+fix: During deserialization, stores now correctly handle cyclic references to themselves

.github/workflows/ci.yml

@@ -694,6 +694,8 @@ jobs:
           mv artifact-create-qwik/* packages/create-qwik/dist/
           mkdir -p packages/eslint-plugin-qwik/dist/
           mv artifact-eslint-plugin-qwik/* packages/eslint-plugin-qwik/dist/
+          mkdir -p packages/qwik-react/lib/
+          mv artifact-qwikreact/lib/* packages/qwik-react/lib/
 
       - run: pnpm install --frozen-lockfile
 
@@ -706,10 +708,12 @@ jobs:
       - name: Playwright E2E Integration Tests
         run: pnpm run test.e2e.integrations.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
 
-      # RE-ENABBLE THIS AFTER qwik.dev/ packages are published
-      # - name: Validate Create Qwik Cli
-      # if: matrix.settings.host != 'windows-latest'
-      # run: pnpm cli.validate
+      - name: Playwright E2E Qwik React Tests
+        run: pnpm run test.e2e.qwik-react.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
+
+      - name: Validate Create Qwik Cli
+        if: matrix.settings.host != 'windows-latest'
+        run: pnpm cli.validate
 
   ############ E2E CLI TEST ############
   test-cli-e2e:

e2e/docs-e2e/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "author": "",
   "devDependencies": {
-    "@playwright/test": "1.50.1",
+    "@playwright/test": "1.54.1",
     "@types/node": "24.3.0"
   },
   "keywords": [],

e2e/docs-e2e/tests/Docs/docs-components-pages-load.spec.ts

@@ -1,37 +1,37 @@
 import { test, expect } from '@playwright/test';
 
 test('Components Overview page loads', async ({ page }) => {
-  await page.goto('/docs/components/overview/');
+  await page.goto('/docs/core/overview/');
   await expect(page).toHaveTitle('Overview | Components 📚 Qwik Documentation');
 });
 
 test('Components State page loads', async ({ page }) => {
-  await page.goto('/docs/components/state/');
+  await page.goto('/docs/core/state/');
   await expect(page).toHaveTitle('State | Components 📚 Qwik Documentation');
 });
 
 test('Components Tasks and Lifecycle page loads', async ({ page }) => {
-  await page.goto('/docs/components/tasks/');
+  await page.goto('/docs/core/tasks/');
   await expect(page).toHaveTitle('Tasks and Lifecycle | Components 📚 Qwik Documentation');
 });
 
 test('Components Context page loads', async ({ page }) => {
-  await page.goto('/docs/components/context/');
+  await page.goto('/docs/core/context/');
   await expect(page).toHaveTitle('Context | Components 📚 Qwik Documentation');
 });
 
 test('Components Slots page loads', async ({ page }) => {
-  await page.goto('/docs/components/slots/');
+  await page.goto('/docs/core/slots/');
   await expect(page).toHaveTitle('Slots | Components 📚 Qwik Documentation');
 });
 
 test('Components Rendering page loads', async ({ page }) => {
-  await page.goto('/docs/components/rendering/');
+  await page.goto('/docs/core/rendering/');
   await expect(page).toHaveTitle('Rendering | Components 📚 Qwik Documentation');
 });
 
 test('Components Styles page loads', async ({ page }) => {
-  await page.goto('/docs/components/styles/');
+  await page.goto('/docs/core/styles/');
   await expect(page).toHaveTitle('Styles | Components 📚 Qwik Documentation');
 });
 

e2e/qwik-react-e2e/.gitignore

@@ -0,0 +1,5 @@
+playwright-report
+dist
+logs
+server
+tmp

e2e/qwik-react-e2e/adapters/express/vite.config.ts

@@ -0,0 +1,15 @@
+import { nodeServerAdapter } from '@qwik.dev/router/adapters/node-server/vite';
+import { extendConfig } from '@qwik.dev/router/vite';
+import baseConfig from '../../vite.config';
+
+export default extendConfig(baseConfig, () => {
+  return {
+    build: {
+      ssr: true,
+      rollupOptions: {
+        input: ['src/entry.express.tsx'],
+      },
+    },
+    plugins: [nodeServerAdapter({ name: 'express' })],
+  };
+});

e2e/qwik-react-e2e/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "qwik-react-test-app",
+  "description": "Qwik react test app",
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+  },
+  "private": true,
+  "devDependencies": {
+    "@qwik.dev/react": "workspace:*",
+    "@types/react": "19.1.13",
+    "@types/react-dom": "19.1.7",
+    "react": "19.1.1",
+    "react-dom": "19.1.1"
+  },
+  "scripts": {
+    "build": "qwik build",
+    "build.client": "vite build",
+    "build.preview": "vite build --ssr src/entry.preview.tsx",
+    "build.server": "vite build -c adapters/express/vite.config.ts",
+    "build.types": "tsc --incremental --noEmit",
+    "deploy": "vercel deploy",
+    "dev": "vite --mode ssr",
+    "dev.debug": "node --inspect-brk ./node_modules/vite/bin/vite.js --mode ssr --force",
+    "express": "pnpm build && pnpm serve",
+    "fmt": "prettier --write .",
+    "fmt.check": "prettier --check .",
+    "lint": "eslint \"src/**/*.ts*\"",
+    "preview": "qwik build preview && vite preview --open",
+    "qwik": "qwik",
+    "serve": "node server/entry.express",
+    "start": "vite --open --mode ssr",
+    "test": "playwright test",
+    "test.debug": "playwright test --debug",
+    "test.ui": "playwright test --ui"
+  },
+  "type": "module"
+}

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

@@ -0,0 +1,48 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/** See https://playwright.dev/docs/test-configuration. */
+export default defineConfig({
+  testDir: './tests',
+  fullyParallel: true,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'line',
+
+  use: {
+    baseURL: 'http://localhost:3000',
+    // trace: 'on-first-retry',
+    // screenshot: 'only-on-failure',
+
+    // Increase timeouts for service worker operations
+    actionTimeout: 10000,
+    navigationTimeout: 10000,
+  },
+
+  // Increase global timeout for service worker tests
+  timeout: 30000,
+
+  projects: [
+    {
+      name: 'chromium',
+      use: {
+        ...devices['Desktop Chrome'],
+      },
+    },
+    // {
+    //   name: 'firefox',
+    //   use: { ...devices['Desktop Firefox'] },
+    // },
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+  ],
+
+  webServer: {
+    command: 'npm run express',
+    port: 3000,
+    stdout: 'pipe',
+    reuseExistingServer: !process.env.CI,
+  },
+});

e2e/qwik-react-e2e/src/components/counter/index.tsx

@@ -0,0 +1,28 @@
+/** @jsxImportSource react */
+import { useEffect, useState } from 'react';
+import { qwikify$ } from '@qwik.dev/react';
+
+interface IProps {
+  onMount(): void;
+  onUnmount(): void;
+}
+
+function Counter({ onMount, onUnmount }: IProps) {
+  const [count, setCount] = useState(0);
+
+  useEffect(() => {
+    onMount();
+    return () => onUnmount();
+  }, []);
+
+  return (
+    <div data-testid="test-component">
+      <span data-testid="count">count {count}</span>
+      <button data-testid="inc-btn" onClick={() => setCount((v) => v + 1)}>
+        inc
+      </button>
+    </div>
+  );
+}
+
+export const QCounter = qwikify$(Counter, { eagerness: 'hover' });

e2e/qwik-react-e2e/src/entry.express.tsx

@@ -0,0 +1,65 @@
+/*
+ * WHAT IS THIS FILE?
+ *
+ * It's the entry point for the Express HTTP server when building for production.
+ *
+ * Learn more about Node.js server integrations here:
+ * - https://qwik.dev/docs/deployments/node/
+ *
+ */
+import { createQwikRouter, type PlatformNode } from '@qwik.dev/router/middleware/node';
+import 'dotenv/config';
+import express from 'express';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import render from './entry.ssr';
+
+declare global {
+  type QwikRouterPlatform = PlatformNode;
+}
+
+// Directories where the static assets are located
+const distDir = join(fileURLToPath(import.meta.url), '..', '..', 'dist');
+const buildDir = join(distDir, 'build');
+const assetsDir = join(distDir, 'assets');
+
+// Allow for dynamic port
+const PORT = process.env.PORT ?? 3000;
+
+// Create the Qwik Router Node middleware
+const { router, notFound } = createQwikRouter({
+  render,
+  // getOrigin(req) {
+  //   // If deploying under a proxy, you may need to build the origin from the request headers
+  //   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto
+  //   const protocol = req.headers["x-forwarded-proto"] ?? "http";
+  //   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Host
+  //   const host = req.headers["x-forwarded-host"] ?? req.headers.host;
+  //   return `${protocol}://${host}`;
+  // }
+});
+
+// Create the express server
+// https://expressjs.com/
+const app = express();
+
+// Enable gzip compression
+// app.use(compression());
+
+// Static asset handlers
+// https://expressjs.com/en/starter/static-files.html
+app.use(`/build`, express.static(buildDir, { immutable: true, maxAge: '1y' }));
+app.use(`/assets`, express.static(assetsDir, { immutable: true, maxAge: '1y' }));
+app.use(express.static(distDir, { redirect: false }));
+
+// Use Qwik Router's page and endpoint request handler
+app.use(router);
+
+// Use Qwik Router's 404 handler
+app.use(notFound);
+
+// Start the express server
+app.listen(PORT, () => {
+  /* eslint-disable */
+  console.log(`Server started: http://localhost:${PORT}/`);
+});

e2e/qwik-react-e2e/src/entry.preview.tsx

@@ -0,0 +1,18 @@
+/*
+ * WHAT IS THIS FILE?
+ *
+ * It's the bundle entry point for `npm run preview`.
+ * That is, serving your app built in production mode.
+ *
+ * Feel free to modify this file, but don't remove it!
+ *
+ * Learn more about Vite's preview command:
+ * - https://vitejs.dev/config/preview-options.html#preview-options
+ *
+ */
+import { createQwikRouter } from '@qwik.dev/router/middleware/node';
+// make sure qwikCityPlan is imported before entry
+import render from './entry.ssr';
+
+/** The default export is the QwikCity adapter used by Vite preview. */
+export default createQwikRouter({ render });

e2e/qwik-react-e2e/src/entry.ssr.tsx

@@ -0,0 +1,31 @@
+/**
+ * WHAT IS THIS FILE?
+ *
+ * SSR renderer function, used by Qwik Router.
+ *
+ * Note that this is the only place the Qwik renderer is called. On the client, containers resume
+ * and do not call render.
+ */
+import { createRenderer } from '@qwik.dev/router';
+import Root from './root';
+
+export default createRenderer((opts) => {
+  return {
+    jsx: <Root />,
+    options: {
+      ...opts,
+      // Use container attributes to set attributes on the html tag.
+      containerAttributes: {
+        lang: 'en-us',
+        ...opts.containerAttributes,
+      },
+      serverData: {
+        ...opts.serverData,
+        // These are the default values for the document head and are overridden by the `head` exports
+        // documentHead: {
+        //   title: "My App",
+        // },
+      },
+    },
+  };
+});

e2e/qwik-react-e2e/src/root.tsx

@@ -0,0 +1,29 @@
+import { component$ } from '@qwik.dev/core';
+import { DocumentHeadTags, RouterOutlet, useLocation, useQwikRouter } from '@qwik.dev/router';
+
+export default component$(() => {
+  useQwikRouter();
+  const { url } = useLocation();
+
+  /**
+   * This is the root of a QwikRouter site. It contains the document's `<head>` and `<body>`. You
+   * can adjust them as you see fit.
+   */
+
+  return (
+    <>
+      <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+
+        <DocumentHeadTags />
+
+        <link rel="canonical" href={url.href} />
+      </head>
+      <body>
+        <RouterOutlet />
+      </body>
+    </>
+  );
+});