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

chore: merge main into v2

Author: wmertens

.github/ISSUE_TEMPLATE/bug.yaml

@@ -53,7 +53,7 @@ body:
     id: system-info
     attributes:
       label: System Info
-      description: Output of `npx envinfo --system --npmPackages '{vite,typescript,@builder.io/*}' --binaries --browsers`
+      description: Output of `npx envinfo --system --npmPackages '{vite,typescript,@builder.io/*,@qwik.dev/*}' --binaries --browsers`
       render: shell
       placeholder: System, Binaries, Browsers
     validations:

.github/workflows/ci.yml

@@ -571,7 +571,7 @@ jobs:
 
       - run: pnpm install --frozen-lockfile
       - name: Build Qwik Docs
-        run: pnpm run build.packages.docs && echo ok > docs-build-completed.txt
+        run: pnpm build --tsc-docs && pnpm run build.packages.docs && echo ok > docs-build-completed.txt
 
       - name: Save Docs Artifacts
         uses: actions/upload-artifact@v4

README.md

@@ -52,7 +52,7 @@ bun create qwik@latest
 
 ## Related
 
-- [Partytown](https://partytown.builder.io/): Relocate resource intensive third-party scripts off of the main thread and into a web worker 🎉.
+- [Partytown](https://partytown.qwik.dev/): Relocate resource intensive third-party scripts off of the main thread and into a web worker 🎉.
 - [Mitosis](https://github.com/BuilderIO/mitosis): Write components once, run everywhere. Compiles to Vue, React, Solid, Angular, Svelte, and more.
 - [Builder](https://github.com/BuilderIO/builder): Drag and drop page builder and CMS for React, Vue, Angular, and more.
 

e2e/qwik-cli-e2e/tests/serve.spec.ts

@@ -1,47 +1,116 @@
-import { assert, test, beforeAll, expect } from 'vitest';
+/* eslint-disable no-console */
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { join } from 'path';
+import { assert, beforeAll, beforeEach, describe, expect, test } from 'vitest';
 import {
   assertHostUnused,
+  DEFAULT_TIMEOUT,
   getPageHtml,
-  promisifiedTreeKill,
   killAllRegisteredProcesses,
+  log,
+  promisifiedTreeKill,
   runCommandUntil,
   scaffoldQwikProject,
-  DEFAULT_TIMEOUT,
+  type QwikProjectType,
 } from '../utils';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-
-const SERVE_PORT = 3535;
-beforeAll(() => {
-  const config = scaffoldQwikProject();
-  global.tmpDir = config.tmpDir;
 
-  return async () => {
-    await killAllRegisteredProcesses();
-    config.cleanupFn();
-  };
+let SERVE_PORT = 3535;
+beforeEach(() => {
+  // the port doesn't clear immediately after the previous test
+  SERVE_PORT++;
 });
+for (const type of ['empty', 'playground'] as QwikProjectType[]) {
+  describe(`template: ${type}`, () => {
+    beforeAll(() => {
+      const config = scaffoldQwikProject(type);
+      global.tmpDir = config.tmpDir;
+
+      return async () => {
+        try {
+          await killAllRegisteredProcesses();
+        } catch (e) {
+          log(`Error during process cleanup: ${e.message}`);
+        }
+        config.cleanupFn();
+      };
+    });
+
+    if (type === 'playground') {
+      test(
+        'Should serve the app in dev mode and update the content on hot reload',
+        { timeout: DEFAULT_TIMEOUT },
+        async () => {
+          const host = `http://localhost:${SERVE_PORT}/`;
+          await assertHostUnused(host);
+          const p = await runCommandUntil(
+            `npm run dev -- --port ${SERVE_PORT}`,
+            global.tmpDir,
+            (output) => {
+              return output.includes(host);
+            }
+          );
+          assert.equal(existsSync(global.tmpDir), true);
 
-test(
-  'Should serve the app in dev mode and update the content on hot reload',
-  { timeout: DEFAULT_TIMEOUT },
-  async () => {
-    const host = `http://localhost:${SERVE_PORT}/`;
-    await assertHostUnused(host);
-    const p = await runCommandUntil(
-      `npm run dev -- --port ${SERVE_PORT}`,
-      global.tmpDir,
-      (output) => {
-        return output.includes(host);
+          await expectHtmlOnARootPage(host);
+
+          // Don't let process termination errors fail the test
+          try {
+            await promisifiedTreeKill(p.pid!, 'SIGKILL');
+          } catch (e) {
+            log(`Error terminating dev server: ${e.message}`);
+          }
+        }
+      );
+    }
+
+    test('Should preview the app', { timeout: DEFAULT_TIMEOUT }, async () => {
+      const host = `http://localhost:${SERVE_PORT}/`;
+      await assertHostUnused(host);
+
+      // First build the app
+      const buildProcess = await runCommandUntil(`npm run build`, global.tmpDir, (output) => {
+        return output.includes('dist/build') || output.includes('built in');
+      });
+
+      try {
+        await promisifiedTreeKill(buildProcess.pid!, 'SIGKILL');
+      } catch (e) {
+        log(`Error terminating build process: ${e.message}`);
       }
-    );
-    assert.equal(existsSync(global.tmpDir), true);
 
-    await expectHtmlOnARootPage(host);
+      // Now run the preview
+      const p = await runCommandUntil(
+        `npm run preview -- --no-open --port ${SERVE_PORT}`,
+        global.tmpDir,
+        (output) => {
+          return output.includes(host);
+        }
+      );
+
+      assert.equal(existsSync(global.tmpDir), true);
+
+      // Wait a bit for the server to fully start
+      await new Promise((resolve) => setTimeout(resolve, 2000));
 
-    await promisifiedTreeKill(p.pid!, 'SIGKILL');
-  }
-);
+      const res = await fetch(host, { headers: { accept: 'text/html' } }).then((r) => r.text());
+      console.log('** res', res);
+
+      // Check for the appropriate content based on template type
+      if (type === 'playground') {
+        expect(res).toContain('fantastic');
+      } else if (type === 'empty') {
+        expect(res).toContain('Hi');
+        expect(res).toContain('qwik');
+      }
+
+      try {
+        await promisifiedTreeKill(p.pid!, 'SIGKILL');
+      } catch (e) {
+        log(`Error terminating preview server: ${e.message}`);
+      }
+    });
+  });
+}
 
 async function expectHtmlOnARootPage(host: string) {
   expect((await getPageHtml(host)).querySelector('.container h1')?.textContent).toBe(

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

@@ -7,8 +7,14 @@ import treeKill from 'tree-kill';
 import { promisify } from 'util';
 import { createDocument } from '../../../packages/qwik/src/testing/document';
 
-export function scaffoldQwikProject(): { tmpDir: string; cleanupFn: () => void } {
-  const tmpHostDirData = getTmpDirSync(process.env.TEMP_E2E_PATH);
+export type QwikProjectType = 'playground' | 'library' | 'empty';
+export function scaffoldQwikProject(type: QwikProjectType): {
+  tmpDir: string;
+  cleanupFn: () => void;
+} {
+  const tmpHostDirData = getTmpDirSync(
+    process.env.TEMP_E2E_PATH ? `${process.env.TEMP_E2E_PATH}/${type}` : undefined
+  );
   const cleanupFn = () => {
     if (!tmpHostDirData.overridden) {
       cleanup(tmpHostDirData.path);
@@ -17,7 +23,7 @@ export function scaffoldQwikProject(): { tmpDir: string; cleanupFn: () => void }
     }
   };
   try {
-    const tmpDir = runCreateQwikCommand(tmpHostDirData.path);
+    const tmpDir = runCreateQwikCommand(tmpHostDirData.path, type);
     log(`Created test application at "${tmpDir}"`);
     replacePackagesWithLocalOnes(tmpDir);
     return { cleanupFn, tmpDir };
@@ -52,10 +58,10 @@ function getTmpDirSync(tmpDirOverride?: string) {
   return { path: dirSync({ prefix: 'qwik_e2e' }).name, overridden: false };
 }
 
-function runCreateQwikCommand(tmpDir: string): string {
+function runCreateQwikCommand(tmpDir: string, type: 'playground' | 'library' | 'empty'): string {
   const appDir = 'e2e-app';
   execSync(
-    `node "${workspaceRoot}/packages/create-qwik/create-qwik.cjs" playground "${join(tmpDir, appDir)}"`
+    `node "${workspaceRoot}/packages/create-qwik/create-qwik.cjs" ${type} "${join(tmpDir, appDir)}"`
   );
   return join(tmpDir, appDir);
 }
@@ -153,11 +159,15 @@ export async function assertHostUnused(host: string): Promise<void> {
 // promisify fails to get the proper type overload, so manually enforcing the type
 const _promisifiedTreeKill = promisify(treeKill) as (pid: number, signal: string) => Promise<void>;
 
-export const promisifiedTreeKill = (pid: number, signal: string) => {
+export const promisifiedTreeKill = async (pid: number, signal: string) => {
   try {
-    return _promisifiedTreeKill(pid, signal);
+    return await _promisifiedTreeKill(pid, signal);
   } catch (error) {
-    console.error('Failed to kill the process ' + pid, error);
+    // Don't treat process termination failures as test failures
+    // This is especially important on Windows where processes may already be gone
+    // or may not be properly terminated with tree-kill
+    log(`Process ${pid} could not be killed, but continuing: ${error.message}`);
+    return Promise.resolve();
   }
 };
 

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

@@ -1,13 +1,27 @@
-import { defineConfig } from 'vitest/config';
-import tsconfigPaths from 'vite-tsconfig-paths';
+import { existsSync, mkdirSync } from 'fs';
 import { resolve } from 'path';
-import { mkdirSync } from 'fs';
+import tsconfigPaths from 'vite-tsconfig-paths';
+import { defineConfig } from 'vitest/config';
 
 // 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);
+
+  // Create base directory if it doesn't exist
+  if (!existsSync(testPath)) {
+    mkdirSync(testPath);
+  }
+
+  // Create subdirectories for each template type
+  const templateTypes = ['empty', 'playground'];
+  for (const type of templateTypes) {
+    const templatePath = resolve(testPath, type);
+    if (!existsSync(templatePath)) {
+      mkdirSync(templatePath);
+    }
+  }
+
   process.env.TEMP_E2E_PATH = testPath;
 }
 

package.json

@@ -75,7 +75,6 @@
     "esbuild-plugin-raw": "^0.1.8"
   },
   "devDependencies": {
-    "@builder.io/partytown": "0.10.2",
     "@changesets/cli": "2.29.3",
     "@changesets/get-github-info": "0.6.0",
     "@changesets/types": "6.1.0",
@@ -91,6 +90,7 @@
     "@playwright/test": "1.50.1",
     "@qwik.dev/core": "workspace:*",
     "@qwik.dev/router": "workspace:*",
+    "@qwik.dev/partytown": "0.11.1",
     "@types/brotli": "1.3.4",
     "@types/bun": "1.1.6",
     "@types/cross-spawn": "6.0.6",
@@ -103,6 +103,7 @@
     "@types/tmp": "0.2.6",
     "@types/which-pm-runs": "1.0.2",
     "@vitest/coverage-v8": "3.1.1",
+    "@vitejs/plugin-basic-ssl": "2.0.0",
     "all-contributors-cli": "6.26.1",
     "brotli": "1.3.3",
     "concurrently": "8.2.2",
@@ -160,8 +161,7 @@
   "pnpm": {
     "overrides": {
       "typescript": "5.8.2",
-      "vfile": "6.0.2",
-      "@supabase/realtime-js": "2.8.4"
+      "vfile": "6.0.2"
     },
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]",

packages/create-qwik/CHANGELOG.md

@@ -22,6 +22,22 @@
 
 ## 2.0.0-alpha.0
 
+## 1.14.1
+
+### Patch Changes
+
+- 🐞🩹 starter app missing package and added preview cli test (by [@wmertens](https://github.com/wmertens) in [#7626](https://github.com/QwikDev/qwik/pull/7626))
+
+## 1.14.0
+
+### Patch Changes
+
+- 🐞🩹 create-qwik logAppCreated.ts now displays correct next steps for deno. (by [@LogProphet](https://github.com/LogProphet) in [#7566](https://github.com/QwikDev/qwik/pull/7566))
+
+  After using the create-qwik command, the logAppCreated.ts file was not displaying the correct next steps for deno. Prior to this fix it would display "deno start" instead of "deno task start". This would cause a failure to run, as deno requires the 'task' keyword. This fixes bug 7520
+
+- 🐞🩹 linting errors which were previously being ignored across the monorepo. (by [@better-salmon](https://github.com/better-salmon) in [#7418](https://github.com/QwikDev/qwik/pull/7418))
+
 ## 1.13.0
 
 ## 1.12.1

packages/create-qwik/README.md

@@ -35,6 +35,6 @@ console.log(result);
 ## Related
 
 - [Qwik](https://qwik.dev/)
-- [Partytown](https://partytown.builder.io)
+- [Partytown](https://partytown.qwik.dev)
 - [Mitosis](https://github.com/BuilderIO/mitosis)
 - [Builder.io](https://github.com/BuilderIO/)

packages/docs/package.json

@@ -7,7 +7,7 @@
   "devDependencies": {
     "@algolia/autocomplete-core": "1.7.4",
     "@algolia/client-search": "4.14.3",
-    "@builder.io/partytown": "0.10.2",
+    "@builder.io/qwik": "1.14.1",
     "@emotion/react": "11.13.0",
     "@emotion/styled": "11.13.0",
     "@modular-forms/qwik": "0.23.1",
@@ -16,13 +16,14 @@
     "@mui/x-data-grid": "6.20.4",
     "@qwik-ui/headless": "0.6.3",
     "@qwik.dev/core": "workspace:*",
+    "@qwik.dev/partytown": "0.11.1",
     "@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",
+    "@supabase/supabase-js": "2.49.4",
     "@tailwindcss/vite": "4.0.12",
     "@types/leaflet": "1.9.12",
     "@types/prismjs": "1.26.4",

packages/docs/public/_headers

@@ -1,14 +1,18 @@
+/*
+  Cache-Control: public, max-age=3600, s-maxage=3600;
+
 /assets/*
-  Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable
+  ! Cache-Control
+  Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable;
 
 /build/*
-  Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable
+  ! Cache-Control
+  Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable;
 
 /*.svg
-  Cache-Control: public, max-age=86400, s-maxage=86400
+  ! Cache-Control
+  Cache-Control: public, max-age=86400, s-maxage=86400;
 
 /favicon.ico
-  Cache-Control: public, max-age=604800, s-maxage=604800
-
-/*
-  Cache-Control: public, max-age=3600, s-maxage=3600
+  ! Cache-Control
+  Cache-Control: public, max-age=604800, s-maxage=604800;