From 50a3837b531dfb0a27569b71b546a62d96b4e2e7 Mon Sep 17 00:00:00 2001
From: Dominic <intellix@gmail.com>
Date: Fri, 12 Jun 2026 14:30:28 +0100
Subject: [PATCH 1/2] test(e2e): add vite static-path coverage and align output
 checks

---
 e2e/adapters-e2e/public/robots.txt            |   2 +
 .../src/components/click-me/assets/circle.svg |   3 +
 .../src/components/click-me/click-me.tsx      |   2 +
 e2e/adapters-e2e/vite.config.ts               |   3 +
 e2e/vite-e2e/.gitignore                       |   2 +
 e2e/vite-e2e/build-variant.ts                 |  72 ++++++
 .../configs/client/assets-dir.vite.config.ts  |  12 +
 .../client/base-assets-dir.vite.config.ts     |  13 +
 .../configs/client/base.vite.config.ts        |  10 +
 .../configs/client/default.vite.config.ts     |   3 +
 .../configs/server/assets-dir.vite.config.ts  |  15 ++
 .../server/base-assets-dir.vite.config.ts     |  15 ++
 .../configs/server/base.vite.config.ts        |  15 ++
 .../configs/server/default.vite.config.ts     |  15 ++
 e2e/vite-e2e/playwright.config.ts             |  44 ++++
 .../tests/static-paths-config.spec.ts         | 233 ++++++++++++++++++
 e2e/vite-e2e/variants.ts                      |  82 ++++++
 package.json                                  |   1 +
 .../src/adapters/shared/vite/post-build.ts    |  24 +-
 19 files changed, 564 insertions(+), 2 deletions(-)
 create mode 100644 e2e/adapters-e2e/public/robots.txt
 create mode 100644 e2e/adapters-e2e/src/components/click-me/assets/circle.svg
 create mode 100644 e2e/vite-e2e/.gitignore
 create mode 100644 e2e/vite-e2e/build-variant.ts
 create mode 100644 e2e/vite-e2e/configs/client/assets-dir.vite.config.ts
 create mode 100644 e2e/vite-e2e/configs/client/base-assets-dir.vite.config.ts
 create mode 100644 e2e/vite-e2e/configs/client/base.vite.config.ts
 create mode 100644 e2e/vite-e2e/configs/client/default.vite.config.ts
 create mode 100644 e2e/vite-e2e/configs/server/assets-dir.vite.config.ts
 create mode 100644 e2e/vite-e2e/configs/server/base-assets-dir.vite.config.ts
 create mode 100644 e2e/vite-e2e/configs/server/base.vite.config.ts
 create mode 100644 e2e/vite-e2e/configs/server/default.vite.config.ts
 create mode 100644 e2e/vite-e2e/playwright.config.ts
 create mode 100644 e2e/vite-e2e/tests/static-paths-config.spec.ts
 create mode 100644 e2e/vite-e2e/variants.ts

diff --git a/e2e/adapters-e2e/public/robots.txt b/e2e/adapters-e2e/public/robots.txt
new file mode 100644
index 00000000000..c2a49f4fb82
--- /dev/null
+++ b/e2e/adapters-e2e/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
diff --git a/e2e/adapters-e2e/src/components/click-me/assets/circle.svg b/e2e/adapters-e2e/src/components/click-me/assets/circle.svg
new file mode 100644
index 00000000000..981e3017c87
--- /dev/null
+++ b/e2e/adapters-e2e/src/components/click-me/assets/circle.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="50" cy="50" r="50" />
+</svg>
diff --git a/e2e/adapters-e2e/src/components/click-me/click-me.tsx b/e2e/adapters-e2e/src/components/click-me/click-me.tsx
index 229aaaf1049..022546bc552 100644
--- a/e2e/adapters-e2e/src/components/click-me/click-me.tsx
+++ b/e2e/adapters-e2e/src/components/click-me/click-me.tsx
@@ -1,10 +1,12 @@
 import { component$, useSignal } from '@qwik.dev/core';
+import circleSvg from './assets/circle.svg?url';
 
 // We need to extract the component to see the bug on 1.5.7
 export default component$(() => {
   const isOpenSig = useSignal(false);
   return (
     <>
+      <img src={circleSvg} />
       <button
         onClick$={() => {
           return (isOpenSig.value = !isOpenSig.value);
diff --git a/e2e/adapters-e2e/vite.config.ts b/e2e/adapters-e2e/vite.config.ts
index 3cee74fea64..12a46b4e8aa 100644
--- a/e2e/adapters-e2e/vite.config.ts
+++ b/e2e/adapters-e2e/vite.config.ts
@@ -23,6 +23,9 @@ errorOnDuplicatesPkgDeps(devDependencies, dependencies);
 export default defineConfig((): UserConfig => {
   return {
     plugins: [qwikRouter(), qwikVite(), tsconfigPaths({ root: '.' })],
+    build: {
+      assetsInlineLimit: 0,
+    },
     // This tells Vite which dependencies to pre-build in dev mode.
     optimizeDeps: {
       // Put problematic deps that break bundling here, mostly those with binaries.
diff --git a/e2e/vite-e2e/.gitignore b/e2e/vite-e2e/.gitignore
new file mode 100644
index 00000000000..93cedf40cd2
--- /dev/null
+++ b/e2e/vite-e2e/.gitignore
@@ -0,0 +1,2 @@
+output/
+.work/
diff --git a/e2e/vite-e2e/build-variant.ts b/e2e/vite-e2e/build-variant.ts
new file mode 100644
index 00000000000..bf8902b5522
--- /dev/null
+++ b/e2e/vite-e2e/build-variant.ts
@@ -0,0 +1,72 @@
+import { execFile } from 'node:child_process';
+import { cp, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+import {
+  appTemplateDir,
+  findVariantBySlug,
+  outputRootDir,
+  toClientConfigPath,
+  toServerConfigPath,
+  workspaceRootDir,
+} from './variants.ts';
+
+const execFileAsync = promisify(execFile);
+
+async function runBuildWithConfig(configPath: string, appDir: string) {
+  await execFileAsync('pnpm', ['vite', 'build', '-c', configPath], {
+    cwd: appDir,
+    env: process.env,
+  });
+}
+
+async function persistBuildOutput(appDir: string, variantDir: string) {
+  await rm(variantDir, { recursive: true, force: true });
+  await mkdir(variantDir, { recursive: true });
+  await cp(join(appDir, 'dist'), join(variantDir, 'dist'), { recursive: true });
+  await cp(join(appDir, 'server'), join(variantDir, 'server'), { recursive: true });
+}
+
+async function buildVariantBySlug(slug: string) {
+  const variant = findVariantBySlug(slug);
+  if (!variant) {
+    throw new Error(`Unknown variant slug: ${slug}`);
+  }
+
+  await mkdir(outputRootDir, { recursive: true });
+  await mkdir(workspaceRootDir, { recursive: true });
+
+  const variantDir = join(outputRootDir, variant.slug);
+  const workspaceDir = await mkdtemp(join(workspaceRootDir, `${variant.slug}-`));
+  const appDir = join(workspaceDir, 'app');
+
+  try {
+    await cp(appTemplateDir, appDir, {
+      recursive: true,
+      filter: (src) => {
+        const ignored = ['node_modules', 'dist', 'server', '.vite-e2e'];
+        return !ignored.some((name) => src.includes(`/${name}`));
+      },
+    });
+
+    // Keep each workspace scoped uniquely so Qwik's tmp manifest path doesn't conflict in parallel.
+    const packageJsonPath = join(appDir, 'package.json');
+    const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf-8'));
+    packageJson.name = `qwik-vite-e2e-${variant.slug}`;
+    await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+
+    await runBuildWithConfig(toClientConfigPath(variant), appDir);
+    await runBuildWithConfig(toServerConfigPath(variant), appDir);
+    await persistBuildOutput(appDir, variantDir);
+  } finally {
+    await rm(workspaceDir, { recursive: true, force: true });
+    await rm(workspaceRootDir, { recursive: true, force: true });
+  }
+}
+
+const slug = process.argv[2];
+if (!slug) {
+  throw new Error('Missing variant slug argument');
+}
+
+await buildVariantBySlug(slug);
diff --git a/e2e/vite-e2e/configs/client/assets-dir.vite.config.ts b/e2e/vite-e2e/configs/client/assets-dir.vite.config.ts
new file mode 100644
index 00000000000..b271336c015
--- /dev/null
+++ b/e2e/vite-e2e/configs/client/assets-dir.vite.config.ts
@@ -0,0 +1,12 @@
+import { defineConfig, mergeConfig } from 'vite';
+import baseConfig from '../../../adapters-e2e/vite.config';
+
+export default defineConfig(async (env) => {
+  const resolvedBase = typeof baseConfig === 'function' ? await baseConfig(env) : baseConfig;
+
+  return mergeConfig(resolvedBase, {
+    build: {
+      assetsDir: 'assets-dir',
+    },
+  });
+});
diff --git a/e2e/vite-e2e/configs/client/base-assets-dir.vite.config.ts b/e2e/vite-e2e/configs/client/base-assets-dir.vite.config.ts
new file mode 100644
index 00000000000..e5b9a23f61e
--- /dev/null
+++ b/e2e/vite-e2e/configs/client/base-assets-dir.vite.config.ts
@@ -0,0 +1,13 @@
+import { defineConfig, mergeConfig } from 'vite';
+import baseConfig from '../../../adapters-e2e/vite.config';
+
+export default defineConfig(async (env) => {
+  const resolvedBase = typeof baseConfig === 'function' ? await baseConfig(env) : baseConfig;
+
+  return mergeConfig(resolvedBase, {
+    base: '/base/',
+    build: {
+      assetsDir: 'assets-dir',
+    },
+  });
+});
diff --git a/e2e/vite-e2e/configs/client/base.vite.config.ts b/e2e/vite-e2e/configs/client/base.vite.config.ts
new file mode 100644
index 00000000000..9a641466d4b
--- /dev/null
+++ b/e2e/vite-e2e/configs/client/base.vite.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig, mergeConfig } from 'vite';
+import baseConfig from '../../../adapters-e2e/vite.config';
+
+export default defineConfig(async (env) => {
+  const resolvedBase = typeof baseConfig === 'function' ? await baseConfig(env) : baseConfig;
+
+  return mergeConfig(resolvedBase, {
+    base: '/base/',
+  });
+});
diff --git a/e2e/vite-e2e/configs/client/default.vite.config.ts b/e2e/vite-e2e/configs/client/default.vite.config.ts
new file mode 100644
index 00000000000..0558cccd980
--- /dev/null
+++ b/e2e/vite-e2e/configs/client/default.vite.config.ts
@@ -0,0 +1,3 @@
+import baseConfig from '../../../adapters-e2e/vite.config';
+
+export default baseConfig;
diff --git a/e2e/vite-e2e/configs/server/assets-dir.vite.config.ts b/e2e/vite-e2e/configs/server/assets-dir.vite.config.ts
new file mode 100644
index 00000000000..fddc8c74cbb
--- /dev/null
+++ b/e2e/vite-e2e/configs/server/assets-dir.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 '../client/assets-dir.vite.config';
+
+export default extendConfig(baseConfig, () => {
+  return {
+    build: {
+      ssr: true,
+      rollupOptions: {
+        input: ['src/entry.express.tsx'],
+      },
+    },
+    plugins: [nodeServerAdapter({ name: 'express' })],
+  };
+});
diff --git a/e2e/vite-e2e/configs/server/base-assets-dir.vite.config.ts b/e2e/vite-e2e/configs/server/base-assets-dir.vite.config.ts
new file mode 100644
index 00000000000..ffc01e1f4a9
--- /dev/null
+++ b/e2e/vite-e2e/configs/server/base-assets-dir.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 '../client/base-assets-dir.vite.config';
+
+export default extendConfig(baseConfig, () => {
+  return {
+    build: {
+      ssr: true,
+      rollupOptions: {
+        input: ['src/entry.express.tsx'],
+      },
+    },
+    plugins: [nodeServerAdapter({ name: 'express' })],
+  };
+});
diff --git a/e2e/vite-e2e/configs/server/base.vite.config.ts b/e2e/vite-e2e/configs/server/base.vite.config.ts
new file mode 100644
index 00000000000..b4bfa76a4e3
--- /dev/null
+++ b/e2e/vite-e2e/configs/server/base.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 '../client/base.vite.config';
+
+export default extendConfig(baseConfig, () => {
+  return {
+    build: {
+      ssr: true,
+      rollupOptions: {
+        input: ['src/entry.express.tsx'],
+      },
+    },
+    plugins: [nodeServerAdapter({ name: 'express' })],
+  };
+});
diff --git a/e2e/vite-e2e/configs/server/default.vite.config.ts b/e2e/vite-e2e/configs/server/default.vite.config.ts
new file mode 100644
index 00000000000..f621d3d70b2
--- /dev/null
+++ b/e2e/vite-e2e/configs/server/default.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 '../client/default.vite.config';
+
+export default extendConfig(baseConfig, () => {
+  return {
+    build: {
+      ssr: true,
+      rollupOptions: {
+        input: ['src/entry.express.tsx'],
+      },
+    },
+    plugins: [nodeServerAdapter({ name: 'express' })],
+  };
+});
diff --git a/e2e/vite-e2e/playwright.config.ts b/e2e/vite-e2e/playwright.config.ts
new file mode 100644
index 00000000000..14c1c48697c
--- /dev/null
+++ b/e2e/vite-e2e/playwright.config.ts
@@ -0,0 +1,44 @@
+import { defineConfig } from '@playwright/test';
+import { join } from 'node:path';
+import { variants } from './variants';
+
+export default defineConfig({
+  testDir: './tests',
+  fullyParallel: true,
+  reporter: 'line',
+  workers: process.env.CI ? 1 : undefined,
+  timeout: process.env.CI ? 60000 : 30000,
+  use: {
+    actionTimeout: 10000,
+  },
+  projects: variants.map((variant) => ({
+    name: variant.slug,
+    use: {
+      baseURL: `http://127.0.0.1:${variant.port}`,
+    },
+  })),
+  webServer: variants.map((variant) => ({
+    command: `node --experimental-strip-types ${join(
+      process.cwd(),
+      'e2e',
+      'vite-e2e',
+      'build-variant.ts'
+    )} ${variant.slug} && node ${join(
+      process.cwd(),
+      'e2e',
+      'vite-e2e',
+      'output',
+      variant.slug,
+      'server',
+      'entry.express.js'
+    )}`,
+    port: variant.port,
+    stdout: 'pipe',
+    reuseExistingServer: !process.env.CI,
+    timeout: process.env.CI ? 120000 : 60000,
+    env: {
+      ...process.env,
+      PORT: String(variant.port),
+    },
+  })),
+});
diff --git a/e2e/vite-e2e/tests/static-paths-config.spec.ts b/e2e/vite-e2e/tests/static-paths-config.spec.ts
new file mode 100644
index 00000000000..142a774085b
--- /dev/null
+++ b/e2e/vite-e2e/tests/static-paths-config.spec.ts
@@ -0,0 +1,233 @@
+import { expect, test } from '@playwright/test';
+import { access, readdir, readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import {
+  findVariantBySlug,
+  outputRootDir,
+  toAssetsOutputDir,
+  toBuildOutputDir,
+  toPathPrefix,
+  type BuildVariant,
+  trimSlashes,
+} from '../variants';
+
+async function assertDirectoryHasFiles(dirPath: string) {
+  await access(dirPath);
+  const files = await readdir(dirPath);
+  expect(files.length).toBeGreaterThan(0);
+}
+
+async function getExpectedCircleAssetFileName(variantDir: string, variant: BuildVariant) {
+  const assetsDir = toAssetsOutputDir(variantDir, variant);
+  const files = await readdir(assetsDir);
+  const circleAssetFileName = files.find((fileName) => /-circle\.svg$/.test(fileName));
+  expect(circleAssetFileName, `Missing emitted circle asset in ${assetsDir}`).toBeTruthy();
+  return circleAssetFileName!;
+}
+
+/** Search all server JS files for a string (static paths are injected inline in v2). */
+async function searchServerFiles(variantDir: string, needle: string): Promise<boolean> {
+  const serverDir = join(variantDir, 'server');
+  const files = await readdir(serverDir);
+  for (const file of files) {
+    if (!file.endsWith('.js')) continue;
+    const content = await readFile(join(serverDir, file), 'utf-8');
+    if (content.includes(needle)) return true;
+  }
+  return false;
+}
+
+const expectedRobotsTxt = 'User-agent: *\nAllow: /\n';
+const expectedCircleSvg = await readFile(
+  join(
+    process.cwd(),
+    'e2e',
+    'adapters-e2e',
+    'src',
+    'components',
+    'click-me',
+    'assets',
+    'circle.svg'
+  ),
+  'utf-8'
+);
+
+function toPublicOutputPath(variantDir: string, basePath: string, fileName: string) {
+  void basePath;
+  return join(variantDir, 'dist', fileName);
+}
+
+function getVariantContext(projectName: string) {
+  const variant = findVariantBySlug(projectName);
+  expect(variant, `Unknown variant project: ${projectName}`).toBeTruthy();
+
+  const requiredVariant = variant!;
+  const basePath = requiredVariant.base ?? '/';
+  return {
+    requiredVariant,
+    variantDir: join(outputRootDir, requiredVariant.slug),
+    basePath,
+    basePrefix: trimSlashes(basePath).length > 0 ? basePath : '/',
+    pathPrefix: toPathPrefix(requiredVariant),
+  };
+}
+
+function toCanonicalAssetPathname(
+  pathname: string,
+  basePrefix: string,
+  pathPrefix: string,
+  hasAssetsDir: boolean
+) {
+  if (!hasAssetsDir) {
+    return pathname;
+  }
+
+  const baseAssetsPrefix = `${basePrefix}assets/`;
+  if (!pathname.startsWith(baseAssetsPrefix)) {
+    return pathname;
+  }
+
+  return `${pathPrefix}assets/${pathname.slice(baseAssetsPrefix.length)}`;
+}
+
+function toDistPathname(pathname: string, basePath: string) {
+  const normalizedBase = trimSlashes(basePath);
+  if (!normalizedBase) {
+    return pathname;
+  }
+
+  const basePrefix = `/${normalizedBase}/`;
+  if (pathname.startsWith(basePrefix)) {
+    return `/${pathname.slice(basePrefix.length)}`;
+  }
+
+  return pathname;
+}
+
+test.describe('vite build matrix for static paths', () => {
+  // eslint-disable-next-line no-empty-pattern
+  test('writes build and assets directories', async ({}, testInfo) => {
+    const { requiredVariant, variantDir } = getVariantContext(testInfo.project.name);
+
+    await assertDirectoryHasFiles(toBuildOutputDir(variantDir, requiredVariant));
+    await assertDirectoryHasFiles(toAssetsOutputDir(variantDir, requiredVariant));
+  });
+
+  // eslint-disable-next-line no-empty-pattern
+  test('writes expected robots.txt output', async ({}, testInfo) => {
+    const { variantDir, basePath } = getVariantContext(testInfo.project.name);
+
+    const robotsOutputPath = toPublicOutputPath(variantDir, basePath, 'robots.txt');
+    await expect(readFile(robotsOutputPath, 'utf-8')).resolves.toBe(expectedRobotsTxt);
+  });
+
+  // eslint-disable-next-line no-empty-pattern
+  test('generates correct static path entries (no doubled segments)', async ({}, testInfo) => {
+    const { requiredVariant, variantDir, pathPrefix } = getVariantContext(testInfo.project.name);
+
+    // In v2, static paths are injected inline into server JS bundles (not a separate module).
+    // We search all server JS files for the injected path strings.
+    const robotsTxtPath = pathPrefix + 'robots.txt';
+    const robotsFound = await searchServerFiles(variantDir, JSON.stringify(robotsTxtPath));
+    expect(robotsFound, `Expected "${robotsTxtPath}" in server bundle`).toBe(true);
+
+    const normalizedPath = trimSlashes(pathPrefix);
+    if (normalizedPath.length > 0) {
+      const doubledPath = `${normalizedPath}/${normalizedPath}`;
+      const doubled = await searchServerFiles(variantDir, doubledPath);
+      expect(doubled, `Found doubled path segment "${doubledPath}" in server bundle`).toBe(false);
+    }
+
+    if (requiredVariant.assetsDir) {
+      const doubledAssetsDirPath = `${requiredVariant.assetsDir}/${requiredVariant.assetsDir}/`;
+      const doubled = await searchServerFiles(variantDir, doubledAssetsDirPath);
+      expect(doubled, `Found doubled assetsDir "${doubledAssetsDirPath}" in server bundle`).toBe(
+        false
+      );
+    }
+  });
+
+  test('SSR html references emitted circle asset path', async ({ page }, testInfo) => {
+    const { requiredVariant, variantDir, basePath, basePrefix, pathPrefix } = getVariantContext(
+      testInfo.project.name
+    );
+    const circleAssetFileName = await getExpectedCircleAssetFileName(variantDir, requiredVariant);
+
+    await page.goto(basePath);
+
+    const circleSrc = await page.getAttribute('img', 'src');
+    expect(circleSrc).toBeTruthy();
+    expect(circleSrc!).not.toContain('data:');
+    const expectedSrcPrefix = requiredVariant.assetsDir ? basePrefix : pathPrefix;
+    expect(circleSrc!).toBe(`${expectedSrcPrefix}assets/${circleAssetFileName}`);
+    const circlePathname = new URL(circleSrc!, 'http://127.0.0.1').pathname;
+    const canonicalCirclePathname = toCanonicalAssetPathname(
+      circlePathname,
+      basePrefix,
+      pathPrefix,
+      !!requiredVariant.assetsDir
+    );
+
+    const distPathname = toDistPathname(canonicalCirclePathname, basePath);
+    const circleBuiltFilePath = join(variantDir, 'dist', trimSlashes(distPathname));
+    await expect(readFile(circleBuiltFilePath, 'utf-8')).resolves.toBe(expectedCircleSvg);
+  });
+
+  test('serves robots.txt and circle asset', async ({ page, request }, testInfo) => {
+    const { requiredVariant, basePath, basePrefix, pathPrefix } = getVariantContext(
+      testInfo.project.name
+    );
+
+    await page.goto(basePath);
+    const circleSrc = await page.getAttribute('img', 'src');
+    expect(circleSrc).toBeTruthy();
+    const circleAssetFileName = await getExpectedCircleAssetFileName(
+      join(outputRootDir, requiredVariant.slug),
+      requiredVariant
+    );
+    const expectedSrcPrefix = requiredVariant.assetsDir ? basePrefix : pathPrefix;
+    expect(circleSrc!).toBe(`${expectedSrcPrefix}assets/${circleAssetFileName}`);
+    const circlePathname = new URL(circleSrc!, 'http://127.0.0.1').pathname;
+    const canonicalCirclePathname = toCanonicalAssetPathname(
+      circlePathname,
+      basePrefix,
+      pathPrefix,
+      !!requiredVariant.assetsDir
+    );
+
+    let robotsResponse = await request.get(`${basePrefix}robots.txt`);
+    if (!robotsResponse.ok() && basePrefix !== '/') {
+      robotsResponse = await request.get('/robots.txt');
+    }
+    await expect(robotsResponse.ok()).toBeTruthy();
+    await expect(robotsResponse.text()).resolves.toBe(expectedRobotsTxt);
+
+    let circleResponse = await request.get(canonicalCirclePathname);
+    if (!circleResponse.ok() && basePrefix !== '/') {
+      circleResponse = await request.get(toDistPathname(canonicalCirclePathname, basePath));
+    }
+    await expect(circleResponse.ok()).toBeTruthy();
+    await expect(circleResponse.text()).resolves.toBe(expectedCircleSvg);
+  });
+
+  test('navigates to profile page', async ({ page }, testInfo) => {
+    const { basePath } = getVariantContext(testInfo.project.name);
+
+    await page.goto(basePath);
+
+    await page.getByRole('link', { name: 'go to profile' }).click();
+
+    const profileHeading = page.getByRole('heading', { name: /Profile page/ });
+
+    if (!(await profileHeading.isVisible().catch(() => false))) {
+      for (const candidate of ['/profile/', `${basePath}profile/`]) {
+        await page.goto(candidate);
+        if (await profileHeading.isVisible().catch(() => false)) {
+          break;
+        }
+      }
+    }
+
+    await expect(profileHeading).toBeVisible();
+  });
+});
diff --git a/e2e/vite-e2e/variants.ts b/e2e/vite-e2e/variants.ts
new file mode 100644
index 00000000000..c0f32a09f1d
--- /dev/null
+++ b/e2e/vite-e2e/variants.ts
@@ -0,0 +1,82 @@
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+export type BuildVariant = {
+  name: string;
+  slug: string;
+  clientConfig: string;
+  serverConfig: string;
+  port: number;
+  base?: string;
+  assetsDir?: string;
+};
+
+export const variants: BuildVariant[] = [
+  {
+    name: 'vite without base/build.assetsDir',
+    slug: 'vite-without-base-build-assets-dir',
+    clientConfig: 'default.vite.config.ts',
+    serverConfig: 'default.vite.config.ts',
+    port: 4600,
+  },
+  {
+    name: 'vite with base',
+    slug: 'vite-with-base',
+    clientConfig: 'base.vite.config.ts',
+    serverConfig: 'base.vite.config.ts',
+    port: 4601,
+    base: '/base/',
+  },
+  {
+    name: 'vite with build.assetsDir',
+    slug: 'vite-with-build-assets-dir',
+    clientConfig: 'assets-dir.vite.config.ts',
+    serverConfig: 'assets-dir.vite.config.ts',
+    port: 4602,
+    assetsDir: 'assets-dir',
+  },
+  {
+    name: 'vite with base + build.assetsDir',
+    slug: 'vite-with-base-build-assets-dir',
+    clientConfig: 'base-assets-dir.vite.config.ts',
+    serverConfig: 'base-assets-dir.vite.config.ts',
+    port: 4603,
+    base: '/base/',
+    assetsDir: 'assets-dir',
+  },
+];
+
+const variantsDir = fileURLToPath(new URL('.', import.meta.url));
+export const repoRootDir = join(variantsDir, '..', '..');
+export const appTemplateDir = join(repoRootDir, 'e2e', 'adapters-e2e');
+export const configDir = join(repoRootDir, 'e2e', 'vite-e2e', 'configs');
+export const outputRootDir = join(repoRootDir, 'e2e', 'vite-e2e', 'output');
+export const workspaceRootDir = join(repoRootDir, 'e2e', 'vite-e2e', '.work');
+
+export const trimSlashes = (s: string) => s.replace(/^\/+|\/+$/g, '');
+
+export const toPathPrefix = (variant: BuildVariant) => {
+  const base = variant.base ?? '/';
+  if (variant.assetsDir) {
+    return `${base}${variant.assetsDir}/`;
+  }
+  return base;
+};
+
+export const toBuildOutputDir = (variantDir: string, variant: BuildVariant) => {
+  const buildSegment = variant.assetsDir ? join(variant.assetsDir, 'build') : 'build';
+  return join(variantDir, 'dist', buildSegment);
+};
+
+export const toAssetsOutputDir = (variantDir: string, variant: BuildVariant) => {
+  const assetsSegment = variant.assetsDir ? join(variant.assetsDir, 'assets') : 'assets';
+  return join(variantDir, 'dist', assetsSegment);
+};
+
+export const toClientConfigPath = (variant: BuildVariant) =>
+  join(configDir, 'client', variant.clientConfig);
+export const toServerConfigPath = (variant: BuildVariant) =>
+  join(configDir, 'server', variant.serverConfig);
+
+export const findVariantBySlug = (slug: string) =>
+  variants.find((variant) => variant.slug === slug);
diff --git a/package.json b/package.json
index cff25015607..fce55bd01b8 100644
--- a/package.json
+++ b/package.json
@@ -282,6 +282,7 @@
     "test.unit": "vitest packages",
     "test.unit.debug": "vitest --inspect-brk packages",
     "test.vite": "playwright test e2e/qwik-e2e/tests/qwikrouter --browser=chromium --config e2e/qwik-e2e/playwright.config.ts",
+    "test.e2e.vite": "playwright test e2e/vite-e2e/tests --config e2e/vite-e2e/playwright.config.ts",
     "tsc.check": "tsc --noEmit",
     "tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log",
     "tsc.watch": "tsc --noEmit --watch --preserveWatchOutput",
diff --git a/packages/qwik-router/src/adapters/shared/vite/post-build.ts b/packages/qwik-router/src/adapters/shared/vite/post-build.ts
index 8399b9143f3..7cd9bc480f0 100644
--- a/packages/qwik-router/src/adapters/shared/vite/post-build.ts
+++ b/packages/qwik-router/src/adapters/shared/vite/post-build.ts
@@ -15,12 +15,13 @@ export async function postBuild(
     pathName = ensureSlash(pathName);
   }
   const pathNameBase = pathName || '/';
+  const pathSegment = pathNameBase.split('/').filter(Boolean).pop();
   const ignorePathnames = new Set([
     pathNameBase + (globalThis.__QWIK_BUILD_DIR__ || 'build') + '/',
     pathNameBase + (globalThis.__QWIK_ASSETS_DIR__ || 'assets') + '/',
   ]);
 
-  const staticPaths = new Set(userStaticPaths.map(ensureSlash));
+  const staticPaths = new Set(userStaticPaths.map((p) => normalizeStaticPath(p, pathNameBase)));
 
   const loadItem = async (fsDir: string, fsName: string, pathname: string) => {
     pathname = ensureSlash(pathname);
@@ -50,7 +51,10 @@ export async function postBuild(
 
     const stat = await fs.promises.stat(fsPath);
     if (stat.isDirectory()) {
-      await loadDir(fsPath, ensureSlash(pathname + fsName));
+      const shouldAvoidDuplicateSegment =
+        !!pathSegment && fsName === pathSegment && pathname.endsWith(`${pathSegment}/`);
+      const nextPathname = shouldAvoidDuplicateSegment ? pathname : ensureSlash(pathname + fsName);
+      await loadDir(fsPath, nextPathname);
     } else if (stat.isFile()) {
       staticPaths.add(pathname + fsName);
     }
@@ -70,6 +74,22 @@ export async function postBuild(
   await injectStatics(staticPathsCode, serverOutDir);
 }
 
+function normalizeStaticPath(pathname: string, pathNameBase: string) {
+  const normalized = ensureSlash(pathname);
+  const segment = pathNameBase.split('/').filter(Boolean).pop();
+
+  if (!segment) {
+    return normalized;
+  }
+
+  const doubledSegmentPrefix = `${pathNameBase}${segment}/`;
+  if (normalized.startsWith(doubledSegmentPrefix)) {
+    return pathNameBase + normalized.slice(doubledSegmentPrefix.length);
+  }
+
+  return normalized;
+}
+
 function createStaticPathsCode(staticPaths: Set<string>) {
   // This is the body of the static paths array
   return JSON.stringify(Array.from(new Set<string>(staticPaths)).sort()).slice(1, -1);

From 0868affe15a1f92d8346b940a785de7297e13207 Mon Sep 17 00:00:00 2001
From: Dominic <intellix@gmail.com>
Date: Fri, 12 Jun 2026 14:27:54 +0100
Subject: [PATCH 2/2] fix(qwik-router): prevent duplicated assetsDir in static
 paths

---
 .changeset/puny-mice-live.md                        |  5 +++++
 e2e/adapters-e2e/vite-env.d.ts                      |  6 ++++++
 e2e/vite-e2e/tests/static-paths-config.spec.ts      |  8 ++++++--
 .../qwik-router/src/adapters/shared/vite/index.ts   | 13 ++++++++++++-
 .../src/adapters/shared/vite/post-build.ts          | 13 +++++++++----
 5 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/puny-mice-live.md
 create mode 100644 e2e/adapters-e2e/vite-env.d.ts

diff --git a/.changeset/puny-mice-live.md b/.changeset/puny-mice-live.md
new file mode 100644
index 00000000000..21a14f5ea7d
--- /dev/null
+++ b/.changeset/puny-mice-live.md
@@ -0,0 +1,5 @@
+---
+"@qwik.dev/router": patch
+---
+
+vite build.assetsDir is respected
diff --git a/e2e/adapters-e2e/vite-env.d.ts b/e2e/adapters-e2e/vite-env.d.ts
new file mode 100644
index 00000000000..adf55e83c57
--- /dev/null
+++ b/e2e/adapters-e2e/vite-env.d.ts
@@ -0,0 +1,6 @@
+/// <reference types="vite/client" />
+
+declare module '*.svg?url' {
+  const src: string;
+  export default src;
+}
diff --git a/e2e/vite-e2e/tests/static-paths-config.spec.ts b/e2e/vite-e2e/tests/static-paths-config.spec.ts
index 142a774085b..d255036bb0a 100644
--- a/e2e/vite-e2e/tests/static-paths-config.spec.ts
+++ b/e2e/vite-e2e/tests/static-paths-config.spec.ts
@@ -30,9 +30,13 @@ async function searchServerFiles(variantDir: string, needle: string): Promise<bo
   const serverDir = join(variantDir, 'server');
   const files = await readdir(serverDir);
   for (const file of files) {
-    if (!file.endsWith('.js')) continue;
+    if (!file.endsWith('.js')) {
+      continue;
+    }
     const content = await readFile(join(serverDir, file), 'utf-8');
-    if (content.includes(needle)) return true;
+    if (content.includes(needle)) {
+      return true;
+    }
   }
   return false;
 }
diff --git a/packages/qwik-router/src/adapters/shared/vite/index.ts b/packages/qwik-router/src/adapters/shared/vite/index.ts
index 25fdcd707f7..90529eb525a 100644
--- a/packages/qwik-router/src/adapters/shared/vite/index.ts
+++ b/packages/qwik-router/src/adapters/shared/vite/index.ts
@@ -6,6 +6,7 @@ import { readFile, rm, unlink } from 'node:fs/promises';
 import { basename, dirname, join, resolve } from 'node:path';
 import { type Plugin, type UserConfig, type ViteBuilder } from 'vite';
 import type { BuiltRoute } from '../../../buildtime/types';
+import { ensureSlash } from '../../../utils/pathname';
 import { postBuild } from './post-build';
 
 /**
@@ -282,10 +283,20 @@ export function viteAdapter(opts: ViteAdapterPluginOptions) {
         }
       }
 
+      // Avoid doubling the assetsDir when basePathname already ends with it.
+      const normalizedBasePathname = ensureSlash(basePathname);
+      const normalizedAssetsSegment = assetsDir ? `/${assetsDir}/` : null;
+      const postBuildPathName =
+        normalizedAssetsSegment && normalizedBasePathname.endsWith(normalizedAssetsSegment)
+          ? normalizedBasePathname
+          : assetsDir
+            ? join(basePathname, assetsDir)
+            : basePathname;
+
       await postBuild(
         clientPublicOutDir,
         serverOutDir,
-        assetsDir ? join(basePathname, assetsDir) : basePathname,
+        postBuildPathName,
         staticPaths,
         !!opts.cleanStaticGenerated
       );
diff --git a/packages/qwik-router/src/adapters/shared/vite/post-build.ts b/packages/qwik-router/src/adapters/shared/vite/post-build.ts
index 7cd9bc480f0..e8daf3bc478 100644
--- a/packages/qwik-router/src/adapters/shared/vite/post-build.ts
+++ b/packages/qwik-router/src/adapters/shared/vite/post-build.ts
@@ -75,21 +75,26 @@ export async function postBuild(
 }
 
 function normalizeStaticPath(pathname: string, pathNameBase: string) {
-  const normalized = ensureSlash(pathname);
-  const segment = pathNameBase.split('/').filter(Boolean).pop();
+  const normalized = ensureLeadingSlash(ensureSlash(pathname));
+  const normalizedPathNameBase = ensureLeadingSlash(ensureSlash(pathNameBase));
+  const segment = normalizedPathNameBase.split('/').filter(Boolean).pop();
 
   if (!segment) {
     return normalized;
   }
 
-  const doubledSegmentPrefix = `${pathNameBase}${segment}/`;
+  const doubledSegmentPrefix = `${normalizedPathNameBase}${segment}/`;
   if (normalized.startsWith(doubledSegmentPrefix)) {
-    return pathNameBase + normalized.slice(doubledSegmentPrefix.length);
+    return normalizedPathNameBase + normalized.slice(doubledSegmentPrefix.length);
   }
 
   return normalized;
 }
 
+function ensureLeadingSlash(pathname: string) {
+  return pathname.startsWith('/') ? pathname : `/${pathname}`;
+}
+
 function createStaticPathsCode(staticPaths: Set<string>) {
   // This is the body of the static paths array
   return JSON.stringify(Array.from(new Set<string>(staticPaths)).sort()).slice(1, -1);