@react-router/dev 0.0.0-experimental-49eef6a01 → 0.0.0-experimental-a26b992a1

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,15 +13,28 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var reactRouter = require('react-router');
-var wrangler = require('wrangler');
 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 PLUGIN_NAME = "react-router-cloudflare-vite-dev-proxy";
-const cloudflareDevProxyVitePlugin = ({
-  getLoadContext,
-  ...options
-} = {}) => {
+/**
+ * Vite plugin that provides [Node proxies to local workerd
+ * bindings](https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy)
+ * to `context.cloudflare` in your server loaders and server actions during
+ * development.
+ */
+const cloudflareDevProxyVitePlugin = (options = {}) => {
+  let {
+    getLoadContext,
+    ...restOptions
+  } = options;
   return {
     name: PLUGIN_NAME,
     config: () => ({
@@ -39,11 +52,14 @@ const cloudflareDevProxyVitePlugin = ({
       }
     },
     configureServer: async viteDevServer => {
+      let {
+        getPlatformProxy
+      } = await importWrangler();
       // Do not include `dispose` in Cloudflare context
       let {
         dispose,
         ...cloudflare
-      } = await wrangler.getPlatformProxy(options);
+      } = await getPlatformProxy(restOptions);
       let context = {
         cloudflare
       };

package/dist/vite/cloudflare.d.ts

@@ -0,0 +1 @@
+export { cloudflareDevProxyVitePlugin as cloudflareDevProxy } from "./cloudflare-dev-proxy";

package/dist/vite/cloudflare.js

@@ -0,0 +1,19 @@
+/**
+ * @react-router/dev v0.0.0-experimental-a26b992a1
+ *
+ * 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 cloudflareDevProxy = require('./cloudflare-dev-proxy.js');
+
+
+
+exports.cloudflareDevProxy = cloudflareDevProxy.cloudflareDevProxyVitePlugin;

package/dist/vite/combine-urls.d.ts

@@ -0,0 +1 @@
+export declare function combineURLs(baseURL: string, relativeURL: string): string;

package/dist/vite/combine-urls.js

@@ -0,0 +1,20 @@
+/**
+ * @react-router/dev v0.0.0-experimental-a26b992a1
+ *
+ * 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 });
+
+// Borrowed from axios: https://github.com/axios/axios/blob/0e4f9fa29077ebee4499facea6be1492b42e8a26/lib/helpers/combineURLs.js#L11-L15
+function combineURLs(baseURL, relativeURL) {
+  return relativeURL ? baseURL.replace(/\/+$/, "") + "/" + relativeURL.replace(/^\/+/, "") : baseURL;
+}
+
+exports.combineURLs = combineURLs;

package/dist/{config.d.ts → vite/config.d.ts}

@@ -1,20 +1,21 @@
 import type * as Vite from "vite";
-import { type RouteManifest, type ConfigRoute, type DefineRoutesFunction } from "./config/routes";
+import type { ViteNodeRunner } from "vite-node/client";
+import { type RouteManifest, type RouteManifestEntry } from "../config/routes";
 declare const excludedConfigPresetKeys: readonly ["presets"];
 type ExcludedConfigPresetKey = (typeof excludedConfigPresetKeys)[number];
-type ConfigPreset = Omit<VitePluginConfig, ExcludedConfigPresetKey>;
+type ConfigPreset = Omit<ReactRouterConfig, ExcludedConfigPresetKey>;
 export type Preset = {
     name: string;
     reactRouterConfig?: (args: {
-        reactRouterUserConfig: VitePluginConfig;
+        reactRouterUserConfig: ReactRouterConfig;
     }) => ConfigPreset | Promise<ConfigPreset>;
     reactRouterConfigResolved?: (args: {
-        reactRouterConfig: ResolvedVitePluginConfig;
+        reactRouterConfig: ResolvedReactRouterConfig;
     }) => void | Promise<void>;
 };
 declare const branchRouteProperties: readonly ["id", "path", "file", "index"];
-type BranchRoute = Pick<ConfigRoute, (typeof branchRouteProperties)[number]>;
-export declare const configRouteToBranchRoute: (configRoute: ConfigRoute) => BranchRoute;
+type BranchRoute = Pick<RouteManifestEntry, (typeof branchRouteProperties)[number]>;
+export declare const configRouteToBranchRoute: (configRoute: RouteManifestEntry) => BranchRoute;
 export type ServerBundlesFunction = (args: {
     branch: BranchRoute[];
 }) => string | Promise<string>;
@@ -36,38 +37,23 @@ export type ServerBundlesBuildManifest = BaseBuildManifest & {
 };
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
-    v3_fetcherPersist: boolean;
-    v3_relativeSplatPath: boolean;
-    v3_throwAbortReason: boolean;
 }
 export type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
 type BuildEndHook = (args: {
     buildManifest: BuildManifest | undefined;
-    reactRouterConfig: ResolvedVitePluginConfig;
+    reactRouterConfig: ResolvedReactRouterConfig;
     viteConfig: Vite.ResolvedConfig;
 }) => void | Promise<void>;
-export type VitePluginConfig = {
+export type ReactRouterConfig = {
     /**
      * The path to the `app` directory, relative to `remix.config.js`. Defaults
      * to `"app"`.
      */
     appDirectory?: string;
-    /**
-     * A function for defining custom routes, in addition to those already defined
-     * using the filesystem convention in `app/routes`. Both sets of routes will
-     * be merged.
-     */
-    routes?: (defineRoutes: DefineRoutesFunction) => ReturnType<DefineRoutesFunction> | Promise<ReturnType<DefineRoutesFunction>>;
     /**
      * The output format of the server build. Defaults to "esm".
      */
     serverModuleFormat?: ServerModuleFormat;
-    /**
-     * A list of filenames or a glob patterns to match files in the `app/routes`
-     * directory that Remix will ignore. Matching files will not be recognized as
-     * routes.
-     */
-    ignoredRouteFiles?: string[];
     /**
      * Enabled future flags
      */
@@ -117,7 +103,7 @@ export type VitePluginConfig = {
      */
     ssr?: boolean;
 };
-export type ResolvedVitePluginConfig = Readonly<{
+export type ResolvedReactRouterConfig = Readonly<{
     /**
      * The absolute path to the application source directory.
      */
@@ -171,11 +157,13 @@ export type ResolvedVitePluginConfig = Readonly<{
     ssr: boolean;
 }>;
 export declare function resolvePublicPath(viteUserConfig: Vite.UserConfig): string;
-export declare function resolveReactRouterConfig({ rootDirectory, reactRouterUserConfig, viteUserConfig, viteCommand, }: {
+export declare function resolveReactRouterConfig({ rootDirectory, reactRouterUserConfig, routeConfigChanged, viteUserConfig, viteCommand, viteNodeRunner, }: {
     rootDirectory: string;
-    reactRouterUserConfig: VitePluginConfig;
+    reactRouterUserConfig: ReactRouterConfig;
+    routeConfigChanged: boolean;
     viteUserConfig: Vite.UserConfig;
     viteCommand: Vite.ConfigEnv["command"];
+    viteNodeRunner: ViteNodeRunner;
 }): Promise<Readonly<{
     /**
      * The absolute path to the application source directory.
@@ -231,7 +219,7 @@ export declare function resolveReactRouterConfig({ rootDirectory, reactRouterUse
 }>>;
 export declare function resolveEntryFiles({ rootDirectory, reactRouterConfig, }: {
     rootDirectory: string;
-    reactRouterConfig: ResolvedVitePluginConfig;
+    reactRouterConfig: ResolvedReactRouterConfig;
 }): Promise<{
     entryClientFilePath: string;
     entryServerFilePath: string;

package/dist/{config.js → vite/config.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,9 +19,9 @@ var colors = require('picocolors');
 var pick = require('lodash/pick');
 var omit = require('lodash/omit');
 var PackageJson = require('@npmcli/package-json');
-var routes = require('./config/routes.js');
-var flatRoutes = require('./config/flatRoutes.js');
-var detectPackageManager = require('./cli/detectPackageManager.js');
+var routes = require('../config/routes.js');
+var detectPackageManager = require('../cli/detectPackageManager.js');
+var importViteEsmSync = require('./import-vite-esm-sync.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -54,21 +54,8 @@ let mergeReactRouterConfig = (...configs) => {
           ...configB.future
         }
       } : {}),
-      ...(mergeRequired("ignoredRouteFiles") ? {
-        ignoredRouteFiles: Array.from(new Set([...(configA.ignoredRouteFiles ?? []), ...(configB.ignoredRouteFiles ?? [])]))
-      } : {}),
       ...(mergeRequired("presets") ? {
         presets: [...(configA.presets ?? []), ...(configB.presets ?? [])]
-      } : {}),
-      ...(mergeRequired("routes") ? {
-        routes: async (...args) => {
-          var _configA$routes, _configB$routes;
-          let [routesA, routesB] = await Promise.all([(_configA$routes = configA.routes) === null || _configA$routes === void 0 ? void 0 : _configA$routes.call(configA, ...args), (_configB$routes = configB.routes) === null || _configB$routes === void 0 ? void 0 : _configB$routes.call(configB, ...args)]);
-          return {
-            ...routesA,
-            ...routesB
-          };
-        }
       } : {})
     };
   };
@@ -89,13 +76,21 @@ let deepFreeze = o => {
 function resolvePublicPath(viteUserConfig) {
   return viteUserConfig.base ?? "/";
 }
+let isFirstLoad = true;
+let lastValidRoutes = {};
 async function resolveReactRouterConfig({
   rootDirectory,
   reactRouterUserConfig,
+  routeConfigChanged,
   viteUserConfig,
-  viteCommand
+  viteCommand,
+  viteNodeRunner
 }) {
   var _viteUserConfig$serve;
+  let vite = importViteEsmSync.importViteEsmSync();
+  let logger = vite.createLogger(viteUserConfig.logLevel, {
+    prefix: "[react-router]"
+  });
   let presets = (await Promise.all((reactRouterUserConfig.presets ?? []).map(async preset => {
     if (!preset.name) {
       throw new Error("React Router presets must have a `name` property defined.");
@@ -122,9 +117,6 @@ async function resolveReactRouterConfig({
     basename,
     buildDirectory: userBuildDirectory,
     buildEnd,
-    future: userFuture,
-    ignoredRouteFiles,
-    routes: userRoutesFunction,
     prerender: prerenderConfig,
     serverBuildFile,
     serverBundles,
@@ -147,18 +139,22 @@ async function resolveReactRouterConfig({
     } else if (typeof prerenderConfig === "function") {
       prerender = await prerenderConfig();
     } else {
-      throw new Error("The `prerender` config must be an array of string paths, or a function " + "returning an array of string paths");
+      logger.error(colors__default["default"].red("The `prerender` config must be an array of string paths, or a function " + "returning an array of string paths"));
+      process.exit(1);
     }
   }
   let appDirectory = path__default["default"].resolve(rootDirectory, userAppDirectory || "app");
   let buildDirectory = path__default["default"].resolve(rootDirectory, userBuildDirectory);
   let publicPath = resolvePublicPath(viteUserConfig);
   if (basename !== "/" && viteCommand === "serve" && !((_viteUserConfig$serve = viteUserConfig.server) !== null && _viteUserConfig$serve !== void 0 && _viteUserConfig$serve.middlewareMode) && !basename.startsWith(publicPath)) {
-    throw new Error("When using the React Router `basename` and the Vite `base` config, " + "the `basename` config must begin with `base` for the default " + "Vite dev server.");
+    logger.error(colors__default["default"].red("When using the React Router `basename` and the Vite `base` config, " + "the `basename` config must begin with `base` for the default " + "Vite dev server."));
+    process.exit(1);
   }
   let rootRouteFile = findEntry(appDirectory, "root");
   if (!rootRouteFile) {
-    throw new Error(`Missing "root" route file in ${appDirectory}`);
+    let rootRouteDisplayPath = path__default["default"].relative(rootDirectory, path__default["default"].join(appDirectory, "root.tsx"));
+    logger.error(colors__default["default"].red(`Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`));
+    process.exit(1);
   }
   let routes$1 = {
     root: {
@@ -167,29 +163,49 @@ async function resolveReactRouterConfig({
       file: rootRouteFile
     }
   };
-  if (fse__default["default"].existsSync(path__default["default"].resolve(appDirectory, "routes"))) {
-    let fileRoutes = flatRoutes.flatRoutes(appDirectory, ignoredRouteFiles);
-    for (let route of Object.values(fileRoutes)) {
-      routes$1[route.id] = {
-        ...route,
-        parentId: route.parentId || "root"
-      };
+  let routeConfigFile = findEntry(appDirectory, "routes");
+  class FriendlyError extends Error {}
+  try {
+    if (!routeConfigFile) {
+      let routeConfigDisplayPath = vite.normalizePath(path__default["default"].relative(rootDirectory, path__default["default"].join(appDirectory, "routes.ts")));
+      throw new FriendlyError(`Route config file not found at "${routeConfigDisplayPath}".`);
     }
-  }
-  if (userRoutesFunction) {
-    let userRoutes = await userRoutesFunction(routes.defineRoutes);
-    for (let route of Object.values(userRoutes)) {
-      routes$1[route.id] = {
-        ...route,
-        parentId: route.parentId || "root"
-      };
+    routes.setAppDirectory(appDirectory);
+    let routeConfigExport = (await viteNodeRunner.executeFile(path__default["default"].join(appDirectory, routeConfigFile))).routes;
+    let routeConfig = await routeConfigExport;
+    let result = routes.validateRouteConfig({
+      routeConfigFile,
+      routeConfig
+    });
+    if (!result.valid) {
+      throw new FriendlyError(result.message);
     }
+    routes$1 = {
+      ...routes$1,
+      ...routes.configRoutesToRouteManifest(routeConfig)
+    };
+    lastValidRoutes = routes$1;
+    if (routeConfigChanged) {
+      logger.info(colors__default["default"].green("Route config changed."), {
+        clear: true,
+        timestamp: true
+      });
+    }
+  } catch (error) {
+    var _error$loc, _error$loc2, _error$frame$trim, _error$frame;
+    logger.error(error instanceof FriendlyError ? colors__default["default"].red(error.message) : [colors__default["default"].red(`Route config in "${routeConfigFile}" is invalid.`), "", (_error$loc = error.loc) !== null && _error$loc !== void 0 && _error$loc.file && (_error$loc2 = error.loc) !== null && _error$loc2 !== void 0 && _error$loc2.column && error.frame ? [path__default["default"].relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column, (_error$frame$trim = (_error$frame = error.frame).trim) === null || _error$frame$trim === void 0 ? void 0 : _error$frame$trim.call(_error$frame)] : error.stack].flat().join("\n") + "\n", {
+      error,
+      clear: !isFirstLoad,
+      timestamp: !isFirstLoad
+    });
+    // Bail if this is the first time loading config, otherwise keep the dev server running
+    if (isFirstLoad) {
+      process.exit(1);
+    }
+    // Keep dev server running with the last valid routes to allow for correction
+    routes$1 = lastValidRoutes;
   }
-  let future = {
-    v3_fetcherPersist: (userFuture === null || userFuture === void 0 ? void 0 : userFuture.v3_fetcherPersist) === true,
-    v3_relativeSplatPath: (userFuture === null || userFuture === void 0 ? void 0 : userFuture.v3_relativeSplatPath) === true,
-    v3_throwAbortReason: (userFuture === null || userFuture === void 0 ? void 0 : userFuture.v3_throwAbortReason) === true
-  };
+  let future = {};
   let reactRouterConfig = deepFreeze({
     appDirectory,
     basename,
@@ -209,6 +225,7 @@ async function resolveReactRouterConfig({
       reactRouterConfig
     }));
   }
+  isFirstLoad = false;
   return reactRouterConfig;
 }
 async function resolveEntryFiles({
@@ -218,7 +235,7 @@ async function resolveEntryFiles({
   let {
     appDirectory
   } = reactRouterConfig;
-  let defaultsDirectory = path__default["default"].resolve(__dirname, "config", "defaults");
+  let defaultsDirectory = path__default["default"].resolve(__dirname, "..", "config", "defaults");
   let userEntryClientFile = findEntry(appDirectory, "entry.client");
   let userEntryServerFile = findEntry(appDirectory, "entry.server");
   let entryServerFile;

package/dist/vite/dev.js

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

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

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

package/dist/vite/node-adapter.js

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

package/dist/vite/plugin.d.ts

@@ -1,7 +1,7 @@
 import type * as Vite from "vite";
 import { type RouteManifest } from "../config/routes";
 import type { Manifest as ReactRouterManifest } from "../manifest";
-import { type VitePluginConfig, type ResolvedVitePluginConfig } from "../config";
+import { type ReactRouterConfig, type ResolvedReactRouterConfig } from "./config";
 export declare function resolveViteConfig({ configFile, mode, root, }: {
     configFile?: string;
     mode?: string;
@@ -61,12 +61,15 @@ export type ReactRouterPluginContext = ReactRouterPluginSsrBuildContext & {
     entryClientFilePath: string;
     entryServerFilePath: string;
     publicPath: string;
-    reactRouterConfig: ResolvedVitePluginConfig;
+    reactRouterConfig: ResolvedReactRouterConfig;
     viteManifestEnabled: boolean;
 };
 export declare let getServerBuildDirectory: (ctx: ReactRouterPluginContext) => string;
 type MaybePromise<T> = T | Promise<T>;
 export declare let setReactRouterDevLoadContext: (loadContext: (request: Request) => MaybePromise<Record<string, unknown>>) => void;
-export type ReactRouterVitePlugin = (config?: VitePluginConfig) => Vite.Plugin[];
+type ReactRouterVitePlugin = (config?: ReactRouterConfig) => Vite.Plugin[];
+/**
+ * React Router [Vite plugin.](https://vitejs.dev/guide/using-plugins.html)
+ */
 export declare const reactRouterVitePlugin: ReactRouterVitePlugin;
 export {};