@react-router/dev 0.0.0-experimental-1fcc8eb1d → 0.0.0-experimental-d82b9430b

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-1fcc8eb1d
+ * @react-router/dev v0.0.0-experimental-d82b9430b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -928,7 +928,7 @@ function generateRoutes(ctx) {
     lineages.set(route.id, lineage2);
     const fullpath2 = fullpath(lineage2);
     if (!fullpath2) continue;
-    const pages = explodeOptionalSegments(fullpath2);
+    const pages = expand(fullpath2);
     pages.forEach((page) => allPages.add(page));
     lineage2.forEach(({ id }) => {
       let routePages = routeToPages.get(id);
@@ -1157,28 +1157,27 @@ function paramsType(path8) {
     })
   );
 }
-function explodeOptionalSegments(path8) {
-  let segments = path8.split("/");
-  if (segments.length === 0) return [];
-  let [first, ...rest] = segments;
-  let isOptional = first.endsWith("?");
-  let required = first.replace(/\?$/, "");
-  if (rest.length === 0) {
-    return isOptional ? [required, ""] : [required];
-  }
-  let restExploded = explodeOptionalSegments(rest.join("/"));
-  let result = [];
-  result.push(
-    ...restExploded.map(
-      (subpath) => subpath === "" ? required : [required, subpath].join("/")
-    )
-  );
-  if (isOptional) {
-    result.push(...restExploded);
-  }
-  return result.map(
-    (exploded) => path8.startsWith("/") && exploded === "" ? "/" : exploded
-  );
+function expand(fullpath2) {
+  function recurse(segments2, index) {
+    if (index === segments2.length) return [""];
+    const segment = segments2[index];
+    const isOptional = segment.endsWith("?");
+    const isDynamic = segment.startsWith(":");
+    const required = segment.replace(/\?$/, "");
+    const keep = !isOptional || isDynamic;
+    const kept = isDynamic ? segment : required;
+    const withoutSegment = recurse(segments2, index + 1);
+    const withSegment = withoutSegment.map((rest) => [kept, rest].join("/"));
+    if (keep) return withSegment;
+    return [...withoutSegment, ...withSegment];
+  }
+  const segments = fullpath2.split("/");
+  const expanded = /* @__PURE__ */ new Set();
+  for (let result of recurse(segments, 0)) {
+    if (result !== "/") result = result.replace(/\/$/, "");
+    expanded.add(result);
+  }
+  return expanded;
 }
 var import_dedent, Path3, Pathe, t2;
 var init_generate = __esm({

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1fcc8eb1d
+ * @react-router/dev v0.0.0-experimental-d82b9430b
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1fcc8eb1d
+ * @react-router/dev v0.0.0-experimental-d82b9430b
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.d.ts

@@ -1,6 +1,6 @@
 import { UNSAFE_MiddlewareEnabled, unstable_InitialContext, AppLoadContext } from 'react-router';
 import { Plugin } from 'vite';
-import { PlatformProxy, GetPlatformProxyOptions } from 'wrangler';
+import { GetPlatformProxyOptions, PlatformProxy } from 'wrangler';
 
 type MaybePromise<T> = T | Promise<T>;
 type CfProperties = Record<string, unknown>;

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1fcc8eb1d
+ * @react-router/dev v0.0.0-experimental-d82b9430b
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1fcc8eb1d
+ * @react-router/dev v0.0.0-experimental-d82b9430b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -915,7 +915,7 @@ function generateRoutes(ctx) {
     lineages.set(route.id, lineage2);
     const fullpath2 = fullpath(lineage2);
     if (!fullpath2) continue;
-    const pages = explodeOptionalSegments(fullpath2);
+    const pages = expand(fullpath2);
     pages.forEach((page) => allPages.add(page));
     lineage2.forEach(({ id }) => {
       let routePages = routeToPages.get(id);
@@ -1144,28 +1144,27 @@ function paramsType(path6) {
     })
   );
 }
-function explodeOptionalSegments(path6) {
-  let segments = path6.split("/");
-  if (segments.length === 0) return [];
-  let [first, ...rest] = segments;
-  let isOptional = first.endsWith("?");
-  let required = first.replace(/\?$/, "");
-  if (rest.length === 0) {
-    return isOptional ? [required, ""] : [required];
+function expand(fullpath2) {
+  function recurse(segments2, index) {
+    if (index === segments2.length) return [""];
+    const segment = segments2[index];
+    const isOptional = segment.endsWith("?");
+    const isDynamic = segment.startsWith(":");
+    const required = segment.replace(/\?$/, "");
+    const keep = !isOptional || isDynamic;
+    const kept = isDynamic ? segment : required;
+    const withoutSegment = recurse(segments2, index + 1);
+    const withSegment = withoutSegment.map((rest) => [kept, rest].join("/"));
+    if (keep) return withSegment;
+    return [...withoutSegment, ...withSegment];
   }
-  let restExploded = explodeOptionalSegments(rest.join("/"));
-  let result = [];
-  result.push(
-    ...restExploded.map(
-      (subpath) => subpath === "" ? required : [required, subpath].join("/")
-    )
-  );
-  if (isOptional) {
-    result.push(...restExploded);
+  const segments = fullpath2.split("/");
+  const expanded = /* @__PURE__ */ new Set();
+  for (let result of recurse(segments, 0)) {
+    if (result !== "/") result = result.replace(/\/$/, "");
+    expanded.add(result);
   }
-  return result.map(
-    (exploded) => path6.startsWith("/") && exploded === "" ? "/" : exploded
-  );
+  return expanded;
 }
 
 // typegen/index.ts
@@ -3271,7 +3270,7 @@ var reactRouterVitePlugin = () => {
         if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
           viteDevServer.middlewares.use(async (req, res, next) => {
             let [reqPathname, reqSearch] = (req.url ?? "").split("?");
-            if (reqPathname === `${ctx.publicPath}@react-router/critical.css`) {
+            if (reqPathname.endsWith("/@react-router/critical.css")) {
               let pathname = new URLSearchParams(reqSearch).get("pathname");
               if (!pathname) {
                 return next("No pathname provided");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-1fcc8eb1d",
+  "version": "0.0.0-experimental-d82b9430b",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^3.1.4",
-    "@react-router/node": "0.0.0-experimental-1fcc8eb1d"
+    "@react-router/node": "0.0.0-experimental-d82b9430b"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -110,15 +110,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.2.0",
-    "@react-router/serve": "0.0.0-experimental-1fcc8eb1d",
-    "react-router": "^0.0.0-experimental-1fcc8eb1d"
+    "react-router": "^0.0.0-experimental-d82b9430b",
+    "@react-router/serve": "0.0.0-experimental-d82b9430b"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-1fcc8eb1d",
-    "react-router": "^0.0.0-experimental-1fcc8eb1d"
+    "@react-router/serve": "^0.0.0-experimental-d82b9430b",
+    "react-router": "^0.0.0-experimental-d82b9430b"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {