@react-router/dev 0.0.0-experimental-4ed3f5da9 → 0.0.0-experimental-fbbd4fd81

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli.js

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

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/findConfig.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/flatRoutes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config.d.ts

@@ -93,11 +93,6 @@ export type VitePluginConfig = {
      * Defaults to `false`.
      */
     manifest?: boolean;
-    /**
-     * An array of URLs to prerender to HTML files at build time.  Can also be a
-     * function returning an array to dynamically generate URLs.
-     */
-    prerender?: Array<string> | (() => Array<string> | Promise<Array<string>>);
     /**
      * An array of React Router plugin config presets to ease integration with
      * other platforms and tools.
@@ -149,10 +144,6 @@ export type ResolvedVitePluginConfig = Readonly<{
      * Defaults to `false`.
      */
     manifest: boolean;
-    /**
-     * An array of URLs to prerender to HTML files at build time.
-     */
-    prerender: Array<string> | null;
     /**
      * Derived from Vite's `base` config
      * */
@@ -216,10 +207,6 @@ export declare function resolveReactRouterConfig({ rootDirectory, reactRouterUse
      * Defaults to `false`.
      */
     manifest: boolean;
-    /**
-     * An array of URLs to prerender to HTML files at build time.
-     */
-    prerender: string[] | null;
     /**
      * Derived from Vite's `base` config
      * */

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -124,7 +124,6 @@ async function resolveReactRouterConfig({
     ignoredRouteFiles,
     manifest,
     routes: userRoutesFunction,
-    prerender: prerenderConfig,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -134,21 +133,12 @@ async function resolveReactRouterConfig({
     // Default values should be completely overridden by user/preset config, not merged
     ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
   };
+  let isSpaMode = !ssr;
   // Log warning for incompatible vite config flags
-  if (!ssr && serverBundles) {
+  if (isSpaMode && serverBundles) {
     console.warn(colors__default["default"].yellow(colors__default["default"].bold("⚠️  SPA Mode: ") + "the `serverBundles` config is invalid with " + "`ssr:false` and will be ignored`"));
     serverBundles = undefined;
   }
-  let prerender = null;
-  if (prerenderConfig) {
-    if (Array.isArray(prerenderConfig)) {
-      prerender = prerenderConfig;
-    } else if (typeof prerenderConfig === "function") {
-      prerender = await prerenderConfig();
-    } else {
-      throw new Error("The `prerender` config must be an array of string paths, or a function " + "returning an array of string paths");
-    }
-  }
   let appDirectory = path__default["default"].resolve(rootDirectory, userAppDirectory || "app");
   let buildDirectory = path__default["default"].resolve(rootDirectory, userBuildDirectory);
   let publicPath = viteUserConfig.base ?? "/";
@@ -197,7 +187,6 @@ async function resolveReactRouterConfig({
     buildEnd,
     future,
     manifest,
-    prerender,
     publicPath,
     routes: routes$1,
     serverBuildFile,
@@ -221,6 +210,7 @@ async function resolveEntryFiles({
     appDirectory,
     future
   } = reactRouterConfig;
+  let isSpaMode = !reactRouterConfig.ssr;
   let defaultsDirectory = path__default["default"].resolve(__dirname, "config", "defaults");
   let userEntryClientFile = findEntry(appDirectory, "entry.client");
   let userEntryServerFile = findEntry(appDirectory, "entry.server");
@@ -228,7 +218,7 @@ async function resolveEntryFiles({
   let entryClientFile = userEntryClientFile || "entry.client.tsx";
   let pkgJson = await PackageJson__default["default"].load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
-  if (!reactRouterConfig.ssr && (future === null || future === void 0 ? void 0 : future.unstable_singleFetch) !== true) {
+  if (isSpaMode && (future === null || future === void 0 ? void 0 : future.unstable_singleFetch) != true) {
     // This is a super-simple default since we don't need streaming in SPA Mode.
     // We can include this in a remix-spa template, but right now `npx remix reveal`
     // will still expose the streaming template since that command doesn't have

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -18,7 +18,6 @@ var url = require('node:url');
 var fse = require('fs-extra');
 var babel = require('@babel/core');
 var serverRuntime = require('@react-router/server-runtime');
-var reactRouter = require('react-router');
 var esModuleLexer = require('es-module-lexer');
 var jsesc = require('jsesc');
 var colors = require('picocolors');
@@ -325,7 +324,7 @@ const reactRouterVitePlugin = _config => {
       export const assetsBuildDirectory = ${JSON.stringify(path__namespace.relative(ctx.rootDirectory, getClientBuildDirectory(ctx.reactRouterConfig)))};
       export const basename = ${JSON.stringify(ctx.reactRouterConfig.basename)};
       export const future = ${JSON.stringify(ctx.reactRouterConfig.future)};
-      export const isSpaMode = ${!ctx.reactRouterConfig.ssr && ctx.reactRouterConfig.prerender == null};
+      export const isSpaMode = ${!ctx.reactRouterConfig.ssr};
       export const publicPath = ${JSON.stringify(ctx.reactRouterConfig.publicPath)};
       export const entry = { module: entryServer };
       export const routes = {
@@ -749,19 +748,8 @@ const reactRouterVitePlugin = _config => {
         if (movedAssetPaths.length) {
           viteConfig.logger.info(["", `${colors__default["default"].green("✓")} ${movedAssetPaths.length} asset${movedAssetPaths.length > 1 ? "s" : ""} moved from React Router server build to client assets.`, ...movedAssetPaths.map(movedAssetPath => colors__default["default"].dim(path__namespace.relative(ctx.rootDirectory, movedAssetPath))), ""].join("\n"));
         }
-        if (ctx.reactRouterConfig.prerender != null) {
-          // If we have prerender routes, that takes precedence over SPA mode
-          // which is ssr:false and only the rot route being rendered
-          await handlePrerender(viteConfig, ctx.reactRouterConfig, serverBuildDirectory, clientBuildDirectory);
-        } else if (!ctx.reactRouterConfig.ssr) {
-          await handleSpaMode(viteConfig, ctx.reactRouterConfig, serverBuildDirectory, clientBuildDirectory);
-        }
-        // For both SPA mode and prerendering, we can remove the server builds
-        // if ssr:false is set
         if (!ctx.reactRouterConfig.ssr) {
-          // Cleanup - we no longer need the server build assets
-          viteConfig.logger.info(["Removing the server build in", colors__default["default"].green(serverBuildDirectory), "due to ssr:false"].join(" "));
-          fse__namespace.removeSync(serverBuildDirectory);
+          await handleSpaMode(serverBuildDirectory, ctx.reactRouterConfig.serverBuildFile, clientBuildDirectory, viteConfig, ctx.reactRouterConfig.basename);
         }
       }
     },
@@ -1051,23 +1039,17 @@ async function getRouteMetadata(ctx, viteChildCompiler, route, readRouteFile) {
   };
   return info;
 }
-async function getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, serverBuildDirectory) {
-  let serverBuildPath = path__namespace.join(serverBuildDirectory, reactRouterConfig.serverBuildFile);
+async function handleSpaMode(serverBuildDirectoryPath, serverBuildFile, clientBuildDirectory, viteConfig, basename) {
+  // Create a handler and call it for the `/` path - rendering down to the
+  // proper HydrateFallback ... or not!  Maybe they have a static landing page
+  // generated from routes/_index.tsx.
+  let serverBuildPath = path__namespace.join(serverBuildDirectoryPath, serverBuildFile);
   let build = await import(url__namespace.pathToFileURL(serverBuildPath).toString());
   let {
     createRequestHandler: createHandler
   } = await import('@react-router/node');
-  return {
-    build,
-    handler: createHandler(build, viteConfig.mode)
-  };
-}
-async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory, clientBuildDirectory) {
-  let {
-    handler
-  } = await getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, serverBuildDirectory);
-  let request = new Request(`http://localhost${reactRouterConfig.basename}`);
-  let response = await handler(request);
+  let handler = createHandler(build, viteConfig.mode);
+  let response = await handler(new Request(`http://localhost${basename}`));
   let html = await response.text();
   if (response.status !== 200) {
     throw new Error(`SPA Mode: Received a ${response.status} status code from ` + `\`entry.server.tsx\` while generating the \`index.html\` file.\n${html}`);
@@ -1078,96 +1060,8 @@ async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory
   // Write out the index.html file for the SPA
   await fse__namespace.writeFile(path__namespace.join(clientBuildDirectory, "index.html"), html);
   viteConfig.logger.info("SPA Mode: index.html has been written to your " + colors__default["default"].bold(path__namespace.relative(process.cwd(), clientBuildDirectory)) + " directory");
-}
-async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirectory, clientBuildDirectory) {
-  let {
-    build,
-    handler
-  } = await getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, serverBuildDirectory);
-  let routes = createPrerenderRoutes(build.routes);
-  let routesToPrerender = reactRouterConfig.prerender || ["/"];
-  let requestInit = {
-    headers: {
-      // Header that can be used in the loader to know if you're running at
-      // build time or runtime
-      "X-React-Router-Prerender": "yes"
-    }
-  };
-  for (let path of routesToPrerender) {
-    var _matchRoutes;
-    let hasLoaders = (_matchRoutes = reactRouter.matchRoutes(routes, path)) === null || _matchRoutes === void 0 ? void 0 : _matchRoutes.some(m => m.route.loader);
-    if (hasLoaders) {
-      await prerenderData(handler, reactRouterConfig.basename, path, clientBuildDirectory, viteConfig, requestInit);
-    }
-    await prerenderRoute(handler, reactRouterConfig.basename, path, clientBuildDirectory, viteConfig, requestInit);
-  }
-  async function prerenderData(handler, basename, prerenderPath, clientBuildDirectory, viteConfig, requestInit) {
-    let normalizedPath = `${basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
-    let request = new Request(`http://localhost${normalizedPath}`, requestInit);
-    let response = await handler(request);
-    let data = await response.text();
-    if (response.status !== 200) {
-      throw new Error(`Prerender: Received a ${response.status} status code from ` + `\`entry.server.tsx\` while prerendering the \`${normalizedPath}\` ` + `path.\n${data}`);
-    }
-    // Write out the .data file
-    let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
-    let outfile = path__namespace.join(outdir, normalizedPath.split("/").join(path__namespace.sep));
-    await fse__namespace.ensureDir(path__namespace.dirname(outfile));
-    await fse__namespace.outputFile(outfile, data);
-    viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
-  }
-}
-async function prerenderRoute(handler, basename, prerenderPath, clientBuildDirectory, viteConfig, requestInit) {
-  let normalizedPath = `${basename}${prerenderPath}/`.replace(/\/\/+/g, "/");
-  let request = new Request(`http://localhost${normalizedPath}`, requestInit);
-  let response = await handler(request);
-  let html = await response.text();
-  if (response.status !== 200) {
-    throw new Error(`Prerender: Received a ${response.status} status code from ` + `\`entry.server.tsx\` while prerendering the \`${normalizedPath}\` ` + `path.\n${html}`);
-  }
-  if (!html.includes("window.__remixContext =") || !html.includes("window.__remixRouteModules =")) {
-    throw new Error("Prerender: Did you forget to include <Scripts/> in your `root.tsx` " + "`HydrateFallback` component?  Your prerendered HTML files cannot " + "hydrate into a SPA without `<Scripts />`.");
-  }
-  // Write out the HTML file
-  let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path__namespace.join(outdir, ...normalizedPath.split("/"), "index.html");
-  await fse__namespace.ensureDir(path__namespace.dirname(outfile));
-  await fse__namespace.outputFile(outfile, html);
-  viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
-}
-// Note: Duplicated from remix-server-runtime
-function groupRoutesByParentId(manifest) {
-  let routes = {};
-  Object.values(manifest).forEach(route => {
-    let parentId = route.parentId || "";
-    if (!routes[parentId]) {
-      routes[parentId] = [];
-    }
-    routes[parentId].push(route);
-  });
-  return routes;
-}
-// Note: Duplicated from remix-server-runtime
-function createPrerenderRoutes(manifest, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) {
-  return (routesByParentId[parentId] || []).map(route => {
-    let commonRoute = {
-      // Always include root due to default boundaries
-      hasErrorBoundary: route.id === "root" || route.module.ErrorBoundary != null,
-      id: route.id,
-      path: route.path,
-      loader: route.module.loader ? () => null : undefined,
-      action: undefined,
-      handle: route.module.handle
-    };
-    return route.index ? {
-      index: true,
-      ...commonRoute
-    } : {
-      caseSensitive: route.caseSensitive,
-      children: createPrerenderRoutes(manifest, route.id, routesByParentId),
-      ...commonRoute
-    };
-  });
+  // Cleanup - we no longer need the server build assets
+  fse__namespace.removeSync(serverBuildDirectoryPath);
 }
 
 exports.extractPluginContext = extractPluginContext;

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4ed3f5da9
+ * @react-router/dev v0.0.0-experimental-fbbd4fd81
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-4ed3f5da9",
+  "version": "0.0.0-experimental-fbbd4fd81",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -42,9 +42,9 @@
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "@react-router/node": "0.0.0-experimental-4ed3f5da9",
-    "@react-router/server-runtime": "0.0.0-experimental-4ed3f5da9",
-    "react-router": "0.0.0-experimental-4ed3f5da9"
+    "@react-router/node": "0.0.0-experimental-fbbd4fd81",
+    "@react-router/server-runtime": "0.0.0-experimental-fbbd4fd81",
+    "react-router": "0.0.0-experimental-fbbd4fd81"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -69,14 +69,14 @@
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-4ed3f5da9"
+    "@react-router/serve": "0.0.0-experimental-fbbd4fd81"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-4ed3f5da9",
-    "react-router": "^0.0.0-experimental-4ed3f5da9"
+    "react-router": "^0.0.0-experimental-fbbd4fd81",
+    "@react-router/serve": "^0.0.0-experimental-fbbd4fd81"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {