@modern-js/app-tools 2.7.0 → 2.8.0

package/dist/esm-node/builder/generator/index.js

@@ -21,8 +21,16 @@ async function generateBuilder(options, generateProvider, utils) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterModern } = await import("../shared/builderPlugins/adapterModern");
-  builder.addPlugins([builderPluginAdapterModern(options)]);
+  const {
+    builderPluginAdapterBasic,
+    builderPluginAdapterHtml,
+    builderPluginAdapterSSR
+  } = await import("../shared/builderPlugins");
+  builder.addPlugins([
+    builderPluginAdapterBasic(options),
+    builderPluginAdapterSSR(options),
+    builderPluginAdapterHtml(options)
+  ]);
 }
 export {
   generateBuilder

package/dist/esm-node/builder/index.js

@@ -5,7 +5,7 @@ async function createBuilderGenerator(bundler) {
       return createRspackBuilderForModern;
     } catch (_) {
       throw new Error(
-        "Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
+        "Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
       );
     }
   }

package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.js

@@ -0,0 +1,67 @@
+const builderPluginAdapterBasic = (options) => ({
+  name: "builder-plugin-adapter-modern-basic",
+  setup(api) {
+    api.modifyBundlerChain((chain, { target, CHAIN_ID }) => {
+      if (target === "node") {
+        chain.name("server");
+      } else if (target === "service-worker") {
+        chain.name("service-worker");
+      } else if (target === "web-worker") {
+        chain.name("worker");
+      } else if (target === "modern-web") {
+        chain.name("modern");
+      } else {
+        chain.name("client");
+      }
+      if (target === "node" || target === "service-worker") {
+        applyNodeCompat(target, chain);
+      }
+      if (target === "web" || target === "modern-web") {
+        const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
+        chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
+        chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
+      }
+    });
+    applyCallbacks(api, options);
+  }
+});
+function applyCallbacks(api, options) {
+  options.onAfterBuild && api.onAfterBuild(options.onAfterBuild);
+  options.onAfterCreateCompiler && api.onAfterCreateCompiler(options.onAfterCreateCompiler);
+  options.onAfterStartDevServer && api.onAfterStartDevServer(options.onAfterStartDevServer);
+  options.onBeforeBuild && api.onBeforeBuild(options.onBeforeBuild);
+  options.onBeforeCreateCompiler && api.onBeforeCreateCompiler(options.onBeforeCreateCompiler);
+  options.onBeforeStartDevServer && api.onBeforeStartDevServer(options.onBeforeStartDevServer);
+  options.onDevCompileDone && api.onDevCompileDone(options.onDevCompileDone);
+  options.onExit && api.onExit(options.onExit);
+}
+function applyNodeCompat(target, chain) {
+  const nodeExts = [
+    ".node.js",
+    ".node.jsx",
+    ".node.ts",
+    ".node.tsx",
+    ".server.js",
+    ".server.ts",
+    ".server.ts",
+    ".server.tsx"
+  ];
+  const webWorkerExts = [
+    ".worker.js",
+    ".worker.jsx",
+    ".worker.ts",
+    ".worker.tsx"
+  ];
+  for (const ext of nodeExts) {
+    chain.resolve.extensions.prepend(ext);
+  }
+  if (target === "service-worker") {
+    for (const ext of webWorkerExts) {
+      chain.resolve.extensions.prepend(ext);
+    }
+  }
+}
+export {
+  applyCallbacks,
+  builderPluginAdapterBasic
+};

package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.js

@@ -0,0 +1,67 @@
+import { getEntryOptions } from "@modern-js/utils";
+import { template as lodashTemplate } from "@modern-js/utils/lodash";
+import { BottomTemplatePlugin } from "../bundlerPlugins";
+function isHtmlEnabled(config, target) {
+  var _a;
+  return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
+}
+const builderPluginAdapterHtml = (options) => ({
+  name: "builder-plugin-adpater-modern-html",
+  setup(api) {
+    api.modifyBundlerChain(
+      (chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
+        const builderConfig = api.getNormalizedConfig();
+        if (isHtmlEnabled(builderConfig, target)) {
+          applyBottomHtmlPlugin({
+            api,
+            options,
+            chain,
+            CHAIN_ID,
+            HtmlBundlerPlugin
+          });
+        }
+      }
+    );
+  }
+});
+function applyBottomHtmlPlugin({
+  api,
+  chain,
+  options,
+  CHAIN_ID,
+  HtmlBundlerPlugin
+}) {
+  const { normalizedConfig: modernConfig, appContext } = options;
+  for (const entryName of Object.keys(api.context.entry)) {
+    const baseTemplateParams = {
+      entryName,
+      title: getEntryOptions(
+        entryName,
+        modernConfig.html.title,
+        modernConfig.html.titleByEntries,
+        appContext.packageName
+      ),
+      mountId: modernConfig.html.mountId,
+      ...getEntryOptions(
+        entryName,
+        modernConfig.html.templateParameters,
+        modernConfig.html.templateParametersByEntries,
+        appContext.packageName
+      )
+    };
+    chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
+      {
+        ...args[0] || {},
+        __internal__: true,
+        bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(
+          baseTemplateParams
+        )
+      }
+    ]);
+  }
+  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [HtmlBundlerPlugin]);
+}
+export {
+  builderPluginAdapterHtml,
+  isHtmlEnabled
+};

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -0,0 +1,143 @@
+import {
+  mergeBuilderConfig
+} from "@modern-js/builder-shared";
+import { fs } from "@modern-js/utils";
+import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
+import { getServerCombinedModueFile } from "../../../analyze/utils";
+import { isHtmlEnabled } from "./adapterHtml";
+const builderPluginAdapterSSR = (options) => ({
+  name: "builder-plugin-adapter-modern-ssr",
+  setup(api) {
+    const { normalizedConfig } = options;
+    api.modifyBuilderConfig((config) => {
+      if (isStreamingSSR(normalizedConfig)) {
+        return mergeBuilderConfig(config, {
+          html: {
+            inject: "body"
+          }
+        });
+      }
+      return config;
+    });
+    api.modifyBundlerChain(
+      async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
+        const builderConfig = api.getNormalizedConfig();
+        applyRouterPlugin(chain, options);
+        await applySSRLoaderEntry(chain, options, isServer);
+        if (["node", "service-worker"].includes(target)) {
+          applyFilterEntriesBySSRConfig({
+            isProd,
+            chain,
+            appNormalizedConfig: options.normalizedConfig
+          });
+        }
+        if (isHtmlEnabled(builderConfig, target)) {
+          applyAsyncChunkHtmlPlugin({
+            chain,
+            modernConfig: options.normalizedConfig,
+            CHAIN_ID,
+            HtmlBundlerPlugin
+          });
+        }
+      }
+    );
+  }
+});
+const isStreamingSSR = (userConfig) => {
+  const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
+  const { server } = userConfig;
+  if (isStreaming(server.ssr)) {
+    return true;
+  }
+  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+    for (const name of Object.keys(server.ssrByEntries)) {
+      if (isStreaming(server.ssrByEntries[name])) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+function applyAsyncChunkHtmlPlugin({
+  chain,
+  modernConfig,
+  CHAIN_ID,
+  HtmlBundlerPlugin
+}) {
+  if (isStreamingSSR(modernConfig)) {
+    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [HtmlBundlerPlugin]);
+  }
+}
+function applyRouterPlugin(chain, options) {
+  var _a;
+  const { appContext, normalizedConfig } = options;
+  const { entrypoints } = appContext;
+  const existNestedRoutes = entrypoints.some(
+    (entrypoint) => entrypoint.nestedRoutesEntry
+  );
+  const routerConfig = (_a = normalizedConfig == null ? void 0 : normalizedConfig.runtime) == null ? void 0 : _a.router;
+  const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
+  if (existNestedRoutes || routerManifest) {
+    chain.plugin("route-plugin").use(RouterPlugin);
+  }
+}
+function applyFilterEntriesBySSRConfig({
+  isProd,
+  chain,
+  appNormalizedConfig
+}) {
+  var _a;
+  const { server: serverConfig, output: outputConfig } = appNormalizedConfig;
+  const entries = chain.entryPoints.entries();
+  if (isProd && ((outputConfig == null ? void 0 : outputConfig.ssg) === true || typeof ((_a = outputConfig == null ? void 0 : outputConfig.ssg) == null ? void 0 : _a[0]) === "function")) {
+    return;
+  }
+  if (typeof entries === "undefined") {
+    throw new Error(
+      "No entry found, one of src/routes/layout.tsx, src/App.tsx, src/index.tsx is required"
+    );
+  }
+  const entryNames = Object.keys(entries);
+  if (isProd && entryNames.length === 1 && (outputConfig == null ? void 0 : outputConfig.ssg)) {
+    return;
+  }
+  const ssgEntries = [];
+  if (isProd && (outputConfig == null ? void 0 : outputConfig.ssg)) {
+    const { ssg } = outputConfig;
+    entryNames.forEach((name) => {
+      if (ssg[name]) {
+        ssgEntries.push(name);
+      }
+    });
+  }
+  const { ssr, ssrByEntries } = serverConfig || {};
+  entryNames.forEach((name) => {
+    if (!ssgEntries.includes(name) && (ssr && (ssrByEntries == null ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries == null ? void 0 : ssrByEntries[name]))) {
+      chain.entryPoints.delete(name);
+    }
+  });
+}
+async function applySSRLoaderEntry(chain, optinos, isServer) {
+  const { appContext } = optinos;
+  const { internalDirectory } = appContext;
+  const { entrypoints } = appContext;
+  await Promise.all(
+    entrypoints.map(async (entrypoint) => {
+      const { entryName } = entrypoint;
+      const serverLoadersFile = getServerCombinedModueFile(
+        internalDirectory,
+        entryName
+      );
+      if (isServer) {
+        try {
+          await fs.access(serverLoadersFile, fs.constants.F_OK);
+          chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+        } catch (err) {
+        }
+      }
+    })
+  );
+}
+export {
+  builderPluginAdapterSSR
+};

package/dist/esm-node/builder/shared/builderPlugins/index.js

@@ -0,0 +1,3 @@
+export * from "./adapterBasic";
+export * from "./adapterHtml";
+export * from "./adapterSSR";

package/dist/esm-node/builder/{builder-webpack/webpackPlugins → shared/bundlerPlugins}/RouterPlugin.js

@@ -38,7 +38,7 @@ class RouterPlugin {
             chunkGroups: true,
             chunks: true
           });
-          const { publicPath } = stats;
+          const { publicPath, chunks = [] } = stats;
           const routeAssets = {};
           const { namedChunkGroups, assetsByChunkName } = stats;
           if (!namedChunkGroups || !assetsByChunkName) {
@@ -71,17 +71,23 @@ class RouterPlugin {
           const entryChunkIds = entrypointsArray.map(
             (entrypoint) => entrypoint[0]
           );
-          const entryChunks = [...compilation.chunks].filter((chunk) => {
-            return entryChunkIds.includes(chunk.name);
+          const entryChunks = [...chunks].filter((chunk) => {
+            var _a;
+            return (_a = chunk.names) == null ? void 0 : _a.some((name) => entryChunkIds.includes(name));
           });
           const entryChunkFiles = entryChunks.map(
-            (chunk) => [...chunk.files].find((fname) => fname.includes(".js"))
+            (chunk) => [...chunk.files || []].find((fname) => fname.includes(".js"))
           );
           for (const file of entryChunkFiles) {
             const asset = compilation.assets[file];
             const newContent = `${injectedContent}${asset.source().toString()}`;
             newAssetsMap.set(path.join(outputPath, file), newContent);
-            compilation.updateAsset(file, new RawSource(newContent));
+            compilation.updateAsset(
+              file,
+              new RawSource(newContent),
+              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+              void 0
+            );
           }
           const filename = path.join(outputPath, ROUTE_MINIFEST_FILE);
           await fs.ensureFile(filename);

package/dist/esm-node/builder/shared/bundlerPlugins/index.js

@@ -0,0 +1,3 @@
+export * from "./HtmlAsyncChunkPlugin";
+export * from "./HtmlBottomTemplate";
+export * from "./RouterPlugin";

package/dist/esm-node/builder/shared/index.js

@@ -1,3 +1,3 @@
 export * from "./createCopyPattern";
 export * from "./types";
-export * from "./builderPlugins/adapterModern";
+export * from "./builderPlugins";

package/dist/esm-node/index.js

@@ -23,7 +23,7 @@ const upgradeModel = Import.lazy(
 const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
-  const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).action(async (options) => {
+  const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
     const { dev } = await import("./commands/dev");
     await dev(api, options);
   });

package/dist/esm-node/locale/en.js

@@ -8,6 +8,7 @@ const EN_LOCALE = {
       describe: "start dev server",
       entry: "compiler by entry",
       apiOnly: "start api server only",
+      webOnly: "start web server only",
       selectEntry: "Please select the entry that needs to be built",
       requireEntry: "You must choose at least one entry"
     },

package/dist/esm-node/locale/zh.js

@@ -8,6 +8,7 @@ const ZH_LOCALE = {
       describe: "本地开发命令",
       entry: "指定入口，编译特定的页面",
       apiOnly: "仅启动 API 接口服务",
+      webOnly: "仅启动 Web 服务",
       selectEntry: "请选择需要构建的入口",
       requireEntry: "请至少选择一个入口"
     },

package/dist/types/analyze/templates.d.ts

@@ -1,5 +1,5 @@
 import type { Entrypoint, NestedRoute, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
-import type { RuntimePlugin } from '../types';
+import type { AppNormalizedConfig, IAppContext, RuntimePlugin } from '../types';
 export declare const index: ({
   mountId,
   imports,
@@ -42,4 +42,5 @@ export declare const fileSystemRoutes: ({
   nestedRoutesEntry?: string | undefined;
   entryName: string;
   internalDirectory: string;
-}) => Promise<string>;
+}) => Promise<string>;
+export declare function ssrLoaderCombinedModule(entrypoints: Entrypoint[], entrypoint: Entrypoint, config: AppNormalizedConfig<'shared'>, appContext: IAppContext): string | null;

package/dist/types/analyze/utils.d.ts

@@ -24,4 +24,5 @@ export declare const parseModule: ({
   filename: string;
 }) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean]>;
 export declare const hasLoader: (filename: string) => Promise<boolean>;
-export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;
+export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;
+export declare const getServerCombinedModueFile: (internalDirectory: string, entryName: string) => string;

package/dist/types/builder/shared/builderPlugins/adapterBasic.d.ts

@@ -0,0 +1,7 @@
+import { BuilderPlugin } from '@modern-js/builder-shared';
+import type { BuilderOptions, BuilderPluginAPI } from '../types';
+import type { Bundler } from '../../../types';
+export declare const builderPluginAdapterBasic: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;
+/** register builder hooks callback */
+
+export declare function applyCallbacks<B extends Bundler>(api: BuilderPluginAPI, options: BuilderOptions<B>): void;

package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts

@@ -0,0 +1,5 @@
+import type { BuilderPlugin, BuilderTarget } from '@modern-js/builder-shared';
+import { Bundler } from '../../../types';
+import type { BuilderNormalizedConfig, BuilderOptions, BuilderPluginAPI } from '../types';
+export declare function isHtmlEnabled(config: BuilderNormalizedConfig, target: BuilderTarget): boolean;
+export declare const builderPluginAdapterHtml: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;

package/dist/types/builder/shared/builderPlugins/adapterSSR.d.ts

@@ -0,0 +1,4 @@
+import { BuilderPlugin } from '@modern-js/builder-shared';
+import type { Bundler } from '../../../types';
+import type { BuilderOptions, BuilderPluginAPI } from '../types';
+export declare const builderPluginAdapterSSR: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;

package/dist/types/builder/shared/builderPlugins/index.d.ts

@@ -0,0 +1,3 @@
+export * from './adapterBasic';
+export * from './adapterHtml';
+export * from './adapterSSR';

package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts

@@ -0,0 +1,5 @@
+import type { webpack } from '@modern-js/builder-webpack-provider';
+import type { Rspack } from '@modern-js/builder-rspack-provider';
+export declare class RouterPlugin {
+  apply(compiler: Rspack.Compiler | webpack.Compiler): void;
+}

package/dist/types/builder/shared/bundlerPlugins/index.d.ts

@@ -0,0 +1,3 @@
+export * from './HtmlAsyncChunkPlugin';
+export * from './HtmlBottomTemplate';
+export * from './RouterPlugin';

package/dist/types/builder/shared/index.d.ts

@@ -1,3 +1,3 @@
 export * from './createCopyPattern';
 export * from './types';
-export * from './builderPlugins/adapterModern';
+export * from './builderPlugins';

package/dist/types/builder/shared/types.d.ts

@@ -1,7 +1,7 @@
-import type { BuilderPluginAPI as WebpackBuilderPluginAPI } from '@modern-js/builder-webpack-provider';
-import type { BuilderPluginAPI as RspackBuilderPluginAPI } from '@modern-js/builder-rspack-provider';
-import { BuilderInstance } from '@modern-js/builder-shared';
-import { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
+import type { BuilderPluginAPI as WebpackBuilderPluginAPI, BuilderConfig as WebpackBuilderConfig, NormalizedConfig as WebpackNormalizedConfig } from '@modern-js/builder-webpack-provider';
+import type { BuilderPluginAPI as RspackBuilderPluginAPI, BuilderConfig as RspackBuilderConfig, NormalizedConfig as RspackNormalizedConfig } from '@modern-js/builder-rspack-provider';
+import type { BuilderInstance, DefaultBuilderPluginAPI } from '@modern-js/builder-shared';
+import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
 type Parameter<T extends (arg: any) => void> = Parameters<T>[0];
 type FnParameter<T extends {
   [p: string]: (arg: any) => void;
@@ -13,4 +13,7 @@ export type BuilderOptions<B extends Bundler> = {
 } & BuilderPluginCallbacks<B>;
 export type ModifyBuilderConfig<B extends Bundler> = (config: AppNormalizedConfig<B>) => Promise<void> | void;
 export type ModifyBuilderInstance = (builder: BuilderInstance) => Promise<void> | void;
+export type BuilderConfig = RspackBuilderConfig | WebpackBuilderConfig;
+export type BuilderNormalizedConfig = RspackNormalizedConfig | WebpackNormalizedConfig;
+export type BuilderPluginAPI = DefaultBuilderPluginAPI<BuilderConfig, BuilderNormalizedConfig>;
 export {};

package/dist/types/locale/en.d.ts

@@ -8,6 +8,7 @@ export declare const EN_LOCALE: {
       describe: string;
       entry: string;
       apiOnly: string;
+      webOnly: string;
       selectEntry: string;
       requireEntry: string;
     };

package/dist/types/locale/index.d.ts

@@ -10,6 +10,7 @@ declare const localeKeys: {
       describe: string;
       entry: string;
       apiOnly: string;
+      webOnly: string;
       selectEntry: string;
       requireEntry: string;
     };
@@ -46,6 +47,7 @@ declare const localeKeys: {
       describe: string;
       entry: string;
       apiOnly: string;
+      webOnly: string;
       selectEntry: string;
       requireEntry: string;
     };

package/dist/types/locale/zh.d.ts

@@ -8,6 +8,7 @@ export declare const ZH_LOCALE: {
       describe: string;
       entry: string;
       apiOnly: string;
+      webOnly: string;
       selectEntry: string;
       requireEntry: string;
     };

package/dist/types/types/config/output.d.ts

@@ -1,6 +1,7 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
 import type { SharedOutputConfig as BuilderSharedOutputConfig } from '@modern-js/builder-shared';
+import type { SSGConfig } from '@modern-js/types';
 import { UnwrapBuilderConfig } from '../utils';
 export type BuilderOutputConfig = UnwrapBuilderConfig<BuilderConfig, 'output'>;
 export type RsBuilderOutputConfig = UnwrapBuilderConfig<RsBuilderConfig, 'output'>;
@@ -10,18 +11,4 @@ export interface SharedOutputConfig extends BuilderSharedOutputConfig {
 }
 export interface OutputUserConfig extends BuilderOutputConfig, SharedOutputConfig {}
 export interface RsOutputUserConfig extends RsBuilderOutputConfig, SharedOutputConfig {}
-export type SSGRouteOptions = string | {
-  url: string;
-  output?: string;
-  params?: Record<string, any>[];
-  headers?: Record<string, any>;
-};
-export type SSGSingleEntryOptions = boolean | {
-  preventDefault?: string[];
-  headers?: Record<string, any>;
-  routes?: SSGRouteOptions[];
-};
-export type SSGMultiEntryOptions = Record<string, SSGSingleEntryOptions>;
-export type SSGConfig = boolean | SSGSingleEntryOptions | SSGMultiEntryOptions | ((entryName: string, payload: {
-  baseUrl?: string;
-}) => SSGSingleEntryOptions);
+export type { SSGRouteOptions, SSGSingleEntryOptions, SSGMultiEntryOptions, SSGConfig } from '@modern-js/types';

package/package.json

@@ -2,8 +2,8 @@
   "name": "@modern-js/app-tools",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": "web-infra-dev/modern.js",
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.7.0",
+  "version": "2.8.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -64,23 +64,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.7.0",
-    "@modern-js/builder-plugin-esbuild": "2.7.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.7.0",
-    "@modern-js/builder-shared": "2.7.0",
-    "@modern-js/builder-webpack-provider": "2.7.0",
-    "@modern-js/core": "2.7.0",
-    "@modern-js/new-action": "2.7.0",
-    "@modern-js/node-bundle-require": "2.7.0",
-    "@modern-js/plugin": "2.7.0",
-    "@modern-js/plugin-data-loader": "2.7.0",
-    "@modern-js/plugin-i18n": "2.7.0",
-    "@modern-js/plugin-lint": "2.7.0",
-    "@modern-js/prod-server": "2.7.0",
-    "@modern-js/server": "2.7.0",
-    "@modern-js/types": "2.7.0",
-    "@modern-js/upgrade": "2.7.0",
-    "@modern-js/utils": "2.7.0"
+    "@modern-js/builder": "2.8.0",
+    "@modern-js/builder-plugin-esbuild": "2.8.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.8.0",
+    "@modern-js/builder-shared": "2.8.0",
+    "@modern-js/builder-webpack-provider": "2.8.0",
+    "@modern-js/core": "2.8.0",
+    "@modern-js/new-action": "2.8.0",
+    "@modern-js/node-bundle-require": "2.8.0",
+    "@modern-js/plugin": "2.8.0",
+    "@modern-js/plugin-data-loader": "2.8.0",
+    "@modern-js/plugin-i18n": "2.8.0",
+    "@modern-js/plugin-lint": "2.8.0",
+    "@modern-js/prod-server": "2.8.0",
+    "@modern-js/server": "2.8.0",
+    "@modern-js/types": "2.8.0",
+    "@modern-js/upgrade": "2.8.0",
+    "@modern-js/utils": "2.8.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -89,14 +89,14 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "2.7.0",
-    "@modern-js/builder-rspack-provider": "2.7.0",
-    "@modern-js/server-core": "2.7.0",
-    "@scripts/jest-config": "2.7.0",
-    "@scripts/build": "2.7.0"
+    "@modern-js/builder-plugin-swc": "2.8.0",
+    "@modern-js/builder-rspack-provider": "2.8.0",
+    "@modern-js/server-core": "2.8.0",
+    "@scripts/jest-config": "2.8.0",
+    "@scripts/build": "2.8.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.7.0"
+    "@modern-js/builder-rspack-provider": "^2.8.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {