@react-router/dev 0.0.0-experimental-3bba3331c → 0.0.0-experimental-07f9b5e04

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/typegen.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -55,7 +55,9 @@ function getPath(ctx, route) {
 async function watch(ctx) {
   const appDirectory = Path__namespace.normalize(ctx.appDirectory);
   const routesTsPath = Path__namespace.join(appDirectory, "routes.ts");
-  const routesViteNodeContext = await viteNode.createContext();
+  const routesViteNodeContext = await viteNode.createContext({
+    root: ctx.rootDirectory
+  });
   async function getRoutes() {
     routesViteNodeContext.devServer.moduleGraph.invalidateAll();
     routesViteNodeContext.runner.moduleCache.clear();
@@ -88,6 +90,7 @@ async function writeAll(ctx, routes) {
     force: true
   });
   Object.values(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);
     fs__default["default"].mkdirSync(Path__namespace.dirname(typesPath), {
@@ -98,24 +101,26 @@ async function writeAll(ctx, routes) {
 }
 function getModule(routes, route) {
   return dedent__default["default"]`
-    // typegen: ${route.file}
+    // React Router generated types for route:
+    // ${route.file}
+
     import * as T from "react-router/types"
 
     export type Params = {${formattedParamsProperties(routes, route)}}
 
     type Route = typeof import("./${Pathe__namespace.filename(route.file)}")
 
-    export type LoaderData = T.LoaderData<Route>
-    export type ActionData = T.ActionData<Route>
+    export type LoaderData = T.CreateLoaderData<Route>
+    export type ActionData = T.CreateActionData<Route>
 
-    export type LoaderArgs = T.ServerLoaderArgs<Params>
-    export type ClientLoaderArgs = T.ClientLoaderArgs<Params, Route>
-    export type ActionArgs = T.ServerActionArgs<Params>
-    export type ClientActionArgs = T.ClientActionArgs<Params, Route>
+    export type LoaderArgs = T.CreateServerLoaderArgs<Params>
+    export type ClientLoaderArgs = T.CreateClientLoaderArgs<Params, Route>
+    export type ActionArgs = T.CreateServerActionArgs<Params>
+    export type ClientActionArgs = T.CreateClientActionArgs<Params, Route>
 
-    export type HydrateFallbackProps = T.HydrateFallbackProps<Params>
-    export type DefaultProps = T.DefaultProps<Params, LoaderData, ActionData>
-    export type ErrorBoundaryProps = T.ErrorBoundaryProps<Params, LoaderData, ActionData>
+    export type HydrateFallbackProps = T.CreateHydrateFallbackProps<Params>
+    export type DefaultProps = T.CreateDefaultProps<Params, LoaderData, ActionData>
+    export type ErrorBoundaryProps = T.CreateErrorBoundaryProps<Params, LoaderData, ActionData>
   `;
 }
 function formattedParamsProperties(routes, route) {

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/combine-urls.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * 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
@@ -655,7 +655,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 +836,7 @@ const reactRouterVitePlugin = _config => {
             let reactRouterManifestString = jsesc__default["default"](reactRouterManifest, {
               es6: true
             });
-            return `window.__remixManifest=${reactRouterManifestString};`;
+            return `window.__reactRouterManifest=${reactRouterManifestString};`;
           }
       }
     }
@@ -895,10 +895,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 +916,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 +1243,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-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * 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-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vite-node.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/with-props.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3bba3331c
+ * @react-router/dev v0.0.0-experimental-07f9b5e04
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-3bba3331c",
+  "version": "0.0.0-experimental-07f9b5e04",
   "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-3bba3331c"
+    "@react-router/node": "0.0.0-experimental-07f9b5e04"
   },
   "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/serve": "0.0.0-experimental-3bba3331c",
-    "react-router": "^0.0.0-experimental-3bba3331c"
+    "@react-router/serve": "0.0.0-experimental-07f9b5e04",
+    "react-router": "^0.0.0-experimental-07f9b5e04"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-3bba3331c",
-    "react-router": "^0.0.0-experimental-3bba3331c"
+    "@react-router/serve": "^0.0.0-experimental-07f9b5e04",
+    "react-router": "^0.0.0-experimental-07f9b5e04"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {