@react-router/dev 7.1.5 → 7.2.0-pre.1

package/dist/config.d.ts

@@ -38,6 +38,14 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
     unstable_optimizeDeps: boolean;
+    /**
+     * Automatically split route modules into multiple chunks when possible.
+     */
+    unstable_splitRouteModules?: boolean | "enforce";
+    /**
+     * Use Vite Environment API (experimental)
+     */
+    unstable_viteEnvironmentApi?: boolean;
 }
 type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
 type BuildEndHook = (args: {

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.5
+ * @react-router/dev v7.2.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.5
+ * @react-router/dev v7.2.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/static/refresh-utils.cjs

@@ -53,7 +53,7 @@ const enqueueUpdate = debounce(async () => {
       needsRevalidation,
       manifest.routes,
       window.__reactRouterRouteModules,
-      window.__reactRouterContext.future,
+      window.__reactRouterContext.ssr,
       window.__reactRouterContext.isSpaMode
     );
     __reactRouterDataRouter._internalSetRoutes(routes);

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.5
+ * @react-router/dev v7.2.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -156,6 +156,469 @@ function getVite() {
   return vite;
 }
 
+// config/config.ts
+var import_node_fs = __toESM(require("fs"));
+var import_node_child_process = require("child_process");
+var import_package_json = __toESM(require("@npmcli/package-json"));
+
+// vite/vite-node.ts
+var import_server = require("vite-node/server");
+var import_client = require("vite-node/client");
+var import_source_map = require("vite-node/source-map");
+async function createContext(viteConfig = {}) {
+  await preloadVite();
+  const vite2 = getVite();
+  const devServer = await vite2.createServer(
+    vite2.mergeConfig(
+      {
+        server: {
+          preTransformRequests: false,
+          hmr: false
+        },
+        optimizeDeps: {
+          noDiscovery: true
+        },
+        configFile: false,
+        envFile: false,
+        plugins: []
+      },
+      viteConfig
+    )
+  );
+  await devServer.pluginContainer.buildStart({});
+  const server = new import_server.ViteNodeServer(devServer);
+  (0, import_source_map.installSourcemapsSupport)({
+    getSourceMap: (source) => server.getSourceMap(source)
+  });
+  const runner = new import_client.ViteNodeRunner({
+    root: devServer.config.root,
+    base: devServer.config.base,
+    fetchModule(id) {
+      return server.fetchModule(id);
+    },
+    resolveId(id, importer) {
+      return server.resolveId(id, importer);
+    }
+  });
+  return { devServer, server, runner };
+}
+
+// config/config.ts
+var import_pathe3 = __toESM(require("pathe"));
+var import_chokidar = __toESM(require("chokidar"));
+var import_picocolors = __toESM(require("picocolors"));
+var import_pick2 = __toESM(require("lodash/pick"));
+var import_omit = __toESM(require("lodash/omit"));
+var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
+var import_isEqual = __toESM(require("lodash/isEqual"));
+
+// config/routes.ts
+var Path = __toESM(require("pathe"));
+var v = __toESM(require("valibot"));
+var import_pick = __toESM(require("lodash/pick"));
+function setAppDirectory(directory) {
+  globalThis.__reactRouterAppDirectory = directory;
+}
+var routeConfigEntrySchema = v.pipe(
+  v.custom((value) => {
+    return !(typeof value === "object" && value !== null && "then" in value && "catch" in value);
+  }, "Invalid type: Expected object but received a promise. Did you forget to await?"),
+  v.object({
+    id: v.optional(v.string()),
+    path: v.optional(v.string()),
+    index: v.optional(v.boolean()),
+    caseSensitive: v.optional(v.boolean()),
+    file: v.string(),
+    children: v.optional(v.array(v.lazy(() => routeConfigEntrySchema)))
+  })
+);
+var resolvedRouteConfigSchema = v.array(routeConfigEntrySchema);
+function validateRouteConfig({
+  routeConfigFile,
+  routeConfig
+}) {
+  if (!routeConfig) {
+    return {
+      valid: false,
+      message: `Route config must be the default export in "${routeConfigFile}".`
+    };
+  }
+  if (!Array.isArray(routeConfig)) {
+    return {
+      valid: false,
+      message: `Route config in "${routeConfigFile}" must be an array.`
+    };
+  }
+  let { issues } = v.safeParse(resolvedRouteConfigSchema, routeConfig);
+  if (issues?.length) {
+    let { root, nested } = v.flatten(issues);
+    return {
+      valid: false,
+      message: [
+        `Route config in "${routeConfigFile}" is invalid.`,
+        root ? `${root}` : [],
+        nested ? Object.entries(nested).map(
+          ([path4, message]) => `Path: routes.${path4}
+${message}`
+        ) : []
+      ].flat().join("\n\n")
+    };
+  }
+  return { valid: true };
+}
+function configRoutesToRouteManifest(appDirectory, routes, rootId = "root") {
+  let routeManifest = {};
+  function walk(route, parentId) {
+    let id = route.id || createRouteId(route.file);
+    let manifestItem = {
+      id,
+      parentId,
+      file: Path.isAbsolute(route.file) ? Path.relative(appDirectory, route.file) : route.file,
+      path: route.path,
+      index: route.index,
+      caseSensitive: route.caseSensitive
+    };
+    if (routeManifest.hasOwnProperty(id)) {
+      throw new Error(
+        `Unable to define routes with duplicate route id: "${id}"`
+      );
+    }
+    routeManifest[id] = manifestItem;
+    if (route.children) {
+      for (let child of route.children) {
+        walk(child, id);
+      }
+    }
+  }
+  for (let route of routes) {
+    walk(route, rootId);
+  }
+  return routeManifest;
+}
+function createRouteId(file) {
+  return Path.normalize(stripFileExtension(file));
+}
+function stripFileExtension(file) {
+  return file.replace(/\.[a-z0-9]+$/i, "");
+}
+
+// config/config.ts
+var excludedConfigPresetKeys = ["presets"];
+var mergeReactRouterConfig = (...configs) => {
+  let reducer = (configA, configB) => {
+    let mergeRequired = (key) => configA[key] !== void 0 && configB[key] !== void 0;
+    return {
+      ...configA,
+      ...configB,
+      ...mergeRequired("buildEnd") ? {
+        buildEnd: async (...args) => {
+          await Promise.all([
+            configA.buildEnd?.(...args),
+            configB.buildEnd?.(...args)
+          ]);
+        }
+      } : {},
+      ...mergeRequired("future") ? {
+        future: {
+          ...configA.future,
+          ...configB.future
+        }
+      } : {},
+      ...mergeRequired("presets") ? {
+        presets: [...configA.presets ?? [], ...configB.presets ?? []]
+      } : {}
+    };
+  };
+  return configs.reduce(reducer, {});
+};
+var 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;
+};
+function ok(value) {
+  return { ok: true, value };
+}
+function err(error) {
+  return { ok: false, error };
+}
+async function resolveConfig({
+  root,
+  viteNodeContext,
+  reactRouterConfigFile
+}) {
+  let reactRouterUserConfig = {};
+  if (reactRouterConfigFile) {
+    try {
+      if (!import_node_fs.default.existsSync(reactRouterConfigFile)) {
+        return err(`${reactRouterConfigFile} no longer exists`);
+      }
+      let configModule = await viteNodeContext.runner.executeFile(
+        reactRouterConfigFile
+      );
+      if (configModule.default === void 0) {
+        return err(`${reactRouterConfigFile} must provide a default export`);
+      }
+      if (typeof configModule.default !== "object") {
+        return err(`${reactRouterConfigFile} must export a config`);
+      }
+      reactRouterUserConfig = configModule.default;
+    } catch (error) {
+      return err(`Error loading ${reactRouterConfigFile}: ${error}`);
+    }
+  }
+  reactRouterUserConfig = deepFreeze((0, import_cloneDeep.default)(reactRouterUserConfig));
+  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 = (0, import_omit.default)(
+        await preset.reactRouterConfig({ reactRouterUserConfig }),
+        excludedConfigPresetKeys
+      );
+      return configPreset;
+    })
+  )).filter(function isNotNull(value) {
+    return value !== null;
+  });
+  let defaults = {
+    basename: "/",
+    buildDirectory: "build",
+    serverBuildFile: "index.js",
+    serverModuleFormat: "esm",
+    ssr: true
+  };
+  let {
+    appDirectory: userAppDirectory,
+    basename,
+    buildDirectory: userBuildDirectory,
+    buildEnd,
+    prerender,
+    serverBuildFile,
+    serverBundles,
+    serverModuleFormat,
+    ssr
+  } = {
+    ...defaults,
+    // Default values should be completely overridden by user/preset config, not merged
+    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
+  };
+  if (!ssr && serverBundles) {
+    serverBundles = void 0;
+  }
+  let isValidPrerenderConfig = prerender == null || typeof prerender === "boolean" || Array.isArray(prerender) || typeof prerender === "function";
+  if (!isValidPrerenderConfig) {
+    return err(
+      "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
+    );
+  }
+  let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
+  let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
+  let rootRouteFile = findEntry(appDirectory, "root");
+  if (!rootRouteFile) {
+    let rootRouteDisplayPath = import_pathe3.default.relative(
+      root,
+      import_pathe3.default.join(appDirectory, "root.tsx")
+    );
+    return err(
+      `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
+    );
+  }
+  let routes = {
+    root: { path: "", id: "root", file: rootRouteFile }
+  };
+  let routeConfigFile = findEntry(appDirectory, "routes");
+  try {
+    if (!routeConfigFile) {
+      let routeConfigDisplayPath = import_pathe3.default.relative(
+        root,
+        import_pathe3.default.join(appDirectory, "routes.ts")
+      );
+      return err(`Route config file not found at "${routeConfigDisplayPath}".`);
+    }
+    setAppDirectory(appDirectory);
+    let routeConfigExport = (await viteNodeContext.runner.executeFile(
+      import_pathe3.default.join(appDirectory, routeConfigFile)
+    )).default;
+    let routeConfig = await routeConfigExport;
+    let result = validateRouteConfig({
+      routeConfigFile,
+      routeConfig
+    });
+    if (!result.valid) {
+      return err(result.message);
+    }
+    routes = {
+      ...routes,
+      ...configRoutesToRouteManifest(appDirectory, routeConfig)
+    };
+  } catch (error) {
+    return err(
+      [
+        import_picocolors.default.red(`Route config in "${routeConfigFile}" is invalid.`),
+        "",
+        error.loc?.file && error.loc?.column && error.frame ? [
+          import_pathe3.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
+          error.frame.trim?.()
+        ] : error.stack
+      ].flat().join("\n")
+    );
+  }
+  let future = {
+    unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
+    unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
+    unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
+  };
+  let reactRouterConfig = deepFreeze({
+    appDirectory,
+    basename,
+    buildDirectory,
+    buildEnd,
+    future,
+    prerender,
+    routes,
+    serverBuildFile,
+    serverBundles,
+    serverModuleFormat,
+    ssr
+  });
+  for (let preset of reactRouterUserConfig.presets ?? []) {
+    await preset.reactRouterConfigResolved?.({ reactRouterConfig });
+  }
+  return ok(reactRouterConfig);
+}
+async function createConfigLoader({
+  rootDirectory: root,
+  watch
+}) {
+  root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
+  let viteNodeContext = await createContext({
+    root,
+    mode: watch ? "development" : "production",
+    server: !watch ? { watch: null } : {},
+    ssr: {
+      external: ssrExternals
+    }
+  });
+  let reactRouterConfigFile = findEntry(root, "react-router.config", {
+    absolute: true
+  });
+  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile });
+  let appDirectory;
+  let initialConfigResult = await getConfig();
+  if (!initialConfigResult.ok) {
+    throw new Error(initialConfigResult.error);
+  }
+  appDirectory = initialConfigResult.value.appDirectory;
+  let lastConfig = initialConfigResult.value;
+  let fsWatcher;
+  let changeHandlers = [];
+  return {
+    getConfig,
+    onChange: (handler) => {
+      if (!watch) {
+        throw new Error(
+          "onChange is not supported when watch mode is disabled"
+        );
+      }
+      changeHandlers.push(handler);
+      if (!fsWatcher) {
+        fsWatcher = import_chokidar.default.watch(
+          [
+            ...reactRouterConfigFile ? [reactRouterConfigFile] : [],
+            appDirectory
+          ],
+          { ignoreInitial: true }
+        );
+        fsWatcher.on("all", async (...args) => {
+          let [event, rawFilepath] = args;
+          let filepath = import_pathe3.default.normalize(rawFilepath);
+          let appFileAddedOrRemoved = appDirectory && (event === "add" || event === "unlink") && filepath.startsWith(import_pathe3.default.normalize(appDirectory));
+          let configCodeUpdated = Boolean(
+            viteNodeContext.devServer?.moduleGraph.getModuleById(filepath)
+          );
+          if (configCodeUpdated || appFileAddedOrRemoved) {
+            viteNodeContext.devServer?.moduleGraph.invalidateAll();
+            viteNodeContext.runner?.moduleCache.clear();
+          }
+          if (appFileAddedOrRemoved || configCodeUpdated) {
+            let result = await getConfig();
+            let configChanged = result.ok && !(0, import_isEqual.default)(lastConfig, result.value);
+            let routeConfigChanged = result.ok && !(0, import_isEqual.default)(lastConfig?.routes, result.value.routes);
+            for (let handler2 of changeHandlers) {
+              handler2({
+                result,
+                configCodeUpdated,
+                configChanged,
+                routeConfigChanged,
+                path: filepath,
+                event
+              });
+            }
+            if (result.ok) {
+              lastConfig = result.value;
+            }
+          }
+        });
+      }
+      return () => {
+        changeHandlers = changeHandlers.filter(
+          (changeHandler) => changeHandler !== handler
+        );
+      };
+    },
+    close: async () => {
+      changeHandlers = [];
+      await viteNodeContext.devServer.close();
+      await fsWatcher?.close();
+    }
+  };
+}
+async function loadConfig({ rootDirectory }) {
+  let configLoader = await createConfigLoader({
+    rootDirectory,
+    watch: false
+  });
+  let config = await configLoader.getConfig();
+  await configLoader.close();
+  return config;
+}
+var ssrExternals = isReactRouterRepo() ? [
+  // 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",
+  "@react-router/dev",
+  "@react-router/express",
+  "@react-router/node",
+  "@react-router/serve"
+] : void 0;
+var entryExts = [".js", ".jsx", ".ts", ".tsx"];
+function findEntry(dir, basename, options) {
+  for (let ext of entryExts) {
+    let file = import_pathe3.default.resolve(dir, basename + ext);
+    if (import_node_fs.default.existsSync(file)) {
+      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
+    }
+  }
+  return void 0;
+}
+
 // vite/cloudflare-dev-proxy.ts
 var serverBuildId = "virtual:react-router/server-build";
 function importWrangler() {
@@ -168,22 +631,43 @@ function importWrangler() {
 var PLUGIN_NAME = "react-router-cloudflare-vite-dev-proxy";
 var cloudflareDevProxyVitePlugin = (options = {}) => {
   let { getLoadContext, ...restOptions } = options;
+  const workerdConditions = ["workerd", "worker"];
+  let future;
   return {
     name: PLUGIN_NAME,
-    config: async () => {
+    config: async (config) => {
       await preloadVite();
       const vite2 = getVite();
       const serverConditions = [
         ...vite2.defaultServerConditions ?? []
       ];
+      let configResult = await loadConfig({
+        rootDirectory: config.root ?? process.cwd()
+      });
+      if (!configResult.ok) {
+        throw new Error(configResult.error);
+      }
+      future = configResult.value.future;
       return {
         ssr: {
           resolve: {
-            externalConditions: ["workerd", "worker", ...serverConditions]
+            externalConditions: [...workerdConditions, ...serverConditions]
           }
         }
       };
     },
+    configEnvironment: async (name, options2) => {
+      if (!future.unstable_viteEnvironmentApi) {
+        return;
+      }
+      if (name !== "client") {
+        options2.resolve = options2.resolve ?? {};
+        options2.resolve.externalConditions = [
+          ...workerdConditions,
+          ...options2.resolve?.externalConditions ?? []
+        ];
+      }
+    },
     configResolved: (viteConfig) => {
       let pluginIndex = (name) => viteConfig.plugins.findIndex((plugin) => plugin.name === name);
       let reactRouterPluginIndex = pluginIndex("react-router");