@react-router/dev 0.0.0-experimental-51412399d → 0.0.0-experimental-abc385596

package/CHANGELOG.md

@@ -1,12 +1,33 @@
 # `@react-router/dev`
 
+## v7.15.1
+
+### Patch Changes
+
+- Fix `basename` conflicting with `app` directory name when Vite `base` is set ([#15027](https://github.com/remix-run/react-router/pull/15027))
+
+  When the Vite `base` config and React Router `basename` both match the
+  app directory name (e.g. `base: "/app/"`, `basename: "/app/"`), Vite would
+  strip the base prefix from server-build virtual module import paths, causing
+  "Failed to load url /root.tsx" errors. The fix uses `/@fs/` absolute paths
+  for those imports to bypass Vite's base-stripping logic.
+- Updated dependencies:
+  - [`react-router@7.15.1`](https://github.com/remix-run/react-router/releases/tag/react-router@7.15.1)
+  - [`@react-router/node@7.15.1`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@7.15.1)
+  - [`@react-router/serve@7.15.1`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@7.15.1)
+
 ## v7.15.0
 
 ### Minor Changes
 
-- Stabilize `future.unstable_passThroughRequests` as `future.v8_passThroughRequests` ([#14999](https://github.com/remix-run/react-router/pull/14999))
-- Stabilize `prerender.unstable_concurrency` as `prerender.concurrency` ([#14999](https://github.com/remix-run/react-router/pull/14999))
-- Stabilize `future.unstable_subResourceIntegrity` as a top-level `subResourceIntegrity` config option in `react-router.config.ts` ([#14999](https://github.com/remix-run/react-router/pull/14999))
+- Stabilize `future.unstable_passThroughRequests` as `future.v8_passThroughRequests` ([a993f09](https://github.com/remix-run/react-router/commit/a993f09))
+  - ⚠️ This is a breaking change if you have already opted into the unstable version - you will need to update your code accordingly
+
+- Stabilize `prerender.unstable_concurrency` as `prerender.concurrency` ([a993f09](https://github.com/remix-run/react-router/commit/a993f09))
+  - ⚠️ This is a breaking change if you have already opted into the unstable version - you will need to update your code accordingly
+
+- Stabilize `future.unstable_subResourceIntegrity` as a top-level `subResourceIntegrity` config option in `react-router.config.ts` ([a993f09](https://github.com/remix-run/react-router/commit/a993f09))
+  - ⚠️ This is a breaking change if you have already opted into the unstable version - you will need to update your code accordingly
 
 ### Patch Changes
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-51412399d
+ * @react-router/dev v0.0.0-experimental-abc385596
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-51412399d
+ * @react-router/dev v0.0.0-experimental-abc385596
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-51412399d
+ * @react-router/dev v0.0.0-experimental-abc385596
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-51412399d
+ * @react-router/dev v0.0.0-experimental-abc385596
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -802,7 +802,7 @@ var serverBuildId = "virtual:react-router/server-build";
 function importWrangler() {
   try {
     return import("wrangler");
-  } catch (_) {
+  } catch (e) {
     throw Error("Could not import `wrangler`. Do you have it installed?");
   }
 }

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-51412399d
+ * @react-router/dev v0.0.0-experimental-abc385596
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1394,14 +1394,18 @@ var import_react_router = require("react-router");
 
 // vite/resolve-file-url.ts
 var path3 = __toESM(require("path"));
-var resolveFileUrl = ({ rootDirectory }, filePath) => {
+var resolveFileUrl = ({ rootDirectory }, filePath, { publicPath } = {}) => {
   let vite2 = getVite();
   let relativePath = path3.relative(rootDirectory, filePath);
   let isWithinRoot = !relativePath.startsWith("..") && !path3.isAbsolute(relativePath);
   if (!isWithinRoot) {
     return path3.posix.join("/@fs", vite2.normalizePath(filePath));
   }
-  return "/" + vite2.normalizePath(relativePath);
+  let url2 = "/" + vite2.normalizePath(relativePath);
+  if (publicPath && publicPath !== "/" && url2.startsWith(publicPath)) {
+    return path3.posix.join("/@fs", vite2.normalizePath(filePath));
+  }
+  return url2;
 };
 
 // vite/styles.ts
@@ -1732,7 +1736,7 @@ function hasDependency({
 }) {
   try {
     return Boolean(require.resolve(name, { paths: [rootDirectory] }));
-  } catch (err2) {
+  } catch (e) {
     return false;
   }
 }
@@ -3152,7 +3156,9 @@ var reactRouterVitePlugin = () => {
     let isSpaMode = isSpaModeEnabled(ctx.reactRouterConfig);
     return `
     import * as entryServer from ${JSON.stringify(
-      resolveFileUrl(ctx, ctx.entryServerFilePath)
+      resolveFileUrl(ctx, ctx.entryServerFilePath, {
+        publicPath: ctx.publicPath
+      })
     )};
     ${Object.keys(routes).map((key, index) => {
       let route = routes[key];
@@ -3162,7 +3168,8 @@ var reactRouterVitePlugin = () => {
         return `import * as route${index} from ${JSON.stringify(
           resolveFileUrl(
             ctx,
-            resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
+            resolveRelativeRouteFilePath(route, ctx.reactRouterConfig),
+            { publicPath: ctx.publicPath }
           )
         )};`;
       }
@@ -4646,7 +4653,7 @@ ${html}`
       },
       async finalize(buildDirectory) {
         invariant(viteConfig);
-        let { ssr, future } = ctx.reactRouterConfig;
+        let { ssr } = ctx.reactRouterConfig;
         if (!ssr) {
           let spaFallback = path7.join(buildDirectory, "__spa-fallback.html");
           let index = path7.join(buildDirectory, "index.html");
@@ -6262,10 +6269,6 @@ function reactRouterRSCVitePlugin() {
       ([routeFile]) => import_pathe6.default.normalize(routeFile).endsWith(normalizedFile)
     )?.[1];
   }
-  function isMdxRouteModule(filename2) {
-    let extension = import_pathe6.default.extname(filename2).toLowerCase();
-    return extension === ".md" || extension === ".mdx";
-  }
   function getTransformLanguage(filename2) {
     let extension = import_pathe6.default.extname(filename2).toLowerCase();
     switch (extension) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-51412399d",
+  "version": "0.0.0-experimental-abc385596",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -92,7 +92,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-51412399d"
+    "@react-router/node": "0.0.0-experimental-abc385596"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -116,8 +116,8 @@
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-51412399d",
-    "react-router": "^0.0.0-experimental-51412399d"
+    "react-router": "^0.0.0-experimental-abc385596",
+    "@react-router/serve": "0.0.0-experimental-abc385596"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.21",
@@ -125,8 +125,8 @@
     "typescript": "^5.1.0 || ^6.0.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-51412399d",
-    "react-router": "^0.0.0-experimental-51412399d"
+    "@react-router/serve": "^0.0.0-experimental-abc385596",
+    "react-router": "^0.0.0-experimental-abc385596"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {