@react-router/dev 0.0.0-experimental-12b260646 → 0.0.0-experimental-f042b8c1e

package/dist/cli/commands.d.ts

@@ -10,4 +10,4 @@ export declare function generateEntry(entry: string, reactRouterRoot: string, fl
     typescript?: boolean;
     config?: string;
 }): Promise<void>;
-export declare function typegen(root?: string): Promise<void>;
+export declare function typegen(root: string): Promise<void>;

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -166,9 +166,10 @@ async function typegen(root) {
     root
   });
   await typegen$1.writeAll({
-    rootDirectory: ctx.rootDirectory,
-    appDirectory: ctx.reactRouterConfig.appDirectory
-  }, ctx.reactRouterConfig.routes);
+    rootDirectory: root,
+    appDirectory: ctx.reactRouterConfig.appDirectory,
+    routes: ctx.reactRouterConfig.routes
+  });
 }
 
 exports.build = build;

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/plugin.d.ts

@@ -1,6 +1,4 @@
 import type ts from "typescript/lib/tsserverlibrary";
-export default function init(modules: {
-    typescript: typeof ts;
-}): {
+export default function init(): {
     create: (info: ts.server.PluginCreateInfo) => ts.LanguageService;
 };

package/dist/typescript/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -34,18 +34,14 @@ function _interopNamespace(e) {
 var Path__namespace = /*#__PURE__*/_interopNamespace(Path);
 
 // For compatibility with the TS language service plugin API, this entrypoint:
-function init(modules) {
+function init() {
   function create(info) {
     const {
       logger
     } = info.project.projectService;
     logger.info("[react-router] setup");
     const rootDirectory = Path__namespace.normalize(info.project.getCurrentDirectory());
-    const ctx = {
-      rootDirectory,
-      appDirectory: Path__namespace.join(rootDirectory, "app")
-    };
-    typegen.watch(ctx);
+    typegen.watch(rootDirectory);
     return info.languageService;
   }
   return {

package/dist/typescript/typegen.d.ts

@@ -2,8 +2,9 @@ import { type RouteManifest, type RouteManifestEntry } from "../config/routes";
 type Context = {
     rootDirectory: string;
     appDirectory: string;
+    routes: RouteManifest;
 };
 export declare function getPath(ctx: Context, route: RouteManifestEntry): string;
-export declare function watch(ctx: Context): Promise<void>;
-export declare function writeAll(ctx: Context, routes: RouteManifest): Promise<void>;
+export declare function watch(rootDirectory: string): Promise<void>;
+export declare function writeAll(ctx: Context): Promise<void>;
 export {};

package/dist/typescript/typegen.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,6 +19,8 @@ var Path = require('pathe');
 var Pathe = require('pathe/utils');
 var routes = require('../config/routes.js');
 var viteNode = require('../vite/vite-node.js');
+var config = require('../vite/config.js');
+var plugin = require('../vite/plugin.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -50,49 +52,67 @@ function getDirectory(ctx) {
   return Path__namespace.join(ctx.rootDirectory, ".react-router/types");
 }
 function getPath(ctx, route) {
-  return Path__namespace.join(getDirectory(ctx), "app", Path__namespace.dirname(route.file), "+types." + Path__namespace.basename(route.file));
+  return Path__namespace.join(getDirectory(ctx), "app", Path__namespace.dirname(route.file), "+types." + Pathe__namespace.filename(route.file) + ".d.ts");
 }
-async function watch(ctx) {
-  const appDirectory = Path__namespace.normalize(ctx.appDirectory);
-  const routesTsPath = Path__namespace.join(appDirectory, "routes.ts");
+async function watch(rootDirectory) {
+  const vitePluginCtx = await plugin.loadPluginContext({
+    root: rootDirectory
+  });
+  const routesTsPath = Path__namespace.join(vitePluginCtx.reactRouterConfig.appDirectory, "routes.ts");
   const routesViteNodeContext = await viteNode.createContext({
-    root: ctx.rootDirectory
+    root: rootDirectory
   });
   async function getRoutes() {
+    const routes$1 = {};
+    const rootRouteFile = config.findEntry(vitePluginCtx.reactRouterConfig.appDirectory, "root");
+    if (rootRouteFile) {
+      routes$1.root = {
+        path: "",
+        id: "root",
+        file: rootRouteFile
+      };
+    }
     routesViteNodeContext.devServer.moduleGraph.invalidateAll();
     routesViteNodeContext.runner.moduleCache.clear();
     const result = await routesViteNodeContext.runner.executeFile(routesTsPath);
-    return routes.configRoutesToRouteManifest(result.routes);
+    return {
+      ...routes$1,
+      ...routes.configRoutesToRouteManifest(result.routes)
+    };
   }
-  const initialRoutes = await getRoutes();
-  await writeAll(ctx, initialRoutes);
-  const watcher = Chokidar__default["default"].watch(appDirectory, {
+  const ctx = {
+    rootDirectory,
+    appDirectory: vitePluginCtx.reactRouterConfig.appDirectory,
+    routes: await getRoutes()
+  };
+  await writeAll(ctx);
+  const watcher = Chokidar__default["default"].watch(ctx.appDirectory, {
     ignoreInitial: true
   });
   watcher.on("all", async (event, path) => {
     path = Path__namespace.normalize(path);
-    const routes = await getRoutes();
+    ctx.routes = await getRoutes();
     const routeConfigChanged = Boolean(routesViteNodeContext.devServer.moduleGraph.getModuleById(path));
     if (routeConfigChanged) {
-      await writeAll(ctx, routes);
+      await writeAll(ctx);
       return;
     }
-    const isRoute = Object.values(routes).find(route => path === Path__namespace.join(ctx.appDirectory, route.file));
+    const isRoute = Object.values(ctx.routes).find(route => path === Path__namespace.join(ctx.appDirectory, route.file));
     if (isRoute && (event === "add" || event === "unlink")) {
-      await writeAll(ctx, routes);
+      await writeAll(ctx);
       return;
     }
   });
 }
-async function writeAll(ctx, routes) {
+async function writeAll(ctx) {
   fs__default["default"].rmSync(getDirectory(ctx), {
     recursive: true,
     force: true
   });
-  Object.values(routes).forEach(route => {
+  Object.values(ctx.routes).forEach(route => {
     if (!fs__default["default"].existsSync(Path__namespace.join(ctx.appDirectory, route.file))) return;
     const typesPath = getPath(ctx, route);
-    const content = getModule(routes, route);
+    const content = getModule(ctx.routes, route);
     fs__default["default"].mkdirSync(Path__namespace.dirname(typesPath), {
       recursive: true
     });

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare-dev-proxy.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/combine-urls.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/config.d.ts

@@ -230,4 +230,5 @@ export declare function resolveEntryFiles({ rootDirectory, reactRouterConfig, }:
     entryClientFilePath: string;
     entryServerFilePath: string;
 }>;
+export declare function findEntry(dir: string, basename: string): string | undefined;
 export {};

package/dist/vite/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -276,6 +276,7 @@ function findEntry(dir, basename) {
 }
 
 exports.configRouteToBranchRoute = configRouteToBranchRoute;
+exports.findEntry = findEntry;
 exports.resolveEntryFiles = resolveEntryFiles;
 exports.resolvePublicPath = resolvePublicPath;
 exports.resolveReactRouterConfig = resolveReactRouterConfig;

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/import-vite-esm-sync.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -428,7 +428,7 @@ const reactRouterVitePlugin = _config => {
       ...nonFingerprintedValues
     };
     // Write the browser manifest to disk as part of the build process
-    await writeFileSafe(path__namespace.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath), `window.__remixManifest=${JSON.stringify(reactRouterBrowserManifest)};`);
+    await writeFileSafe(path__namespace.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath), `window.__reactRouterManifest=${JSON.stringify(reactRouterBrowserManifest)};`);
     // The server manifest is the same as the browser manifest, except for
     // server bundle builds which only includes routes for the current bundle,
     // otherwise the server and client have the same routes
@@ -487,6 +487,7 @@ const reactRouterVitePlugin = _config => {
       viteConfigEnv = _viteConfigEnv;
       viteCommand = viteConfigEnv.command;
       routesViteNodeContext = await viteNode.createContext({
+        root: viteUserConfig.root,
         mode: viteConfigEnv.mode,
         server: {
           watch: viteCommand === "build" ? null : undefined
@@ -655,7 +656,7 @@ const reactRouterVitePlugin = _config => {
         // disk from the child compiler. This is important in the
         // production build because the child compiler is a Vite dev
         // server and will generate incorrect manifests.
-        .filter(plugin => typeof plugin === "object" && plugin !== null && "name" in plugin && plugin.name !== "react-router" && plugin.name !== "react-router-hmr-updates")]
+        .filter(plugin => typeof plugin === "object" && plugin !== null && "name" in plugin && plugin.name !== "react-router" && plugin.name !== "react-router-route-exports" && plugin.name !== "react-router-hmr-updates")]
       });
       await viteChildCompiler.pluginContainer.buildStart({});
     },
@@ -836,7 +837,7 @@ const reactRouterVitePlugin = _config => {
             let reactRouterManifestString = jsesc__default["default"](reactRouterManifest, {
               es6: true
             });
-            return `window.__remixManifest=${reactRouterManifestString};`;
+            return `window.__reactRouterManifest=${reactRouterManifestString};`;
           }
       }
     }
@@ -895,10 +896,9 @@ const reactRouterVitePlugin = _config => {
   }, withProps.plugin, {
     name: "react-router-route-exports",
     async transform(code, id, options) {
-      if (options !== null && options !== void 0 && options.ssr) return;
       let route = getRoute(ctx.reactRouterConfig, id);
       if (!route) return;
-      if (!ctx.reactRouterConfig.ssr) {
+      if (!(options !== null && options !== void 0 && options.ssr) && !ctx.reactRouterConfig.ssr) {
         let serverOnlyExports = esModuleLexer.parse(code)[1].map(exp => exp.n).filter(exp => SERVER_ONLY_ROUTE_EXPORTS.includes(exp));
         if (serverOnlyExports.length > 0) {
           let str = serverOnlyExports.map(e => `\`${e}\``).join(", ");
@@ -917,7 +917,9 @@ const reactRouterVitePlugin = _config => {
       let ast = parser.parse(code, {
         sourceType: "module"
       });
-      removeExports.removeExports(ast, SERVER_ONLY_ROUTE_EXPORTS);
+      if (!(options !== null && options !== void 0 && options.ssr)) {
+        removeExports.removeExports(ast, SERVER_ONLY_ROUTE_EXPORTS);
+      }
       withProps.transform(ast);
       return babel.generate(ast, {
         sourceMaps: true,
@@ -1242,7 +1244,7 @@ function validatePrerenderedResponse(response, html, prefix, path) {
   }
 }
 function validatePrerenderedHtml(html, prefix) {
-  if (!html.includes("window.__remixContext =") || !html.includes("window.__remixRouteModules =")) {
+  if (!html.includes("window.__reactRouterContext =") || !html.includes("window.__reactRouterRouteModules =")) {
     throw new Error(`${prefix}: Did you forget to include <Scripts/> in your root route? ` + "Your pre-rendered HTML files cannot hydrate without `<Scripts />`.");
   }
 }

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/resolve-file-url.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/static/refresh-utils.cjs

@@ -13,7 +13,7 @@ function debounce(fn, delay) {
 const enqueueUpdate = debounce(async () => {
   let manifest;
   if (routeUpdates.size > 0) {
-    manifest = JSON.parse(JSON.stringify(__remixManifest));
+    manifest = JSON.parse(JSON.stringify(__reactRouterManifest));
 
     for (let route of routeUpdates.values()) {
       manifest.routes[route.id] = route;
@@ -28,18 +28,19 @@ const enqueueUpdate = debounce(async () => {
         // react-refresh takes care of updating these in-place,
         // if we don't preserve existing values we'll loose state.
         default: imported.default
-          ? window.__remixRouteModules[route.id]?.default ?? imported.default
+          ? window.__reactRouterRouteModules[route.id]?.default ??
+            imported.default
           : imported.default,
         ErrorBoundary: imported.ErrorBoundary
-          ? window.__remixRouteModules[route.id]?.ErrorBoundary ??
+          ? window.__reactRouterRouteModules[route.id]?.ErrorBoundary ??
             imported.ErrorBoundary
           : imported.ErrorBoundary,
         HydrateFallback: imported.HydrateFallback
-          ? window.__remixRouteModules[route.id]?.HydrateFallback ??
+          ? window.__reactRouterRouteModules[route.id]?.HydrateFallback ??
             imported.HydrateFallback
           : imported.HydrateFallback,
       };
-      window.__remixRouteModules[route.id] = routeModule;
+      window.__reactRouterRouteModules[route.id] = routeModule;
     }
 
     let needsRevalidation = new Set(
@@ -48,27 +49,27 @@ const enqueueUpdate = debounce(async () => {
         .map((route) => route.id)
     );
 
-    let routes = __remixRouter.createRoutesForHMR(
+    let routes = __reactRouterInstance.createRoutesForHMR(
       needsRevalidation,
       manifest.routes,
-      window.__remixRouteModules,
-      window.__remixContext.future,
-      window.__remixContext.isSpaMode
+      window.__reactRouterRouteModules,
+      window.__reactRouterContext.future,
+      window.__reactRouterContext.isSpaMode
     );
-    __remixRouter._internalSetRoutes(routes);
+    __reactRouterInstance._internalSetRoutes(routes);
     routeUpdates.clear();
     window.__reactRouterRouteModuleUpdates.clear();
   }
 
   try {
-    window.__remixHdrActive = true;
-    await __remixRouter.revalidate();
+    window.__reactRouterHdrActive = true;
+    await __reactRouterInstance.revalidate();
   } finally {
-    window.__remixHdrActive = false;
+    window.__reactRouterHdrActive = false;
   }
 
   if (manifest) {
-    Object.assign(window.__remixManifest, manifest);
+    Object.assign(window.__reactRouterManifest, manifest);
   }
   exports.performReactRefresh();
 }, 16);
@@ -152,7 +153,7 @@ const routeUpdates = new Map();
 window.__reactRouterRouteModuleUpdates = new Map();
 
 import.meta.hot.on("react-router:hmr", async ({ route }) => {
-  window.__remixClearCriticalCss();
+  window.__reactRouterClearCriticalCss();
 
   if (route) {
     routeUpdates.set(route.id, route);

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vite-node.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/with-props.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-12b260646
+ * @react-router/dev v0.0.0-experimental-f042b8c1e
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-12b260646",
+  "version": "0.0.0-experimental-f042b8c1e",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -61,7 +61,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^1.6.0",
-    "@react-router/node": "0.0.0-experimental-12b260646"
+    "@react-router/node": "0.0.0-experimental-f042b8c1e"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -87,15 +87,15 @@
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-12b260646",
-    "@react-router/serve": "0.0.0-experimental-12b260646"
+    "@react-router/serve": "0.0.0-experimental-f042b8c1e",
+    "react-router": "^0.0.0-experimental-f042b8c1e"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-12b260646",
-    "react-router": "^0.0.0-experimental-12b260646"
+    "@react-router/serve": "^0.0.0-experimental-f042b8c1e",
+    "react-router": "^0.0.0-experimental-f042b8c1e"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {