fix(qwik-city): remove internal params in qdata

.changeset/rich-hairs-worry.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik-city': patch
+---
+
+strip internal search parameters in canonical URLs

packages/qwik-city/middleware/request-handler/resolve-request-handlers.ts

@@ -144,15 +144,15 @@ const _resolveRequestHandlers = (
     }
 
     if (collectActions) {
-      const loaders = Object.values(routeModule).filter((e) =>
-        checkBrand(e, 'server_loader')
-      ) as LoaderInternal[];
-      routeLoaders.push(...loaders);
-
-      const actions = Object.values(routeModule).filter((e) =>
-        checkBrand(e, 'server_action')
-      ) as ActionInternal[];
-      routeActions.push(...actions);
+      for (const module of Object.values(routeModule)) {
+        if (typeof module === 'function') {
+          if (module.__brand === 'server_loader') {
+            routeLoaders.push(module as LoaderInternal);
+          } else if (module.__brand === 'server_action') {
+            routeActions.push(module as ActionInternal);
+          }
+        }
+      }
     }
   }
 };
@@ -407,7 +407,9 @@ export function getPathname(url: URL, trailingSlash: boolean | undefined) {
       url.pathname = url.pathname.slice(0, -1);
     }
   }
-  return url.toString().substring(url.origin.length);
+  // strip internal search params
+  const search = url.search.slice(1).replaceAll(/&?q(action|data|func)=[^&]+/g, '');
+  return `${url.pathname}${search ? `?${search}` : ''}${url.hash}`;
 }
 
 export const encoder = /*#__PURE__*/ new TextEncoder();

packages/qwik-city/middleware/request-handler/resolve-request-handlers.unit.ts

@@ -20,5 +20,14 @@ describe('resolve-request-handler', () => {
         '/path?foo=bar#hash'
       );
     });
+
+    it('should remove internal search params', () => {
+      expect(getPathname(new URL('http://server/path?qaction=123&qdata=data'), true)).toBe(
+        '/path/'
+      );
+      expect(getPathname(new URL('http://server/path?foo=1&qfunc=f&bar=2'), false)).toBe(
+        '/path?foo=1&bar=2'
+      );
+    });
   });
 });

packages/qwik-city/runtime/src/qwik-city-component.tsx

@@ -264,6 +264,7 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
         const newHref = pageData.href;
         const newURL = new URL(newHref, trackUrl);
         if (!isSamePath(newURL, trackUrl)) {
+          // Change our path to the canonical path in the response.
           trackUrl = newURL;
           loadRoutePromise = loadRoute(
             qwikCity.routes,

starters/apps/qwikcity-test/src/routes/issue6660/index.tsx

@@ -12,7 +12,7 @@ export default component$(() => {
         Submit
       </button>
 
-      {action.value?.ok && <span id="#status">Submitted</span>}
+      {action.value?.ok && <span id="status">Submitted</span>}
     </Form>
   );
 });

starters/e2e/qwikcity/nav.spec.ts

@@ -155,17 +155,33 @@ test.describe("actions", () => {
       });
     });
 
-    test("issue 6660 internal params should no trigger navigation", async ({
+    test("issue 6660 internal params should not trigger navigation", async ({
       page,
     }) => {
       await page.goto("/qwikcity-test/issue6660/");
+      await expect(page.locator("#status")).toBeHidden();
 
-      const startUrl = page.url();
+      {
+        const startUrl = page.url();
 
-      await page.getByText("Submit").click();
-      await page.waitForSelector("span");
+        await page.getByText("Submit").click();
+        await page.waitForSelector("#status");
+
+        expect(page.url()).toBe(startUrl);
+      }
+
+      await page.goto("/qwikcity-test/issue6660/?var=1&hello");
+      await expect(page.locator("#status")).toBeHidden();
+
+      {
+        const startUrl = page.url();
+        expect(startUrl).toContain("var=1&hello");
+
+        await page.getByText("Submit").click();
+        await page.waitForSelector("#status");
 
-      expect(page.url()).toBe(startUrl);
+        expect(page.url()).toBe(startUrl);
+      }
     });
   }