one 1.14.4 → 1.15.0

package/dist/esm/server/getServerManifest.test.mjs

@@ -14,139 +14,149 @@ function makeRouteNode(overrides) {
 describe("getServerManifest route specificity", () => {
   it("static segment /blog/[slug] should come before fully dynamic /[a]/[b]", () => {
     const root = makeRouteNode({
-        route: "",
-        children: [
-        // group (site) with blog/[slug]
-        makeRouteNode({
-          route: "(site)",
-          children: [makeRouteNode({
-            route: "blog/[slug]",
-            contextKey: "(site)/blog/[slug]+ssg.tsx",
-            type: "ssg",
-            dynamic: [{
-              name: "slug",
-              deep: !1
-            }],
-            children: []
-          })]
-        }),
-        // group (chat) with [serverId]/[channelId]
-        makeRouteNode({
-          route: "(chat)",
+      route: "",
+      children: [
+      // group (site) with blog/[slug]
+      makeRouteNode({
+        route: "(site)",
+        children: [makeRouteNode({
+          route: "blog/[slug]",
+          contextKey: "(site)/blog/[slug]+ssg.tsx",
+          type: "ssg",
+          dynamic: [{
+            name: "slug",
+            deep: false
+          }],
+          children: []
+        })]
+      }),
+      // group (chat) with [serverId]/[channelId]
+      makeRouteNode({
+        route: "(chat)",
+        children: [makeRouteNode({
+          route: "[serverId]",
+          dynamic: [{
+            name: "serverId",
+            deep: false
+          }],
           children: [makeRouteNode({
-            route: "[serverId]",
+            route: "[channelId]",
             dynamic: [{
-              name: "serverId",
-              deep: !1
+              name: "channelId",
+              deep: false
             }],
             children: [makeRouteNode({
-              route: "[channelId]",
-              dynamic: [{
-                name: "channelId",
-                deep: !1
-              }],
-              children: [makeRouteNode({
-                route: "index",
-                contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
-                type: "spa",
-                children: []
-              })]
+              route: "index",
+              contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
+              type: "spa",
+              children: []
             })]
           })]
         })]
-      }),
-      pages = getServerManifest(root).pageRoutes.map(r => r.file),
-      blogIdx = pages.indexOf("(site)/blog/[slug]+ssg.tsx"),
-      chatIdx = pages.indexOf("(chat)/[serverId]/[channelId]/index.tsx");
-    expect(blogIdx).toBeGreaterThanOrEqual(0), expect(chatIdx).toBeGreaterThanOrEqual(0), expect(blogIdx).toBeLessThan(chatIdx);
-  }), it("/blog should come before /[slug]", () => {
+      })]
+    });
+    const manifest = getServerManifest(root);
+    const pages = manifest.pageRoutes.map(r => r.file);
+    const blogIdx = pages.indexOf("(site)/blog/[slug]+ssg.tsx");
+    const chatIdx = pages.indexOf("(chat)/[serverId]/[channelId]/index.tsx");
+    expect(blogIdx).toBeGreaterThanOrEqual(0);
+    expect(chatIdx).toBeGreaterThanOrEqual(0);
+    expect(blogIdx).toBeLessThan(chatIdx);
+  });
+  it("/blog should come before /[slug]", () => {
     const root = makeRouteNode({
-        route: "",
+      route: "",
+      children: [makeRouteNode({
+        route: "blog",
+        contextKey: "blog.tsx",
+        type: "ssg",
+        children: []
+      }), makeRouteNode({
+        route: "[slug]",
+        contextKey: "[slug].tsx",
+        type: "ssr",
+        dynamic: [{
+          name: "slug",
+          deep: false
+        }],
+        children: []
+      })]
+    });
+    const manifest = getServerManifest(root);
+    const pages = manifest.pageRoutes.map(r => r.file);
+    expect(pages.indexOf("blog.tsx")).toBeLessThan(pages.indexOf("[slug].tsx"));
+  });
+  it("/blog/hello-world should match blog route first, not [serverId]/[channelId]", () => {
+    const root = makeRouteNode({
+      route: "",
+      children: [makeRouteNode({
+        route: "(site)",
         children: [makeRouteNode({
-          route: "blog",
-          contextKey: "blog.tsx",
+          route: "blog/[slug]",
+          contextKey: "(site)/blog/[slug]+ssg.tsx",
           type: "ssg",
-          children: []
-        }), makeRouteNode({
-          route: "[slug]",
-          contextKey: "[slug].tsx",
-          type: "ssr",
           dynamic: [{
             name: "slug",
-            deep: !1
+            deep: false
           }],
           children: []
         })]
-      }),
-      pages = getServerManifest(root).pageRoutes.map(r => r.file);
-    expect(pages.indexOf("blog.tsx")).toBeLessThan(pages.indexOf("[slug].tsx"));
-  }), it("/blog/hello-world should match blog route first, not [serverId]/[channelId]", () => {
-    const root = makeRouteNode({
-        route: "",
+      }), makeRouteNode({
+        route: "(chat)",
         children: [makeRouteNode({
-          route: "(site)",
-          children: [makeRouteNode({
-            route: "blog/[slug]",
-            contextKey: "(site)/blog/[slug]+ssg.tsx",
-            type: "ssg",
-            dynamic: [{
-              name: "slug",
-              deep: !1
-            }],
-            children: []
-          })]
-        }), makeRouteNode({
-          route: "(chat)",
+          route: "[serverId]",
+          dynamic: [{
+            name: "serverId",
+            deep: false
+          }],
           children: [makeRouteNode({
-            route: "[serverId]",
+            route: "[channelId]",
             dynamic: [{
-              name: "serverId",
-              deep: !1
+              name: "channelId",
+              deep: false
             }],
             children: [makeRouteNode({
-              route: "[channelId]",
-              dynamic: [{
-                name: "channelId",
-                deep: !1
-              }],
-              children: [makeRouteNode({
-                route: "index",
-                contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
-                type: "spa",
-                children: []
-              })]
+              route: "index",
+              contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
+              type: "spa",
+              children: []
             })]
           })]
         })]
-      }),
-      manifest = getServerManifest(root),
-      pathname = "/blog/hello-world",
-      matched = manifest.pageRoutes.find(route => new RegExp(route.namedRegex).test(pathname));
+      })]
+    });
+    const manifest = getServerManifest(root);
+    const pathname = "/blog/hello-world";
+    const matched = manifest.pageRoutes.find(route => {
+      return new RegExp(route.namedRegex).test(pathname);
+    });
     expect(matched?.file).toBe("(site)/blog/[slug]+ssg.tsx");
-  }), it("[slug] should come before [...catchAll]", () => {
+  });
+  it("[slug] should come before [...catchAll]", () => {
     const root = makeRouteNode({
-        route: "",
-        children: [makeRouteNode({
-          route: "[...catchAll]",
-          contextKey: "[...catchAll].tsx",
-          type: "ssr",
-          dynamic: [{
-            name: "catchAll",
-            deep: !0
-          }],
-          children: []
-        }), makeRouteNode({
-          route: "[slug]",
-          contextKey: "[slug].tsx",
-          type: "ssr",
-          dynamic: [{
-            name: "slug",
-            deep: !1
-          }],
-          children: []
-        })]
-      }),
-      pages = getServerManifest(root).pageRoutes.map(r => r.file);
+      route: "",
+      children: [makeRouteNode({
+        route: "[...catchAll]",
+        contextKey: "[...catchAll].tsx",
+        type: "ssr",
+        dynamic: [{
+          name: "catchAll",
+          deep: true
+        }],
+        children: []
+      }), makeRouteNode({
+        route: "[slug]",
+        contextKey: "[slug].tsx",
+        type: "ssr",
+        dynamic: [{
+          name: "slug",
+          deep: false
+        }],
+        children: []
+      })]
+    });
+    const manifest = getServerManifest(root);
+    const pages = manifest.pageRoutes.map(r => r.file);
     expect(pages.indexOf("[slug].tsx")).toBeLessThan(pages.indexOf("[...catchAll].tsx"));
   });
 });

package/dist/esm/server/getServerManifest.test.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","getServerManifest","makeRouteNode","overrides","loadRoute","contextKey","route","children","dynamic","type","root","name","deep","pages","pageRoutes","map","r","file","blogIdx","indexOf","chatIdx","toBeGreaterThanOrEqual","toBeLessThan","manifest","pathname","matched","find","RegExp","namedRegex","test","toBe"],"sources":["../../../src/server/getServerManifest.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","getServerManifest","makeRouteNode","overrides","loadRoute","contextKey","route","children","dynamic","type","root","name","deep","manifest","pages","pageRoutes","map","r","file","blogIdx","indexOf","chatIdx","toBeGreaterThanOrEqual","toBeLessThan","pathname","matched","find","RegExp","namedRegex","test","toBe"],"sources":["../../../src/server/getServerManifest.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/server/getServerManifest.test.native.js

@@ -16,150 +16,155 @@ function makeRouteNode(overrides) {
 describe("getServerManifest route specificity", function () {
   it("static segment /blog/[slug] should come before fully dynamic /[a]/[b]", function () {
     var root = makeRouteNode({
-        route: "",
-        children: [
-        // group (site) with blog/[slug]
-        makeRouteNode({
-          route: "(site)",
-          children: [makeRouteNode({
-            route: "blog/[slug]",
-            contextKey: "(site)/blog/[slug]+ssg.tsx",
-            type: "ssg",
-            dynamic: [{
-              name: "slug",
-              deep: !1
-            }],
-            children: []
-          })]
-        }),
-        // group (chat) with [serverId]/[channelId]
-        makeRouteNode({
-          route: "(chat)",
-          children: [makeRouteNode({
-            route: "[serverId]",
-            dynamic: [{
-              name: "serverId",
-              deep: !1
-            }],
-            children: [makeRouteNode({
-              route: "[channelId]",
-              dynamic: [{
-                name: "channelId",
-                deep: !1
-              }],
-              children: [makeRouteNode({
-                route: "index",
-                contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
-                type: "spa",
-                children: []
-              })]
-            })]
-          })]
-        })]
-      }),
-      manifest = getServerManifest(root),
-      pages = manifest.pageRoutes.map(function (r) {
-        return r.file;
-      }),
-      blogIdx = pages.indexOf("(site)/blog/[slug]+ssg.tsx"),
-      chatIdx = pages.indexOf("(chat)/[serverId]/[channelId]/index.tsx");
-    expect(blogIdx).toBeGreaterThanOrEqual(0), expect(chatIdx).toBeGreaterThanOrEqual(0), expect(blogIdx).toBeLessThan(chatIdx);
-  }), it("/blog should come before /[slug]", function () {
-    var root = makeRouteNode({
-        route: "",
+      route: "",
+      children: [
+      // group (site) with blog/[slug]
+      makeRouteNode({
+        route: "(site)",
         children: [makeRouteNode({
-          route: "blog",
-          contextKey: "blog.tsx",
+          route: "blog/[slug]",
+          contextKey: "(site)/blog/[slug]+ssg.tsx",
           type: "ssg",
-          children: []
-        }), makeRouteNode({
-          route: "[slug]",
-          contextKey: "[slug].tsx",
-          type: "ssr",
           dynamic: [{
             name: "slug",
-            deep: !1
+            deep: false
           }],
           children: []
         })]
       }),
-      manifest = getServerManifest(root),
-      pages = manifest.pageRoutes.map(function (r) {
-        return r.file;
-      });
-    expect(pages.indexOf("blog.tsx")).toBeLessThan(pages.indexOf("[slug].tsx"));
-  }), it("/blog/hello-world should match blog route first, not [serverId]/[channelId]", function () {
-    var root = makeRouteNode({
-        route: "",
+      // group (chat) with [serverId]/[channelId]
+      makeRouteNode({
+        route: "(chat)",
         children: [makeRouteNode({
-          route: "(site)",
-          children: [makeRouteNode({
-            route: "blog/[slug]",
-            contextKey: "(site)/blog/[slug]+ssg.tsx",
-            type: "ssg",
-            dynamic: [{
-              name: "slug",
-              deep: !1
-            }],
-            children: []
-          })]
-        }), makeRouteNode({
-          route: "(chat)",
+          route: "[serverId]",
+          dynamic: [{
+            name: "serverId",
+            deep: false
+          }],
           children: [makeRouteNode({
-            route: "[serverId]",
+            route: "[channelId]",
             dynamic: [{
-              name: "serverId",
-              deep: !1
+              name: "channelId",
+              deep: false
             }],
             children: [makeRouteNode({
-              route: "[channelId]",
-              dynamic: [{
-                name: "channelId",
-                deep: !1
-              }],
-              children: [makeRouteNode({
-                route: "index",
-                contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
-                type: "spa",
-                children: []
-              })]
+              route: "index",
+              contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
+              type: "spa",
+              children: []
             })]
           })]
         })]
-      }),
-      manifest = getServerManifest(root),
-      pathname = "/blog/hello-world",
-      matched = manifest.pageRoutes.find(function (route) {
-        return new RegExp(route.namedRegex).test(pathname);
-      });
-    expect(matched?.file).toBe("(site)/blog/[slug]+ssg.tsx");
-  }), it("[slug] should come before [...catchAll]", function () {
+      })]
+    });
+    var manifest = getServerManifest(root);
+    var pages = manifest.pageRoutes.map(function (r) {
+      return r.file;
+    });
+    var blogIdx = pages.indexOf("(site)/blog/[slug]+ssg.tsx");
+    var chatIdx = pages.indexOf("(chat)/[serverId]/[channelId]/index.tsx");
+    expect(blogIdx).toBeGreaterThanOrEqual(0);
+    expect(chatIdx).toBeGreaterThanOrEqual(0);
+    expect(blogIdx).toBeLessThan(chatIdx);
+  });
+  it("/blog should come before /[slug]", function () {
+    var root = makeRouteNode({
+      route: "",
+      children: [makeRouteNode({
+        route: "blog",
+        contextKey: "blog.tsx",
+        type: "ssg",
+        children: []
+      }), makeRouteNode({
+        route: "[slug]",
+        contextKey: "[slug].tsx",
+        type: "ssr",
+        dynamic: [{
+          name: "slug",
+          deep: false
+        }],
+        children: []
+      })]
+    });
+    var manifest = getServerManifest(root);
+    var pages = manifest.pageRoutes.map(function (r) {
+      return r.file;
+    });
+    expect(pages.indexOf("blog.tsx")).toBeLessThan(pages.indexOf("[slug].tsx"));
+  });
+  it("/blog/hello-world should match blog route first, not [serverId]/[channelId]", function () {
     var root = makeRouteNode({
-        route: "",
+      route: "",
+      children: [makeRouteNode({
+        route: "(site)",
         children: [makeRouteNode({
-          route: "[...catchAll]",
-          contextKey: "[...catchAll].tsx",
-          type: "ssr",
+          route: "blog/[slug]",
+          contextKey: "(site)/blog/[slug]+ssg.tsx",
+          type: "ssg",
           dynamic: [{
-            name: "catchAll",
-            deep: !0
+            name: "slug",
+            deep: false
           }],
           children: []
-        }), makeRouteNode({
-          route: "[slug]",
-          contextKey: "[slug].tsx",
-          type: "ssr",
+        })]
+      }), makeRouteNode({
+        route: "(chat)",
+        children: [makeRouteNode({
+          route: "[serverId]",
           dynamic: [{
-            name: "slug",
-            deep: !1
+            name: "serverId",
+            deep: false
           }],
-          children: []
+          children: [makeRouteNode({
+            route: "[channelId]",
+            dynamic: [{
+              name: "channelId",
+              deep: false
+            }],
+            children: [makeRouteNode({
+              route: "index",
+              contextKey: "(chat)/[serverId]/[channelId]/index.tsx",
+              type: "spa",
+              children: []
+            })]
+          })]
         })]
-      }),
-      manifest = getServerManifest(root),
-      pages = manifest.pageRoutes.map(function (r) {
-        return r.file;
-      });
+      })]
+    });
+    var manifest = getServerManifest(root);
+    var pathname = "/blog/hello-world";
+    var matched = manifest.pageRoutes.find(function (route) {
+      return new RegExp(route.namedRegex).test(pathname);
+    });
+    expect(matched === null || matched === void 0 ? void 0 : matched.file).toBe("(site)/blog/[slug]+ssg.tsx");
+  });
+  it("[slug] should come before [...catchAll]", function () {
+    var root = makeRouteNode({
+      route: "",
+      children: [makeRouteNode({
+        route: "[...catchAll]",
+        contextKey: "[...catchAll].tsx",
+        type: "ssr",
+        dynamic: [{
+          name: "catchAll",
+          deep: true
+        }],
+        children: []
+      }), makeRouteNode({
+        route: "[slug]",
+        contextKey: "[slug].tsx",
+        type: "ssr",
+        dynamic: [{
+          name: "slug",
+          deep: false
+        }],
+        children: []
+      })]
+    });
+    var manifest = getServerManifest(root);
+    var pages = manifest.pageRoutes.map(function (r) {
+      return r.file;
+    });
     expect(pages.indexOf("[slug].tsx")).toBeLessThan(pages.indexOf("[...catchAll].tsx"));
   });
 });

