@react-router/dev 7.1.1 → 7.1.2-pre.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # `@react-router/dev`
 
+## 7.1.2-pre.0
+
+### Patch Changes
+
+- Fix default external conditions in Vite v6. This fixes resolution issues with certain npm packages. ([#12644](https://github.com/remix-run/react-router/pull/12644))
+- Fix mismatch in prerendering html/data files when path is missing a leading slash ([#12684](https://github.com/remix-run/react-router/pull/12684))
+- Use `module-sync` server condition when enabled in the runtime. This fixes React context mismatches (e.g. `useHref() may be used only in the context of a <Router> component.`) during development on Node 22.10.0+ when using libraries that have a peer dependency on React Router. ([#12729](https://github.com/remix-run/react-router/pull/12729))
+- Fix react-refresh source maps ([#12686](https://github.com/remix-run/react-router/pull/12686))
+- Updated dependencies:
+  - `react-router@7.1.2-pre.0`
+  - `@react-router/node@7.1.2-pre.0`
+  - `@react-router/serve@7.1.2-pre.0`
+
 ## 7.1.1
 
 ### Patch Changes
@@ -74,7 +87,7 @@
   +import { cloudflareDevProxy } from "@react-router/dev/vite/cloudflare";
   ```
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.1.1
+ * @react-router/dev v7.1.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -55,26 +55,55 @@ var init_invariant = __esm({
   }
 });
 
-// vite/import-vite-esm-sync.ts
-async function preloadViteEsm() {
-  vite = await import("vite");
+// config/is-react-router-repo.ts
+function isReactRouterRepo() {
+  let serverRuntimePath = import_pathe.default.dirname(
+    require.resolve("@react-router/node/package.json")
+  );
+  let serverRuntimeParentDir = import_pathe.default.basename(
+    import_pathe.default.resolve(serverRuntimePath, "..")
+  );
+  return serverRuntimeParentDir === "packages";
 }
-function importViteEsmSync() {
-  invariant(vite, "importViteEsmSync() called before preloadViteEsm()");
+var import_pathe;
+var init_is_react_router_repo = __esm({
+  "config/is-react-router-repo.ts"() {
+    "use strict";
+    import_pathe = __toESM(require("pathe"));
+  }
+});
+
+// vite/vite.ts
+async function preloadVite() {
+  vite = await import(viteImportSpecifier);
+}
+function getVite() {
+  invariant(vite, "getVite() called before preloadVite()");
   return vite;
 }
-var vite;
-var init_import_vite_esm_sync = __esm({
-  "vite/import-vite-esm-sync.ts"() {
+var import_pathe2, vite, viteImportSpecifier;
+var init_vite = __esm({
+  "vite/vite.ts"() {
     "use strict";
+    import_pathe2 = __toESM(require("pathe"));
     init_invariant();
+    init_is_react_router_repo();
+    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:///${import_pathe2.default.normalize(
+        require.resolve("vite/package.json", { paths: [process.cwd()] })
+      ).replace("package.json", "dist/node/index.js")}`
+    ) : "vite";
   }
 });
 
 // vite/vite-node.ts
 async function createContext(viteConfig = {}) {
-  await preloadViteEsm();
-  const vite2 = importViteEsmSync();
+  await preloadVite();
+  const vite2 = getVite();
   const devServer = await vite2.createServer(
     vite2.mergeConfig(
       {
@@ -116,7 +145,7 @@ var init_vite_node = __esm({
     import_server = require("vite-node/server");
     import_client = require("vite-node/client");
     import_source_map = require("vite-node/source-map");
-    init_import_vite_esm_sync();
+    init_vite();
   }
 });
 
@@ -149,7 +178,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path8, message]) => `Path: routes.${path8}
+          ([path10, message]) => `Path: routes.${path10}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -307,13 +336,13 @@ async function resolveConfig({
       "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_pathe.default.resolve(root, userAppDirectory || "app");
-  let buildDirectory = import_pathe.default.resolve(root, userBuildDirectory);
+  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_pathe.default.relative(
+    let rootRouteDisplayPath = import_pathe3.default.relative(
       root,
-      import_pathe.default.join(appDirectory, "root.tsx")
+      import_pathe3.default.join(appDirectory, "root.tsx")
     );
     return err(
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
@@ -325,15 +354,15 @@ async function resolveConfig({
   let routeConfigFile = findEntry(appDirectory, "routes");
   try {
     if (!routeConfigFile) {
-      let routeConfigDisplayPath = import_pathe.default.relative(
+      let routeConfigDisplayPath = import_pathe3.default.relative(
         root,
-        import_pathe.default.join(appDirectory, "routes.ts")
+        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_pathe.default.join(appDirectory, routeConfigFile)
+      import_pathe3.default.join(appDirectory, routeConfigFile)
     )).default;
     let routeConfig = await routeConfigExport;
     let result = validateRouteConfig({
@@ -353,7 +382,7 @@ async function resolveConfig({
         import_picocolors.default.red(`Route config in "${routeConfigFile}" is invalid.`),
         "",
         error.loc?.file && error.loc?.column && error.frame ? [
-          import_pathe.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
+          import_pathe3.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
           error.frame.trim?.()
         ] : error.stack
       ].flat().join("\n")
@@ -425,8 +454,8 @@ async function createConfigLoader({
         );
         fsWatcher.on("all", async (...args) => {
           let [event, rawFilepath] = args;
-          let filepath = import_pathe.default.normalize(rawFilepath);
-          let appFileAddedOrRemoved = appDirectory && (event === "add" || event === "unlink") && filepath.startsWith(import_pathe.default.normalize(appDirectory));
+          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)
           );
@@ -467,25 +496,16 @@ async function createConfigLoader({
     }
   };
 }
-function isInReactRouterMonorepo() {
-  let serverRuntimePath = import_pathe.default.dirname(
-    require.resolve("@react-router/node/package.json")
-  );
-  let serverRuntimeParentDir = import_pathe.default.basename(
-    import_pathe.default.resolve(serverRuntimePath, "..")
-  );
-  return serverRuntimeParentDir === "packages";
-}
 function findEntry(dir, basename2, options) {
   for (let ext of entryExts) {
-    let file = import_pathe.default.resolve(dir, basename2 + ext);
+    let file = import_pathe3.default.resolve(dir, basename2 + ext);
     if (import_node_fs.default.existsSync(file)) {
-      return options?.absolute ?? false ? file : import_pathe.default.relative(dir, file);
+      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
     }
   }
   return void 0;
 }
-var import_node_fs, import_node_child_process, import_package_json, import_pathe, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, branchRouteProperties, configRouteToBranchRoute, mergeReactRouterConfig, deepFreeze, ssrExternals, entryExts;
+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, branchRouteProperties, configRouteToBranchRoute, mergeReactRouterConfig, deepFreeze, ssrExternals, entryExts;
 var init_config = __esm({
   "config/config.ts"() {
     "use strict";
@@ -493,7 +513,7 @@ var init_config = __esm({
     import_node_child_process = require("child_process");
     import_package_json = __toESM(require("@npmcli/package-json"));
     init_vite_node();
-    import_pathe = __toESM(require("pathe"));
+    import_pathe3 = __toESM(require("pathe"));
     import_chokidar = __toESM(require("chokidar"));
     import_picocolors = __toESM(require("picocolors"));
     import_pick2 = __toESM(require("lodash/pick"));
@@ -502,6 +522,7 @@ var init_config = __esm({
     import_isEqual = __toESM(require("lodash/isEqual"));
     init_routes();
     init_detectPackageManager();
+    init_is_react_router_repo();
     excludedConfigPresetKeys = ["presets"];
     branchRouteProperties = [
       "id",
@@ -548,7 +569,7 @@ var init_config = __esm({
       });
       return o;
     };
-    ssrExternals = isInReactRouterMonorepo() ? [
+    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.
@@ -695,7 +716,7 @@ var init_generate = __esm({
     Path3 = __toESM(require("pathe"));
     Pathe2 = __toESM(require("pathe/utils"));
     init_paths();
-    noExtension = (path8) => Path3.join(Path3.dirname(path8), Pathe2.filename(path8));
+    noExtension = (path10) => Path3.join(Path3.dirname(path10), Pathe2.filename(path10));
   }
 });
 
@@ -791,24 +812,24 @@ var init_node_adapter = __esm({
 });
 
 // vite/resolve-file-url.ts
-var path2;
+var path4;
 var init_resolve_file_url = __esm({
   "vite/resolve-file-url.ts"() {
     "use strict";
-    path2 = __toESM(require("path"));
-    init_import_vite_esm_sync();
+    path4 = __toESM(require("path"));
+    init_vite();
   }
 });
 
 // vite/styles.ts
-var path3, import_react_router, cssFileRegExp, cssModulesRegExp;
+var path5, import_react_router, cssFileRegExp, cssModulesRegExp;
 var init_styles = __esm({
   "vite/styles.ts"() {
     "use strict";
-    path3 = __toESM(require("path"));
+    path5 = __toESM(require("path"));
     import_react_router = require("react-router");
     init_resolve_file_url();
-    init_import_vite_esm_sync();
+    init_vite();
     cssFileRegExp = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
     cssModulesRegExp = new RegExp(`\\.module${cssFileRegExp.source}`);
   }
@@ -864,7 +885,7 @@ async function resolveViteConfig({
   mode,
   root
 }) {
-  let vite2 = await import("vite");
+  let vite2 = getVite();
   let viteConfig = await vite2.resolveConfig(
     { mode, configFile, root },
     "build",
@@ -914,17 +935,17 @@ async function loadPluginContext({
 function findConfig(dir, basename2, extensions) {
   for (let ext of extensions) {
     let name = basename2 + ext;
-    let file = path4.join(dir, name);
+    let file = path6.join(dir, name);
     if (fse.existsSync(file)) return file;
   }
   return void 0;
 }
-var import_node_crypto, path4, url, fse, babel, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors3, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER, REACT_REFRESH_FOOTER;
+var import_node_crypto, path6, url, fse, babel, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors3, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
-    path4 = __toESM(require("path"));
+    path6 = __toESM(require("path"));
     url = __toESM(require("url"));
     fse = __toESM(require("fs-extra"));
     babel = __toESM(require("@babel/core"));
@@ -941,7 +962,7 @@ var init_plugin = __esm({
     init_resolve_file_url();
     init_combine_urls();
     init_remove_exports();
-    init_import_vite_esm_sync();
+    init_vite();
     init_config();
     init_with_props();
     virtualHmrRuntime = create("hmr-runtime");
@@ -951,18 +972,18 @@ var init_plugin = __esm({
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")
     };
-    getServerBuildDirectory = (ctx) => path4.join(
+    getServerBuildDirectory = (ctx) => path6.join(
       ctx.reactRouterConfig.buildDirectory,
       "server",
       ...ctx.serverBundleBuildConfig ? [ctx.serverBundleBuildConfig.serverBundleId] : []
     );
-    defaultEntriesDir = path4.resolve(
-      path4.dirname(require.resolve("@react-router/dev/package.json")),
+    defaultEntriesDir = path6.resolve(
+      path6.dirname(require.resolve("@react-router/dev/package.json")),
       "dist",
       "config",
       "defaults"
     );
-    defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path4.join(defaultEntriesDir, filename3));
+    defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path6.join(defaultEntriesDir, filename3));
     invariant(defaultEntries.length > 0, "No default entries found");
     REACT_REFRESH_HEADER = `
 import RefreshRuntime from "${virtualHmrRuntime.id}";
@@ -984,21 +1005,7 @@ if (import.meta.hot && !inWebWorker) {
     RefreshRuntime.register(type, __SOURCE__ + " " + id)
   };
   window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-}`.trim();
-    REACT_REFRESH_FOOTER = `
-if (import.meta.hot && !inWebWorker) {
-  window.$RefreshReg$ = prevRefreshReg;
-  window.$RefreshSig$ = prevRefreshSig;
-  RefreshRuntime.__hmr_import(import.meta.url).then((currentExports) => {
-    RefreshRuntime.registerExportsForReactRefresh(__SOURCE__, currentExports);
-    import.meta.hot.accept((nextExports) => {
-      if (!nextExports) return;
-      __ROUTE_ID__ && window.__reactRouterRouteModuleUpdates.set(__ROUTE_ID__, nextExports);
-      const invalidateMessage = RefreshRuntime.validateRefreshBoundaryAndEnqueueUpdate(currentExports, nextExports, __ACCEPT_EXPORTS__);
-      if (invalidateMessage) import.meta.hot.invalidate(invalidateMessage);
-    });
-  });
-}`.trim();
+}`.replaceAll("\n", "");
   }
 });
 
@@ -1195,7 +1202,7 @@ async function build(root, {
   sourcemapClient,
   sourcemapServer
 }) {
-  await preloadViteEsm();
+  await preloadVite();
   let viteConfig = await resolveViteConfig({ configFile, mode, root });
   const ctx = await extractPluginContext(viteConfig);
   if (!ctx) {
@@ -1205,7 +1212,7 @@ async function build(root, {
     process.exit(1);
   }
   let { reactRouterConfig } = ctx;
-  let vite2 = await import("vite");
+  let vite2 = getVite();
   async function viteBuild({
     ssr,
     serverBundleBuildConfig
@@ -1262,7 +1269,7 @@ var init_build = __esm({
     init_plugin();
     init_config();
     init_invariant();
-    init_import_vite_esm_sync();
+    init_vite();
   }
 });
 
@@ -1283,8 +1290,8 @@ async function dev(root, {
   port,
   strictPort
 }) {
-  await preloadViteEsm();
-  let vite2 = await import("vite");
+  await preloadVite();
+  let vite2 = getVite();
   let server = await vite2.createServer({
     root,
     mode,
@@ -1324,7 +1331,7 @@ var init_dev = __esm({
   "vite/dev.ts"() {
     "use strict";
     import_picocolors6 = __toESM(require("picocolors"));
-    init_import_vite_esm_sync();
+    init_vite();
     init_profiler();
   }
 });
@@ -1335,7 +1342,7 @@ var import_semver = __toESM(require("semver"));
 var import_picocolors8 = __toESM(require("picocolors"));
 
 // cli/commands.ts
-var path7 = __toESM(require("path"));
+var path9 = __toESM(require("path"));
 var import_fs_extra2 = __toESM(require("fs-extra"));
 var import_package_json2 = __toESM(require("@npmcli/package-json"));
 var import_exit_hook = __toESM(require("exit-hook"));
@@ -1421,7 +1428,7 @@ function transpile(tsx, options = {}) {
 // cli/commands.ts
 init_profiler();
 init_typegen();
-init_import_vite_esm_sync();
+init_vite();
 async function routes(reactRouterRoot, flags = {}) {
   let ctx = await loadPluginContext({
     root: reactRouterRoot,
@@ -1493,14 +1500,14 @@ async function generateEntry(entry, reactRouterRoot, flags = {}) {
     console.error(import_picocolors7.default.red(`No default server entry detected.`));
     return;
   }
-  let defaultsDirectory = path7.resolve(
-    path7.dirname(require.resolve("@react-router/dev/package.json")),
+  let defaultsDirectory = path9.resolve(
+    path9.dirname(require.resolve("@react-router/dev/package.json")),
     "dist",
     "config",
     "defaults"
   );
-  let defaultEntryClient = path7.resolve(defaultsDirectory, "entry.client.tsx");
-  let defaultEntryServer = path7.resolve(
+  let defaultEntryClient = path9.resolve(defaultsDirectory, "entry.client.tsx");
+  let defaultEntryServer = path9.resolve(
     defaultsDirectory,
     `entry.server.node.tsx`
   );
@@ -1509,7 +1516,7 @@ async function generateEntry(entry, reactRouterRoot, flags = {}) {
   let useTypeScript = flags.typescript ?? true;
   let outputExtension = useTypeScript ? "tsx" : "jsx";
   let outputEntry = `${entry}.${outputExtension}`;
-  let outputFile2 = path7.resolve(appDirectory, outputEntry);
+  let outputFile2 = path9.resolve(appDirectory, outputEntry);
   if (!useTypeScript) {
     let javascript = transpile(contents, {
       cwd: rootDirectory,
@@ -1521,7 +1528,7 @@ async function generateEntry(entry, reactRouterRoot, flags = {}) {
   }
   console.log(
     import_picocolors7.default.blue(
-      `Entry file ${entry} created at ${path7.relative(
+      `Entry file ${entry} created at ${path9.relative(
         rootDirectory,
         outputFile2
       )}.`
@@ -1530,10 +1537,10 @@ async function generateEntry(entry, reactRouterRoot, flags = {}) {
 }
 async function checkForEntry(rootDirectory, appDirectory, entries2) {
   for (let entry of entries2) {
-    let entryPath = path7.resolve(appDirectory, entry);
+    let entryPath = path9.resolve(appDirectory, entry);
     let exists = await import_fs_extra2.default.pathExists(entryPath);
     if (exists) {
-      let relative8 = path7.relative(rootDirectory, entryPath);
+      let relative8 = path9.relative(rootDirectory, entryPath);
       console.error(import_picocolors7.default.red(`Entry file ${relative8} already exists.`));
       return process.exit(1);
     }
@@ -1552,8 +1559,8 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
 async function typegen(root, flags) {
   root ??= process.cwd();
   if (flags.watch) {
-    await preloadViteEsm();
-    const vite2 = importViteEsmSync();
+    await preloadVite();
+    const vite2 = getVite();
     const logger = vite2.createLogger("info", { prefix: "[react-router]" });
     await watch(root, { logger });
     await new Promise(() => {

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.1
+ * @react-router/dev v7.1.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -122,6 +122,40 @@ async function toNodeRequest(res, nodeRes) {
   }
 }
 
+// vite/vite.ts
+var import_pathe2 = __toESM(require("pathe"));
+
+// config/is-react-router-repo.ts
+var import_pathe = __toESM(require("pathe"));
+function isReactRouterRepo() {
+  let serverRuntimePath = import_pathe.default.dirname(
+    require.resolve("@react-router/node/package.json")
+  );
+  let serverRuntimeParentDir = import_pathe.default.basename(
+    import_pathe.default.resolve(serverRuntimePath, "..")
+  );
+  return serverRuntimeParentDir === "packages";
+}
+
+// vite/vite.ts
+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:///${import_pathe2.default.normalize(
+    require.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;
+}
+
 // vite/cloudflare-dev-proxy.ts
 var serverBuildId = "virtual:react-router/server-build";
 function importWrangler() {
@@ -136,13 +170,20 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
   let { getLoadContext, ...restOptions } = options;
   return {
     name: PLUGIN_NAME,
-    config: () => ({
-      ssr: {
-        resolve: {
-          externalConditions: ["workerd", "worker"]
+    config: async () => {
+      await preloadVite();
+      const vite2 = getVite();
+      const serverConditions = [
+        ...vite2.defaultServerConditions ?? []
+      ];
+      return {
+        ssr: {
+          resolve: {
+            externalConditions: ["workerd", "worker", ...serverConditions]
+          }
         }
-      }
-    }),
+      };
+    },
     configResolved: (viteConfig) => {
       let pluginIndex = (name) => viteConfig.plugins.findIndex((plugin) => plugin.name === name);
       let reactRouterPluginIndex = pluginIndex("react-router");