vite-plugin-react-server 0.3.3 → 0.3.5

package/src/options.ts

@@ -1,423 +0,0 @@
-import path from "node:path";
-import type { ConfigEnv, ResolvedConfig, UserConfig } from "vite";
-import type { ResolvedUserConfig, ResolvedUserOptions, StreamPluginOptions } from "./types.js";
-import type { InputOption } from "rollup";
-// Default configuration values
-export const DEFAULT_CONFIG = {
-  FILE_REGEX: /\.(m|c)?(j|t)sx?$/,
-  CLIENT_ASSETS_DIR: "assets",
-  RSC_DIR: "rsc",
-  MODULE_BASE: "src",
-  MODULE_BASE_PATH: "/src",
-  MODULE_BASE_URL: "/src",
-  PAGE: "/src/page/page.tsx",
-  PROPS: "/src/page/props.ts",
-  CLIENT_ENTRY: "/src/client.tsx",
-  PAGE_EXPORT: "Page",
-  PROPS_EXPORT: "props",
-  // Use package name paths instead of relative paths
-  WORKER_PATH: "vite-plugin-react-server/worker",
-  LOADER_PATH: "vite-plugin-react-server/loader",
-  RSC_EXTENSION: ".rsc",
-  HTML: ({ children }: { children: any }) => children,
-  COLLECT_CSS: true,
-  COLLECT_ASSETS: true,
-  PAGE_PATTERN: "/src/page/**/*.page.tsx",
-  PROPS_PATTERN: "/src/page/**/*.props.ts",
-  DEV_PORT: 5173,
-  PREVIEW_PORT: 4173,
-  DEV_HOST: "localhost",
-  PREVIEW_HOST: "localhost",
-  ENV_PREFIX: "VITE_",
-  BUILD: {
-    pages: () => ["/"],
-    client: "dist/client",
-    server: "dist/server",
-  },
-  AUTO_DISCOVER: {
-    pagePattern: "**/*.page.tsx",
-    propsPattern: "**/*.props.ts",
-  },
-} as const;
-
-export const resolveConfig = <T extends ResolvedConfig>(
-  config: T,
-  resolvedUserConfig: UserConfig,
-  userOptions: ResolvedUserOptions
-) => {
-  return {
-    ...config,
-    build: {
-      ...config.build,
-      assetsDir: config.build?.assetsDir ?? DEFAULT_CONFIG.CLIENT_ASSETS_DIR,
-    },
-  };
-};
-
-export const resolveUserConfig = (
-  condition: "react-client" | "react-server",
-  input: InputOption,
-  config: UserConfig,
-  configEnv: ConfigEnv,
-  userOptions: ResolvedUserOptions
-):
-  | { type: "error"; error: Error }
-  | {
-      type: "success";
-      userConfig: ResolvedUserConfig;
-    } => {
-  const isReactServer = condition === "react-server";
-  const isViteServer = configEnv.command === "serve";
-  const isVitePreview = configEnv.isPreview;
-
-  if (isReactServer && configEnv.command === "build") {
-    if (!config.build?.rollupOptions?.input) {
-      config = {
-        ...config,
-        build: {
-          ...config.build,
-          rollupOptions: {
-            ...config.build?.rollupOptions,
-            input: input,
-          },
-        },
-      };
-    }
-  }
-
-  if (
-    typeof config.build?.assetsDir === "string" &&
-    userOptions.assetsDir !== config.build?.assetsDir
-  ) {
-    return {
-      type: "error",
-      error: new Error(
-        `assetsDir cannot be changed after the config has been resolved, before: ${userOptions.assetsDir}, after: ${config.build?.assetsDir}`
-      ),
-    };
-  }
-
-  if (isReactServer) {
-    if (configEnv.command === "build") {
-      if (!configEnv.isSsrBuild) {
-        return {
-          type: "error",
-          error: new Error(
-            "ssr must be true when using the server plugin, NODE_OPTIONS='--conditions react-server' vite build --ssr"
-          ),
-        };
-      }
-    } else if (!isViteServer) {
-      return {
-        type: "error",
-        error: new Error(
-          isViteServer
-            ? `react-server condition was not set. Please use \`NODE_OPTIONS='--conditions react-server' vite${
-                isVitePreview ? " preview" : ""
-              }\``
-            : "react-server condition was not set. Please use `NODE_OPTIONS='--conditions react-server' vite build --ssr`"
-        ),
-      };
-    } else if (!configEnv.isSsrBuild && configEnv.command !== "serve") {
-      return {
-        type: "error",
-        error: new Error(
-          "Vite was run with the react-server condition, but is making a client build."
-        ),
-      };
-    }
-  }
-
-  const { root: configRoot, mode: configMode, ...configRest } = config;
-  const {
-    outDir: configOutDir,
-    assetsDir: configAssetsDir,
-    ssr: configSsr,
-    manifest: configManifest,
-    ssrManifest: configSsrManifest,
-    ssrEmitAssets: configSsrEmitAssets,
-    target: configTarget,
-    ...configBuildRest
-  } = config.build ?? {};
-
-  return {
-    type: "success",
-    userConfig: {
-      ...configRest,
-      root: configRoot ?? userOptions.projectRoot ?? process.cwd(),
-      mode: configMode ?? process.env["NODE_ENV"] ?? "production",
-      build: {
-        ...configBuildRest,
-        ssr: configSsr ?? isReactServer,
-        manifest: configManifest ?? true,
-        ssrManifest: configSsrManifest ?? true,
-        ssrEmitAssets: configSsrEmitAssets ?? true,
-        target: configTarget ?? "es2020",
-        outDir:
-          typeof configOutDir === "string"
-            ? configOutDir
-            : isReactServer
-            ? userOptions.build.server
-            : userOptions.build.client,
-        assetsDir:
-          typeof configAssetsDir === "string"
-            ? configAssetsDir
-            : isReactServer
-            ? ""
-            : DEFAULT_CONFIG.CLIENT_ASSETS_DIR,
-      },
-    },
-  };
-};
-
-export const resolveOptions = (
-  options: StreamPluginOptions
-):
-  | {
-      type: "success";
-      userOptions: ResolvedUserOptions;
-    }
-  | {
-      type: "error";
-      error: Error;
-    } => {
-  const {
-    workerPath: optionsWorkerPath,
-    loaderPath: optionsLoaderPath,
-    projectRoot: optionsProjectRoot,
-    moduleBase: optionsModuleBase,
-    moduleBasePath: optionsModuleBasePath,
-    moduleBaseURL: optionsModuleBaseURL,
-    build: optionsBuild,
-    Page: optionsPage,
-    props: optionsProps,
-    Html: optionsHtml,
-    pageExportName: optionsPageExportName,
-    propsExportName: optionsPropsExportName,
-    collectCss: optionsCollectCss,
-    collectAssets: optionsCollectAssets,
-    assetsDir: optionsAssetsDir,
-    clientEntry: optionsClientEntry,
-    serverOutDir: optionsServerOutDir,
-    clientOutDir: optionsClientOutDir,
-    autoDiscover: optionsAutoDiscover,
-    moduleBaseExceptions: optionsModuleBaseExceptions,
-    ...restOptions
-  } = options;
-  const projectRoot = optionsProjectRoot ?? process.cwd();
-  /** the module base can be assumed to not have a leading slash */
-  const moduleBase =
-    typeof optionsModuleBase === "string"
-      ? optionsModuleBase.startsWith(path.sep)
-        ? optionsModuleBase.slice(path.sep.length)
-        : optionsModuleBase
-      : DEFAULT_CONFIG.MODULE_BASE;
-
-  if (
-    typeof optionsModuleBase === "string" &&
-    optionsModuleBase !== moduleBase
-  ) {
-    return {
-      type: "error",
-      error: new Error(
-        `moduleBase ${optionsModuleBase} is invalid, should be like ${moduleBase}`
-      ),
-    };
-  }
-
-  const moduleBasePath =
-    typeof optionsModuleBasePath === "string"
-      ? !optionsModuleBasePath.startsWith(path.sep)
-        ? `${path.sep}${optionsModuleBasePath}`
-        : optionsModuleBasePath
-      : `${path.sep}${moduleBase}`;
-
-  if (!moduleBasePath.includes(moduleBase)) {
-    return {
-      type: "error",
-      error: new Error(
-        `moduleBasePath ${moduleBasePath} is invalid, should include moduleBase ${moduleBase}`
-      ),
-    };
-  }
-
-  const moduleBaseURL =
-    typeof optionsModuleBaseURL === "string"
-      ? !optionsModuleBaseURL.endsWith(moduleBasePath)
-        ? path.join(optionsModuleBaseURL, moduleBasePath)
-        : optionsModuleBaseURL
-      : moduleBasePath;
-
-  if (!moduleBaseURL.includes(moduleBasePath)) {
-    return {
-      type: "error",
-      error: new Error(
-        `moduleBaseURL ${moduleBaseURL} is invalid, should include moduleBasePath ${moduleBasePath}`
-      ),
-    };
-  }
-
-  if (
-    typeof optionsModuleBaseURL === "string" &&
-    optionsModuleBaseURL !== moduleBaseURL
-  ) {
-    return {
-      type: "error",
-      error: new Error(
-        `moduleBaseURL ${optionsModuleBaseURL} is invalid, should be like ${moduleBaseURL}`
-      ),
-    };
-  }
-
-  const build = optionsBuild
-    ? {
-        client: optionsBuild.client ?? DEFAULT_CONFIG.BUILD.client,
-        pages: optionsBuild.pages ?? DEFAULT_CONFIG.BUILD.pages,
-        server: optionsBuild.server ?? DEFAULT_CONFIG.BUILD.server,
-      }
-    : DEFAULT_CONFIG.BUILD;
-
-  const autoDiscover =
-    typeof optionsAutoDiscover === "object"
-      ? {
-          pagePattern:
-            typeof optionsAutoDiscover.pagePattern === "string"
-              ? optionsAutoDiscover.pagePattern
-              : DEFAULT_CONFIG.AUTO_DISCOVER.pagePattern,
-          propsPattern:
-            typeof optionsAutoDiscover.propsPattern === "string"
-              ? optionsAutoDiscover.propsPattern
-              : DEFAULT_CONFIG.AUTO_DISCOVER.propsPattern,
-        }
-      : DEFAULT_CONFIG.AUTO_DISCOVER;
-
-  const workerPath = typeof optionsWorkerPath === "string" ? optionsWorkerPath : DEFAULT_CONFIG.WORKER_PATH;
-  const loaderPath = typeof optionsLoaderPath === "string" ? optionsLoaderPath : DEFAULT_CONFIG.LOADER_PATH;
-  return {
-    type: "success",
-    userOptions: {
-      ...DEFAULT_CONFIG,
-      ...restOptions,
-      moduleBase,
-      moduleBasePath,
-      moduleBaseURL,
-      build,
-      Page: optionsPage ?? DEFAULT_CONFIG.PAGE,
-      props: optionsProps ?? DEFAULT_CONFIG.PROPS,
-      Html: optionsHtml ?? DEFAULT_CONFIG.HTML,
-      pageExportName: optionsPageExportName ?? DEFAULT_CONFIG.PAGE_EXPORT,
-      propsExportName: optionsPropsExportName ?? DEFAULT_CONFIG.PROPS_EXPORT,
-      collectCss: optionsCollectCss ?? DEFAULT_CONFIG.COLLECT_CSS,
-      collectAssets: optionsCollectAssets ?? DEFAULT_CONFIG.COLLECT_ASSETS,
-      projectRoot: projectRoot,
-      assetsDir: optionsAssetsDir ?? DEFAULT_CONFIG.CLIENT_ASSETS_DIR,
-      workerPath: workerPath,
-      loaderPath: loaderPath,
-      clientEntry: optionsClientEntry ?? DEFAULT_CONFIG.CLIENT_ENTRY,
-      serverOutDir: optionsServerOutDir ?? DEFAULT_CONFIG.BUILD.server,
-      clientOutDir: optionsClientOutDir ?? DEFAULT_CONFIG.BUILD.client,
-      autoDiscover: autoDiscover,
-      moduleBaseExceptions: [
-        workerPath,
-        loaderPath,
-        ...(optionsModuleBaseExceptions ?? []),
-      ],
-    } satisfies ResolvedUserOptions,
-  };
-};
-
-export async function resolvePages(
-  pages: ResolvedUserOptions["build"]["pages"]
-): Promise<
-  | {
-      type: "success";
-      pages: string[];
-    }
-  | {
-      type: "error";
-      error: Error;
-    }
-> {
-  if (!pages) {
-    return {
-      type: "success",
-      pages: [],
-    };
-  }
-  if (typeof pages === "function") {
-    try {
-      return resolvePages(await Promise.resolve(pages()));
-    } catch (error) {
-      return {
-        type: "error",
-        error:
-          error instanceof Error
-            ? error
-            : new Error(
-                `build.pages must be a array of strings, or a (async) function that returns a string or an array of strings. Got "${JSON.stringify(
-                  pages
-                )}"`,
-                {
-                  cause: error,
-                }
-              ),
-      };
-    }
-  }
-  try {
-    const result = pages;
-    const awaited = "then" in result ? await result : result;
-    if (typeof awaited === "string") {
-      return {
-        type: "success",
-        pages: [awaited],
-      };
-    }
-    if (Array.isArray(awaited)) {
-      if (awaited.every((page) => typeof page === "string")) {
-        return {
-          type: "success",
-          pages: awaited,
-        };
-      } else {
-        return {
-          type: "error",
-          error: new Error(
-            `build.pages must be a array of strings, or a (async) function that returns a string or an array of strings. Got "${JSON.stringify(
-              awaited.find((page) => typeof page !== "string")
-            )}"`,
-            {
-              cause: awaited,
-            }
-          ),
-        };
-      }
-    }
-    return {
-      type: "error",
-      error: new Error(
-        `build.pages must be a array of strings, or a (async) function that returns a string or an array of strings. Got "${JSON.stringify(
-          pages
-        )}"`,
-        {
-          cause: pages,
-        }
-      ),
-    };
-  } catch (error) {
-    return {
-      type: "error",
-      error:
-        error instanceof Error
-          ? error
-          : new Error(
-              `build.pages must be a array of strings, or a (async) function that returns a string or an array of strings. Got "${JSON.stringify(
-                error
-              )}"`,
-              {
-                cause: error,
-              }
-            ),
-    };
-  }
-}

package/src/plugin.ts

@@ -1,5 +0,0 @@
-import "./assertServerCondition.js";
-export { reactStreamPlugin } from "./react-server/plugin.js";
-
-// the main plugin is version is the server version, if you want the client version, use the `vite-plugin-react-server/client` import
-// this is because the workflow assumes main thread = react server condition

package/src/react-client/plugin.ts

@@ -1,34 +0,0 @@
-import type { Plugin } from "vite";
-import {
-  resolveOptions,
-  resolvePages,
-  resolveUserConfig,
-} from "../options.js";
-import type { StreamPluginOptions } from "../types.js";
-
-export async function reactStreamPlugin(
-  options: StreamPluginOptions
-): Promise<Plugin> {
-  const resolvedOptions = resolveOptions(options);
-  if (resolvedOptions.type === "error") {
-    throw resolvedOptions.error;
-  }
-  const { userOptions } = resolvedOptions;
-
-  const resolvedPages  = await resolvePages(userOptions.build.pages)
-  if(resolvedPages.type === "error") {
-    throw resolvedPages.error
-  }
-  const { pages } = resolvedPages
-  return {
-    name: "vite:react-stream",
-    config(config, configEnv) {
-      const resolvedConfig = resolveUserConfig("react-client", pages, config, configEnv, userOptions);
-      if (resolvedConfig.type === "error") {
-        throw resolvedConfig.error;
-      }
-      const { userConfig } = resolvedConfig;
-      return userConfig
-    },
-  };
-}