@react-router/dev 0.0.0-experimental-4996fbe2b → 0.0.0-experimental-ecd35cd60

package/bin.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require("./dist/cli");

package/dist/cli/commands.js

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

package/dist/cli/detectPackageManager.js

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

package/dist/cli/index.js

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

package/dist/cli/run.js

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

package/dist/cli/useJavascript.js

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

package/dist/cli.js

@@ -1,6 +1,5 @@
-#!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-4996fbe2b
+ * @react-router/dev v0.0.0-experimental-ecd35cd60
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

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

package/dist/config/defaults/entry.server.node.tsx

@@ -3,7 +3,8 @@ import { PassThrough } from "node:stream";
 import type { AppLoadContext, EntryContext } from "react-router";
 import { createReadableStreamFromReadable } from "@react-router/node";
 import { ServerRouter } from "react-router";
-import * as isbotModule from "isbot";
+import { isbot } from "isbot";
+import type { RenderToPipeableStreamOptions } from "react-dom/server";
 import { renderToPipeableStream } from "react-dom/server";
 
 const ABORT_DELAY = 5_000;
@@ -12,114 +13,28 @@ export default function handleRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  remixContext: EntryContext,
+  routerContext: EntryContext,
   loadContext: AppLoadContext
-) {
-  let prohibitOutOfOrderStreaming =
-    isBotRequest(request.headers.get("user-agent")) || remixContext.isSpaMode;
-
-  return prohibitOutOfOrderStreaming
-    ? handleBotRequest(
-        request,
-        responseStatusCode,
-        responseHeaders,
-        remixContext
-      )
-    : handleBrowserRequest(
-        request,
-        responseStatusCode,
-        responseHeaders,
-        remixContext
-      );
-}
-
-// We have some Remix apps in the wild already running with isbot@3 so we need
-// to maintain backwards compatibility even though we want new apps to use
-// isbot@4.  That way, we can ship this as a minor Semver update to @react-router/dev.
-function isBotRequest(userAgent: string | null) {
-  if (!userAgent) {
-    return false;
-  }
-
-  // isbot >= 3.8.0, >4
-  if ("isbot" in isbotModule && typeof isbotModule.isbot === "function") {
-    return isbotModule.isbot(userAgent);
-  }
-
-  // isbot < 3.8.0
-  if ("default" in isbotModule && typeof isbotModule.default === "function") {
-    return isbotModule.default(userAgent);
-  }
-
-  return false;
-}
-
-function handleBotRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;
-    const { pipe, abort } = renderToPipeableStream(
-      <ServerRouter
-        context={remixContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
-      {
-        onAllReady() {
-          shellRendered = true;
-          const body = new PassThrough();
-          const stream = createReadableStreamFromReadable(body);
-
-          responseHeaders.set("Content-Type", "text/html");
-
-          resolve(
-            new Response(stream, {
-              headers: responseHeaders,
-              status: responseStatusCode,
-            })
-          );
-
-          pipe(body);
-        },
-        onShellError(error: unknown) {
-          reject(error);
-        },
-        onError(error: unknown) {
-          responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
-        },
-      }
-    );
+    let userAgent = request.headers.get("user-agent");
 
-    setTimeout(abort, ABORT_DELAY);
-  });
-}
+    // Ensure requests from bots and SPA Mode renders wait for all content to load before responding
+    // https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
+    let readyOption: keyof RenderToPipeableStreamOptions =
+      (userAgent && isbot(userAgent)) || routerContext.isSpaMode
+        ? "onAllReady"
+        : "onShellReady";
 
