fixup

Author: wmertens

packages/qwik-router/src/buildtime/build-layout.unit.ts

@@ -3,6 +3,7 @@ import { assert, testAppSuite } from '../utils/test-suite';
 const test = testAppSuite('Build Layout');
 
 test('total layouts', ({ ctx: { layouts } }) => {
+  // $ find starters/apps/qwikrouter-test/src/routes -name layout*tsx | wc -l
   assert.equal(layouts.length, 12, JSON.stringify(layouts, null, 2));
 });
 

starters/apps/qwikcity-test/src/routes/issue7732/b/index.tsx

@@ -6,7 +6,7 @@ import Root from "./root";
 
 export default function (opts: RenderToStreamOptions) {
   return renderToStream(<Root />, {
-    base: "/qwikcity-test.prod/build/",
+    base: "/qwikrouter-test.prod/build/",
     ...opts,
   });
 }

starters/apps/qwikcity-test/src/routes/issue7732/layout.tsx

@@ -5,7 +5,7 @@ export default component$(() => {
     <div>
       <h1>Welcome to Qwik City!</h1>
       <p>
-        <a href="/qwikcity-test.prod/server-function">Server Function</a>
+        <a href="/qwikrouter-test.prod/server-function">Server Function</a>
       </p>
     </div>
   );

starters/apps/qwikrouter-test.prod/src/entry.ssr.tsx

@@ -1,5 +1,5 @@
-import { useLocation } from "@builder.io/qwik-city";
-import { component$ } from "@builder.io/qwik";
+import { useLocation } from "@qwik.dev/router";
+import { component$ } from "@qwik.dev/core";
 
 export default component$(() => {
   const location = useLocation();

starters/apps/qwikrouter-test.prod/src/routes/index.tsx

@@ -1,10 +1,10 @@
-import { routeAction$, Form } from "@builder.io/qwik-city";
-import { component$ } from "@builder.io/qwik";
+import { routeAction$, Form } from "@qwik.dev/router";
+import { component$ } from "@qwik.dev/core";
 
 export const useAction = routeAction$((_, event) => {
   throw event.redirect(
     302,
-    "/qwikcity-test/action-redirect-without-search-params-target/",
+    "/qwikrouter-test/action-redirect-without-search-params-target/",
   );
 });
 

starters/apps/qwikcity-test/src/routes/issue-route-with-search-params-and-action-redirect-without-search-params/action-redirect-without-search-params-target/index.tsx renamed to starters/apps/qwikrouter-test/src/routes/issue-route-with-search-params-and-action-redirect-without-search-params/action-redirect-without-search-params-target/index.tsx

@@ -1,4 +1,4 @@
-import { component$ } from "@builder.io/qwik";
+import { component$ } from "@qwik.dev/core";
 
 export default component$(() => {
   return <div>empty default route A</div>;

starters/apps/qwikcity-test/src/routes/issue-route-with-search-params-and-action-redirect-without-search-params/action-redirect-without-search-params/index.tsx renamed to starters/apps/qwikrouter-test/src/routes/issue-route-with-search-params-and-action-redirect-without-search-params/action-redirect-without-search-params/index.tsx

@@ -0,0 +1,10 @@
+import { component$ } from "@qwik.dev/core";
+import type { RequestHandler } from "@qwik.dev/router";
+
+export const onGet: RequestHandler<void> = ({ redirect }) => {
+  throw redirect(302, `/qwikrouter-test/issue7732/c/?redirected=true`);
+};
+
+export default component$(() => {
+  return <div>B route with redirect</div>;
+});

starters/apps/qwikcity-test/src/routes/issue7732/a/index.tsx renamed to starters/apps/qwikrouter-test/src/routes/issue7732/a/index.tsx

@@ -1,4 +1,4 @@
-import { component$ } from "@builder.io/qwik";
+import { component$ } from "@qwik.dev/core";
 
 export default component$(() => {
   return <div>route C should have redirected=true params</div>;