package/dist/esm/server/getServerManifest.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","getServerManifest","makeRouteNode","overrides","loadRoute","contextKey","route","children","dynamic","type","root","name","deep","manifest","pages","pageRoutes","map","r","file","blogIdx","indexOf","chatIdx","toBeGreaterThanOrEqual","toBeLessThan"],"sources":["../../../src/server/getServerManifest.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,iBAAA,QAAyB;AAGlC,SAASC,cAAcC,SAAA,EAA0C;EAC/D,OAAO;IACLC,SAAA,EAAW,SAAAA,CAAA,EAAQ;MACnB;IACA;IACAC,UAAU,EAAC;IACXC,KAAA,IAAS;IACTC,QAAM;IACNC,OAAG;IACLC,IAAA;IACF,GAAAN;EAEA;AACE;AAEEL,QAAA,sCAA2B;EAAAE,EAAA,wEAClB;IAAA,IACPU,IAAA,GAAAR,aAAU;QAAAI,KAAA;QAAAC,QAER;QAAc;QACLL,aACG;UAAAI,KACR;UAAcC,QACZ,GAAOL,aACP,CAAY;YACZI,KAAA,EAAM;YACND,UAAU,EAAE,4BAA2B;YACvCI,IAAA,OAAW;YACZD,OAAA,GACH;cACDG,IAAA;cAAAC,IAAA;YAED,EACE;YACAL,QAAU;UACR;QACS;QACoC;QACjCL,aACR;UAAcI,KAAA,UACL;UAAAC,QACP,GAA4CL,aAC5C;YAAUI,KAAA,EACR;YAAcE,OAAA,EACZ,CAAO;cACKG,IACZ,YAAM;cAAAC,IACN;YAAW,EACZ;YACHL,QACD,GACHL,aAAA;cACDI,KAAA;cACHE,OAAA,GACD;gBACHG,IAAA;gBAGeC,IAAA;cAMD,EAMf;cACYL,QAAA,GACJL,aAAA;gBACGI,KAAA;gBACMD,UAAA;gBACLI,IAAA;gBACKF,QAAA;cACN;YAEP;UAEC;QACY,EACZ;MACuC;MAAAM,QACvC,GAAAZ,iBAAW,CAAAS,IAAA;MAAAI,KAAA,GAAAD,QAAA,CAAAE,UAAA,CAAAC,GAAA,WAAAC,CAAA;QAAA,OACZA,CAAA,CAAAC,IAAA;MAAA,EACH;MAAAC,OAAA,GAAAL,KAAA,CAAAM,OAAA;MAAAC,OAAA,GAAAP,KAAA,CAAAM,OAAA;IACFrB,MAGM,CAAAoB,OADW,EAAAG,sBACM,KAAAvB,MAAW,CAAAsB,OAAK,CAAM,CAAAC,sBAAM,KAAAvB,MAAA,CAAAoB,OAAA,EAAAI,YAAA,CAAAF,OAAA;EACnD,IAAArB,EAAA,mCAAkC,cAAa;IAChD,IAEDU,IAAG,GAAAR,aAAA;QACDI,KAAM;QACJC,QAAO,GACPL,aAAU;UACRI,KAAA,QAAc;UACZD,UAAO;UACPI,IAAA,OAAU;UAAAF,QACR;QAAc,IACLL,aACP;UAAYI,KACZ,UAAM;UAAAD,UACN,cAAkB;UAAqBI,IACvC;UAAWD,OACZ,GACH;YACDG,IAAA;YACDC,IAAA;UACE,EACA;UAAUL,QACR;QAAc;MAE+B;MAAAM,QAC3C,GAAAZ,iBAAU,CAAAS,IAAA;MAAAI,KAAA,GAAAD,QAAA,CAAAE,UAAA,CAAAC,GAAA,WAAAC,CAAA;QAAA,OAAAA,CAAA,CAAAC,IACR;MAAc;IACLnB,MAAA,CAAAe,KAAA,CAAAM,OACP,WAAY,CAAM,EAAAG,YAAa,CAAAT,KAAM,CAAAM,OAAO;EAAA,IAAApB,EAAA,8EAClC;IAAA,IAAAU,IAAA,GAAAR,aACR;QAAcI,KAAA;QACLC,QAAA,GACKL,aAAA,CACZ;UAAMI,KAAA,UACN;UAAWC,QAAA,EACb,CAACL,aACH;YAAAI,KACD;YACHD,UAAA;YACDI,IAAA;YACHD,OAAA,GACD;cACHG,IAAA;cAGIC,IAAW;YAQV,EAGN;YACKL,QAAO;UACX,CAAO;QAEL,IAAcL,aACL;UACPI,KAAA,UAAY;UACZC,QAAM,GACNL,aAAY;YACZI,KAAA,EAAW;YACZE,OAAA,GACD;cACSG,IAAA;cACPC,IAAY;YACN,EACN;YACAL,QAAW,GACZL,aAAA;cACHI,KAAA;cAGeE,OAAA,GAEJ;gBACdG,IAAA;gBACFC,IAAA","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","getServerManifest","makeRouteNode","overrides","loadRoute","contextKey","route","children","dynamic","type","root","name","deep","manifest","pages","pageRoutes","map","r","file","blogIdx","indexOf","chatIdx","toBeGreaterThanOrEqual","toBeLessThan"],"sources":["../../../src/server/getServerManifest.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}