@react-router/dev 0.0.0-experimental-7b411a741 → 0.0.0-experimental-79e23be50

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -15,29 +15,202 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var node_child_process = require('node:child_process');
 var path = require('node:path');
 var fse = require('fs-extra');
+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 serverModes = require('./config/serverModes.js');
-var flatRoutes = require('./config/flat-routes.js');
+var flatRoutes = require('./config/flatRoutes.js');
 var detectPackageManager = require('./cli/detectPackageManager.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
+var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
+var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var PackageJson__default = /*#__PURE__*/_interopDefaultLegacy(PackageJson);
 
-async function resolveConfig(appConfig, {
+const excludedConfigPresetKeys = ["presets"];
+// Only expose a subset of route properties to the "serverBundles" function
+const branchRouteProperties = ["id", "path", "file", "index"];
+const configRouteToBranchRoute = configRoute => pick__default["default"](configRoute, branchRouteProperties);
+let mergeReactRouterConfig = (...configs) => {
+  let reducer = (configA, configB) => {
+    let mergeRequired = key => configA[key] !== undefined && configB[key] !== undefined;
+    return {
+      ...configA,
+      ...configB,
+      ...(mergeRequired("buildEnd") ? {
+        buildEnd: async (...args) => {
+          var _configA$buildEnd, _configB$buildEnd;
+          await Promise.all([(_configA$buildEnd = configA.buildEnd) === null || _configA$buildEnd === void 0 ? void 0 : _configA$buildEnd.call(configA, ...args), (_configB$buildEnd = configB.buildEnd) === null || _configB$buildEnd === void 0 ? void 0 : _configB$buildEnd.call(configB, ...args)]);
+        }
+      } : {}),
+      ...(mergeRequired("future") ? {
+        future: {
+          ...configA.future,
+          ...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
+          };
+        }
+      } : {})
+    };
+  };
+  return configs.reduce(reducer, {});
+};
+// Inlined from https://github.com/jsdf/deep-freeze
+let deepFreeze = o => {
+  Object.freeze(o);
+  let oIsFunction = typeof o === "function";
+  let hasOwnProp = Object.prototype.hasOwnProperty;
+  Object.getOwnPropertyNames(o).forEach(function (prop) {
+    if (hasOwnProp.call(o, prop) && (oIsFunction ? prop !== "caller" && prop !== "callee" && prop !== "arguments" : true) && o[prop] !== null && (typeof o[prop] === "object" || typeof o[prop] === "function") && !Object.isFrozen(o[prop])) {
+      deepFreeze(o[prop]);
+    }
+  });
+  return o;
+};
+async function resolveReactRouterConfig({
   rootDirectory,
-  serverMode = serverModes.ServerMode.Production,
-  isSpaMode = false
+  reactRouterUserConfig,
+  viteUserConfig,
+  viteCommand
 }) {
-  var _appConfig$future, _appConfig$future2, _appConfig$future3, _appConfig$future4, _appConfig$future5;
-  if (!serverModes.isValidServerMode(serverMode)) {
-    throw new Error(`Invalid server mode "${serverMode}"`);
+  var _viteUserConfig$serve;
+  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.");
+    }
+    if (!preset.reactRouterConfig) {
+      return null;
+    }
+    let configPreset = omit__default["default"](await preset.reactRouterConfig({
+      reactRouterUserConfig
+    }), excludedConfigPresetKeys);
+    return configPreset;
+  }))).filter(function isNotNull(value) {
+    return value !== null;
+  });
+  let defaults = {
+    basename: "/",
+    buildDirectory: "build",
+    manifest: false,
+    serverBuildFile: "index.js",
+    serverModuleFormat: "esm",
+    ssr: true
+  };
+  let {
+    appDirectory: userAppDirectory,
+    basename,
+    buildDirectory: userBuildDirectory,
+    buildEnd,
+    future: userFuture,
+    ignoredRouteFiles,
+    manifest,
+    routes: userRoutesFunction,
+    serverBuildFile,
+    serverBundles,
+    serverModuleFormat,
+    ssr
+  } = {
+    ...defaults,
+    // Default values should be completely overridden by user/preset config, not merged
+    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
+  };
+  let isSpaMode = !ssr;
+  // Log warning for incompatible vite config flags
+  if (isSpaMode && serverBundles) {
+    console.warn(colors__default["default"].yellow(colors__default["default"].bold("⚠️  SPA Mode: ") + "the `serverBundles` config is invalid with " + "`ssr:false` and will be ignored`"));
+    serverBundles = undefined;
+  }
+  let appDirectory = path__default["default"].resolve(rootDirectory, userAppDirectory || "app");
+  let buildDirectory = path__default["default"].resolve(rootDirectory, userBuildDirectory);
+  let publicPath = viteUserConfig.base ?? "/";
+  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.");
   }
