@react-router/dev 0.0.0-experimental-7a19e47ea → 0.0.0-experimental-8fdb14ec6

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # `@react-router/dev`
 
+## 7.1.1
+
+### Patch Changes
+
+- Fix for a crash when optional args are passed to the CLI ([`5b1ca202f`](https://github.com/remix-run/react-router/commit/5b1ca202f77ef342db0109c6b791d33188077cd0))
+- Updated dependencies:
+  - `react-router@7.1.1`
+  - `@react-router/node@7.1.1`
+  - `@react-router/serve@7.1.1`
+
+## 7.1.0
+
+### Minor Changes
+
+- Add support for Vite v6 ([#12469](https://github.com/remix-run/react-router/pull/12469))
+
+### Patch Changes
+
+- Properly initialize `NODE_ENV` if not already set for compatibility with React 19 ([#12578](https://github.com/remix-run/react-router/pull/12578))
+
+- Remove the leftover/unused `abortDelay` prop from `ServerRouter` and update the default `entry.server.tsx` to use the new `streamTimeout` value for Single Fetch ([#12478](https://github.com/remix-run/react-router/pull/12478))
+
+  - The `abortDelay` functionality was removed in v7 as it was coupled to the `defer` implementation from Remix v2, but this removal of this prop was missed
+  - If you were still using this prop in your `entry.server` file, it's likely your app is not aborting streams as you would expect and you will need to adopt the new [`streamTimeout`](https://reactrouter.com/explanation/special-files#streamtimeout) value introduced with Single Fetch
+
+- Updated dependencies:
+  - `react-router@7.1.0`
+  - `@react-router/node@7.1.0`
+  - `@react-router/serve@7.1.0`
+
 ## 7.0.2
 
 ### Patch Changes

package/bin.js

@@ -1,2 +1,17 @@
 #!/usr/bin/env node
-require("./dist/cli/index");
+import arg from "arg";
+
+// Minimal replication of our actual parsing in `run.ts`.  If not already set,
+// default `NODE_ENV` so React loads the proper version in it's CJS entry script.
+// We have to do this before importing `run.ts` since that is what imports
+// `react` (indirectly via `react-router`)
+let args = arg({}, { argv: process.argv.slice(2), stopAtPositional: true });
+if (args._[0] === "dev") {
+  process.env.NODE_ENV = process.env.NODE_ENV ?? "development";
+} else {
+  process.env.NODE_ENV = process.env.NODE_ENV ?? "production";
+}
+
+(async () => {
+  await import("./dist/cli/index.js");
+})();

package/dist/build-7YIQVVYE.js

@@ -0,0 +1,239 @@
+/**
+ * @react-router/dev v0.0.0-experimental-8fdb14ec6
+ *
+ * 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
+ */
+import {
+  configRouteToBranchRoute,
+  extractPluginContext,
+  getServerBuildDirectory,
+  resolveViteConfig
+} from "./chunk-TLJPROZH.js";
+import "./chunk-76RVI3VW.js";
+import "./chunk-ACXLX4EI.js";
+import {
+  getVite,
+  preloadVite
+} from "./chunk-6ZGYCLOA.js";
+import {
+  invariant
+} from "./chunk-6CEKSKVN.js";
+
+// vite/build.ts
+import path from "node:path";
+import fse from "fs-extra";
+import colors from "picocolors";
+function getAddressableRoutes(routes) {
+  let nonAddressableIds = /* @__PURE__ */ new Set();
+  for (let id in routes) {
+    let route = routes[id];
+    if (route.index) {
+      invariant(
+        route.parentId,
+        `Expected index route "${route.id}" to have "parentId" set`
+      );
+      nonAddressableIds.add(route.parentId);
+    }
+    if (typeof route.path !== "string" && !route.index) {
+      nonAddressableIds.add(id);
+    }
+  }
+  return Object.values(routes).filter(
+    (route) => !nonAddressableIds.has(route.id)
+  );
+}
+function getRouteBranch(routes, routeId) {
+  let branch = [];
+  let currentRouteId = routeId;
+  while (currentRouteId) {
+    let route = routes[currentRouteId];
+    invariant(route, `Missing route for ${currentRouteId}`);
+    branch.push(route);
+    currentRouteId = route.parentId;
+  }
+  return branch.reverse();
+}
+async function getServerBuilds(ctx) {
+  let { rootDirectory } = ctx;
+  const { routes, serverBuildFile, serverBundles, appDirectory } = ctx.reactRouterConfig;
+  let serverBuildDirectory = getServerBuildDirectory(ctx);
+  if (!serverBundles) {
+    return {
+      serverBuilds: [{ ssr: true }],
+      buildManifest: { routes }
+    };
+  }
+  let { normalizePath } = await import("vite");
+  let resolvedAppDirectory = path.resolve(rootDirectory, appDirectory);
+  let rootRelativeRoutes = Object.fromEntries(
+    Object.entries(routes).map(([id, route]) => {
+      let filePath = path.join(resolvedAppDirectory, route.file);
+      let rootRelativeFilePath = normalizePath(
+        path.relative(rootDirectory, filePath)
+      );
+      return [id, { ...route, file: rootRelativeFilePath }];
+    })
+  );
+  let buildManifest = {
+    serverBundles: {},
+    routeIdToServerBundleId: {},
+    routes: rootRelativeRoutes
+  };
+  let serverBundleBuildConfigById = /* @__PURE__ */ new Map();
+  await Promise.all(
+    getAddressableRoutes(routes).map(async (route) => {
+      let branch = getRouteBranch(routes, route.id);
+      let serverBundleId = await serverBundles({
+        branch: branch.map(
+          (route2) => configRouteToBranchRoute({
+            ...route2,
+            // Ensure absolute paths are passed to the serverBundles function
+            file: path.join(resolvedAppDirectory, route2.file)
+          })
+        )
+      });
+      if (typeof serverBundleId !== "string") {
+        throw new Error(`The "serverBundles" function must return a string`);
+      }
+      if (!/^[a-zA-Z0-9-_]+$/.test(serverBundleId)) {
+        throw new Error(
+          `The "serverBundles" function must only return strings containing alphanumeric characters, hyphens and underscores.`
+        );
+      }
+      buildManifest.routeIdToServerBundleId[route.id] = serverBundleId;
+      let relativeServerBundleDirectory = path.relative(
+        rootDirectory,
+        path.join(serverBuildDirectory, serverBundleId)
+      );
+      let serverBuildConfig = serverBundleBuildConfigById.get(serverBundleId);
+      if (!serverBuildConfig) {
+        buildManifest.serverBundles[serverBundleId] = {
+          id: serverBundleId,
+          file: normalizePath(
+            path.join(relativeServerBundleDirectory, serverBuildFile)
+          )
+        };
+        serverBuildConfig = {
+          routes: {},
+          serverBundleId
+        };
+        serverBundleBuildConfigById.set(serverBundleId, serverBuildConfig);
+      }
+      for (let route2 of branch) {
+        serverBuildConfig.routes[route2.id] = route2;
+      }
+    })
+  );
+  let serverBuilds = Array.from(serverBundleBuildConfigById.values()).map(
+    (serverBundleBuildConfig) => {
+      let serverBuild = {
+        ssr: true,
+        serverBundleBuildConfig
+      };
+      return serverBuild;
+    }
+  );
+  return {
+    serverBuilds,
+    buildManifest
+  };
+}
+async function cleanBuildDirectory(viteConfig, ctx) {
+  let buildDirectory = ctx.reactRouterConfig.buildDirectory;
+  let isWithinRoot = () => {
+    let relativePath = path.relative(ctx.rootDirectory, buildDirectory);
+    return !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
+  };
+  if (viteConfig.build.emptyOutDir ?? isWithinRoot()) {
+    await fse.remove(buildDirectory);
+  }
+}
+function getViteManifestPaths(ctx, serverBuilds) {
+  let buildRelative = (pathname) => path.resolve(ctx.reactRouterConfig.buildDirectory, pathname);
+  let viteManifestPaths = [
+    "client/.vite/manifest.json",
+    ...serverBuilds.map(({ serverBundleBuildConfig }) => {
+      let serverBundleId = serverBundleBuildConfig?.serverBundleId;
+      let serverBundlePath = serverBundleId ? serverBundleId + "/" : "";
+      return `server/${serverBundlePath}.vite/manifest.json`;
+    })
+  ].map((srcPath) => buildRelative(srcPath));
+  return viteManifestPaths;
+}
+async function build(root, {
+  assetsInlineLimit,
+  clearScreen,
+  config: configFile,
+  emptyOutDir,
+  force,
+  logLevel,
+  minify,
+  mode,
+  sourcemapClient,
+  sourcemapServer
+}) {
+  await preloadVite();
+  let viteConfig = await resolveViteConfig({ configFile, mode, root });
+  const ctx = await extractPluginContext(viteConfig);
+  if (!ctx) {
+    console.error(
+      colors.red("React Router Vite plugin not found in Vite config")
+    );
+    process.exit(1);
+  }
+  let { reactRouterConfig } = ctx;
+  let vite = getVite();
+  async function viteBuild({
+    ssr,
+    serverBundleBuildConfig
+  }) {
+    await vite.build({
+      root,
+      mode,
+      configFile,
+      build: {
+        assetsInlineLimit,
+        emptyOutDir,
+        minify,
+        ssr,
+        sourcemap: ssr ? sourcemapServer : sourcemapClient
+      },
+      optimizeDeps: { force },
+      clearScreen,
+      logLevel,
+      ...serverBundleBuildConfig ? { __reactRouterServerBundleBuildConfig: serverBundleBuildConfig } : {}
+    });
+  }
+  await cleanBuildDirectory(viteConfig, ctx);
+  await viteBuild({ ssr: false });
+  let { serverBuilds, buildManifest } = await getServerBuilds(ctx);
+  await Promise.all(serverBuilds.map(viteBuild));
+  let viteManifestPaths = getViteManifestPaths(ctx, serverBuilds);
+  await Promise.all(
+    viteManifestPaths.map(async (viteManifestPath) => {
+      let manifestExists = await fse.pathExists(viteManifestPath);
+      if (!manifestExists) return;
+      if (!ctx.viteManifestEnabled) {
+        await fse.remove(viteManifestPath);
+      }
+      let viteDir = path.dirname(viteManifestPath);
+      let viteDirFiles = await fse.readdir(viteDir);
+      if (viteDirFiles.length === 0) {
+        await fse.remove(viteDir);
+      }
+    })
+  );
+  await reactRouterConfig.buildEnd?.({
+    buildManifest,
+    reactRouterConfig,
+    viteConfig
+  });
+}
+export {
+  build
+};

package/dist/chunk-6CEKSKVN.js

@@ -0,0 +1,31 @@
+/**
+ * @react-router/dev v0.0.0-experimental-8fdb14ec6
+ *
+ * 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
+ */
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+// invariant.ts
+function invariant(value, message) {
+  if (value === false || value === null || typeof value === "undefined") {
+    console.error(
+      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
+    );
+    throw new Error(message);
+  }
+}
+
+export {
+  __require,
+  invariant
+};

package/dist/chunk-6ZGYCLOA.js

@@ -0,0 +1,57 @@
+/**
+ * @react-router/dev v0.0.0-experimental-8fdb14ec6
+ *
+ * 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
+ */
+import {
+  invariant
+} from "./chunk-6CEKSKVN.js";
+
+// vite/vite.ts
+import { createRequire as createRequire2 } from "node:module";
+import path2 from "pathe";
+
+// config/is-react-router-repo.ts
+import path from "pathe";
+import { createRequire } from "node:module";
+var require2 = createRequire(import.meta.url);
+function isReactRouterRepo() {
+  let serverRuntimePath = path.dirname(
+    require2.resolve("@react-router/node/package.json")
+  );
+  let serverRuntimeParentDir = path.basename(
+    path.resolve(serverRuntimePath, "..")
+  );
+  return serverRuntimeParentDir === "packages";
+}
+
+// vite/vite.ts
+var require3 = createRequire2(import.meta.url);
+var vite;
+var viteImportSpecifier = isReactRouterRepo() ? (
+  // Support testing against different versions of Vite by ensuring that Vite
+  // is resolved from the current working directory when running within this
+  // repo. If we don't do this, Vite will always be imported relative to this
+  // file, which means that it will always resolve to Vite 6.
+  `file:///${path2.normalize(
+    require3.resolve("vite/package.json", { paths: [process.cwd()] })
+  ).replace("package.json", "dist/node/index.js")}`
+) : "vite";
+async function preloadVite() {
+  vite = await import(viteImportSpecifier);
+}
+function getVite() {
+  invariant(vite, "getVite() called before preloadVite()");
+  return vite;
+}
+
+export {
+  isReactRouterRepo,
+  preloadVite,
+  getVite
+};

package/dist/chunk-76RVI3VW.js

@@ -0,0 +1,219 @@
+/**
+ * @react-router/dev v0.0.0-experimental-8fdb14ec6
+ *
+ * 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
+ */
+import {
+  invariant
+} from "./chunk-6CEKSKVN.js";
+
+// config/routes.ts
+import * as Path from "pathe";
+import * as v from "valibot";
+import pick from "lodash/pick.js";
+function setAppDirectory(directory) {
+  globalThis.__reactRouterAppDirectory = directory;
+}
+function getAppDirectory() {
+  invariant(globalThis.__reactRouterAppDirectory);
+  return globalThis.__reactRouterAppDirectory;
+}
+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(
+          ([path, message]) => `Path: routes.${path}
+${message}`
+        ) : []
+      ].flat().join("\n\n")
+    };
+  }
+  return { valid: true };
+}
+var createConfigRouteOptionKeys = [
+  "id",
+  "index",
+  "caseSensitive"
+];
+function route(path, file, optionsOrChildren, children) {
+  let options = {};
+  if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
+    children = optionsOrChildren;
+  } else {
+    options = optionsOrChildren;
+  }
+  return {
+    file,
+    children,
+    path: path ?? void 0,
+    ...pick(options, createConfigRouteOptionKeys)
+  };
+}
+var createIndexOptionKeys = ["id"];
+function index(file, options) {
+  return {
+    file,
+    index: true,
+    ...pick(options, createIndexOptionKeys)
+  };
+}
+var createLayoutOptionKeys = ["id"];
+function layout(file, optionsOrChildren, children) {
+  let options = {};
+  if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
+    children = optionsOrChildren;
+  } else {
+    options = optionsOrChildren;
+  }
+  return {
+    file,
+    children,
+    ...pick(options, createLayoutOptionKeys)
+  };
+}
+function prefix(prefixPath, routes) {
+  return routes.map((route2) => {
+    if (route2.index || typeof route2.path === "string") {
+      return {
+        ...route2,
+        path: route2.path ? joinRoutePaths(prefixPath, route2.path) : prefixPath,
+        children: route2.children
+      };
+    } else if (route2.children) {
+      return {
+        ...route2,
+        children: prefix(prefixPath, route2.children)
+      };
+    }
+    return route2;
+  });
+}
+function relative2(directory) {
+  return {
+    /**
+     * Helper function for creating a route config entry, for use within
+     * `routes.ts`. Note that this helper has been scoped, meaning that file
+     * path will be resolved relative to the directory provided to the
+     * `relative` call that created this helper.
+     */
+    route: (path, file, ...rest) => {
+      return route(path, Path.resolve(directory, file), ...rest);
+    },
+    /**
+     * Helper function for creating a route config entry for an index route, for
+     * use within `routes.ts`. Note that this helper has been scoped, meaning
+     * that file path will be resolved relative to the directory provided to the
+     * `relative` call that created this helper.
+     */
+    index: (file, ...rest) => {
+      return index(Path.resolve(directory, file), ...rest);
+    },
+    /**
+     * Helper function for creating a route config entry for a layout route, for
+     * use within `routes.ts`. Note that this helper has been scoped, meaning
+     * that file path will be resolved relative to the directory provided to the
+     * `relative` call that created this helper.
+     */
+    layout: (file, ...rest) => {
+      return layout(Path.resolve(directory, file), ...rest);
+    },
+    // Passthrough of helper functions that don't need relative scoping so that
+    // a complete API is still provided.
+    prefix
+  };
+}
+function configRoutesToRouteManifest(appDirectory, routes, rootId = "root") {
+  let routeManifest = {};
+  function walk(route2, parentId) {
+    let id = route2.id || createRouteId(route2.file);
+    let manifestItem = {
+      id,
+      parentId,
+      file: Path.isAbsolute(route2.file) ? Path.relative(appDirectory, route2.file) : route2.file,
+      path: route2.path,
+      index: route2.index,
+      caseSensitive: route2.caseSensitive
+    };
+    if (routeManifest.hasOwnProperty(id)) {
+      throw new Error(
+        `Unable to define routes with duplicate route id: "${id}"`
+      );
+    }
+    routeManifest[id] = manifestItem;
+    if (route2.children) {
+      for (let child of route2.children) {
+        walk(child, id);
+      }
+    }
+  }
+  for (let route2 of routes) {
+    walk(route2, rootId);
+  }
+  return routeManifest;
+}
+function createRouteId(file) {
+  return Path.normalize(stripFileExtension(file));
+}
+function stripFileExtension(file) {
+  return file.replace(/\.[a-z0-9]+$/i, "");
+}
+function joinRoutePaths(path1, path2) {
+  return [
+    path1.replace(/\/+$/, ""),
+    // Remove trailing slashes
+    path2.replace(/^\/+/, "")
+    // Remove leading slashes
+  ].join("/");
+}
+
+export {
+  setAppDirectory,
+  getAppDirectory,
+  validateRouteConfig,
+  route,
+  index,
+  layout,
+  prefix,
+  relative2 as relative,
+  configRoutesToRouteManifest
+};

package/dist/chunk-ACXLX4EI.js

@@ -0,0 +1,81 @@
+/**
+ * @react-router/dev v0.0.0-experimental-8fdb14ec6
+ *
+ * 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
+ */
+import {
+  invariant
+} from "./chunk-6CEKSKVN.js";
+
+// vite/node-adapter.ts
+import { once } from "node:events";
+import { Readable } from "node:stream";
+import { splitCookiesString } from "set-cookie-parser";
+import { createReadableStreamFromReadable } from "@react-router/node";
+function fromNodeHeaders(nodeHeaders) {
+  let headers = new Headers();
+  for (let [key, values] of Object.entries(nodeHeaders)) {
+    if (values) {
+      if (Array.isArray(values)) {
+        for (let value of values) {
+          headers.append(key, value);
+        }
+      } else {
+        headers.set(key, values);
+      }
+    }
+  }
+  return headers;
+}
+function fromNodeRequest(nodeReq, nodeRes) {
+  let origin = nodeReq.headers.origin && "null" !== nodeReq.headers.origin ? nodeReq.headers.origin : `http://${nodeReq.headers.host}`;
+  invariant(
+    nodeReq.originalUrl,
+    "Expected `nodeReq.originalUrl` to be defined"
+  );
+  let url = new URL(nodeReq.originalUrl, origin);
+  let controller = new AbortController();
+  let init = {
+    method: nodeReq.method,
+    headers: fromNodeHeaders(nodeReq.headers),
+    signal: controller.signal
+  };
+  nodeRes.on("finish", () => controller = null);
+  nodeRes.on("close", () => controller?.abort());
+  if (nodeReq.method !== "GET" && nodeReq.method !== "HEAD") {
+    init.body = createReadableStreamFromReadable(nodeReq);
+    init.duplex = "half";
+  }
+  return new Request(url.href, init);
+}
+async function toNodeRequest(res, nodeRes) {
+  nodeRes.statusCode = res.status;
+  nodeRes.statusMessage = res.statusText;
+  let cookiesStrings = [];
+  for (let [name, value] of res.headers) {
+    if (name === "set-cookie") {
+      cookiesStrings.push(...splitCookiesString(value));
+    } else nodeRes.setHeader(name, value);
+  }
+  if (cookiesStrings.length) {
+    nodeRes.setHeader("set-cookie", cookiesStrings);
+  }
+  if (res.body) {
+    let responseBody = res.body;
+    let readable = Readable.from(responseBody);
+    readable.pipe(nodeRes);
+    await once(readable, "end");
+  } else {
+    nodeRes.end();
+  }
+}
+
+export {
+  fromNodeRequest,
+  toNodeRequest
+};