@react-router/dev 0.0.0-experimental-c0856287f → 0.0.0-experimental-79e23be50

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-c0856287f
+ * @react-router/dev v0.0.0-experimental-79e23be50
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -20,10 +20,8 @@ var babel = require('@babel/core');
 var serverRuntime = require('@react-router/server-runtime');
 var esModuleLexer = require('es-module-lexer');
 var jsesc = require('jsesc');
-var pick = require('lodash/pick');
-var omit = require('lodash/omit');
 var colors = require('picocolors');
-var config = require('../config.js');
+var findConfig = require('../config/findConfig.js');
 var invariant = require('../invariant.js');
 var nodeAdapter = require('./node-adapter.js');
 var styles = require('./styles.js');
@@ -31,6 +29,7 @@ var vmod = require('./vmod.js');
 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');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -57,8 +56,6 @@ var url__namespace = /*#__PURE__*/_interopNamespace(url);
 var fse__namespace = /*#__PURE__*/_interopNamespace(fse);
 var babel__default = /*#__PURE__*/_interopDefaultLegacy(babel);
 var jsesc__default = /*#__PURE__*/_interopDefaultLegacy(jsesc);
-var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
-var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
 
 async function resolveViteConfig({
@@ -92,7 +89,7 @@ async function loadPluginContext({
   if (!root) {
     root = process.env.REACT_ROUTER_ROOT || process.cwd();
   }
-  configFile = configFile ?? config.findConfig(root, "vite.config", [".ts", ".cts", ".mts", ".js", ".cjs", ".mjs"]);
+  configFile = configFile ?? findConfig.findConfig(root, "vite.config", [".ts", ".cts", ".mts", ".js", ".cjs", ".mjs"]);
   if (!configFile) {
     console.error(colors__default["default"].red("Vite config file not found"));
     process.exit(1);
@@ -113,10 +110,6 @@ const CLIENT_ROUTE_EXPORTS = ["clientAction", "clientLoader", "default", "ErrorB
 // The "=1" suffix ensures client route requests can be processed before hitting
 // the Vite plugin since "?client-route" can be serialized as "?client-route="
 const CLIENT_ROUTE_QUERY_STRING = "?client-route=1";
-// 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);
-const excludedConfigPresetKeys = ["presets"];
 let serverBuildId = vmod.id("server-build");
 let serverManifestId = vmod.id("server-manifest");
 let browserManifestId = vmod.id("browser-manifest");
@@ -244,44 +237,6 @@ let getClientBuildDirectory = reactRouterConfig => path__namespace.join(reactRou
 let defaultEntriesDir = path__namespace.resolve(__dirname, "..", "config", "defaults");
 let defaultEntries = fse__namespace.readdirSync(defaultEntriesDir).map(filename => path__namespace.join(defaultEntriesDir, filename));
 invariant["default"](defaultEntries.length > 0, "No default entries found");
-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, {});
-};
 let reactRouterDevLoadContext = () => ({});
 let setReactRouterDevLoadContext = loadContext => {
   reactRouterDevLoadContext = loadContext;
@@ -315,86 +270,21 @@ const reactRouterVitePlugin = _config => {
   let ctx;
   /** Mutates `ctx` as a side-effect */
   let updatePluginContext = async () => {
-    var _viteUserConfig$serve, _viteUserConfig$build;
-    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",
-      ssr: true
-    };
-    let resolvedReactRouterUserConfig = {
-      ...defaults,
-      // Default values should be completely overridden by user/preset config, not merged
-      ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
-    };
+    var _viteUserConfig$build;
     let rootDirectory = viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
-    let {
-      basename,
-      buildEnd,
-      manifest,
-      ssr
-    } = resolvedReactRouterUserConfig;
-    let isSpaMode = !ssr;
-    let {
-      appDirectory,
-      entryClientFilePath,
-      entryServerFilePath,
-      future,
-      routes,
-      serverModuleFormat
-    } = await config.resolveConfig(resolvedReactRouterUserConfig, {
+    let reactRouterConfig = await config.resolveReactRouterConfig({
       rootDirectory,
-      isSpaMode
+      reactRouterUserConfig,
+      viteUserConfig,
+      viteCommand
     });
-    let buildDirectory = path__namespace.resolve(rootDirectory, resolvedReactRouterUserConfig.buildDirectory);
     let {
-      serverBuildFile,
-      serverBundles
-    } = resolvedReactRouterUserConfig;
-    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.");
-    }
-    // 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 reactRouterConfig = deepFreeze({
-      appDirectory,
-      basename,
-      buildDirectory,
-      buildEnd,
-      future,
-      manifest,
-      publicPath,
-      routes,
-      serverBuildFile,
-      serverBundles,
-      serverModuleFormat,
-      ssr
+      entryClientFilePath,
+      entryServerFilePath
+    } = await config.resolveEntryFiles({
+      rootDirectory,
+      reactRouterConfig
     });
-    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
-      }));
-    }
     let viteManifestEnabled = ((_viteUserConfig$build = viteUserConfig.build) === null || _viteUserConfig$build === void 0 ? void 0 : _viteUserConfig$build.manifest) === true;
     let ssrBuildCtx = viteConfigEnv.isSsrBuild && viteCommand === "build" ? {
       isSsrBuild: true,
@@ -455,6 +345,10 @@ const reactRouterVitePlugin = _config => {
     let manifestContents = await fse__namespace.readFile(path__namespace.resolve(directory, ".vite", "manifest.json"), "utf-8");
     return JSON.parse(manifestContents);
   };
+  let getViteManifestFilePaths = viteManifest => {
+    let filePaths = Object.values(viteManifest).map(chunk => chunk.file);
+    return new Set(filePaths);
+  };
   let getViteManifestAssetPaths = viteManifest => {
     // Get .css?url imports and CSS entry points
     let cssUrlPaths = Object.values(viteManifest).filter(chunk => chunk.file.endsWith(".css")).map(chunk => chunk.file);
@@ -563,7 +457,7 @@ const reactRouterVitePlugin = _config => {
   return [{
     name: "react-router",
     config: async (_viteUserConfig, _viteConfigEnv) => {
-      var _viteUserConfig$serve2, _viteUserConfig$serve3, _viteUserConfig$build4;
+      var _viteUserConfig$serve, _viteUserConfig$serve2, _viteUserConfig$build4;
       // 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
@@ -596,11 +490,11 @@ const reactRouterVitePlugin = _config => {
         __reactRouterPluginContext: ctx,
         appType: viteCommand === "serve" && viteConfigEnv.mode === "production" && ctx.reactRouterConfig.ssr === false ? "spa" : "custom",
         ssr: {
-          external: [
-          // This is only necessary for development within this repo
-          // because these packages are symlinked and Vite treats them as
-          // internal source code. For consumers this is a no-op.
-          "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"]
+          external: isInReactRouterMonorepo() ? [
+          // 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
         },
         optimizeDeps: {
           include: [
@@ -610,13 +504,7 @@ const reactRouterVitePlugin = _config => {
           "react", "react/jsx-runtime", "react/jsx-dev-runtime", "react-dom/client",
           // Pre-bundle router dependencies to avoid router duplicates.
           // Mismatching routers cause `Error: You must render this element inside a <Remix> element`.
-          "react-router", "react-router-dom",
-          // For some reason, the `vite-dotenv` integration test consistently fails on webkit
-          // with `504 (Outdated Optimize Dep)` from Vite  unless `@react-router/node` is included
-          // in `optimizeDeps.include`. 🤷
-          // This could be caused by how we copy `node_modules/` into integration test fixtures,
-          // so maybe this will be unnecessary once we switch to pnpm
-          "@react-router/node"]
+          "react-router", "react-router-dom"]
         },
         esbuild: {
           jsx: "automatic",
@@ -635,7 +523,7 @@ const reactRouterVitePlugin = _config => {
         // If we don't do this and a default entry file is used, the server
         // will throw an error that the file is not allowed to be read.
         // https://vitejs.dev/config/server-options#server-fs-allow
-        server: (_viteUserConfig$serve2 = viteUserConfig.server) !== null && _viteUserConfig$serve2 !== void 0 && (_viteUserConfig$serve3 = _viteUserConfig$serve2.fs) !== null && _viteUserConfig$serve3 !== void 0 && _viteUserConfig$serve3.allow ? {
+        server: (_viteUserConfig$serve = viteUserConfig.server) !== null && _viteUserConfig$serve !== void 0 && (_viteUserConfig$serve2 = _viteUserConfig$serve.fs) !== null && _viteUserConfig$serve2 !== void 0 && _viteUserConfig$serve2.allow ? {
           fs: {
             allow: defaultEntries
           }
@@ -834,7 +722,7 @@ const reactRouterVitePlugin = _config => {
         let serverBuildDirectory = getServerBuildDirectory(ctx);
         let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
         let clientViteManifest = await loadViteManifest(clientBuildDirectory);
-        let clientAssetPaths = getViteManifestAssetPaths(clientViteManifest);
+        let clientFilePaths = getViteManifestFilePaths(clientViteManifest);
         let ssrAssetPaths = getViteManifestAssetPaths(ssrViteManifest);
         // We only move assets that aren't in the client build, otherwise we
         // remove them. These assets only exist because we explicitly set
@@ -845,7 +733,7 @@ const reactRouterVitePlugin = _config => {
         let movedAssetPaths = [];
         for (let ssrAssetPath of ssrAssetPaths) {
           let src = path__namespace.join(serverBuildDirectory, ssrAssetPath);
-          if (!clientAssetPaths.has(ssrAssetPath)) {
+          if (!clientFilePaths.has(ssrAssetPath)) {
             let dest = path__namespace.join(clientBuildDirectory, ssrAssetPath);
             await fse__namespace.move(src, dest);
             movedAssetPaths.push(dest);
@@ -1075,6 +963,13 @@ const reactRouterVitePlugin = _config => {
     }
   }];
 };
+function isInReactRouterMonorepo() {
+  // We use '@react-router/server-runtime' 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 serverRuntimeParentDir = path__namespace.basename(path__namespace.resolve(serverRuntimePath, ".."));
+  return serverRuntimeParentDir === "packages";
+}
 function isEqualJson(v1, v2) {
   return JSON.stringify(v1) === JSON.stringify(v2);
 }
@@ -1169,7 +1064,6 @@ async function handleSpaMode(serverBuildDirectoryPath, serverBuildFile, clientBu
   fse__namespace.removeSync(serverBuildDirectoryPath);
 }
 
-exports.configRouteToBranchRoute = configRouteToBranchRoute;
 exports.extractPluginContext = extractPluginContext;
 exports.getServerBuildDirectory = getServerBuildDirectory;
 exports.loadPluginContext = loadPluginContext;

package/dist/vite/profiler.js

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

package/dist/vite/remove-exports.js

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

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

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

package/dist/vite/styles.d.ts

@@ -1,11 +1,11 @@
 import type { ServerBuild } from "@react-router/server-runtime";
 import type { ViteDevServer } from "vite";
-import type { RemixConfig as ResolvedRemixConfig } from "../config";
+import type { ResolvedVitePluginConfig } from "../config";
 export declare const isCssModulesFile: (file: string) => boolean;
 export declare const getStylesForUrl: ({ viteDevServer, rootDirectory, reactRouterConfig, entryClientFilePath, cssModulesManifest, build, url, }: {
     viteDevServer: ViteDevServer;
     rootDirectory: string;
-    reactRouterConfig: Pick<ResolvedRemixConfig, "appDirectory" | "routes">;
+    reactRouterConfig: Pick<ResolvedVitePluginConfig, "appDirectory" | "routes">;
     entryClientFilePath: string;
     cssModulesManifest: Record<string, string>;
     build: ServerBuild;

package/dist/vite/styles.js

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

package/dist/vite/vmod.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-c0856287f",
+  "version": "0.0.0-experimental-79e23be50",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -42,9 +42,9 @@
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "@react-router/server-runtime": "0.0.0-experimental-c0856287f",
-    "@react-router/node": "0.0.0-experimental-c0856287f",
-    "react-router": "0.0.0-experimental-c0856287f"
+    "@react-router/node": "0.0.0-experimental-79e23be50",
+    "react-router": "0.0.0-experimental-79e23be50",
+    "@react-router/server-runtime": "0.0.0-experimental-79e23be50"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -69,14 +69,14 @@
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-c0856287f"
+    "@react-router/serve": "0.0.0-experimental-79e23be50"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-c0856287f",
-    "@react-router/serve": "^0.0.0-experimental-c0856287f"
+    "react-router": "^0.0.0-experimental-79e23be50",
+    "@react-router/serve": "^0.0.0-experimental-79e23be50"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {

package/dist/config/serverModes.js

@@ -1,28 +0,0 @@
-/**
- * @react-router/dev v0.0.0-experimental-c0856287f
- *
- * 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 });
-
-/**
- * The mode to use when running the server.
- */
-exports.ServerMode = void 0;
-(function (ServerMode) {
-  ServerMode["Development"] = "development";
-  ServerMode["Production"] = "production";
-  ServerMode["Test"] = "test";
-})(exports.ServerMode || (exports.ServerMode = {}));
-function isValidServerMode(mode) {
-  return mode === exports.ServerMode.Development || mode === exports.ServerMode.Production || mode === exports.ServerMode.Test;
-}
-
-exports.isValidServerMode = isValidServerMode;