@react-router/dev 0.0.0-experimental-10a6fd0e1 → 0.0.0-experimental-4996fbe2b

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-10a6fd0e1
+ * @react-router/dev v0.0.0-experimental-4996fbe2b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -94,10 +94,6 @@ let conjunctionListFormat = new Intl.ListFormat("en", {
   style: "long",
   type: "conjunction"
 });
-let disjunctionListFormat = new Intl.ListFormat("en", {
-  style: "long",
-  type: "disjunction"
-});
 async function generateEntry(entry, reactRouterRoot, flags = {}) {
   let ctx = await plugin.loadPluginContext({
     root: reactRouterRoot,
@@ -119,16 +115,13 @@ async function generateEntry(entry, reactRouterRoot, flags = {}) {
   }
   let pkgJson = await PackageJson__default["default"].load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
-  let serverRuntime = deps["@react-router/deno"] ? "deno" : deps["@react-router/cloudflare"] ? "cloudflare" : deps["@react-router/node"] ? "node" : undefined;
-  if (!serverRuntime) {
-    let serverRuntimes = ["@react-router/deno", "@react-router/cloudflare", "@react-router/node"];
-    let formattedList = disjunctionListFormat.format(serverRuntimes);
-    console.error(colors.error(`Could not determine server runtime. Please install one of the following: ${formattedList}`));
+  if (!deps["@react-router/node"]) {
+    console.error(colors.error(`No default server entry detected.`));
     return;
   }
   let defaultsDirectory = path__namespace.resolve(__dirname, "..", "config", "defaults");
   let defaultEntryClient = path__namespace.resolve(defaultsDirectory, "entry.client.tsx");
-  let defaultEntryServer = path__namespace.resolve(defaultsDirectory, (ctx === null || ctx === void 0 ? void 0 : ctx.reactRouterConfig.ssr) === false ? `entry.server.spa.tsx` : `entry.server.${serverRuntime}.tsx`);
+  let defaultEntryServer = path__namespace.resolve(defaultsDirectory, `entry.server.node.tsx`);
   let isServerEntry = entry === "entry.server";
   let contents = isServerEntry ? await createServerEntry(rootDirectory, appDirectory, defaultEntryServer) : await createClientEntry(rootDirectory, appDirectory, defaultEntryClient);
   let useTypeScript = flags.typescript ?? true;

package/dist/cli/detectPackageManager.js

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

package/dist/cli/index.js

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

package/dist/cli/run.js

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

package/dist/cli/useJavascript.js

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

package/dist/cli.js

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

package/dist/colors.js

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

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

@@ -1,8 +1,8 @@
 import { PassThrough } from "node:stream";
 
-import type { AppLoadContext, EntryContext } from "@react-router/node";
+import type { AppLoadContext, EntryContext } from "react-router";
 import { createReadableStreamFromReadable } from "@react-router/node";
-import { RemixServer } from "react-router";
+import { ServerRouter } from "react-router";
 import * as isbotModule from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 
@@ -63,7 +63,7 @@ function handleBotRequest(
   return new Promise((resolve, reject) => {
     let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
+      <ServerRouter
         context={remixContext}
         url={request.url}
         abortDelay={ABORT_DELAY}
@@ -113,7 +113,7 @@ function handleBrowserRequest(
   return new Promise((resolve, reject) => {
     let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
+      <ServerRouter
         context={remixContext}
         url={request.url}
         abortDelay={ABORT_DELAY}

package/dist/config/findConfig.js

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

package/dist/config/flatRoutes.js

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

package/dist/config/format.js

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

package/dist/config/routes.js

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

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-10a6fd0e1
+ * @react-router/dev v0.0.0-experimental-4996fbe2b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -216,8 +216,7 @@ async function resolveEntryFiles({
   reactRouterConfig
 }) {
   let {
-    appDirectory,
-    future
+    appDirectory
   } = reactRouterConfig;
   let defaultsDirectory = path__default["default"].resolve(__dirname, "config", "defaults");
   let userEntryClientFile = findEntry(appDirectory, "entry.client");
@@ -226,24 +225,11 @@ async function resolveEntryFiles({
   let entryClientFile = userEntryClientFile || "entry.client.tsx";
   let pkgJson = await PackageJson__default["default"].load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
-  if (!reactRouterConfig.ssr) {
-    // This is a super-simple default since we don't need streaming in SPA Mode.
-    // We can include this in a remix-spa template, but right now `npx remix reveal`
-    // will still expose the streaming template since that command doesn't have
-    // access to the `ssr:false` flag in the vite config (the streaming template
-    // works just fine so maybe instead of having this we _only have this version
-    // in the template...).  We let users manage an entry.server file in SPA Mode
-    // so they can de ide if they want to hydrate the full document or just an
-    // embedded `<div id="app">` or whatever.
-    entryServerFile = "entry.server.spa.tsx";
-  } else if (userEntryServerFile) {
+  if (userEntryServerFile) {
     entryServerFile = userEntryServerFile;
   } else {
-    let serverRuntime = deps["@react-router/deno"] ? "deno" : deps["@react-router/cloudflare"] ? "cloudflare" : deps["@react-router/node"] ? "node" : undefined;
-    if (!serverRuntime) {
-      let serverRuntimes = ["@react-router/deno", "@react-router/cloudflare", "@react-router/node"];
-      let formattedList = disjunctionListFormat.format(serverRuntimes);
-      throw new Error(`Could not determine server runtime. Please install one of the following: ${formattedList}`);
+    if (!deps["@react-router/node"]) {
+      throw new Error(`Could not determine server runtime. Please install @react-router/node, or provide a custom entry.server.tsx/jsx file in your app directory.`);
     }
     if (!deps["isbot"]) {
       console.log("adding `isbot` to your package.json, you should commit this change");
@@ -260,7 +246,7 @@ async function resolveEntryFiles({
         stdio: "inherit"
       });
     }
-    entryServerFile = `entry.server.${serverRuntime}.tsx`;
+    entryServerFile = `entry.server.node.tsx`;
   }
   let entryClientFilePath = userEntryClientFile ? path__default["default"].resolve(reactRouterConfig.appDirectory, userEntryClientFile) : path__default["default"].resolve(defaultsDirectory, entryClientFile);
   let entryServerFilePath = userEntryServerFile ? path__default["default"].resolve(reactRouterConfig.appDirectory, userEntryServerFile) : path__default["default"].resolve(defaultsDirectory, entryServerFile);
@@ -277,10 +263,6 @@ function findEntry(dir, basename) {
   }
   return undefined;
 }
-let disjunctionListFormat = new Intl.ListFormat("en", {
-  style: "long",
-  type: "disjunction"
-});
 
 exports.configRouteToBranchRoute = configRouteToBranchRoute;
 exports.resolveEntryFiles = resolveEntryFiles;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * as cli from "./cli/index";
 export type { Manifest as AssetsManifest } from "./manifest";
 export type { BuildManifest, Preset, ServerBundlesFunction, VitePluginConfig, } from "./config";
-export { vitePlugin, cloudflareDevProxyVitePlugin } from "./vite";
+export { vitePlugin } from "./vite";

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-10a6fd0e1
+ * @react-router/dev v0.0.0-experimental-4996fbe2b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,10 +14,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var index = require('./cli/index.js');
 var index$1 = require('./vite/index.js');
-var cloudflareProxyPlugin = require('./vite/cloudflare-proxy-plugin.js');
 
 
 
 exports.cli = index;
 exports.vitePlugin = index$1.vitePlugin;
-exports.cloudflareDevProxyVitePlugin = cloudflareProxyPlugin.cloudflareDevProxyVitePlugin;

package/dist/invariant.js

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

package/dist/vite/babel.js

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

package/dist/vite/build.js

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

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

@@ -0,0 +1,2 @@
+export declare function transform(code: string): void;
+export declare function assertNotImported(code: string): void;

package/dist/vite/define-route.js

@@ -0,0 +1,172 @@
+/**
+ * @react-router/dev v0.0.0-experimental-4996fbe2b
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var babel$1 = require('@babel/core');
+var babel = require('./babel.js');
+var t = require('@babel/types');
+var parser = require('@babel/parser');
+
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n["default"] = e;
+    return Object.freeze(n);
+}
+
+var babel__namespace = /*#__PURE__*/_interopNamespace(babel$1);
+var t__namespace = /*#__PURE__*/_interopNamespace(t);
+
+function transform(code) {
+  let ast = parse(code);
+  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) {
+      analyzeRouteExport(path);
+    }
+  });
+}
+function analyzeRouteExport(path) {
+  let route = path.node.declaration;
+  // export default {...}
+  if (t__namespace.isObjectExpression(route)) {
+    let routePath = path.get("declaration");
+    return analyzeRoute(routePath);
+  }
+  // export default defineRoute({...})
+  if (t__namespace.isCallExpression(route)) {
+    let routePath = path.get("declaration");
+    if (!isDefineRoute(routePath.get("callee"))) {
+      throw routePath.buildCodeFrameError("Default export of a route module must be either a literal object or a call to `defineRoute`");
+    }
+    if (routePath.node.arguments.length !== 1) {
+      throw routePath.buildCodeFrameError("`defineRoute` must take exactly one argument");
+    }
+    let arg = routePath.node.arguments[0];
+    let argPath = routePath.get("arguments.0");
+    if (!t__namespace.isObjectExpression(arg)) {
+      throw argPath.buildCodeFrameError("`defineRoute` argument must be a literal object");
+    }
+    return analyzeRoute(argPath);
+  }
+  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) {
+  for (let [i, property] of path.node.properties.entries()) {
+    // spread: defineRoute({ ...dynamic })
+    if (!t__namespace.isObjectProperty(property) && !t__namespace.isObjectMethod(property)) {
+      let propertyPath = path.get(`properties.${i}`);
+      throw propertyPath.buildCodeFrameError("Properties cannot be spread into route");
+    }
+    // defineRoute({ [dynamic]: ... })
+    let propertyPath = path.get(`properties.${i}`);
+    if (property.computed || !t__namespace.isIdentifier(property.key)) {
+      throw propertyPath.buildCodeFrameError("Route cannot have computed keys");
+    }
+    // defineRoute({ params: [...] })
+    let key = property.key.name;
+    if (key === "params") {
+      let paramsPath = propertyPath;
+      if (t__namespace.isObjectMethod(paramsPath.node)) {
+        throw paramsPath.buildCodeFrameError("Route params must be a literal array");
+      }
+      if (!t__namespace.isArrayExpression(paramsPath.node.value)) {
+        throw paramsPath.buildCodeFrameError("Route params must be a literal array");
+      }
+      for (let [i, element] of paramsPath.node.value.elements.entries()) {
+        if (!t__namespace.isStringLiteral(element)) {
+          let elementPath = paramsPath.get(`value.elements.${i}`);
+          throw elementPath.buildCodeFrameError("Route param must be a literal string");
+        }
+      }
+      continue;
+    }
+  }
+  throw path.buildCodeFrameError("TODO: not yet implemented");
+}
+function assertNotImported(code) {
+  let ast = parse(code);
+  babel.traverse(ast, {
+    Identifier(path) {
+      if (isDefineRoute(path)) {
+        throw path.buildCodeFrameError("`defineRoute` cannot be used outside of route modules");
+      }
+    }
+  });
+}
+function parse(source) {
+  let ast = parser.parse(source, {
+    sourceType: "module",
+    plugins: ["jsx", ["typescript", {}]]
+  });
+  // Workaround for `path.buildCodeFrameError`
+  // See:
+  // - https://github.com/babel/babel/issues/11889
+  // - https://github.com/babel/babel/issues/11350#issuecomment-606169054
+  // @ts-expect-error `@types/babel__core` is missing types for `File`
+  new babel__namespace.File({
+    filename: undefined
+  }, {
+    code: source,
+    ast
+  });
+  return ast;
+}
+function isDefineRoute(path) {
+  if (!t__namespace.isIdentifier(path.node)) return false;
+  let binding = path.scope.getBinding(path.node.name);
+  if (!binding) return false;
+  return isCanonicallyImportedAs(binding, {
+    imported: "defineRoute",
+    source: "react-router"
+  });
+}
+function isCanonicallyImportedAs(binding, {
+  source: sourceName,
+  imported: importedName
+}) {
+  // import source
+  if (!t__namespace.isImportDeclaration(binding === null || binding === void 0 ? void 0 : binding.path.parent)) return false;
+  if (binding.path.parent.source.value !== sourceName) return false;
+  // import specifier
+  if (!t__namespace.isImportSpecifier(binding === null || binding === void 0 ? void 0 : binding.path.node)) return false;
+  let {
+    imported
+  } = binding.path.node;
+  if (!t__namespace.isIdentifier(imported)) return false;
+  if (imported.name !== importedName) return false;
+  return true;
+}
+
+exports.assertNotImported = assertNotImported;
+exports.transform = transform;

package/dist/vite/dev.js

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

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

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

package/dist/vite/index.d.ts

@@ -1,3 +1,2 @@
 import type { ReactRouterVitePlugin } from "./plugin";
 export declare const vitePlugin: ReactRouterVitePlugin;
-export { cloudflareDevProxyVitePlugin } from "./cloudflare-proxy-plugin";

package/dist/vite/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-10a6fd0e1
+ * @react-router/dev v0.0.0-experimental-4996fbe2b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,12 +12,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('@react-router/server-runtime');
-require('node:events');
-require('node:stream');
-require('set-cookie-parser');
-require('@react-router/node');
-
 const vitePlugin = (...args) => {
   let {
     reactRouterVitePlugin

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-10a6fd0e1
+ * @react-router/dev v0.0.0-experimental-4996fbe2b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -33,7 +33,7 @@ function fromNodeHeaders(nodeHeaders) {
   }
   return headers;
 }
-// Based on `createRemixRequest` in packages/remix-express/server.ts
+// Based on `createRemixRequest` in packages/react-router-express/server.ts
 function fromNodeRequest(nodeReq) {
   let origin = nodeReq.headers.origin && "null" !== nodeReq.headers.origin ? nodeReq.headers.origin : `http://${nodeReq.headers.host}`;
   // Use `req.originalUrl` so React Router is aware of the full path

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-10a6fd0e1
+ * @react-router/dev v0.0.0-experimental-4996fbe2b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -17,7 +17,6 @@ var path = require('node:path');
 var url = require('node:url');
 var fse = require('fs-extra');
 var babel = require('@babel/core');
-var serverRuntime = require('@react-router/server-runtime');
 var reactRouter = require('react-router');
 var esModuleLexer = require('es-module-lexer');
 var jsesc = require('jsesc');
@@ -31,6 +30,7 @@ var resolveFileUrl = require('./resolve-file-url.js');
 var removeExports = require('./remove-exports.js');
 var importViteEsmSync = require('./import-vite-esm-sync.js');
 var config = require('../config.js');
+var defineRoute = require('./define-route.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -459,7 +459,7 @@ const reactRouterVitePlugin = _config => {
   return [{
     name: "react-router",
     config: async (_viteUserConfig, _viteConfigEnv) => {
-      var _viteUserConfig$serve, _viteUserConfig$serve2, _viteUserConfig$build4;
+      var _viteUserConfig$serve, _viteUserConfig$serve2, _viteUserConfig$build4, _viteUserConfig$build5, _viteUserConfig$build6;
       // Preload Vite's ESM build up-front as soon as we're in an async context
       await importViteEsmSync.preloadViteEsm();
       // Ensure sync import of Vite works after async preload
@@ -496,7 +496,7 @@ const reactRouterVitePlugin = _config => {
           // This is only needed within this repo because these packages
           // are linked to a directory outside of node_modules so Vite
           // treats them as internal code by default.
-          "react-router", "react-router-dom", "@react-router/architect", "@react-router/cloudflare-pages", "@react-router/cloudflare-workers", "@react-router/cloudflare", "@react-router/deno", "@react-router/dev", "@react-router/express", "@react-router/netlify", "@react-router/node", "@react-router/serve", "@react-router/server-runtime"] : undefined
+          "react-router", "react-router-dom", "@react-router/dev", "@react-router/express", "@react-router/node", "@react-router/serve"] : undefined
         },
         optimizeDeps: {
           include: [
@@ -557,7 +557,7 @@ const reactRouterVitePlugin = _config => {
               rollupOptions: {
                 ...baseRollupOptions,
                 preserveEntrySignatures: "exports-only",
-                input: serverBuildId,
+                input: ((_viteUserConfig$build5 = viteUserConfig.build) === null || _viteUserConfig$build5 === void 0 ? void 0 : (_viteUserConfig$build6 = _viteUserConfig$build5.rollupOptions) === null || _viteUserConfig$build6 === void 0 ? void 0 : _viteUserConfig$build6.input) ?? serverBuildId,
                 output: {
                   entryFileNames: ctx.reactRouterConfig.serverBuildFile,
                   format: ctx.reactRouterConfig.serverModuleFormat
@@ -652,7 +652,7 @@ const reactRouterVitePlugin = _config => {
       }
     },
     async configureServer(viteDevServer) {
-      serverRuntime.unstable_setDevServerHooks({
+      reactRouter.unstable_setDevServerHooks({
         // Give the request handler access to the critical CSS in dev to avoid a
         // flash of unstyled content since Vite injects CSS file contents via JS
         getCriticalCss: async (build, url) => {
@@ -698,7 +698,7 @@ const reactRouterVitePlugin = _config => {
           viteDevServer.middlewares.use(async (req, res, next) => {
             try {
               let build = await viteDevServer.ssrLoadModule(serverBuildId);
-              let handler = serverRuntime.createRequestHandler(build, "development");
+              let handler = reactRouter.createRequestHandler(build, "development");
               let nodeHandler = async (nodeReq, nodeRes) => {
                 let req = nodeAdapter.fromNodeRequest(nodeReq);
                 let res = await handler(req, await reactRouterDevLoadContext(req));
@@ -802,6 +802,19 @@ const reactRouterVitePlugin = _config => {
           }
       }
     }
+  }, {
+    name: "react-router-define-route",
+    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;
+      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);
+    }
   }, {
     name: "react-router-dot-server",
     enforce: "pre",
@@ -972,9 +985,9 @@ const reactRouterVitePlugin = _config => {
   }];
 };
 function isInReactRouterMonorepo() {
-  // We use '@react-router/server-runtime' for this check since it's a
+  // We use '@react-router/node' for this check since it's a
   // dependency of this package and guaranteed to be in node_modules
-  let serverRuntimePath = path__namespace.dirname(require.resolve("@react-router/server-runtime/package.json"));
+  let serverRuntimePath = path__namespace.dirname(require.resolve("@react-router/node/package.json"));
   let serverRuntimeParentDir = path__namespace.basename(path__namespace.resolve(serverRuntimePath, ".."));
   return serverRuntimeParentDir === "packages";
 }
@@ -1052,7 +1065,7 @@ async function getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, server
   let build = await import(url__namespace.pathToFileURL(serverBuildPath).toString());
   let {
     createRequestHandler: createHandler
-  } = await import('@react-router/node');
+  } = await import('react-router');
   return {
     build,
     handler: createHandler(build, viteConfig.mode)
@@ -1133,7 +1146,7 @@ function validatePrerenderedHtml(html, prefix) {
     throw new Error(`${prefix}: Did you forget to include <Scripts/> in your root route? ` + "Your pre-rendered HTML files cannot hydrate without `<Scripts />`.");
   }
 }
-// Note: Duplicated from remix-server-runtime
+// Note: Duplicated from react-router/lib/server-runtime
 function groupRoutesByParentId(manifest) {
   let routes = {};
   Object.values(manifest).forEach(route => {
@@ -1145,7 +1158,7 @@ function groupRoutesByParentId(manifest) {
   });
   return routes;
 }
-// Note: Duplicated from remix-server-runtime
+// Note: Duplicated from react-router/lib/server-runtime
 function createPrerenderRoutes(manifest, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) {
   return (routesByParentId[parentId] || []).map(route => {
     let commonRoute = {

package/dist/vite/profiler.js

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

package/dist/vite/remove-exports.js

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

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

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

package/dist/vite/styles.d.ts

@@ -1,4 +1,4 @@
-import type { ServerBuild } from "@react-router/server-runtime";
+import type { ServerBuild } from "react-router";
 import type { ViteDevServer } from "vite";
 import type { ResolvedVitePluginConfig } from "../config";
 export declare const isCssModulesFile: (file: string) => boolean;

package/dist/vite/styles.js

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

package/dist/vite/vmod.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-10a6fd0e1",
+  "version": "0.0.0-experimental-4996fbe2b",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -9,7 +9,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/remix-run/react-router",
-    "directory": "packages/remix-dev"
+    "directory": "packages/react-router-dev"
   },
   "license": "MIT",
   "main": "dist/index.js",
@@ -42,9 +42,7 @@
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "@react-router/node": "0.0.0-experimental-10a6fd0e1",
-    "@react-router/server-runtime": "0.0.0-experimental-10a6fd0e1",
-    "react-router": "0.0.0-experimental-10a6fd0e1"
+    "@react-router/node": "0.0.0-experimental-4996fbe2b"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -61,22 +59,21 @@
     "@types/prettier": "^2.7.3",
     "@types/set-cookie-parser": "^2.4.1",
     "dotenv": "^16.0.0",
-    "execa": "5.1.1",
-    "express": "^4.17.1",
     "esbuild-register": "^3.3.2",
+    "execa": "5.1.1",
+    "express": "^4.19.2",
     "fast-glob": "3.2.11",
     "strip-ansi": "^6.0.1",
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
-    "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-10a6fd0e1"
+    "@react-router/serve": "0.0.0-experimental-4996fbe2b",
+    "react-router": "^0.0.0-experimental-4996fbe2b"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
-    "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-10a6fd0e1",
-    "@react-router/serve": "^0.0.0-experimental-10a6fd0e1"
+    "@react-router/serve": "^0.0.0-experimental-4996fbe2b",
+    "react-router": "^0.0.0-experimental-4996fbe2b"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {
@@ -84,12 +81,6 @@
     },
     "typescript": {
       "optional": true
-    },
-    "vite": {
-      "optional": true
-    },
-    "wrangler": {
-      "optional": true
     }
   },
   "engines": {

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

@@ -1,55 +0,0 @@
-import type { AppLoadContext, EntryContext } from "@react-router/cloudflare";
-import { RemixServer } from "react-router";
-import * as isbotModule from "isbot";
-import { renderToReadableStream } from "react-dom/server";
-
-export default async function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  loadContext: AppLoadContext
-) {
-  const body = await renderToReadableStream(
-    <RemixServer context={remixContext} url={request.url} />,
-    {
-      signal: request.signal,
-      onError(error: unknown) {
-        // Log streaming rendering errors from inside the shell
-        console.error(error);
-        responseStatusCode = 500;
-      },
-    }
-  );
-
-  if (isBotRequest(request.headers.get("user-agent"))) {
-    await body.allReady;
-  }
-
-  responseHeaders.set("Content-Type", "text/html");
-  return new Response(body, {
-    headers: responseHeaders,
-    status: responseStatusCode,
-  });
-}
-
-// 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;
-}

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

@@ -1,55 +0,0 @@
-import type { AppLoadContext, EntryContext } from "@react-router/deno";
-import { RemixServer } from "@remix-run/react";
-import * as isbotModule from "isbot";
-import { renderToReadableStream } from "react-dom/server";
-
-export default async function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  loadContext: AppLoadContext
-) {
-  const body = await renderToReadableStream(
-    <RemixServer context={remixContext} url={request.url} />,
-    {
-      signal: request.signal,
-      onError(error: unknown) {
-        // Log streaming rendering errors from inside the shell
-        console.error(error);
-        responseStatusCode = 500;
-      },
-    }
-  );
-
-  if (isBotRequest(request.headers.get("user-agent"))) {
-    await body.allReady;
-  }
-
-  responseHeaders.set("Content-Type", "text/html");
-  return new Response(body, {
-    headers: responseHeaders,
-    status: responseStatusCode,
-  });
-}
-
-// 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;
-}

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

@@ -1,73 +0,0 @@
-import { PassThrough } from "node:stream";
-
-import type { AppLoadContext, EntryContext } from "@react-router/node";
-import { createReadableStreamFromReadable } from "@react-router/node";
-import { RemixServer } from "react-router";
-import { renderToPipeableStream } from "react-dom/server";
-
-const ABORT_DELAY = 5_000;
-
-export default function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  loadContext: AppLoadContext
-) {
-  return handleBotRequest(
-    request,
-    responseStatusCode,
-    responseHeaders,
-    remixContext
-  );
-}
-
-function handleBotRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  return new Promise((resolve, reject) => {
-    let shellRendered = false;
-    const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
-        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);
-          }
-        },
-      }
-    );
-
-    setTimeout(abort, ABORT_DELAY);
-  });
-}

package/dist/vite/cloudflare-proxy-plugin.d.ts

@@ -1,15 +0,0 @@
-import type { AppLoadContext } from "@react-router/server-runtime";
-import type { Plugin } from "vite";
-import type { GetPlatformProxyOptions, PlatformProxy } from "wrangler";
-type CfProperties = Record<string, unknown>;
-type LoadContext<Env, Cf extends CfProperties> = {
-    cloudflare: Omit<PlatformProxy<Env, Cf>, "dispose">;
-};
-type GetLoadContext<Env, Cf extends CfProperties> = (args: {
-    request: Request;
-    context: LoadContext<Env, Cf>;
-}) => AppLoadContext | Promise<AppLoadContext>;
-export declare const cloudflareDevProxyVitePlugin: <Env, Cf extends CfProperties>({ getLoadContext, ...options }?: {
-    getLoadContext?: GetLoadContext<Env, Cf>;
-} & GetPlatformProxyOptions) => Plugin;
-export {};

package/dist/vite/cloudflare-proxy-plugin.js

@@ -1,82 +0,0 @@
-/**
- * @react-router/dev v0.0.0-experimental-10a6fd0e1
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var serverRuntime = require('@react-router/server-runtime');
-var nodeAdapter = require('./node-adapter.js');
-
-let serverBuildId = "virtual:react-router/server-build";
-function importWrangler() {
-  try {
-    return import('wrangler');
-  } catch (_) {
-    throw Error("Could not import `wrangler`. Do you have it installed?");
-  }
-}
-const NAME = "vite-plugin-react-router-cloudflare-proxy";
-const cloudflareDevProxyVitePlugin = ({
-  getLoadContext,
-  ...options
-} = {}) => {
-  return {
-    name: NAME,
-    config: () => ({
-      ssr: {
-        resolve: {
-          externalConditions: ["workerd", "worker"]
-        }
-      }
-    }),
-    configResolved: viteConfig => {
-      let pluginIndex = name => viteConfig.plugins.findIndex(plugin => plugin.name === name);
-      let reactRouterPluginIndex = pluginIndex("react-router");
-      if (reactRouterPluginIndex >= 0 && reactRouterPluginIndex < pluginIndex(NAME)) {
-        throw new Error(`The "${NAME}" plugin should be placed before the React Router plugin in your Vite config file`);
-      }
-    },
-    configureServer: async viteDevServer => {
-      let {
-        getPlatformProxy
-      } = await importWrangler();
-      // Do not include `dispose` in Cloudflare context
-      let {
-        dispose,
-        ...cloudflare
-      } = await getPlatformProxy(options);
-      let context = {
-        cloudflare
-      };
-      return () => {
-        if (!viteDevServer.config.server.middlewareMode) {
-          viteDevServer.middlewares.use(async (nodeReq, nodeRes, next) => {
-            try {
-              let build = await viteDevServer.ssrLoadModule(serverBuildId);
-              let handler = serverRuntime.createRequestHandler(build, "development");
-              let req = nodeAdapter.fromNodeRequest(nodeReq);
-              let loadContext = getLoadContext ? await getLoadContext({
-                request: req,
-                context
-              }) : context;
-              let res = await handler(req, loadContext);
-              await nodeAdapter.toNodeRequest(res, nodeRes);
-            } catch (error) {
-              next(error);
-            }
-          });
-        }
-      };
-    }
-  };
-};
-
-exports.cloudflareDevProxyVitePlugin = cloudflareDevProxyVitePlugin;