fix(dev): retain @ in qrl segments

This way the generated imports by vite and the generated qrl segments are in the same path in devtools
QwikDev · Jul 9, 2024 · b115d82 · b115d82
1 parent 574cc3b
commit b115d82
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/packages/qwik-city/buildtime/vite/dev-server.ts b/packages/qwik-city/buildtime/vite/dev-server.ts
@@ -498,11 +498,7 @@ function skipRequest(pathname: string) {
   if (pathname.includes('favicon')) {
     return true;
   }
-  if (
-    pathname.startsWith('/src/') ||
-    pathname.startsWith('/@fs/') ||
-    pathname.startsWith('/%40fs/')
-  ) {
+  if (pathname.startsWith('/src/') || pathname.startsWith('/@fs/')) {
     const ext = getExtension(pathname);
     if (SKIP_SRC_EXTS[ext]) {
       return true;

diff --git a/packages/qwik/src/optimizer/src/plugins/plugin.ts b/packages/qwik/src/optimizer/src/plugins/plugin.ts
@@ -460,7 +460,6 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
       from: importerId,
       for: isSSR ? 'server' : 'client',
     });
-    // note that qrl segments request /%40fs instead of /@fs
     if (id.startsWith('\0')) {
       return;
     }

diff --git a/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts b/packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts
@@ -33,7 +33,8 @@ function getOrigin(req: IncomingMessage) {
 }
 
 // We must encode the chunk so that e.g. + doesn't get converted to space etc
-const encode = (url: string) => encodeURIComponent(url).replaceAll('%2F', '/');
+const encode = (url: string) =>
+  encodeURIComponent(url).replaceAll('%2F', '/').replaceAll('%40', '@');
 
 function createSymbolMapper(
   base: string,