-  let serverModuleFormat = appConfig.serverModuleFormat || "esm";
-  let appDirectory = path__default["default"].resolve(rootDirectory, appConfig.appDirectory || "app");
+  let rootRouteFile = findEntry(appDirectory, "root");
+  if (!rootRouteFile) {
+    throw new Error(`Missing "root" route file in ${appDirectory}`);
+  }
+  let routes$1 = {
+    root: {
+      path: "",
+      id: "root",
+      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"
+      };
+    }
+  }
+  if (userRoutesFunction) {
+    let userRoutes = await userRoutesFunction(routes.defineRoutes);
+    for (let route of Object.values(userRoutes)) {
+      routes$1[route.id] = {
+        ...route,
+        parentId: route.parentId || "root"
+      };
+    }
+  }
+  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,
+    unstable_singleFetch: (userFuture === null || userFuture === void 0 ? void 0 : userFuture.unstable_singleFetch) === true
+  };
+  let reactRouterConfig = deepFreeze({
+    appDirectory,
+    basename,
+    buildDirectory,
+    buildEnd,
+    future,
+    manifest,
+    publicPath,
+    routes: routes$1,
+    serverBuildFile,
+    serverBundles,
+    serverModuleFormat,
+    ssr
+  });
+  for (let preset of reactRouterUserConfig.presets ?? []) {
+    var _preset$reactRouterCo;
+    await ((_preset$reactRouterCo = preset.reactRouterConfigResolved) === null || _preset$reactRouterCo === void 0 ? void 0 : _preset$reactRouterCo.call(preset, {
+      reactRouterConfig
+    }));
+  }
+  return reactRouterConfig;
+}
+async function resolveEntryFiles({
+  rootDirectory,
+  reactRouterConfig
+}) {
+  let {
+    appDirectory,
+    future
+  } = reactRouterConfig;
+  let isSpaMode = !reactRouterConfig.ssr;
   let defaultsDirectory = path__default["default"].resolve(__dirname, "config", "defaults");
   let userEntryClientFile = findEntry(appDirectory, "entry.client");
   let userEntryServerFile = findEntry(appDirectory, "entry.server");
@@ -45,12 +218,12 @@ async function resolveConfig(appConfig, {
   let entryClientFile = userEntryClientFile || "entry.client.tsx";
   let pkgJson = await PackageJson__default["default"].load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
-  if (isSpaMode && ((_appConfig$future = appConfig.future) === null || _appConfig$future === void 0 ? void 0 : _appConfig$future.unstable_singleFetch) != true) {
+  if (isSpaMode && (future === null || future === void 0 ? void 0 : future.unstable_singleFetch) != true) {
     // 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 instea dof having this we _only have this version
+    // 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.
@@ -81,50 +254,11 @@ async function resolveConfig(appConfig, {
     }
     entryServerFile = `entry.server.${serverRuntime}.tsx`;
   }
-  let entryClientFilePath = userEntryClientFile ? path__default["default"].resolve(appDirectory, userEntryClientFile) : path__default["default"].resolve(defaultsDirectory, entryClientFile);
-  let entryServerFilePath = userEntryServerFile ? path__default["default"].resolve(appDirectory, userEntryServerFile) : path__default["default"].resolve(defaultsDirectory, entryServerFile);
-  let rootRouteFile = findEntry(appDirectory, "root");
-  if (!rootRouteFile) {
-    throw new Error(`Missing "root" route file in ${appDirectory}`);
-  }
-  let routes$1 = {
-    root: {
-      path: "",
-      id: "root",
-      file: rootRouteFile
-    }
-  };
-  if (fse__default["default"].existsSync(path__default["default"].resolve(appDirectory, "routes"))) {
-    let fileRoutes = flatRoutes.flatRoutes(appDirectory, appConfig.ignoredRouteFiles);
-    for (let route of Object.values(fileRoutes)) {
-      routes$1[route.id] = {
-        ...route,
-        parentId: route.parentId || "root"
-      };
-    }
-  }
-  if (appConfig.routes) {
-    let manualRoutes = await appConfig.routes(routes.defineRoutes);
-    for (let route of Object.values(manualRoutes)) {
-      routes$1[route.id] = {
-        ...route,
-        parentId: route.parentId || "root"
-      };
-    }
-  }
-  let future = {
-    v3_fetcherPersist: ((_appConfig$future2 = appConfig.future) === null || _appConfig$future2 === void 0 ? void 0 : _appConfig$future2.v3_fetcherPersist) === true,
-    v3_relativeSplatPath: ((_appConfig$future3 = appConfig.future) === null || _appConfig$future3 === void 0 ? void 0 : _appConfig$future3.v3_relativeSplatPath) === true,
-    v3_throwAbortReason: ((_appConfig$future4 = appConfig.future) === null || _appConfig$future4 === void 0 ? void 0 : _appConfig$future4.v3_throwAbortReason) === true,
-    unstable_singleFetch: ((_appConfig$future5 = appConfig.future) === null || _appConfig$future5 === void 0 ? void 0 : _appConfig$future5.unstable_singleFetch) === true
-  };
+  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);
   return {
-    appDirectory,
     entryClientFilePath,
-    entryServerFilePath,
-    routes: routes$1,
-    serverModuleFormat,
-    future
+    entryServerFilePath
   };
 }
 const entryExts = [".js", ".jsx", ".ts", ".tsx"];
@@ -135,18 +269,11 @@ function findEntry(dir, basename) {
   }
   return undefined;
 }
-function findConfig(dir, basename, extensions) {
-  for (let ext of extensions) {
-    let name = basename + ext;
-    let file = path__default["default"].join(dir, name);
-    if (fse__default["default"].existsSync(file)) return file;
-  }
-  return undefined;
-}
 let disjunctionListFormat = new Intl.ListFormat("en", {
   style: "long",
   type: "disjunction"
 });
 
-exports.findConfig = findConfig;
-exports.resolveConfig = resolveConfig;
+exports.configRouteToBranchRoute = configRouteToBranchRoute;
+exports.resolveEntryFiles = resolveEntryFiles;
+exports.resolveReactRouterConfig = resolveReactRouterConfig;

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 "./vite";
+export type { BuildManifest, Preset, ServerBundlesFunction, VitePluginConfig, } from "./config";
 export { vitePlugin, cloudflareDevProxyVitePlugin } from "./vite";

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -16,6 +16,7 @@ var path = require('node:path');
 var fse = require('fs-extra');
 var colors = require('picocolors');
 var plugin = require('./plugin.js');
+var config = require('../config.js');
 var invariant = require('../invariant.js');
 var importViteEsmSync = require('./import-vite-esm-sync.js');
 
@@ -94,7 +95,7 @@ async function getServerBuilds(ctx) {
   await Promise.all(getAddressableRoutes(routes).map(async route => {
     let branch = getRouteBranch(routes, route.id);
     let serverBundleId = await serverBundles({
-      branch: branch.map(route => plugin.configRouteToBranchRoute({
+      branch: branch.map(route => config.configRouteToBranchRoute({
         ...route,
         // Ensure absolute paths are passed to the serverBundles function
         file: path__default["default"].join(resolvedAppDirectory, route.file)

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/index.d.ts

@@ -1,4 +1,3 @@
 import type { ReactRouterVitePlugin } from "./plugin";
-export type { BuildManifest, Preset, VitePluginConfig, ServerBundlesFunction, } 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-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-7b411a741
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/plugin.d.ts

@@ -1,7 +1,7 @@
 import type * as Vite from "vite";
-import type { ConfigRoute, RouteManifest } from "../config/routes";
-import type { AppConfig as RemixEsbuildUserConfig, RemixConfig as ResolvedRemixEsbuildConfig } from "../config";
+import { type RouteManifest } from "../config/routes";
 import type { Manifest as ReactRouterManifest } from "../manifest";
+import { type VitePluginConfig, type ResolvedVitePluginConfig } from "../config";
 export declare function resolveViteConfig({ configFile, mode, root, }: {
     configFile?: string;
     mode?: string;
@@ -43,100 +43,6 @@ export declare function loadPluginContext({ configFile, root, }: {
     configFile?: string;
     root?: string;
 }): Promise<ReactRouterPluginContext>;
-declare const branchRouteProperties: readonly ["id", "path", "file", "index"];
-type BranchRoute = Pick<ConfigRoute, (typeof branchRouteProperties)[number]>;
-export declare const configRouteToBranchRoute: (configRoute: ConfigRoute) => BranchRoute;
-export type ServerBundlesFunction = (args: {
-    branch: BranchRoute[];
-}) => string | Promise<string>;
-type BaseBuildManifest = {
-    routes: RouteManifest;
-};
-type DefaultBuildManifest = BaseBuildManifest & {
-    serverBundles?: never;
-    routeIdToServerBundleId?: never;
-};
-export type ServerBundlesBuildManifest = BaseBuildManifest & {
-    serverBundles: {
-        [serverBundleId: string]: {
-            id: string;
-            file: string;
-        };
-    };
-    routeIdToServerBundleId: Record<string, string>;
-};
-export type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
-declare const excludedConfigPresetKeys: readonly ["presets"];
-type ExcludedConfigPresetKey = (typeof excludedConfigPresetKeys)[number];
-type ConfigPreset = Omit<VitePluginConfig, ExcludedConfigPresetKey>;
-export type Preset = {
-    name: string;
-    reactRouterConfig?: (args: {
-        reactRouterUserConfig: VitePluginConfig;
-    }) => ConfigPreset | Promise<ConfigPreset>;
-    reactRouterConfigResolved?: (args: {
-        reactRouterConfig: ResolvedVitePluginConfig;
-    }) => void | Promise<void>;
-};
-export type VitePluginConfig = RemixEsbuildUserConfig & {
-    /**
-     * The react router app basename.  Defaults to `"/"`.
-     */
-    basename?: string;
-    /**
-     * The path to the build directory, relative to the project. Defaults to
-     * `"build"`.
-     */
-    buildDirectory?: string;
-    /**
-     * A function that is called after the full React Router build is complete.
-     */
-    buildEnd?: BuildEndHook;
-    /**
-     * Whether to write a `"manifest.json"` file to the build directory.`
-     * Defaults to `false`.
-     */
-    manifest?: boolean;
-    /**
-     * An array of React Router plugin config presets to ease integration with
-     * other platforms and tools.
-     */
-    presets?: Array<Preset>;
-    /**
-     * The file name of the server build output. This file
-     * should end in a `.js` extension and should be deployed to your server.
-     * Defaults to `"index.js"`.
-     */
-    serverBuildFile?: string;
-    /**
-     * A function for assigning routes to different server bundles. This
-     * function should return a server bundle ID which will be used as the
-     * bundle's directory name within the server build directory.
-     */
-    serverBundles?: ServerBundlesFunction;
-    /**
-     * Enable server-side rendering for your application. Disable to use "SPA
-     * Mode", which will request the `/` path at build-time and save it as an
-     * `index.html` file with your assets so your application can be deployed as a
-     * SPA without server-rendering. Default's to `true`.
-     */
-    ssr?: boolean;
-};
-type BuildEndHook = (args: {
-    buildManifest: BuildManifest | undefined;
-    reactRouterConfig: ResolvedVitePluginConfig;
-    viteConfig: Vite.ResolvedConfig;
-}) => void | Promise<void>;
-export type ResolvedVitePluginConfig = Readonly<Pick<ResolvedRemixEsbuildConfig, "appDirectory" | "future" | "routes" | "serverModuleFormat"> & {
-    basename: string;
-    buildDirectory: string;
-    buildEnd?: BuildEndHook;
-    manifest: boolean;
-    publicPath: string;
-    serverBuildFile: string;
-    serverBundles?: ServerBundlesFunction;
-    ssr: boolean;
-}>;
 export type ServerBundleBuildConfig = {
     routes: RouteManifest;
     serverBundleId: string;