@react-router/dev 0.0.0-experimental-b2bc694a6 → 0.0.0-experimental-a25eed86d

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-b2bc694a6
+ * @react-router/dev v0.0.0-experimental-a25eed86d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -933,18 +933,21 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
-  const indexPaths = new Set(
-    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
-  );
+  const fullpaths = {};
+  for (const route of Object.values(ctx.config.routes)) {
+    if (route.id !== "root" && !route.path) continue;
+    const lineage2 = lineage(ctx.config.routes, route);
+    const fullpath2 = fullpath(lineage2);
+    const existing = fullpaths[fullpath2];
+    if (!existing || existing.length < lineage2.length) {
+      fullpaths[fullpath2] = lineage2;
+    }
+  }
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        if (route.id !== "root" && !route.path) return void 0;
-        if (!route.index && indexPaths.has(route.path)) return void 0;
-        const lineage2 = lineage(ctx.config.routes, route);
-        const fullpath2 = fullpath(lineage2);
+      Object.keys(fullpaths).map((fullpath2) => {
         const params = parse2(fullpath2);
         return t2.tsPropertySignature(
           t2.stringLiteral(fullpath2),
@@ -961,7 +964,7 @@ function register(ctx) {
             )
           )
         );
-      }).filter((x) => x !== void 0)
+      })
     )
   );
   return [register2, generate(typeParams).code].join("\n\n");
@@ -1031,6 +1034,7 @@ var init_styles = __esm({
     path6 = __toESM(require("path"));
     import_react_router = require("react-router");
     init_resolve_file_url();
+    init_babel();
     cssFileRegExp = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
     cssModulesRegExp = new RegExp(`\\.module${cssFileRegExp.source}`);
   }
@@ -1353,9 +1357,6 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
       }
     });
   }
-  if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve") {
-    environmentOptionsResolvers[CSS_DEV_HELPER_ENVIRONMENT_NAME] = () => ({});
-  }
   return environmentOptionsResolvers;
 }
 function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
@@ -1370,7 +1371,7 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, fs4, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, fs4, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -1418,7 +1419,6 @@ var init_plugin = __esm({
     ];
     BUILD_CLIENT_ROUTE_QUERY_STRING = "?__react-router-build-client-route";
     SSR_BUNDLE_PREFIX = "ssrBundle_";
-    CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
     virtualHmrRuntime = create("hmr-runtime");
     virtualInjectHmrRuntime = create("inject-hmr-runtime");
     virtual2 = {

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-b2bc694a6
+ * @react-router/dev v0.0.0-experimental-a25eed86d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -906,18 +906,21 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
-  const indexPaths = new Set(
-    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
-  );
+  const fullpaths = {};
+  for (const route of Object.values(ctx.config.routes)) {
+    if (route.id !== "root" && !route.path) continue;
+    const lineage2 = lineage(ctx.config.routes, route);
+    const fullpath2 = fullpath(lineage2);
+    const existing = fullpaths[fullpath2];
+    if (!existing || existing.length < lineage2.length) {
+      fullpaths[fullpath2] = lineage2;
+    }
+  }
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        if (route.id !== "root" && !route.path) return void 0;
-        if (!route.index && indexPaths.has(route.path)) return void 0;
-        const lineage2 = lineage(ctx.config.routes, route);
-        const fullpath2 = fullpath(lineage2);
+      Object.keys(fullpaths).map((fullpath2) => {
         const params = parse2(fullpath2);
         return t2.tsPropertySignature(
           t2.stringLiteral(fullpath2),
@@ -934,7 +937,7 @@ function register(ctx) {
             )
           )
         );
-      }).filter((x) => x !== void 0)
+      })
     )
   );
   return [register2, generate(typeParams).code].join("\n\n");
@@ -1199,6 +1202,20 @@ var getStylesForPathname = async ({
   });
   return styles;
 };
+var getCssStringFromViteDevModuleCode = (code) => {
+  let cssContent = void 0;
+  const ast = import_parser.parse(code, { sourceType: "module" });
+  traverse(ast, {
+    VariableDeclaration(path7) {
+      const declaration = path7.node.declarations[0];
+      if (declaration?.id?.type === "Identifier" && declaration.id.name === "__vite__css" && declaration.init?.type === "StringLiteral") {
+        cssContent = declaration.init.value;
+        path7.stop();
+      }
+    }
+  });
+  return cssContent;
+};
 
 // vite/virtual-module.ts
 function create(name) {
@@ -2085,7 +2102,6 @@ var SSR_BUNDLE_PREFIX = "ssrBundle_";
 function isSsrBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
-var CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
 function getServerEnvironmentEntries(ctx, record) {
   return Object.entries(record).filter(
     ([name]) => ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr"
@@ -2306,7 +2322,6 @@ var getServerBundleRouteIds = (vitePluginContext, ctx) => {
   );
   return Object.keys(serverBundleRoutes);
 };
-var injectQuery = (url2, query) => url2.includes("?") ? url2.replace("?", `?${query}&`) : `${url2}?${query}`;
 var defaultEntriesDir = path6.resolve(
   path6.dirname(require.resolve("@react-router/dev/package.json")),
   "dist",
@@ -2716,31 +2731,17 @@ var reactRouterVitePlugin = () => {
     if (dep.file && isCssModulesFile(dep.file)) {
       return cssModulesManifest[dep.file];
     }
-    const vite2 = getVite();
-    const viteMajor = parseInt(vite2.version.split(".")[0], 10);
-    const url2 = viteMajor >= 6 ? (
-      // We need the ?inline query in Vite v6 when loading CSS in SSR
-      // since it does not expose the default export for CSS in a
-      // server environment. This is to align with non-SSR
-      // environments. For backwards compatibility with v5 we keep
-      // using the URL without ?inline query because the HMR code was
-      // relying on the implicit SSR-client module graph relationship.
-      injectQuery(dep.url, "inline")
-    ) : dep.url;
-    let cssMod;
-    if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
-      const cssDevHelperEnvironment = viteDevServer.environments[CSS_DEV_HELPER_ENVIRONMENT_NAME];
-      invariant(cssDevHelperEnvironment, "Missing CSS dev helper environment");
-      invariant(vite2.isRunnableDevEnvironment(cssDevHelperEnvironment));
-      cssMod = await cssDevHelperEnvironment.runner.import(url2);
-    } else {
-      cssMod = await viteDevServer.ssrLoadModule(url2);
-    }
+    let transformedCssCode = (await viteDevServer.transformRequest(dep.url))?.code;
     invariant(
-      typeof cssMod === "object" && cssMod !== null && "default" in cssMod && typeof cssMod.default === "string",
+      transformedCssCode,
       `Failed to load CSS for ${dep.file ?? dep.url}`
     );
-    return cssMod.default;
+    let cssString = getCssStringFromViteDevModuleCode(transformedCssCode);
+    invariant(
+      typeof cssString === "string",
+      `Failed to extract CSS for ${dep.file ?? dep.url}`
+    );
+    return cssString;
   };
   return [
     {
@@ -4482,9 +4483,6 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
       }
     });
   }
-  if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve") {
-    environmentOptionsResolvers[CSS_DEV_HELPER_ENVIRONMENT_NAME] = () => ({});
-  }
   return environmentOptionsResolvers;
 }
 function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-b2bc694a6",
+  "version": "0.0.0-experimental-a25eed86d",
   "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.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-b2bc694a6"
+    "@react-router/node": "0.0.0-experimental-a25eed86d"
   },
   "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": "^0.0.0-experimental-b2bc694a6",
-    "@react-router/serve": "0.0.0-experimental-b2bc694a6"
+    "@react-router/serve": "0.0.0-experimental-a25eed86d",
+    "react-router": "^0.0.0-experimental-a25eed86d"
   },
   "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-b2bc694a6",
-    "react-router": "^0.0.0-experimental-b2bc694a6"
+    "@react-router/serve": "^0.0.0-experimental-a25eed86d",
+    "react-router": "^0.0.0-experimental-a25eed86d"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {