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

package/dist/vite/config.js

@@ -1,282 +0,0 @@
-/**
- * @react-router/dev v7.0.0-pre.2
- *
- * 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
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var node_child_process = require('node:child_process');
-var path = require('node:path');
-var fse = require('fs-extra');
-var colors = require('picocolors');
-var pick = require('lodash/pick');
-var omit = require('lodash/omit');
-var PackageJson = require('@npmcli/package-json');
-var routes = require('../config/routes.js');
-var detectPackageManager = require('../cli/detectPackageManager.js');
-var importViteEsmSync = require('./import-vite-esm-sync.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
-var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
-var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
-var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
-var PackageJson__default = /*#__PURE__*/_interopDefaultLegacy(PackageJson);
-
-const excludedConfigPresetKeys = ["presets"];
-// Only expose a subset of route properties to the "serverBundles" function
-const branchRouteProperties = ["id", "path", "file", "index"];
-const configRouteToBranchRoute = configRoute => pick__default["default"](configRoute, branchRouteProperties);
-let mergeReactRouterConfig = (...configs) => {
-  let reducer = (configA, configB) => {
-    let mergeRequired = key => configA[key] !== undefined && configB[key] !== undefined;
-    return {
-      ...configA,
-      ...configB,
-      ...(mergeRequired("buildEnd") ? {
-        buildEnd: async (...args) => {
-          var _configA$buildEnd, _configB$buildEnd;
-          await Promise.all([(_configA$buildEnd = configA.buildEnd) === null || _configA$buildEnd === void 0 ? void 0 : _configA$buildEnd.call(configA, ...args), (_configB$buildEnd = configB.buildEnd) === null || _configB$buildEnd === void 0 ? void 0 : _configB$buildEnd.call(configB, ...args)]);
-        }
-      } : {}),
-      ...(mergeRequired("future") ? {
-        future: {
-          ...configA.future,
-          ...configB.future
-        }
-      } : {}),
-      ...(mergeRequired("presets") ? {
-        presets: [...(configA.presets ?? []), ...(configB.presets ?? [])]
-      } : {})
-    };
-  };
-  return configs.reduce(reducer, {});
-};
-// Inlined from https://github.com/jsdf/deep-freeze
-let deepFreeze = o => {
-  Object.freeze(o);
-  let oIsFunction = typeof o === "function";
-  let hasOwnProp = Object.prototype.hasOwnProperty;
-  Object.getOwnPropertyNames(o).forEach(function (prop) {
-    if (hasOwnProp.call(o, prop) && (oIsFunction ? prop !== "caller" && prop !== "callee" && prop !== "arguments" : true) && o[prop] !== null && (typeof o[prop] === "object" || typeof o[prop] === "function") && !Object.isFrozen(o[prop])) {
-      deepFreeze(o[prop]);
-    }
-  });
-  return o;
-};
-function resolvePublicPath(viteUserConfig) {
-  return viteUserConfig.base ?? "/";
-}
-let isFirstLoad = true;
-let lastValidRoutes = {};
-async function resolveReactRouterConfig({
-  rootDirectory,
-  reactRouterUserConfig,
-  routeConfigChanged,
-  viteUserConfig,
-  viteCommand,
-  routesViteNodeContext
-}) {
-  var _viteUserConfig$serve;
-  let vite = importViteEsmSync.importViteEsmSync();
-  let logger = vite.createLogger(viteUserConfig.logLevel, {
-    prefix: "[react-router]"
-  });
-  let presets = (await Promise.all((reactRouterUserConfig.presets ?? []).map(async preset => {
-    if (!preset.name) {
-      throw new Error("React Router presets must have a `name` property defined.");
-    }
-    if (!preset.reactRouterConfig) {
-      return null;
-    }
-    let configPreset = omit__default["default"](await preset.reactRouterConfig({
-      reactRouterUserConfig
-    }), excludedConfigPresetKeys);
-    return configPreset;
-  }))).filter(function isNotNull(value) {
-    return value !== null;
-  });
-  let defaults = {
-    basename: "/",
-    buildDirectory: "build",
-    serverBuildFile: "index.js",
-    serverModuleFormat: "esm",
-    ssr: true
-  };
-  let {
-    appDirectory: userAppDirectory,
-    basename,
-    buildDirectory: userBuildDirectory,
-    buildEnd,
-    prerender,
-    serverBuildFile,
-    serverBundles,
-    serverModuleFormat,
-    ssr
-  } = {
-    ...defaults,
-    // Default values should be completely overridden by user/preset config, not merged
-    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
-  };
-  // Log warning for incompatible vite config flags
-  if (!ssr && 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 isValidPrerenderConfig = prerender == null || typeof prerender === "boolean" || Array.isArray(prerender) || typeof prerender === "function";
-  if (!isValidPrerenderConfig) {
-    logger.error(colors__default["default"].red("The `prerender` config must be a boolean, an array of string paths, " + "or a function returning a boolean or array of string paths"));
-    process.exit(1);
-  }
-  let appDirectory = path__default["default"].resolve(rootDirectory, userAppDirectory || "app");
-  let buildDirectory = path__default["default"].resolve(rootDirectory, userBuildDirectory);
-  let publicPath = resolvePublicPath(viteUserConfig);
-  if (basename !== "/" && viteCommand === "serve" && !((_viteUserConfig$serve = viteUserConfig.server) !== null && _viteUserConfig$serve !== void 0 && _viteUserConfig$serve.middlewareMode) && !basename.startsWith(publicPath)) {
-    logger.error(colors__default["default"].red("When using the React Router `basename` and the Vite `base` config, " + "the `basename` config must begin with `base` for the default " + "Vite dev server."));
-    process.exit(1);
-  }
-  let rootRouteFile = findEntry(appDirectory, "root");
-  if (!rootRouteFile) {
-    let rootRouteDisplayPath = path__default["default"].relative(rootDirectory, path__default["default"].join(appDirectory, "root.tsx"));
-    logger.error(colors__default["default"].red(`Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`));
-    process.exit(1);
-  }
-  let routes$1 = {
-    root: {
-      path: "",
-      id: "root",
-      file: rootRouteFile
-    }
-  };
-  let routeConfigFile = findEntry(appDirectory, "routes");
-  class FriendlyError extends Error {}
-  try {
-    if (!routeConfigFile) {
-      let routeConfigDisplayPath = vite.normalizePath(path__default["default"].relative(rootDirectory, path__default["default"].join(appDirectory, "routes.ts")));
-      throw new FriendlyError(`Route config file not found at "${routeConfigDisplayPath}".`);
-    }
-    routes.setAppDirectory(appDirectory);
-    let routeConfigExport = (await routesViteNodeContext.runner.executeFile(path__default["default"].join(appDirectory, routeConfigFile))).routes;
-    let routeConfig = await routeConfigExport;
-    let result = routes.validateRouteConfig({
-      routeConfigFile,
-      routeConfig
-    });
-    if (!result.valid) {
-      throw new FriendlyError(result.message);
-    }
-    routes$1 = {
-      ...routes$1,
-      ...routes.configRoutesToRouteManifest(routeConfig)
-    };
-    lastValidRoutes = routes$1;
-    if (routeConfigChanged) {
-      logger.info(colors__default["default"].green("Route config changed."), {
-        clear: true,
-        timestamp: true
-      });
-    }
-  } catch (error) {
-    var _error$loc, _error$loc2, _error$frame$trim, _error$frame;
-    logger.error(error instanceof FriendlyError ? colors__default["default"].red(error.message) : [colors__default["default"].red(`Route config in "${routeConfigFile}" is invalid.`), "", (_error$loc = error.loc) !== null && _error$loc !== void 0 && _error$loc.file && (_error$loc2 = error.loc) !== null && _error$loc2 !== void 0 && _error$loc2.column && error.frame ? [path__default["default"].relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column, (_error$frame$trim = (_error$frame = error.frame).trim) === null || _error$frame$trim === void 0 ? void 0 : _error$frame$trim.call(_error$frame)] : error.stack].flat().join("\n") + "\n", {
-      error,
-      clear: !isFirstLoad,
-      timestamp: !isFirstLoad
-    });
-    // Bail if this is the first time loading config, otherwise keep the dev server running
-    if (isFirstLoad) {
-      process.exit(1);
-    }
-    // Keep dev server running with the last valid routes to allow for correction
-    routes$1 = lastValidRoutes;
-  }
-  let future = {};
-  let reactRouterConfig = deepFreeze({
-    appDirectory,
-    basename,
-    buildDirectory,
-    buildEnd,
-    future,
-    prerender,
-    routes: routes$1,
-    serverBuildFile,
-    serverBundles,
-    serverModuleFormat,
-    ssr
-  });
-  for (let preset of reactRouterUserConfig.presets ?? []) {
-    var _preset$reactRouterCo;
-    await ((_preset$reactRouterCo = preset.reactRouterConfigResolved) === null || _preset$reactRouterCo === void 0 ? void 0 : _preset$reactRouterCo.call(preset, {
-      reactRouterConfig
-    }));
-  }
-  isFirstLoad = false;
-  return reactRouterConfig;
-}
-async function resolveEntryFiles({
-  rootDirectory,
-  reactRouterConfig
-}) {
-  let {
-    appDirectory
-  } = reactRouterConfig;
-  let defaultsDirectory = path__default["default"].resolve(__dirname, "..", "config", "defaults");
-  let userEntryClientFile = findEntry(appDirectory, "entry.client");
-  let userEntryServerFile = findEntry(appDirectory, "entry.server");
-  let entryServerFile;
-  let entryClientFile = userEntryClientFile || "entry.client.tsx";
-  let pkgJson = await PackageJson__default["default"].load(rootDirectory);
-  let deps = pkgJson.content.dependencies ?? {};
-  if (userEntryServerFile) {
-    entryServerFile = userEntryServerFile;
-  } else {
-    if (!deps["@react-router/node"]) {
-      throw new Error(`Could not determine server runtime. Please install @react-router/node, or provide a custom entry.server.tsx/jsx file in your app directory.`);
-    }
-    if (!deps["isbot"]) {
-      console.log("adding `isbot@5` to your package.json, you should commit this change");
-      pkgJson.update({
-        dependencies: {
-          ...pkgJson.content.dependencies,
-          isbot: "^5"
-        }
-      });
-      await pkgJson.save();
-      let packageManager = detectPackageManager.detectPackageManager() ?? "npm";
-      node_child_process.execSync(`${packageManager} install`, {
-        cwd: rootDirectory,
-        stdio: "inherit"
-      });
-    }
-    entryServerFile = `entry.server.node.tsx`;
-  }
-  let entryClientFilePath = userEntryClientFile ? path__default["default"].resolve(reactRouterConfig.appDirectory, userEntryClientFile) : path__default["default"].resolve(defaultsDirectory, entryClientFile);
-  let entryServerFilePath = userEntryServerFile ? path__default["default"].resolve(reactRouterConfig.appDirectory, userEntryServerFile) : path__default["default"].resolve(defaultsDirectory, entryServerFile);
-  return {
-    entryClientFilePath,
-    entryServerFilePath
-  };
-}
-const entryExts = [".js", ".jsx", ".ts", ".tsx"];
-function findEntry(dir, basename) {
-  for (let ext of entryExts) {
-    let file = path__default["default"].resolve(dir, basename + ext);
-    if (fse__default["default"].existsSync(file)) return path__default["default"].relative(dir, file);
-  }
-  return undefined;
-}
-
-exports.configRouteToBranchRoute = configRouteToBranchRoute;
-exports.findEntry = findEntry;
-exports.resolveEntryFiles = resolveEntryFiles;
-exports.resolvePublicPath = resolvePublicPath;
-exports.resolveReactRouterConfig = resolveReactRouterConfig;

package/dist/vite/dev.d.ts

@@ -1,15 +0,0 @@
-import type * as Vite from "vite";
-export interface ViteDevOptions {
-    clearScreen?: boolean;
-    config?: string;
-    cors?: boolean;
-    force?: boolean;
-    host?: boolean | string;
-    logLevel?: Vite.LogLevel;
-    mode?: string;
-    open?: boolean | string;
-    port?: number;
-    strictPort?: boolean;
-    profile?: boolean;
-}
-export declare function dev(root: string, { clearScreen, config: configFile, cors, force, host, logLevel, mode, open, port, strictPort, }: ViteDevOptions): Promise<void>;

package/dist/vite/dev.js

@@ -1,81 +0,0 @@
-/**
- * @react-router/dev v7.0.0-pre.2
- *
- * 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
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var colors = require('picocolors');
-var importViteEsmSync = require('./import-vite-esm-sync.js');
-var profiler = require('./profiler.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
-
-async function dev(root, {
-  clearScreen,
-  config: configFile,
-  cors,
-  force,
-  host,
-  logLevel,
-  mode,
-  open,
-  port,
-  strictPort
-}) {
-  // Ensure Vite's ESM build is preloaded at the start of the process
-  // so it can be accessed synchronously via `importViteEsmSync`
-  await importViteEsmSync.preloadViteEsm();
-  let vite = await import('vite');
-  let server = await vite.createServer({
-    root,
-    mode,
-    configFile,
-    server: {
-      open,
-      cors,
-      host,
-      port,
-      strictPort
-    },
-    optimizeDeps: {
-      force
-    },
-    clearScreen,
-    logLevel
-  });
-  if (!server.config.plugins.find(plugin => plugin.name === "react-router")) {
-    console.error(colors__default["default"].red("React Router Vite plugin not found in Vite config"));
-    process.exit(1);
-  }
-  await server.listen();
-  server.printUrls();
-  let customShortcuts = [{
-    key: "p",
-    description: "start/stop the profiler",
-    async action(server) {
-      if (profiler.getSession()) {
-        await profiler.stop(server.config.logger.info);
-      } else {
-        await profiler.start(() => {
-          server.config.logger.info("Profiler started");
-        });
-      }
-    }
-  }];
-  server.bindCLIShortcuts({
-    print: true,
-    customShortcuts
-  });
-}
-
-exports.dev = dev;

package/dist/vite/import-vite-esm-sync.d.ts

@@ -1,4 +0,0 @@
-type Vite = typeof import("vite");
-export declare function preloadViteEsm(): Promise<void>;
-export declare function importViteEsmSync(): Vite;
-export {};

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

@@ -1,28 +0,0 @@
-/**
- * @react-router/dev v7.0.0-pre.2
- *
- * 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
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var invariant = require('../invariant.js');
-
-// This file is used to avoid CJS deprecation warnings in Vite 5 since
-let vite;
-async function preloadViteEsm() {
-  vite = await import('vite');
-}
-function importViteEsmSync() {
-  invariant(vite, "importViteEsmSync() called before preloadViteEsm()");
-  return vite;
-}
-
-exports.importViteEsmSync = importViteEsmSync;
-exports.preloadViteEsm = preloadViteEsm;

package/dist/vite/node-adapter.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="node" />
-import type { ServerResponse } from "node:http";
-import type * as Vite from "vite";
-export type NodeRequestHandler = (req: Vite.Connect.IncomingMessage, res: ServerResponse) => Promise<void>;
-export declare function fromNodeRequest(nodeReq: Vite.Connect.IncomingMessage, nodeRes: ServerResponse<Vite.Connect.IncomingMessage>): Request;
-export declare function toNodeRequest(res: Response, nodeRes: ServerResponse): Promise<void>;

package/dist/vite/node-adapter.js

@@ -1,90 +0,0 @@
-/**
- * @react-router/dev v7.0.0-pre.2
- *
- * 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
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var node_events = require('node:events');
-var node_stream = require('node:stream');
-var setCookieParser = require('set-cookie-parser');
-var node = require('@react-router/node');
-var invariant = require('../invariant.js');
-
-function fromNodeHeaders(nodeHeaders) {
-  let headers = new Headers();
-  for (let [key, values] of Object.entries(nodeHeaders)) {
-    if (values) {
-      if (Array.isArray(values)) {
-        for (let value of values) {
-          headers.append(key, value);
-        }
-      } else {
-        headers.set(key, values);
-      }
-    }
-  }
-  return headers;
-}
-// Based on `createRemixRequest` in packages/react-router-express/server.ts
-function fromNodeRequest(nodeReq, nodeRes) {
-  let origin = nodeReq.headers.origin && "null" !== nodeReq.headers.origin ? nodeReq.headers.origin : `http://${nodeReq.headers.host}`;
-  // Use `req.originalUrl` so React Router is aware of the full path
-  invariant(nodeReq.originalUrl, "Expected `nodeReq.originalUrl` to be defined");
-  let url = new URL(nodeReq.originalUrl, origin);
-  // Abort action/loaders once we can no longer write a response
-  let controller = new AbortController();
-  let init = {
-    method: nodeReq.method,
-    headers: fromNodeHeaders(nodeReq.headers),
-    signal: controller.signal
-  };
-  // Abort action/loaders once we can no longer write a response iff we have
-  // not yet sent a response (i.e., `close` without `finish`)
-  // `finish` -> done rendering the response
-  // `close` -> response can no longer be written to
-  nodeRes.on("finish", () => controller = null);
-  nodeRes.on("close", () => {
-    var _controller;
-    return (_controller = controller) === null || _controller === void 0 ? void 0 : _controller.abort();
-  });
-  if (nodeReq.method !== "GET" && nodeReq.method !== "HEAD") {
-    init.body = node.createReadableStreamFromReadable(nodeReq);
-    init.duplex = "half";
-  }
-  return new Request(url.href, init);
-}
-// Adapted from solid-start's `handleNodeResponse`:
-// https://github.com/solidjs/solid-start/blob/7398163869b489cce503c167e284891cf51a6613/packages/start/node/fetch.js#L162-L185
-async function toNodeRequest(res, nodeRes) {
-  nodeRes.statusCode = res.status;
-  nodeRes.statusMessage = res.statusText;
-  let cookiesStrings = [];
-  for (let [name, value] of res.headers) {
-    if (name === "set-cookie") {
-      cookiesStrings.push(...setCookieParser.splitCookiesString(value));
-    } else nodeRes.setHeader(name, value);
-  }
-  if (cookiesStrings.length) {
-    nodeRes.setHeader("set-cookie", cookiesStrings);
-  }
-  if (res.body) {
-    // https://github.com/microsoft/TypeScript/issues/29867
-    let responseBody = res.body;
-    let readable = node_stream.Readable.from(responseBody);
-    readable.pipe(nodeRes);
-    await node_events.once(readable, "end");
-  } else {
-    nodeRes.end();
-  }
-}
-
-exports.fromNodeRequest = fromNodeRequest;
-exports.toNodeRequest = toNodeRequest;

package/dist/vite/plugin.d.ts

@@ -1,75 +0,0 @@
-import type * as Vite from "vite";
-import { type RouteManifest } from "../config/routes";
-import type { Manifest as ReactRouterManifest } from "../manifest";
-import { type ReactRouterConfig, type ResolvedReactRouterConfig } from "./config";
-export declare function resolveViteConfig({ configFile, mode, root, }: {
-    configFile?: string;
-    mode?: string;
-    root: string;
-}): Promise<Readonly<Omit<Vite.UserConfig, "optimizeDeps" | "plugins" | "css" | "assetsInclude" | "worker" | "build"> & {
-    configFile: string | undefined;
-    configFileDependencies: string[];
-    inlineConfig: Vite.InlineConfig;
-    root: string;
-    base: string;
-    publicDir: string;
-    cacheDir: string;
-    command: "build" | "serve";
-    mode: string;
-    isWorker: boolean;
-    isProduction: boolean;
-    envDir: string;
-    env: Record<string, any>;
-    resolve: Required<Vite.ResolveOptions> & {
-        alias: Vite.Alias[];
-    };
-    plugins: readonly Vite.Plugin<any>[];
-    css: Vite.ResolvedCSSOptions;
-    esbuild: false | Vite.ESBuildOptions;
-    server: Vite.ResolvedServerOptions;
-    build: Vite.ResolvedBuildOptions;
-    preview: Vite.ResolvedPreviewOptions;
-    ssr: Vite.ResolvedSSROptions;
-    assetsInclude: (file: string) => boolean;
-    logger: Vite.Logger;
-    createResolver: (options?: Partial<Vite.InternalResolveOptions> | undefined) => Vite.ResolveFn;
-    optimizeDeps: Vite.DepOptimizationOptions;
-    worker: Vite.ResolvedWorkerOptions;
-    appType: Vite.AppType;
-    experimental: Vite.ExperimentalOptions;
-} & Vite.PluginHookUtils>>;
-export declare function extractPluginContext(viteConfig: Vite.ResolvedConfig): Promise<ReactRouterPluginContext | undefined>;
-export declare function loadPluginContext({ configFile, root, }: {
-    configFile?: string;
-    root?: string;
-}): Promise<ReactRouterPluginContext>;
-export type ServerBundleBuildConfig = {
-    routes: RouteManifest;
-    serverBundleId: string;
-};
-type ReactRouterPluginSsrBuildContext = {
-    isSsrBuild: false;
-    getReactRouterServerManifest?: never;
-    serverBundleBuildConfig?: never;
-} | {
-    isSsrBuild: true;
-    getReactRouterServerManifest: () => Promise<ReactRouterManifest>;
-    serverBundleBuildConfig: ServerBundleBuildConfig | null;
-};
-export type ReactRouterPluginContext = ReactRouterPluginSsrBuildContext & {
-    rootDirectory: string;
-    entryClientFilePath: string;
-    entryServerFilePath: string;
-    publicPath: string;
-    reactRouterConfig: ResolvedReactRouterConfig;
-    viteManifestEnabled: boolean;
-};
-export declare let getServerBuildDirectory: (ctx: ReactRouterPluginContext) => string;
-type MaybePromise<T> = T | Promise<T>;
-export declare let setReactRouterDevLoadContext: (loadContext: (request: Request) => MaybePromise<Record<string, unknown>>) => void;
-type ReactRouterVitePlugin = (config?: ReactRouterConfig) => Vite.Plugin[];
-/**
- * React Router [Vite plugin.](https://vitejs.dev/guide/using-plugins.html)
- */
-export declare const reactRouterVitePlugin: ReactRouterVitePlugin;
-export {};