@react-router/dev 7.15.1 → 8.0.0-pre.0

package/dist/routes-DXogguGb.js

@@ -0,0 +1,194 @@
+/**
+ * @react-router/dev v8.0.0-pre.0
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+import * as Path from "pathe";
+import pick from "lodash/pick.js";
+import * as v from "valibot";
+//#region invariant.ts
+function invariant(value, message) {
+	if (value === false || value === null || typeof value === "undefined") {
+		console.error("The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose");
+		throw new Error(message);
+	}
+}
+//#endregion
+//#region config/routes.ts
+function setAppDirectory(directory) {
+	globalThis.__reactRouterAppDirectory = directory;
+}
+/**
+* Provides the absolute path to the app directory, for use within `routes.ts`.
+* This is designed to support resolving file system routes.
+*/
+function getAppDirectory() {
+	invariant(globalThis.__reactRouterAppDirectory);
+	return globalThis.__reactRouterAppDirectory;
+}
+const routeConfigEntrySchema = v.pipe(v.custom((value) => {
+	return !(typeof value === "object" && value !== null && "then" in value && "catch" in value);
+}, "Invalid type: Expected object but received a promise. Did you forget to await?"), v.object({
+	id: v.optional(v.pipe(v.string(), v.notValue("root", "A route cannot use the reserved id 'root'."))),
+	path: v.optional(v.string()),
+	index: v.optional(v.boolean()),
+	caseSensitive: v.optional(v.boolean()),
+	file: v.string(),
+	children: v.optional(v.array(v.lazy(() => routeConfigEntrySchema)))
+}));
+const resolvedRouteConfigSchema = v.array(routeConfigEntrySchema);
+function validateRouteConfig({ routeConfigFile, routeConfig }) {
+	if (!routeConfig) return {
+		valid: false,
+		message: `Route config must be the default export in "${routeConfigFile}".`
+	};
+	if (!Array.isArray(routeConfig)) return {
+		valid: false,
+		message: `Route config in "${routeConfigFile}" must be an array.`
+	};
+	let { issues } = v.safeParse(resolvedRouteConfigSchema, routeConfig);
+	if (issues?.length) {
+		let { root, nested } = v.flatten(issues);
+		return {
+			valid: false,
+			message: [
+				`Route config in "${routeConfigFile}" is invalid.`,
+				root ? `${root}` : [],
+				nested ? Object.entries(nested).map(([path, message]) => `Path: routes.${path}\n${message}`) : []
+			].flat().join("\n\n")
+		};
+	}
+	return {
+		valid: true,
+		routeConfig
+	};
+}
+const createConfigRouteOptionKeys = [
+	"id",
+	"index",
+	"caseSensitive"
+];
+function route(path, file, optionsOrChildren, children) {
+	let options = {};
+	if (Array.isArray(optionsOrChildren) || !optionsOrChildren) children = optionsOrChildren;
+	else options = optionsOrChildren;
+	return {
+		file,
+		children,
+		path: path ?? void 0,
+		...pick(options, createConfigRouteOptionKeys)
+	};
+}
+const createIndexOptionKeys = ["id"];
+/**
+* Helper function for creating a route config entry for an index route, for use
+* within `routes.ts`.
+*/
+function index(file, options) {
+	return {
+		file,
+		index: true,
+		...pick(options, createIndexOptionKeys)
+	};
+}
+const createLayoutOptionKeys = ["id"];
+function layout(file, optionsOrChildren, children) {
+	let options = {};
+	if (Array.isArray(optionsOrChildren) || !optionsOrChildren) children = optionsOrChildren;
+	else options = optionsOrChildren;
+	return {
+		file,
+		children,
+		...pick(options, createLayoutOptionKeys)
+	};
+}
+/**
+* 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`.
+*/
+function prefix(prefixPath, routes) {
+	return routes.map((route) => {
+		if (route.index || typeof route.path === "string") return {
+			...route,
+			path: route.path ? joinRoutePaths(prefixPath, route.path) : prefixPath,
+			children: route.children
+		};
+		else if (route.children) return {
+			...route,
+			children: prefix(prefixPath, route.children)
+		};
+		return route;
+	});
+}
+/**
+* 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.
+*/
+function relative(directory) {
+	return {
+		/**
+		* Helper function for creating a route config entry, for use within
+		* `routes.ts`. Note that this helper has been scoped, meaning that file
+		* path will be resolved relative to the directory provided to the
+		* `relative` call that created this helper.
+		*/
+		route: (path, file, ...rest) => {
+			return route(path, Path.resolve(directory, file), ...rest);
+		},
+		/**
+		* Helper function for creating a route config entry for an index route, for
+		* use within `routes.ts`. Note that this helper has been scoped, meaning
+		* that file path will be resolved relative to the directory provided to the
+		* `relative` call that created this helper.
+		*/
+		index: (file, ...rest) => {
+			return index(Path.resolve(directory, file), ...rest);
+		},
+		/**
+		* Helper function for creating a route config entry for a layout route, for
+		* use within `routes.ts`. Note that this helper has been scoped, meaning
+		* that file path will be resolved relative to the directory provided to the
+		* `relative` call that created this helper.
+		*/
+		layout: (file, ...rest) => {
+			return layout(Path.resolve(directory, file), ...rest);
+		},
+		prefix
+	};
+}
+function configRoutesToRouteManifest(appDirectory, routes) {
+	let routeManifest = {};
+	function walk(route, parentId) {
+		let id = route.id || createRouteId(route.file);
+		let manifestItem = {
+			id,
+			parentId,
+			file: Path.isAbsolute(route.file) ? Path.relative(appDirectory, route.file) : route.file,
+			path: route.path,
+			index: route.index,
+			caseSensitive: route.caseSensitive
+		};
+		if (routeManifest.hasOwnProperty(id)) throw new Error(`Unable to define routes with duplicate route id: "${id}"`);
+		routeManifest[id] = manifestItem;
+		if (route.children) for (let child of route.children) walk(child, id);
+	}
+	for (let route of routes) walk(route);
+	return routeManifest;
+}
+function createRouteId(file) {
+	return Path.normalize(stripFileExtension(file));
+}
+function stripFileExtension(file) {
+	return file.replace(/\.[a-z0-9]+$/i, "");
+}
+function joinRoutePaths(path1, path2) {
+	return [path1.replace(/\/+$/, ""), path2.replace(/^\/+/, "")].join("/");
+}
+//#endregion
+export { prefix as a, setAppDirectory as c, layout as i, validateRouteConfig as l, getAppDirectory as n, relative as o, index as r, route as s, configRoutesToRouteManifest as t, invariant as u };

package/dist/{routes-CZR-bKRt.d.ts → routes-Kx8VZRs3.d.ts}

@@ -1,7 +1,9 @@
-import * as v from 'valibot';
 
+import * as v from "valibot";
+
+//#region config/routes.d.ts
 declare global {
-    var __reactRouterAppDirectory: string;
+  var __reactRouterAppDirectory: string;
 }
 /**
  * Provides the absolute path to the app directory, for use within `routes.ts`.
@@ -9,36 +11,36 @@ declare global {
  */
 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;
+  /**
+   * 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;
+  [routeId: string]: RouteManifestEntry;
 }
 /**
  * Configuration for an individual route, for use within `routes.ts`. As a
@@ -46,31 +48,31 @@ interface RouteManifest {
  * {@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[];
+  /**
+   * 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>;
@@ -107,17 +109,16 @@ declare function layout(file: string, options: CreateLayoutOptions, children?: R
  */
 declare function prefix(prefixPath: string, routes: RouteConfigEntry[]): RouteConfigEntry[];
 declare const helpers: {
-    route: typeof route;
-    index: typeof index;
-    layout: typeof layout;
-    prefix: typeof prefix;
+  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 RouteConfigEntry as b, type RouteConfig as c, relative as d, getAppDirectory as g, index as i, layout as l, prefix as p, route as r };
+//#endregion
+export { getAppDirectory as a, prefix as c, RouteManifestEntry as i, relative as l, RouteConfigEntry as n, index as o, RouteManifest as r, layout as s, RouteConfig as t, route as u };

package/dist/routes.d.ts

@@ -1,2 +1,3 @@
-export { c as RouteConfig, b as RouteConfigEntry, g as getAppDirectory, i as index, l as layout, p as prefix, d as relative, r as route } from './routes-CZR-bKRt.js';
-import 'valibot';
+
+import { a as getAppDirectory, c as prefix, l as relative, n as RouteConfigEntry, o as index, s as layout, t as RouteConfig, u as route } from "./routes-Kx8VZRs3.js";
+export { type RouteConfig, type RouteConfigEntry, getAppDirectory, index, layout, prefix, relative, route };

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.15.1
+ * @react-router/dev v8.0.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,192 +8,5 @@
  *
  * @license MIT
  */
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// routes.ts
-var routes_exports = {};
-__export(routes_exports, {
-  getAppDirectory: () => getAppDirectory,
-  index: () => index,
-  layout: () => layout,
-  prefix: () => prefix,
-  relative: () => relative2,
-  route: () => route
-});
-module.exports = __toCommonJS(routes_exports);
-
-// config/routes.ts
-var Path = __toESM(require("pathe"));
-var v = __toESM(require("valibot"));
-var import_pick = __toESM(require("lodash/pick"));
-
-// invariant.ts
-function invariant(value, message) {
-  if (value === false || value === null || typeof value === "undefined") {
-    console.error(
-      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
-    );
-    throw new Error(message);
-  }
-}
-
-// config/routes.ts
-function getAppDirectory() {
-  invariant(globalThis.__reactRouterAppDirectory);
-  return globalThis.__reactRouterAppDirectory;
-}
-var routeConfigEntrySchema = v.pipe(
-  v.custom((value) => {
-    return !(typeof value === "object" && value !== null && "then" in value && "catch" in value);
-  }, "Invalid type: Expected object but received a promise. Did you forget to await?"),
-  v.object({
-    id: v.optional(
-      v.pipe(
-        v.string(),
-        v.notValue("root", "A route cannot use the reserved id 'root'.")
-      )
-    ),
-    path: v.optional(v.string()),
-    index: v.optional(v.boolean()),
-    caseSensitive: v.optional(v.boolean()),
-    file: v.string(),
-    children: v.optional(v.array(v.lazy(() => routeConfigEntrySchema)))
-  })
-);
-var resolvedRouteConfigSchema = v.array(routeConfigEntrySchema);
-var createConfigRouteOptionKeys = [
-  "id",
-  "index",
-  "caseSensitive"
-];
-function route(path, file, optionsOrChildren, children) {
-  let options = {};
-  if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
-    children = optionsOrChildren;
-  } else {
-    options = optionsOrChildren;
-  }
-  return {
-    file,
-    children,
-    path: path ?? void 0,
-    ...(0, import_pick.default)(options, createConfigRouteOptionKeys)
-  };
-}
-var createIndexOptionKeys = ["id"];
-function index(file, options) {
-  return {
-    file,
-    index: true,
-    ...(0, import_pick.default)(options, createIndexOptionKeys)
-  };
-}
-var createLayoutOptionKeys = ["id"];
-function layout(file, optionsOrChildren, children) {
-  let options = {};
-  if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
-    children = optionsOrChildren;
-  } else {
-    options = optionsOrChildren;
-  }
-  return {
-    file,
-    children,
-    ...(0, import_pick.default)(options, createLayoutOptionKeys)
-  };
-}
-function prefix(prefixPath, routes) {
-  return routes.map((route2) => {
-    if (route2.index || typeof route2.path === "string") {
-      return {
-        ...route2,
-        path: route2.path ? joinRoutePaths(prefixPath, route2.path) : prefixPath,
-        children: route2.children
-      };
-    } else if (route2.children) {
-      return {
-        ...route2,
-        children: prefix(prefixPath, route2.children)
-      };
-    }
-    return route2;
-  });
-}
-function relative2(directory) {
-  return {
-    /**
-     * Helper function for creating a route config entry, for use within
-     * `routes.ts`. Note that this helper has been scoped, meaning that file
-     * path will be resolved relative to the directory provided to the
-     * `relative` call that created this helper.
-     */
-    route: (path, file, ...rest) => {
-      return route(path, Path.resolve(directory, file), ...rest);
-    },
-    /**
-     * Helper function for creating a route config entry for an index route, for
-     * use within `routes.ts`. Note that this helper has been scoped, meaning
-     * that file path will be resolved relative to the directory provided to the
-     * `relative` call that created this helper.
-     */
-    index: (file, ...rest) => {
-      return index(Path.resolve(directory, file), ...rest);
-    },
-    /**
-     * Helper function for creating a route config entry for a layout route, for
-     * use within `routes.ts`. Note that this helper has been scoped, meaning
-     * that file path will be resolved relative to the directory provided to the
-     * `relative` call that created this helper.
-     */
-    layout: (file, ...rest) => {
-      return layout(Path.resolve(directory, file), ...rest);
-    },
-    // Passthrough of helper functions that don't need relative scoping so that
-    // a complete API is still provided.
-    prefix
-  };
-}
-function joinRoutePaths(path1, path2) {
-  return [
-    path1.replace(/\/+$/, ""),
-    // Remove trailing slashes
-    path2.replace(/^\/+/, "")
-    // Remove leading slashes
-  ].join("/");
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getAppDirectory,
-  index,
-  layout,
-  prefix,
-  relative,
-  route
-});
+import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-DXogguGb.js";
+export { getAppDirectory, index, layout, prefix, relative, route };