fix(qwik-router): prevent duplicated assetsDir in static paths

Author: intellix

.changeset/puny-mice-live.md

@@ -0,0 +1,5 @@
+---
+"@qwik.dev/router": patch
+---
+
+vite build.assetsDir is respected

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;
 }

packages/qwik-router/src/adapters/shared/vite/index.ts

@@ -5,6 +5,7 @@ import { basename, dirname, join, resolve } from 'node:path';
 import type { Plugin, UserConfig } from 'vite';
 import type { BuiltRoute } from '../../../buildtime/types';
 import { ssgWorkerImportPlugin } from '../../../buildtime/vite/ssg-worker-imports';
+import { ensureSlash } from '../../../utils/pathname';
 import { postBuild } from './post-build';
 
 /**
@@ -225,10 +226,19 @@ export function viteAdapter(opts: ViteAdapterPluginOptions) {
             }
           }
 
+          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
           );

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 createNotFoundPathsCode(basePathname: string, notFounds: string[][]) {
   /** Sort in order of longest path, so that the most specific paths match first */
   notFounds.sort((a, b) => {