@react-router/dev 0.0.0-experimental-2d8f5c807 → 0.0.0-experimental-303421afa

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # `@react-router/dev`
 
+## 7.9.6
+
+### Patch Changes
+
+- Use a dynamic `import()` to load ESM-only `p-map` dependency to avoid issues on Node 20.18 and below ([#14492](https://github.com/remix-run/react-router/pull/14492))
+- Short circuit `HEAD` document requests before calling `renderToPipeableStream` in the default `entry.server.tsx` to more closely align with the [spec](https://httpwg.org/specs/rfc9110.html#HEAD) ([#14488](https://github.com/remix-run/react-router/pull/14488))
+- Updated dependencies:
+  - `react-router@7.9.6`
+  - `@react-router/node@7.9.6`
+  - `@react-router/serve@7.9.6`
+
 ## 7.9.5
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-2d8f5c807
+ * @react-router/dev v0.0.0-experimental-303421afa
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -718,17 +718,17 @@ function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /
   }
   return false;
 }
-var import_node_fs, import_node_child_process, import_package_json, import_pathe3, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, entryExts;
+var import_node_fs, import_node_child_process, import_pathe3, import_chokidar, import_picocolors, import_pkg_types, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, entryExts;
 var init_config = __esm({
   "config/config.ts"() {
     "use strict";
     import_node_fs = __toESM(require("fs"));
     import_node_child_process = require("child_process");
-    import_package_json = __toESM(require("@npmcli/package-json"));
     init_vite_node();
     import_pathe3 = __toESM(require("pathe"));
     import_chokidar = __toESM(require("chokidar"));
     import_picocolors = __toESM(require("picocolors"));
+    import_pkg_types = require("pkg-types");
     import_pick2 = __toESM(require("lodash/pick"));
     import_omit = __toESM(require("lodash/omit"));
     import_cloneDeep = __toESM(require("lodash/cloneDeep"));
@@ -2142,9 +2142,9 @@ var import_picocolors9 = __toESM(require("picocolors"));
 var import_node_fs4 = require("fs");
 var import_promises3 = require("fs/promises");
 var path8 = __toESM(require("path"));
-var import_package_json2 = __toESM(require("@npmcli/package-json"));
 var import_exit_hook = __toESM(require("exit-hook"));
 var import_picocolors8 = __toESM(require("picocolors"));
+var import_pkg_types2 = require("pkg-types");
 var import_react_router3 = require("react-router");
 init_config();
 
@@ -2308,8 +2308,8 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     );
     return;
   }
-  let pkgJson = await import_package_json2.default.load(rootDirectory);
-  let deps = pkgJson.content.dependencies ?? {};
+  let pkgJson = await (0, import_pkg_types2.readPackageJSON)(rootDirectory);
+  let deps = pkgJson.dependencies ?? {};
   if (!deps["@react-router/node"]) {
     console.error(import_picocolors8.default.red(`No default server entry detected.`));
     return;

package/dist/config/default-rsc-entries/entry.rsc.tsx

@@ -37,7 +37,7 @@ export default async function handler(request: Request) {
   const ssr = await import.meta.viteRsc.loadModule<
     typeof import("./entry.ssr")
   >("ssr", "index");
-  return ssr.default(request, fetchServer);
+  return ssr.default(request, await fetchServer(request));
 }
 
 if (import.meta.hot) {

package/dist/config/default-rsc-entries/entry.ssr.tsx

@@ -8,14 +8,14 @@ import {
 
 export default async function handler(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
 ) {
   const bootstrapScriptContent =
     await import.meta.viteRsc.loadBootstrapScriptContent("index");
 
   return routeRSCServerRequest({
     request,
-    fetchServer,
+    serverResponse,
     createFromReadableStream,
     async renderHTML(getPayload) {
       const payload = getPayload();

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d8f5c807
+ * @react-router/dev v0.0.0-experimental-303421afa
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d8f5c807
+ * @react-router/dev v0.0.0-experimental-303421afa
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d8f5c807
+ * @react-router/dev v0.0.0-experimental-303421afa
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -108,7 +108,6 @@ function getVite() {
 // 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/ssr-externals.ts
 var ssrExternals = isReactRouterRepo() ? [
@@ -188,6 +187,7 @@ async function createContext({
 var import_pathe3 = __toESM(require("pathe"));
 var import_chokidar = __toESM(require("chokidar"));
 var import_picocolors = __toESM(require("picocolors"));
+var import_pkg_types = require("pkg-types");
 var import_pick2 = __toESM(require("lodash/pick"));
 var import_omit = __toESM(require("lodash/omit"));
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"));

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2d8f5c807
+ * @react-router/dev v0.0.0-experimental-303421afa
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -68,7 +68,6 @@ var import_picocolors2 = require("picocolors");
 // 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.ts
 var import_pathe2 = __toESM(require("pathe"));
@@ -192,6 +191,7 @@ async function createContext({
 var import_pathe3 = __toESM(require("pathe"));
 var import_chokidar = __toESM(require("chokidar"));
 var import_picocolors = __toESM(require("picocolors"));
+var import_pkg_types = require("pkg-types");
 var import_pick2 = __toESM(require("lodash/pick"));
 var import_omit = __toESM(require("lodash/omit"));
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
@@ -736,8 +736,8 @@ async function resolveEntryFiles({
       );
     }
     let packageJsonDirectory = import_pathe3.default.dirname(packageJsonPath);
-    let pkgJson = await import_package_json.default.load(packageJsonDirectory);
-    let deps = pkgJson.content.dependencies ?? {};
+    let pkgJson = await (0, import_pkg_types.readPackageJSON)(packageJsonDirectory);
+    let deps = pkgJson.dependencies ?? {};
     if (!deps["@react-router/node"]) {
       throw new Error(
         `Could not determine server runtime. Please install @react-router/node, or provide a custom entry.server.tsx/jsx file in your app directory.`
@@ -747,13 +747,11 @@ async function resolveEntryFiles({
       console.log(
         "adding `isbot@5` to your package.json, you should commit this change"
       );
-      pkgJson.update({
-        dependencies: {
-          ...pkgJson.content.dependencies,
-          isbot: "^5"
-        }
+      await (0, import_pkg_types.updatePackage)(packageJsonPath, (pkg) => {
+        pkg.dependencies ??= {};
+        pkg.dependencies.isbot = "^5";
+        (0, import_pkg_types.sortPackage)(pkg);
       });
-      await pkgJson.save();
       let packageManager = detectPackageManager() ?? "npm";
       (0, import_node_child_process.execSync)(`${packageManager} install`, {
         cwd: packageJsonDirectory,
@@ -3190,17 +3188,17 @@ var reactRouterVitePlugin = () => {
             logger: vite2.createLogger("warn", { prefix: "[react-router]" })
           });
         }
+        await loadDotenv({
+          rootDirectory,
+          viteUserConfig,
+          mode
+        });
         reactRouterConfigLoader = await createConfigLoader({
           rootDirectory,
           mode,
           watch: viteCommand === "serve"
         });
         await updatePluginContext();
-        await loadDotenv({
-          rootDirectory,
-          viteUserConfig,
-          mode
-        });
         let environments = await getEnvironmentsOptions(ctx, viteCommand, {
           viteUserConfig
         });
@@ -5337,6 +5335,11 @@ function reactRouterRSCVitePlugin() {
         viteCommand = command;
         const rootDirectory = getRootDirectory(viteUserConfig);
         const watch2 = command === "serve";
+        await loadDotenv({
+          rootDirectory,
+          viteUserConfig,
+          mode
+        });
         configLoader = await createConfigLoader({
           rootDirectory,
           mode,
@@ -5372,11 +5375,6 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
             "When using the React Router `basename` and the Vite `base` config, the `basename` config must begin with `base` for the default Vite dev server."
           );
         }
-        await loadDotenv({
-          rootDirectory,
-          viteUserConfig,
-          mode
-        });
         const vite2 = await import("vite");
         logger = vite2.createLogger(viteUserConfig.logLevel, {
           prefix: "[react-router]"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-2d8f5c807",
+  "version": "0.0.0-experimental-303421afa",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -67,7 +67,6 @@
     "@babel/preset-typescript": "^7.27.1",
     "@babel/traverse": "^7.27.7",
     "@babel/types": "^7.27.7",
-    "@npmcli/package-json": "^4.0.1",
     "@remix-run/node-fetch-server": "^0.9.0",
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.6",
@@ -81,13 +80,14 @@
     "p-map": "^7.0.3",
     "pathe": "^1.1.2",
     "picocolors": "^1.1.1",
+    "pkg-types": "^2.3.0",
     "prettier": "^3.6.2",
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "tinyglobby": "^0.2.14",
     "valibot": "^1.1.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-2d8f5c807"
+    "@react-router/node": "0.0.0-experimental-303421afa"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -107,19 +107,19 @@
     "fast-glob": "3.2.11",
     "tsup": "^8.3.0",
     "typescript": "^5.1.6",
-    "vite": "^6.1.0",
+    "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-2d8f5c807",
-    "react-router": "^0.0.0-experimental-2d8f5c807"
+    "react-router": "^0.0.0-experimental-303421afa",
+    "@react-router/serve": "0.0.0-experimental-303421afa"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "*",
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "react-router": "^0.0.0-experimental-2d8f5c807",
-    "@react-router/serve": "^0.0.0-experimental-2d8f5c807"
+    "@react-router/serve": "^0.0.0-experimental-303421afa",
+    "react-router": "^0.0.0-experimental-303421afa"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {