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

package/dist/{config/routes.d.ts → routes-C14jcF98.d.ts}

@@ -1,11 +1,14 @@
-import * as v from "valibot";
-export declare function setAppDirectory(directory: string): void;
+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.
  */
-export declare function getAppDirectory(): string;
-export interface RouteManifestEntry {
+declare function getAppDirectory(): string;
+interface RouteManifestEntry {
     /**
      * The path this route uses to match on the URL pathname.
      */
@@ -34,7 +37,7 @@ export interface RouteManifestEntry {
      */
     file: string;
 }
-export interface RouteManifest {
+interface RouteManifest {
     [routeId: string]: RouteManifestEntry;
 }
 /**
@@ -42,7 +45,7 @@ export interface RouteManifest {
  * convenience, route config entries can be created with the {@link route},
  * {@link index} and {@link layout} helper functions.
  */
-export interface RouteConfigEntry {
+interface RouteConfigEntry {
     /**
      * The unique id for this route.
      */
@@ -69,22 +72,12 @@ export interface RouteConfigEntry {
      */
     children?: RouteConfigEntry[];
 }
-export declare const routeConfigEntrySchema: v.BaseSchema<RouteConfigEntry, any, v.BaseIssue<unknown>>;
-export declare const resolvedRouteConfigSchema: v.ArraySchema<v.BaseSchema<RouteConfigEntry, any, v.BaseIssue<unknown>>, undefined>;
+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`.
  */
-export type RouteConfig = ResolvedRouteConfig | Promise<ResolvedRouteConfig>;
-export declare function validateRouteConfig({ routeConfigFile, routeConfig, }: {
-    routeConfigFile: string;
-    routeConfig: unknown;
-}): {
-    valid: false;
-    message: string;
-} | {
-    valid: true;
-};
+type RouteConfig = ResolvedRouteConfig | Promise<ResolvedRouteConfig>;
 declare const createConfigRouteOptionKeys: ["id", "index", "caseSensitive"];
 type CreateRouteOptions = Pick<RouteConfigEntry, (typeof createConfigRouteOptionKeys)[number]>;
 /**
@@ -119,11 +112,12 @@ declare const helpers: {
     layout: typeof layout;
     prefix: typeof prefix;
 };
-export { route, index, layout, 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.
  */
-export declare function relative(directory: string): typeof helpers;
-export declare function configRoutesToRouteManifest(routes: RouteConfigEntry[], rootId?: string): RouteManifest;
+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,2 +1,2 @@
-export type { RouteConfig, RouteConfigEntry } from "./config/routes";
-export { route, index, layout, prefix, relative, getAppDirectory, } from "./config/routes";
+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.2
+ * @react-router/dev v7.0.0-pre.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,17 +8,187 @@
  *
  * @license MIT
  */
-'use strict';
+"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);
 
-Object.defineProperty(exports, '__esModule', { value: true });
+// routes.ts
+var routes_exports = {};
+__export(routes_exports, {
+  getAppDirectory: () => getAppDirectory,
+  index: () => index,
+  layout: () => layout,
+  prefix: () => prefix,
+  relative: () => relative,
+  route: () => route
+});
+module.exports = __toCommonJS(routes_exports);
 
-var routes = require('./config/routes.js');
+// config/routes.ts
+var import_node_path = require("path");
+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);
+  }
+}
 
-
-exports.getAppDirectory = routes.getAppDirectory;
-exports.index = routes.index;
-exports.layout = routes.layout;
-exports.prefix = routes.prefix;
-exports.relative = routes.relative;
-exports.route = routes.route;
+// 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.string()),
+    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 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, (0, import_node_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((0, import_node_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((0, import_node_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
+});

package/dist/typescript/plugin.d.ts

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