-function handleBrowserRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  return new Promise((resolve, reject) => {
-    let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
       <ServerRouter
-        context={remixContext}
+        context={routerContext}
         url={request.url}
         abortDelay={ABORT_DELAY}
       />,
       {
-        onShellReady() {
+        [readyOption]() {
           shellRendered = true;
           const body = new PassThrough();
           const stream = createReadableStreamFromReadable(body);

package/dist/config/findConfig.js

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

package/dist/config/flatRoutes.js

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

package/dist/config/format.js

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

package/dist/config/routes.js

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

package/dist/config.js

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

package/dist/index.js

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

package/dist/invariant.js

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

package/dist/vite/babel.js

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

package/dist/vite/build.js

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

package/dist/vite/define-route.d.ts

@@ -1,2 +1,5 @@
-export declare function transform(code: string): void;
+export declare function transform(code: string, id: string, options?: {
+    ssr?: boolean;
+}): string | import("@babel/generator").GeneratorResult;
+export declare function parseFields(code: string): string[];
 export declare function assertNotImported(code: string): void;

package/dist/vite/define-route.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4996fbe2b
+ * @react-router/dev v0.0.0-experimental-ecd35cd60
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,6 +13,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var babel$1 = require('@babel/core');
+var babelDeadCodeElimination = require('babel-dead-code-elimination');
 var babel = require('./babel.js');
 var t = require('@babel/types');
 var parser = require('@babel/parser');
@@ -38,23 +39,41 @@ function _interopNamespace(e) {
 var babel__namespace = /*#__PURE__*/_interopNamespace(babel$1);
 var t__namespace = /*#__PURE__*/_interopNamespace(t);
 
-function transform(code) {
+function transform(code, id, options = {}) {
+  if (options !== null && options !== void 0 && options.ssr) return code;
   let ast = parse(code);
+  let refs = babelDeadCodeElimination.findReferencedIdentifiers(ast);
+  let markedForRemoval = [];
+  assertDefineRouteOnlyAfterExportDefault(ast);
   babel.traverse(ast, {
-    Identifier(path) {
-      if (!isDefineRoute(path)) return;
-      if (t__namespace.isImportSpecifier(path.parent)) return;
-      if (!t__namespace.isCallExpression(path.parent)) {
-        throw path.buildCodeFrameError("`defineRoute` must be a function call immediately after `export default`");
-      }
-      if (!t__namespace.isExportDefaultDeclaration(path.parentPath.parent)) {
-        throw path.buildCodeFrameError("`defineRoute` must be a function call immediately after `export default`");
+    ExportDefaultDeclaration(path) {
+      let analysis = analyzeRouteExport(path);
+      for (let [key, fieldPath] of Object.entries(analysis)) {
+        if (["headers", "serverLoader", "serverAction"].includes(key)) {
+          if (!fieldPath) continue;
+          markedForRemoval.push(fieldPath);
+        }
       }
-    },
+    }
+  });
+  markedForRemoval.forEach(path => path.remove());
+  babelDeadCodeElimination.deadCodeElimination(ast, refs);
+  return babel.generate(ast, {
+    sourceMaps: true,
+    sourceFileName: id
+  }, code);
+}
+function parseFields(code) {
+  let fields = [];
+  let ast = parse(code);
+  assertDefineRouteOnlyAfterExportDefault(ast);
+  babel.traverse(ast, {
     ExportDefaultDeclaration(path) {
-      analyzeRouteExport(path);
+      let analysis = analyzeRouteExport(path);
+      fields = Object.keys(analysis);
     }
   });
+  return fields;
 }
 function analyzeRouteExport(path) {
   let route = path.node.declaration;
@@ -82,6 +101,7 @@ function analyzeRouteExport(path) {
   throw path.get("declaration").buildCodeFrameError("Default export of a route module must be either a literal object or a call to `defineRoute`");
 }
 function analyzeRoute(path) {
+  let analysis = {};
   for (let [i, property] of path.node.properties.entries()) {
     // spread: defineRoute({ ...dynamic })
     if (!t__namespace.isObjectProperty(property) && !t__namespace.isObjectMethod(property)) {
@@ -109,10 +129,10 @@ function analyzeRoute(path) {
           throw elementPath.buildCodeFrameError("Route param must be a literal string");
         }
       }
-      continue;
     }
+    analysis[key] = propertyPath;
   }
-  throw path.buildCodeFrameError("TODO: not yet implemented");
+  return analysis;
 }
 function assertNotImported(code) {
   let ast = parse(code);
@@ -142,6 +162,20 @@ function parse(source) {
   });
   return ast;
 }
+function assertDefineRouteOnlyAfterExportDefault(ast) {
+  babel.traverse(ast, {
+    Identifier(path) {
+      if (!isDefineRoute(path)) return;
+      if (t__namespace.isImportSpecifier(path.parent)) return;
+      if (!t__namespace.isCallExpression(path.parent)) {
+        throw path.buildCodeFrameError("`defineRoute` must be a function call immediately after `export default`");
+      }
+      if (!t__namespace.isExportDefaultDeclaration(path.parentPath.parent)) {
+        throw path.buildCodeFrameError("`defineRoute` must be a function call immediately after `export default`");
+      }
+    }
+  });
+}
 function isDefineRoute(path) {
   if (!t__namespace.isIdentifier(path.node)) return false;
   let binding = path.scope.getBinding(path.node.name);
@@ -169,4 +203,5 @@ function isCanonicallyImportedAs(binding, {
 }
 
 exports.assertNotImported = assertNotImported;
+exports.parseFields = parseFields;
 exports.transform = transform;

package/dist/vite/dev.js

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

package/dist/vite/import-vite-esm-sync.js

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

package/dist/vite/index.js

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

package/dist/vite/node-adapter.js

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

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4996fbe2b
+ * @react-router/dev v0.0.0-experimental-ecd35cd60
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -108,11 +108,11 @@ async function loadPluginContext({
 }
 const SERVER_ONLY_ROUTE_EXPORTS = ["loader", "action", "headers"];
 const CLIENT_ROUTE_EXPORTS = ["clientAction", "clientLoader", "default", "ErrorBoundary", "handle", "HydrateFallback", "Layout", "links", "meta", "shouldRevalidate"];
-/** This is used to manage a build optimization to remove unused route exports
-from the client build output. This is important in cases where custom route
-exports are only ever used on the server. Without this optimization we can't
-tree-shake any unused custom exports because routes are entry points. */
-const BUILD_CLIENT_ROUTE_QUERY_STRING = "?__remix-build-client-route";
+// Each route gets its own virtual module marked with an entry query string
+const ROUTE_ENTRY_QUERY_STRING = "?route-entry=1";
+const isRouteEntry = id => {
+  return id.endsWith(ROUTE_ENTRY_QUERY_STRING);
+};
 let serverBuildId = vmod.id("server-build");
 let serverManifestId = vmod.id("server-manifest");
 let browserManifestId = vmod.id("browser-manifest");
@@ -140,7 +140,7 @@ const getHash = (source, maxLength) => {
 const resolveChunk = (ctx, viteManifest, absoluteFilePath) => {
   let vite = importViteEsmSync.importViteEsmSync();
   let rootRelativeFilePath = vite.normalizePath(path__namespace.relative(ctx.rootDirectory, absoluteFilePath));
-  let entryChunk = viteManifest[rootRelativeFilePath + BUILD_CLIENT_ROUTE_QUERY_STRING] ?? viteManifest[rootRelativeFilePath];
+  let entryChunk = viteManifest[rootRelativeFilePath + ROUTE_ENTRY_QUERY_STRING] ?? viteManifest[rootRelativeFilePath];
   if (!entryChunk) {
     let knownManifestKeys = Object.keys(viteManifest).map(key => '"' + key + '"').join(", ");
     throw new Error(`No manifest entry found for "${rootRelativeFilePath}". Known manifest keys: ${knownManifestKeys}`);
@@ -195,6 +195,20 @@ const getRouteManifestModuleExports = async (viteChildCompiler, ctx) => {
   return Object.fromEntries(entries);
 };
 const getRouteModuleExports = async (viteChildCompiler, ctx, routeFile, readRouteFile) => {
+  let routePath = path__namespace.resolve(ctx.reactRouterConfig.appDirectory, routeFile);
+  let code = await ((readRouteFile === null || readRouteFile === void 0 ? void 0 : readRouteFile()) ?? fse__namespace.readFile(routePath, "utf-8"));
+  if (!code.includes("defineRoute")) {
+    return _getRouteModuleExports(viteChildCompiler, ctx, routeFile, readRouteFile);
+  }
+  let renameFields = ["Component", "serverLoader", "actionLoader"];
+  let fields = defineRoute.parseFields(code);
+  let exports = fields.filter(exportName => !renameFields.includes(exportName));
+  if (fields.includes("Component")) exports.push("default");
+  if (fields.includes("serverLoader")) exports.push("loader");
+  if (fields.includes("serverAction")) exports.push("action");
+  return exports;
+};
+const _getRouteModuleExports = async (viteChildCompiler, ctx, routeFile, readRouteFile) => {
   if (!viteChildCompiler) {
     throw new Error("Vite child compiler not found");
   }
@@ -320,7 +334,7 @@ const reactRouterVitePlugin = _config => {
     import * as entryServer from ${JSON.stringify(resolveFileUrl.resolveFileUrl(ctx, ctx.entryServerFilePath))};
     ${Object.keys(routes).map((key, index) => {
       let route = routes[key];
-      return `import * as route${index} from ${JSON.stringify(resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)))};`;
+      return `import * as route${index} from ${JSON.stringify(resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)) + ROUTE_ENTRY_QUERY_STRING)};`;
     }).join("\n")}
       export { default as assets } from ${JSON.stringify(serverManifestId)};
       export const assetsBuildDirectory = ${JSON.stringify(path__namespace.relative(ctx.rootDirectory, getClientBuildDirectory(ctx.reactRouterConfig)))};
@@ -434,7 +448,7 @@ const reactRouterVitePlugin = _config => {
         path: route.path,
         index: route.index,
         caseSensitive: route.caseSensitive,
-        module: path__namespace.posix.join(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}`),
+        module: path__namespace.posix.join(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}${ROUTE_ENTRY_QUERY_STRING}`),
         hasAction: sourceExports.includes("action"),
         hasLoader: sourceExports.includes("loader"),
         hasClientAction: sourceExports.includes("clientAction"),
@@ -540,7 +554,7 @@ const reactRouterVitePlugin = _config => {
               rollupOptions: {
                 ...baseRollupOptions,
                 preserveEntrySignatures: "exports-only",
-                input: [ctx.entryClientFilePath, ...Object.values(ctx.reactRouterConfig.routes).map(route => `${path__namespace.resolve(ctx.reactRouterConfig.appDirectory, route.file)}${BUILD_CLIENT_ROUTE_QUERY_STRING}`)]
+                input: [ctx.entryClientFilePath, ...Object.values(ctx.reactRouterConfig.routes).map(route => `${path__namespace.resolve(ctx.reactRouterConfig.appDirectory, route.file)}${ROUTE_ENTRY_QUERY_STRING}`)]
               }
             } : {
               // We move SSR-only assets to client assets. Note that the
@@ -637,13 +651,6 @@ const reactRouterVitePlugin = _config => {
       if (styles.isCssModulesFile(id)) {
         cssModulesManifest[id] = code;
       }
-      if (id.endsWith(BUILD_CLIENT_ROUTE_QUERY_STRING)) {
-        let routeModuleId = id.replace(BUILD_CLIENT_ROUTE_QUERY_STRING, "");
-        let sourceExports = await getRouteModuleExports(viteChildCompiler, ctx, routeModuleId);
-        let routeFileName = path__namespace.basename(routeModuleId);
-        let clientExports = sourceExports.filter(exportName => CLIENT_ROUTE_EXPORTS.includes(exportName)).join(", ");
-        return `export { ${clientExports} } from "./${routeFileName}";`;
-      }
     },
     buildStart() {
       invariant["default"](viteConfig);
@@ -770,6 +777,34 @@ const reactRouterVitePlugin = _config => {
       var _viteChildCompiler;
       await ((_viteChildCompiler = viteChildCompiler) === null || _viteChildCompiler === void 0 ? void 0 : _viteChildCompiler.close());
     }
+  }, {
+    name: "react-router-route-entry",
+    enforce: "pre",
+    async transform(code, id, options) {
+      if (!isRouteEntry(id)) return;
+      let routeModuleId = id.replace(ROUTE_ENTRY_QUERY_STRING, "");
+      let routeFileName = path__namespace.basename(routeModuleId);
+      if (!code.includes("defineRoute")) {
+        let sourceExports = await getRouteModuleExports(viteChildCompiler, ctx, routeModuleId);
+        let reexports = sourceExports.filter(exportName => (options === null || options === void 0 ? void 0 : options.ssr) && SERVER_ONLY_ROUTE_EXPORTS.includes(exportName) || CLIENT_ROUTE_EXPORTS.includes(exportName)).join(", ");
+        return `export { ${reexports} } from "./${routeFileName}";`;
+      }
+      let renameFields = ["Component", "serverLoader", "serverAction"];
+      let fields = defineRoute.parseFields(code);
+      let reexports = fields.filter(exportName => !renameFields.includes(exportName)).filter(exportName => (options === null || options === void 0 ? void 0 : options.ssr) && SERVER_ONLY_ROUTE_EXPORTS.includes(exportName) || CLIENT_ROUTE_EXPORTS.includes(exportName)).map(reexport => `export const ${reexport} = route.${reexport};`);
+      let content = `import route from "./${routeFileName}";`;
+      if (fields.includes("Component")) {
+        content += `\n` + [`import { createElement } from "react";`, `import { useParams, useLoaderData, useActionData } from "react-router";`, `export default function Route() {`, `  let params = useParams();`, `  let loaderData = useLoaderData();`, `  let actionData = useActionData();`, `  return createElement(route.Component, { params, loaderData, actionData });`, `}`].join("\n");
+      }
+      if (options !== null && options !== void 0 && options.ssr && fields.includes("serverLoader")) {
+        content += `\nexport const loader = route.serverLoader;`;
+      }
+      if (options !== null && options !== void 0 && options.ssr && fields.includes("serverAction")) {
+        content += `\nexport const action = route.serverAction;`;
+      }
+      content += "\n" + reexports.join("\n");
+      return content;
+    }
   }, {
     name: "react-router-virtual-modules",
     enforce: "pre",
@@ -807,13 +842,13 @@ const reactRouterVitePlugin = _config => {
     enforce: "pre",
     async transform(code, id, options) {
       if (options !== null && options !== void 0 && options.ssr) return;
-      if (id.endsWith(BUILD_CLIENT_ROUTE_QUERY_STRING)) return;
+      if (!code.includes("defineRoute")) return; // temporary back compat, remove once old style routes are unsupported
+      if (id.endsWith(ROUTE_ENTRY_QUERY_STRING)) return;
       let route = getRoute(ctx.reactRouterConfig, id);
       if (!route && code.includes("defineRoute")) {
         return defineRoute.assertNotImported(code);
       }
-      if (!code.includes("defineRoute")) return; // temporary back compat, remove once old style routes are unsupported
-      defineRoute.transform(code);
+      return defineRoute.transform(code, id, options);
     }
   }, {
     name: "react-router-dot-server",
@@ -928,6 +963,11 @@ const reactRouterVitePlugin = _config => {
       let isJSX = filepath.endsWith("x");
       let useFastRefresh = !ssr && (isJSX || code.includes(devRuntime));
       if (!useFastRefresh) return;
+      if (isRouteEntry(id)) {
+        return {
+          code: addRefreshWrapper(ctx.reactRouterConfig, code, id)
+        };
+      }
       let result = await babel__default["default"].transformAsync(code, {
         babelrc: false,
         configFile: false,
@@ -996,7 +1036,7 @@ function isEqualJson(v1, v2) {
 }
 function addRefreshWrapper(reactRouterConfig, code, id) {
   let route = getRoute(reactRouterConfig, id);
-  let acceptExports = route ? ["clientAction", "clientLoader", "handle", "meta", "links", "shouldRevalidate"] : [];
+  let acceptExports = route || isRouteEntry(id) ? ["clientAction", "clientLoader", "handle", "meta", "links", "shouldRevalidate"] : [];
   return REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id)) + code + REACT_REFRESH_FOOTER.replaceAll("__SOURCE__", JSON.stringify(id)).replaceAll("__ACCEPT_EXPORTS__", JSON.stringify(acceptExports)).replaceAll("__ROUTE_ID__", JSON.stringify(route === null || route === void 0 ? void 0 : route.id));
 }
 const REACT_REFRESH_HEADER = `

package/dist/vite/profiler.js

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

package/dist/vite/remove-exports.js

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

package/dist/vite/resolve-file-url.js

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

package/dist/vite/styles.js

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

package/dist/vite/vmod.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-4996fbe2b",
+  "version": "0.0.0-experimental-ecd35cd60",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -15,7 +15,7 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "bin": {
-    "react-router": "dist/cli.js"
+    "react-router": "bin.js"
   },
   "dependencies": {
     "@babel/core": "^7.21.8",
@@ -28,6 +28,7 @@
     "@babel/types": "^7.22.5",
     "@npmcli/package-json": "^4.0.1",
     "arg": "^5.0.1",
+    "babel-dead-code-elimination": "^1.0.6",
     "chalk": "^4.1.2",
     "es-module-lexer": "^1.3.1",
     "exit-hook": "2.2.1",
@@ -42,7 +43,7 @@
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "@react-router/node": "0.0.0-experimental-4996fbe2b"
+    "@react-router/node": "0.0.0-experimental-ecd35cd60"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -66,14 +67,14 @@
     "strip-ansi": "^6.0.1",
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
-    "@react-router/serve": "0.0.0-experimental-4996fbe2b",
-    "react-router": "^0.0.0-experimental-4996fbe2b"
+    "react-router": "^0.0.0-experimental-ecd35cd60",
+    "@react-router/serve": "0.0.0-experimental-ecd35cd60"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
-    "@react-router/serve": "^0.0.0-experimental-4996fbe2b",
-    "react-router": "^0.0.0-experimental-4996fbe2b"
+    "@react-router/serve": "^0.0.0-experimental-ecd35cd60",
+    "react-router": "^0.0.0-experimental-ecd35cd60"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {
@@ -88,6 +89,7 @@
   },
   "files": [
     "dist/",
+    "bin.js",
     "CHANGELOG.md",
     "LICENSE.md",
     "README.md"