@react-router/dev 7.0.0-pre.3 → 7.0.0-pre.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # `@remix-run/dev`
 
+## 7.0.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.0-pre.4`
+  - `@react-router/node@7.0.0-pre.4`
+  - `@react-router/serve@7.0.0-pre.4`
+
 ## 7.0.0-pre.3
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.3
+ * @react-router/dev v7.0.0-pre.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -18,9 +18,6 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -278,9 +275,9 @@ async function loadPluginContext({
   }
   return ctx;
 }
-function findConfig(dir, basename2, extensions) {
+function findConfig(dir, basename3, extensions) {
   for (let ext of extensions) {
-    let name = basename2 + ext;
+    let name = basename3 + ext;
     let file = path4.join(dir, name);
     if (fse2.existsSync(file)) return file;
   }
@@ -694,157 +691,6 @@ var init_dev = __esm({
   }
 });
 
-// package.json
-var require_package = __commonJS({
-  "package.json"(exports2, module2) {
-    module2.exports = {
-      name: "@react-router/dev",
-      version: "7.0.0-pre.3",
-      description: "Dev tools and CLI for React Router",
-      homepage: "https://reactrouter.com",
-      bugs: {
-        url: "https://github.com/remix-run/react-router/issues"
-      },
-      repository: {
-        type: "git",
-        url: "https://github.com/remix-run/react-router",
-        directory: "packages/react-router-dev"
-      },
-      license: "MIT",
-      main: "./dist/typescript/plugin.ts",
-      exports: {
-        "./routes": {
-          types: "./dist/routes.d.ts",
-          default: "./dist/routes.js"
-        },
-        "./vite": {
-          types: "./dist/vite.d.ts",
-          default: "./dist/vite.js"
-        },
-        "./vite/cloudflare": {
-          types: "./dist/vite/cloudflare.d.ts",
-          default: "./dist/vite/cloudflare.js"
-        },
-        "./package.json": "./package.json"
-      },
-      bin: {
-        "react-router": "bin.js"
-      },
-      scripts: {
-        build: "wireit"
-      },
-      wireit: {
-        build: {
-          command: "tsup",
-          files: [
-            "cli/**",
-            "config/**",
-            "typescript/**",
-            "vite/**",
-            "*.ts",
-            "bin.js",
-            "tsconfig.json",
-            "package.json"
-          ],
-          output: [
-            "dist/**"
-          ]
-        }
-      },
-      dependencies: {
-        "@babel/core": "^7.21.8",
-        "@babel/generator": "^7.21.5",
-        "@babel/parser": "^7.21.8",
-        "@babel/plugin-syntax-decorators": "^7.22.10",
-        "@babel/plugin-syntax-jsx": "^7.21.4",
-        "@babel/preset-typescript": "^7.21.5",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.22.5",
-        "@npmcli/package-json": "^4.0.1",
-        "@react-router/node": "workspace:*",
-        arg: "^5.0.1",
-        "babel-dead-code-elimination": "^1.0.6",
-        chalk: "^4.1.2",
-        chokidar: "^4.0.0",
-        dedent: "^1.5.3",
-        "es-module-lexer": "^1.3.1",
-        "exit-hook": "2.2.1",
-        "fs-extra": "^10.0.0",
-        "gunzip-maybe": "^1.4.2",
-        jsesc: "3.0.2",
-        lodash: "^4.17.21",
-        pathe: "^1.1.2",
-        picocolors: "^1.0.0",
-        picomatch: "^2.3.1",
-        prettier: "^2.7.1",
-        "react-refresh": "^0.14.0",
-        semver: "^7.3.7",
-        "set-cookie-parser": "^2.6.0",
-        valibot: "^0.41.0",
-        "vite-node": "^1.6.0"
-      },
-      devDependencies: {
-        "@react-router/serve": "workspace:*",
-        "@types/babel__core": "^7.20.5",
-        "@types/babel__generator": "^7.6.8",
-        "@types/babel__traverse": "^7.20.5",
-        "@types/dedent": "^0.7.0",
-        "@types/express": "^4.17.9",
-        "@types/fs-extra": "^8.1.2",
-        "@types/gunzip-maybe": "^1.4.0",
-        "@types/jsesc": "^3.0.1",
-        "@types/lodash": "^4.14.182",
-        "@types/node": "^18.17.1",
-        "@types/npmcli__package-json": "^4.0.0",
-        "@types/picomatch": "^2.3.0",
-        "@types/prettier": "^2.7.3",
-        "@types/set-cookie-parser": "^2.4.1",
-        dotenv: "^16.0.0",
-        "esbuild-register": "^3.3.2",
-        execa: "5.1.1",
-        express: "^4.19.2",
-        "fast-glob": "3.2.11",
-        "react-router": "workspace:^",
-        "strip-ansi": "^6.0.1",
-        "tiny-invariant": "^1.2.0",
-        tsup: "^8.3.0",
-        typescript: "^5.1.6",
-        vite: "^5.1.0",
-        wireit: "0.14.9",
-        wrangler: "^3.28.2"
-      },
-      peerDependencies: {
-        "@react-router/serve": "workspace:^",
-        "react-router": "workspace:^",
-        typescript: "^5.1.0",
-        vite: "^5.1.0",
-        wrangler: "^3.28.2"
-      },
-      peerDependenciesMeta: {
-        "@react-router/serve": {
-          optional: true
-        },
-        typescript: {
-          optional: true
-        },
-        wrangler: {
-          optional: true
-        }
-      },
-      engines: {
-        node: ">=20.0.0"
-      },
-      files: [
-        "dist/",
-        "bin.js",
-        "CHANGELOG.md",
-        "LICENSE.md",
-        "README.md"
-      ]
-    };
-  }
-});
-
 // cli/run.ts
 var import_arg = __toESM(require("arg"));
 var import_semver = __toESM(require("semver"));
@@ -973,7 +819,7 @@ function getDirectory(ctx) {
 function getPath(ctx, route) {
   return Path.join(
     getDirectory(ctx),
-    "app",
+    Path.basename(ctx.appDirectory),
     Path.dirname(route.file),
     "+types." + Pathe.filename(route.file) + ".d.ts"
   );
@@ -1321,7 +1167,7 @@ async function run(argv = process.argv.slice(2)) {
     return;
   }
   if (flags.version) {
-    let version = require_package().version;
+    let version = require("../package.json").version;
     console.log(version);
     return;
   }

package/dist/routes-C14jcF98.d.ts

@@ -0,0 +1,123 @@
+import * as v from 'valibot';
+
+declare global {
+    var __reactRouterAppDirectory: string;
+}
+/**
+ * Provides the absolute path to the app directory, for use within `routes.ts`.
+ * This is designed to support resolving file system routes.
+ */
+declare function getAppDirectory(): string;
+interface RouteManifestEntry {
+    /**
+     * The path this route uses to match on the URL pathname.
+     */
+    path?: string;
+    /**
+     * Should be `true` if it is an index route. This disallows child routes.
+     */
+    index?: boolean;
+    /**
+     * Should be `true` if the `path` is case-sensitive. Defaults to `false`.
+     */
+    caseSensitive?: boolean;
+    /**
+     * The unique id for this route, named like its `file` but without the
+     * extension. So `app/routes/gists/$username.tsx` will have an `id` of
+     * `routes/gists/$username`.
+     */
+    id: string;
+    /**
+     * The unique `id` for this route's parent route, if there is one.
+     */
+    parentId?: string;
+    /**
+     * The path to the entry point for this route, relative to
+     * `config.appDirectory`.
+     */
+    file: string;
+}
+interface RouteManifest {
+    [routeId: string]: RouteManifestEntry;
+}
+/**
+ * Configuration for an individual route, for use within `routes.ts`. As a
+ * convenience, route config entries can be created with the {@link route},
+ * {@link index} and {@link layout} helper functions.
+ */
+interface RouteConfigEntry {
+    /**
+     * The unique id for this route.
+     */
+    id?: string;
+    /**
+     * The path this route uses to match on the URL pathname.
+     */
+    path?: string;
+    /**
+     * Should be `true` if it is an index route. This disallows child routes.
+     */
+    index?: boolean;
+    /**
+     * Should be `true` if the `path` is case-sensitive. Defaults to `false`.
+     */
+    caseSensitive?: boolean;
+    /**
+     * The path to the entry point for this route, relative to
+     * `config.appDirectory`.
+     */
+    file: string;
+    /**
+     * The child routes.
+     */
+    children?: RouteConfigEntry[];
+}
+declare const resolvedRouteConfigSchema: v.ArraySchema<v.BaseSchema<RouteConfigEntry, any, v.BaseIssue<unknown>>, undefined>;
+type ResolvedRouteConfig = v.InferInput<typeof resolvedRouteConfigSchema>;
+/**
+ * Route config to be exported via the `routes` export within `routes.ts`.
+ */
+type RouteConfig = ResolvedRouteConfig | Promise<ResolvedRouteConfig>;
+declare const createConfigRouteOptionKeys: ["id", "index", "caseSensitive"];
+type CreateRouteOptions = Pick<RouteConfigEntry, (typeof createConfigRouteOptionKeys)[number]>;
+/**
+ * Helper function for creating a route config entry, for use within
+ * `routes.ts`.
+ */
+declare function route(path: string | null | undefined, file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function route(path: string | null | undefined, file: string, options: CreateRouteOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare const createIndexOptionKeys: ["id"];
+type CreateIndexOptions = Pick<RouteConfigEntry, (typeof createIndexOptionKeys)[number]>;
+/**
+ * Helper function for creating a route config entry for an index route, for use
+ * within `routes.ts`.
+ */
+declare function index(file: string, options?: CreateIndexOptions): RouteConfigEntry;
+declare const createLayoutOptionKeys: ["id"];
+type CreateLayoutOptions = Pick<RouteConfigEntry, (typeof createLayoutOptionKeys)[number]>;
+/**
+ * Helper function for creating a route config entry for a layout route, for use
+ * within `routes.ts`.
+ */
+declare function layout(file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function layout(file: string, options: CreateLayoutOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
+/**
+ * Helper function for adding a path prefix to a set of routes without needing
+ * to introduce a parent route file, for use within `routes.ts`.
+ */
+declare function prefix(prefixPath: string, routes: RouteConfigEntry[]): RouteConfigEntry[];
+declare const helpers: {
+    route: typeof route;
+    index: typeof index;
+    layout: typeof layout;
+    prefix: typeof prefix;
+};
+
+/**
+ * Creates a set of route config helpers that resolve file paths relative to the
+ * given directory, for use within `routes.ts`. This is designed to support
+ * splitting route config into multiple files within different directories.
+ */
+declare function relative(directory: string): typeof helpers;
+
+export { type RouteManifest as R, type RouteManifestEntry as a, type RouteConfig as b, type RouteConfigEntry as c, relative as d, getAppDirectory as g, index as i, layout as l, prefix as p, route as r };

package/dist/routes.d.ts

@@ -1,4 +1,2 @@
-export { RouteConfig, RouteConfigEntry, getAppDirectory, index, layout, prefix, relative, route } from './config/routes.ts';
-import './vite/config.ts';
-import './vite/plugin.ts';
-import './vite/cloudflare-dev-proxy.ts';
+export { b as RouteConfig, c as RouteConfigEntry, g as getAppDirectory, i as index, l as layout, p as prefix, d as relative, r as route } from './routes-C14jcF98.js';
+import 'valibot';

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.3
+ * @react-router/dev v7.0.0-pre.4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.3
+ * @react-router/dev v7.0.0-pre.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -184,9 +184,9 @@ var import_pick2 = __toESM(require("lodash/pick"));
 var import_omit = __toESM(require("lodash/omit"));
 var import_package_json = __toESM(require("@npmcli/package-json"));
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
-function findEntry(dir, basename2) {
+function findEntry(dir, basename3) {
   for (let ext of entryExts) {
-    let file = import_node_path2.default.resolve(dir, basename2 + ext);
+    let file = import_node_path2.default.resolve(dir, basename3 + ext);
     if (import_fs_extra.default.existsSync(file)) return import_node_path2.default.relative(dir, file);
   }
   return void 0;
@@ -302,9 +302,9 @@ var defaultEntriesDir = path4.resolve(
 );
 var defaultEntries = fse2.readdirSync(defaultEntriesDir).map((filename2) => path4.join(defaultEntriesDir, filename2));
 invariant(defaultEntries.length > 0, "No default entries found");
-function findConfig(dir, basename2, extensions) {
+function findConfig(dir, basename3, extensions) {
   for (let ext of extensions) {
-    let name = basename2 + ext;
+    let name = basename3 + ext;
     let file = path4.join(dir, name);
     if (fse2.existsSync(file)) return file;
   }
@@ -353,7 +353,7 @@ function getDirectory(ctx) {
 function getPath(ctx, route) {
   return Path.join(
     getDirectory(ctx),
-    "app",
+    Path.basename(ctx.appDirectory),
     Path.dirname(route.file),
     "+types." + Pathe.filename(route.file) + ".d.ts"
   );

package/dist/vite/cloudflare.d.ts

@@ -1 +1,23 @@
-export { cloudflareDevProxyVitePlugin as cloudflareDevProxy } from './cloudflare-dev-proxy.ts';
+import { AppLoadContext } from 'react-router';
+import { Plugin } from 'vite';
+import { GetPlatformProxyOptions, PlatformProxy } from 'wrangler';
+
+type CfProperties = Record<string, unknown>;
+type LoadContext<Env, Cf extends CfProperties> = {
+    cloudflare: Omit<PlatformProxy<Env, Cf>, "dispose">;
+};
+type GetLoadContext<Env, Cf extends CfProperties> = (args: {
+    request: Request;
+    context: LoadContext<Env, Cf>;
+}) => AppLoadContext | Promise<AppLoadContext>;
+/**
+ * Vite plugin that provides [Node proxies to local workerd
+ * bindings](https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy)
+ * to `context.cloudflare` in your server loaders and server actions during
+ * development.
+ */
+declare const cloudflareDevProxyVitePlugin: <Env, Cf extends CfProperties>(options?: {
+    getLoadContext?: GetLoadContext<Env, Cf>;
+} & GetPlatformProxyOptions) => Plugin;
+
+export { cloudflareDevProxyVitePlugin as cloudflareDevProxy };

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.3
+ * @react-router/dev v7.0.0-pre.4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.d.ts

@@ -1,2 +1,169 @@
-export { BuildManifest, Preset, ReactRouterConfig, ServerBundlesFunction } from './vite/config.ts';
-export { reactRouterVitePlugin as reactRouter } from './vite/plugin.ts';
+import * as Vite from 'vite';
+import { R as RouteManifest, a as RouteManifestEntry } from './routes-C14jcF98.js';
+import 'valibot';
+
+declare const excludedConfigPresetKeys: readonly ["presets"];
+type ExcludedConfigPresetKey = (typeof excludedConfigPresetKeys)[number];
+type ConfigPreset = Omit<ReactRouterConfig, ExcludedConfigPresetKey>;
+type Preset = {
+    name: string;
+    reactRouterConfig?: (args: {
+        reactRouterUserConfig: ReactRouterConfig;
+    }) => ConfigPreset | Promise<ConfigPreset>;
+    reactRouterConfigResolved?: (args: {
+        reactRouterConfig: ResolvedReactRouterConfig;
+    }) => void | Promise<void>;
+};
+declare const branchRouteProperties: readonly ["id", "path", "file", "index"];
+type BranchRoute = Pick<RouteManifestEntry, (typeof branchRouteProperties)[number]>;
+type ServerBundlesFunction = (args: {
+    branch: BranchRoute[];
+}) => string | Promise<string>;
+type BaseBuildManifest = {
+    routes: RouteManifest;
+};
+type DefaultBuildManifest = BaseBuildManifest & {
+    serverBundles?: never;
+    routeIdToServerBundleId?: never;
+};
+type ServerBundlesBuildManifest = BaseBuildManifest & {
+    serverBundles: {
+        [serverBundleId: string]: {
+            id: string;
+            file: string;
+        };
+    };
+    routeIdToServerBundleId: Record<string, string>;
+};
+type ServerModuleFormat = "esm" | "cjs";
+interface FutureConfig {
+}
+type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
+type BuildEndHook = (args: {
+    buildManifest: BuildManifest | undefined;
+    reactRouterConfig: ResolvedReactRouterConfig;
+    viteConfig: Vite.ResolvedConfig;
+}) => void | Promise<void>;
+type ReactRouterConfig = {
+    /**
+     * The path to the `app` directory, relative to `remix.config.js`. Defaults
+     * to `"app"`.
+     */
+    appDirectory?: string;
+    /**
+     * The output format of the server build. Defaults to "esm".
+     */
+    serverModuleFormat?: ServerModuleFormat;
+    /**
+     * Enabled future flags
+     */
+    future?: [keyof FutureConfig] extends [never] ? {
+        [key: string]: never;
+    } : Partial<FutureConfig>;
+    /**
+     * The React Router app basename.  Defaults to `"/"`.
+     */
+    basename?: string;
+    /**
+     * The path to the build directory, relative to the project. Defaults to
+     * `"build"`.
+     */
+    buildDirectory?: string;
+    /**
+     * A function that is called after the full React Router build is complete.
+     */
+    buildEnd?: BuildEndHook;
+    /**
+     * 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?: boolean | Array<string> | ((args: {
+        getStaticPaths: () => string[];
+    }) => Array<string> | Promise<Array<string>>);
+    /**
+     * An array of React Router plugin config presets to ease integration with
+     * other platforms and tools.
+     */
+    presets?: Array<Preset>;
+    /**
+     * The file name of the server build output. This file
+     * should end in a `.js` extension and should be deployed to your server.
+     * Defaults to `"index.js"`.
+     */
+    serverBuildFile?: string;
+    /**
+     * A function for assigning routes to different server bundles. This
+     * function should return a server bundle ID which will be used as the
+     * bundle's directory name within the server build directory.
+     */
+    serverBundles?: ServerBundlesFunction;
+    /**
+     * Enable server-side rendering for your application. Disable to use "SPA
+     * Mode", which will request the `/` path at build-time and save it as an
+     * `index.html` file with your assets so your application can be deployed as a
+     * SPA without server-rendering. Default's to `true`.
+     */
+    ssr?: boolean;
+};
+type ResolvedReactRouterConfig = Readonly<{
+    /**
+     * The absolute path to the application source directory.
+     */
+    appDirectory: string;
+    /**
+     * The React Router app basename.  Defaults to `"/"`.
+     */
+    basename: string;
+    /**
+     * The absolute path to the build directory.
+     */
+    buildDirectory: string;
+    /**
+     * A function that is called after the full React Router build is complete.
+     */
+    buildEnd?: BuildEndHook;
+    /**
+     * Enabled future flags
+     */
+    future: FutureConfig;
+    /**
+     * 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: ReactRouterConfig["prerender"];
+    /**
+     * An object of all available routes, keyed by route id.
+     */
+    routes: RouteManifest;
+    /**
+     * The file name of the server build output. This file
+     * should end in a `.js` extension and should be deployed to your server.
+     * Defaults to `"index.js"`.
+     */
+    serverBuildFile: string;
+    /**
+     * A function for assigning routes to different server bundles. This
+     * function should return a server bundle ID which will be used as the
+     * bundle's directory name within the server build directory.
+     */
+    serverBundles?: ServerBundlesFunction;
+    /**
+     * The output format of the server build. Defaults to "esm".
+     */
+    serverModuleFormat: ServerModuleFormat;
+    /**
+     * Enable server-side rendering for your application. Disable to use "SPA
+     * Mode", which will request the `/` path at build-time and save it as an
+     * `index.html` file with your assets so your application can be deployed as a
+     * SPA without server-rendering. Default's to `true`.
+     */
+    ssr: boolean;
+}>;
+
+type ReactRouterVitePlugin = (config?: ReactRouterConfig) => Vite.Plugin[];
+/**
+ * React Router [Vite plugin.](https://vitejs.dev/guide/using-plugins.html)
+ */
+declare const reactRouterVitePlugin: ReactRouterVitePlugin;
+
+export { type BuildManifest, type Preset, type ReactRouterConfig, type ServerBundlesFunction, reactRouterVitePlugin as reactRouter };

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.3
+ * @react-router/dev v7.0.0-pre.4
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.0.0-pre.3",
+  "version": "7.0.0-pre.4",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -79,7 +79,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^1.6.0",
-    "@react-router/node": "7.0.0-pre.3"
+    "@react-router/node": "7.0.0-pre.4"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -108,15 +108,15 @@
     "vite": "^5.1.0",
     "wireit": "0.14.9",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "7.0.0-pre.3",
-    "react-router": "^7.0.0-pre.3"
+    "@react-router/serve": "7.0.0-pre.4",
+    "react-router": "^7.0.0-pre.4"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^7.0.0-pre.3",
-    "react-router": "^7.0.0-pre.3"
+    "@react-router/serve": "^7.0.0-pre.4",
+    "react-router": "^7.0.0-pre.4"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {