fix unit test and revert getRoutePath change

dai-shi · Dec 18, 2024 · 5549e2e · 5549e2e
1 parent 0040ecd
commit 5549e2e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/waku/src/router/create-pages.ts b/packages/waku/src/router/create-pages.ts
@@ -218,12 +218,15 @@ export const createPages = <
 
   /** helper to find dynamic path when slugs are used */
   const getRoutePath: (path: string) => string | undefined = (path) => {
-    const staticPathSpec = staticPathMap.get(path);
-    if (staticPathSpec) {
-      return pathSpecAsString(
-        staticPathSpec.originalSpec ?? staticPathSpec.literalSpec,
-      );
+    if (staticComponentMap.has(joinPath(path, 'page').slice(1))) {
+      return path;
     }
+    // const staticPathSpec = staticPathMap.get(path);
+    // if (staticPathSpec) {
+    //   return pathSpecAsString(
+    //     staticPathSpec.originalSpec ?? staticPathSpec.literalSpec,
+    //   );
+    // }
     const allPaths = [
       ...dynamicPagePathMap.keys(),
       ...wildcardPagePathMap.keys(),

diff --git a/packages/waku/tests/create-pages.test.ts b/packages/waku/tests/create-pages.test.ts
@@ -647,6 +647,7 @@ describe('createPages', () => {
         elements: {
           root: { isStatic: true },
           'page:/test/nested': { isStatic: true },
+          'layout:/test/nested': { isStatic: true },
         },
         routeElement: { isStatic: true },
         noSsr: false,
@@ -668,7 +669,11 @@ describe('createPages', () => {
     });
     expect(route).toBeDefined();
     expect(route.routeElement).toBeDefined();
-    expect(Object.keys(route.elements)).toEqual(['root', 'page:/test/nested']);
+    expect(Object.keys(route.elements)).toEqual([
+      'root',
+      'page:/test/nested',
+      'layout:/test/nested',
+    ]);
   });
 
   it('creates a nested dynamic page', async () => {