@modern-js/core 1.21.3 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,12 +1,51 @@
 # @modern-js/core
 
-## 1.21.3
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Minor Changes
+
+- c9e800d39: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- edd1cfb1a: feat: modernjs Access builder compiler
+  feat: modernjs 接入 builder 构建
+- d5a31df78: refactor: remove unbundle configs and types
+
+  refactor: 移除 unbundle 相关的配置项和类型定义
 
 ### Patch Changes
 
-- @modern-js/node-bundle-require@1.21.3
-- @modern-js/plugin@1.21.3
-- @modern-js/utils@1.21.3
+- 85edee8: feat(app-tools): support tools.htmlPlugin config
+
+  feat(app-tools): 支持 tools.htmlPlugin 配置项
+
+- b8bbe036c: feat: change type logic
+  feat: 修改类型相关的逻辑
+- 8b8e1bb57: feat: support nested routes
+  feat: 支持嵌套路由
+- 3bbea92b2: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [a2509bf]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/node-bundle-require@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/plugin@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/config/defaults.d.ts

@@ -1,5 +1,6 @@
+import type { IAppContext } from '@modern-js/types';
 import { OutputConfig, ServerConfig, SourceConfig } from '.';
-export declare const defaults: {
+export declare const getDefaultConfig: (appContext?: IAppContext) => {
     source: SourceConfig;
     output: OutputConfig;
     server: ServerConfig;

package/dist/config/defaults.js

@@ -1,99 +1,110 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaults = void 0;
-const sourceDefaults = {
-    entries: undefined,
-    enableAsyncEntry: false,
-    disableDefaultEntries: false,
-    entriesDir: './src',
-    configDir: './config',
-    apiDir: './api',
-    envVars: [],
-    globalVars: undefined,
-    alias: undefined,
-    moduleScopes: undefined,
-    include: [],
-};
-const outputDefaults = {
-    assetPrefix: '/',
-    htmlPath: 'html',
-    jsPath: 'static/js',
-    cssPath: 'static/css',
-    mediaPath: 'static/media',
-    path: 'dist',
-    title: '',
-    titleByEntries: undefined,
-    meta: {
-        charset: { charset: 'utf-8' },
-        viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
-        'http-equiv': { 'http-equiv': 'x-ua-compatible', content: 'ie=edge' },
-        renderer: 'webkit',
-        layoutmode: 'standard',
-        imagemode: 'force',
-        'wap-font-scale': 'no',
-        'format-detection': 'telephone=no',
-    },
-    metaByEntries: undefined,
-    inject: 'head',
-    injectByEntries: undefined,
-    mountId: 'root',
-    favicon: '',
-    faviconByEntries: undefined,
-    copy: undefined,
-    scriptExt: undefined,
-    disableHtmlFolder: false,
-    disableCssModuleExtension: false,
-    disableCssExtract: false,
-    enableCssModuleTSDeclaration: false,
-    disableMinimize: false,
-    enableInlineStyles: false,
-    enableInlineScripts: false,
-    disableSourceMap: false,
-    disableInlineRuntimeChunk: false,
-    disableAssetsCache: false,
-    enableLatestDecorators: false,
-    polyfill: 'entry',
-    dataUriLimit: 10000,
-    templateParameters: {},
-    templateParametersByEntries: undefined,
-    cssModuleLocalIdentName: '[name]__[local]--[hash:base64:5]',
-    enableModernMode: false,
-    federation: undefined,
-    disableNodePolyfill: false,
-    enableTsLoader: false,
-};
-const serverDefaults = {
-    routes: undefined,
-    publicRoutes: undefined,
-    ssr: undefined,
-    ssrByEntries: undefined,
-    baseUrl: '/',
-    port: 8080,
-};
-const devDefaults = { assetPrefix: false, https: false };
-const deployDefaults = {
-    domain: '',
-    domainByEntries: undefined,
-};
-const toolsDefaults = {
-    webpack: undefined,
-    babel: undefined,
-    postcss: undefined,
-    autoprefixer: undefined,
-    lodash: undefined,
-    devServer: undefined,
-    tsLoader: undefined,
-    terser: undefined,
-    minifyCss: undefined,
-};
-exports.defaults = {
-    source: sourceDefaults,
-    output: outputDefaults,
-    server: serverDefaults,
-    dev: devDefaults,
-    deploy: deployDefaults,
-    tools: toolsDefaults,
-    plugins: [],
-    runtime: {},
-    runtimeByEntries: {},
+exports.getDefaultConfig = void 0;
+const getDefaultConfig = (appContext) => {
+    const defaultAlias = appContext
+        ? {
+            [appContext.internalDirAlias]: appContext.internalDirectory,
+            [appContext.internalSrcAlias]: appContext.srcDirectory,
+            '@': appContext.srcDirectory,
+            '@shared': appContext.sharedDirectory,
+        }
+        : {};
+    const sourceDefaults = {
+        entries: undefined,
+        enableAsyncEntry: false,
+        disableDefaultEntries: false,
+        entriesDir: './src',
+        configDir: './config',
+        apiDir: './api',
+        envVars: [],
+        globalVars: undefined,
+        alias: defaultAlias,
+        moduleScopes: undefined,
+        include: [],
+    };
+    const outputDefaults = {
+        assetPrefix: '/',
+        htmlPath: 'html',
+        jsPath: 'static/js',
+        cssPath: 'static/css',
+        mediaPath: 'static/media',
+        path: 'dist',
+        title: '',
+        titleByEntries: undefined,
+        meta: {
+            charset: { charset: 'utf-8' },
+            viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
+            'http-equiv': { 'http-equiv': 'x-ua-compatible', content: 'ie=edge' },
+            renderer: 'webkit',
+            layoutmode: 'standard',
+            imagemode: 'force',
+            'wap-font-scale': 'no',
+            'format-detection': 'telephone=no',
+        },
+        metaByEntries: undefined,
+        inject: 'head',
+        injectByEntries: undefined,
+        mountId: 'root',
+        favicon: '',
+        faviconByEntries: undefined,
+        copy: undefined,
+        scriptExt: undefined,
+        disableHtmlFolder: false,
+        disableCssModuleExtension: false,
+        disableCssExtract: false,
+        enableCssModuleTSDeclaration: false,
+        disableMinimize: false,
+        enableInlineStyles: false,
+        enableInlineScripts: false,
+        disableSourceMap: false,
+        disableInlineRuntimeChunk: false,
+        disableAssetsCache: false,
+        enableLatestDecorators: false,
+        polyfill: 'entry',
+        dataUriLimit: 10000,
+        templateParameters: {},
+        templateParametersByEntries: undefined,
+        cssModuleLocalIdentName: undefined,
+        enableModernMode: false,
+        federation: undefined,
+        disableNodePolyfill: false,
+        enableTsLoader: false,
+    };
+    const serverDefaults = {
+        routes: undefined,
+        publicRoutes: undefined,
+        ssr: undefined,
+        ssrByEntries: undefined,
+        baseUrl: '/',
+        port: 8080,
+    };
+    const devDefaults = { assetPrefix: false, https: false };
+    const deployDefaults = {
+        domain: '',
+        domainByEntries: undefined,
+    };
+    const toolsDefaults = {
+        webpack: undefined,
+        babel: undefined,
+        postcss: undefined,
+        autoprefixer: undefined,
+        lodash: undefined,
+        devServer: undefined,
+        tsLoader: undefined,
+        terser: undefined,
+        minifyCss: undefined,
+    };
+    return {
+        source: sourceDefaults,
+        output: outputDefaults,
+        server: serverDefaults,
+        dev: devDefaults,
+        deploy: deployDefaults,
+        tools: toolsDefaults,
+        plugins: [],
+        runtime: {},
+        runtimeByEntries: {},
+    };
 };
+exports.getDefaultConfig = getDefaultConfig;

package/dist/config/index.d.ts

@@ -1,9 +1,9 @@
 import type { ErrorObject } from '@modern-js/utils/ajv';
-import { defaults } from './defaults';
+import { getDefaultConfig } from './defaults';
 import { NormalizedConfig } from './mergeConfig';
 import { PluginValidateSchema } from './schema';
 import type { UserConfig, ConfigParam, LoadedConfig } from './types';
-export { defaults as defaultsConfig };
+export { getDefaultConfig };
 export * from './mergeConfig';
 export * from './types';
 export * from './schema';

package/dist/config/index.js

@@ -26,13 +26,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveConfig = exports.loadUserConfig = exports.assignPkgConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.defaultsConfig = void 0;
+exports.resolveConfig = exports.loadUserConfig = exports.assignPkgConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.getDefaultConfig = void 0;
 const utils_1 = require("@modern-js/utils");
 const lodash_1 = require("@modern-js/utils/lodash");
+const context_1 = require("../context");
 const load_configs_1 = require("../load-configs");
 const repeatKeyWarning_1 = require("../utils/repeatKeyWarning");
 const defaults_1 = require("./defaults");
-Object.defineProperty(exports, "defaultsConfig", { enumerable: true, get: function () { return defaults_1.defaults; } });
+Object.defineProperty(exports, "getDefaultConfig", { enumerable: true, get: function () { return defaults_1.getDefaultConfig; } });
 const mergeConfig_1 = require("./mergeConfig");
 const schema_1 = require("./schema");
 const debug = (0, utils_1.createDebugger)('resolve-config');
@@ -129,7 +130,11 @@ const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort,
             throw new Error(`Validate configuration error.`);
         }
     }
-    const resolved = (0, mergeConfig_1.mergeConfig)([defaults_1.defaults, ...configs, userConfig]);
+    const resolved = (0, mergeConfig_1.mergeConfig)([
+        (0, defaults_1.getDefaultConfig)(context_1.AppContext.use().value),
+        ...configs,
+        userConfig,
+    ]);
     resolved._raw = loaded.config;
     if ((0, utils_1.isDev)() && argv[0] === 'dev') {
         if (restartWithExistingPort > 0) {

package/dist/config/mergeConfig.d.ts

@@ -1,6 +1,6 @@
 import { UserConfig, SourceConfig, ToolsConfig } from '.';
 export interface NormalizedSourceConfig extends Omit<SourceConfig, 'alias' | 'moduleScopes'> {
-    alias: SourceConfig['alias'] | Array<SourceConfig['alias']>;
+    alias: SourceConfig['alias'] | Array<NonNullable<SourceConfig['alias']>>;
     moduleScopes: SourceConfig['moduleScopes'] | Array<SourceConfig['moduleScopes']>;
 }
 export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'webpackChain' | 'babel' | 'postcss' | 'autoprefixer' | 'lodash' | 'tsLoader' | 'terser' | 'minifyCss' | 'esbuild' | 'styledComponents'> {
@@ -15,6 +15,7 @@ export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'we
     terser: ToolsConfig['terser'] | Array<NonNullable<ToolsConfig['terser']>>;
     minifyCss: ToolsConfig['minifyCss'] | Array<NonNullable<ToolsConfig['minifyCss']>>;
     esbuild: ToolsConfig['esbuild'] | Array<NonNullable<ToolsConfig['esbuild']>>;
+    htmlPlugin: ToolsConfig['htmlPlugin'] | Array<NonNullable<ToolsConfig['htmlPlugin']>>;
 }
 export interface NormalizedConfig extends Omit<Required<UserConfig>, 'source' | 'tools'> {
     source: NormalizedSourceConfig;

package/dist/config/schema/index.d.ts

@@ -400,6 +400,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                 enableMicroFrontendDebug: {
                     type: string;
                 };
+                disableFrameworkExt: {
+                    type: string;
+                };
                 watchOptions: {
                     type: string;
                 };
@@ -477,6 +480,18 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                 styledComponents: {
                     typeof: string[];
                 };
+                htmlPlugin: {
+                    typeof: string[];
+                };
+                esbuild: {
+                    type: string;
+                };
+                sass: {
+                    typeof: string[];
+                };
+                less: {
+                    typeof: string[];
+                };
             };
         };
     };

package/dist/config/schema/server.d.ts

@@ -181,6 +181,9 @@ export declare const server: {
         enableMicroFrontendDebug: {
             type: string;
         };
+        disableFrameworkExt: {
+            type: string;
+        };
         watchOptions: {
             type: string;
         };

package/dist/config/schema/server.js

@@ -104,6 +104,7 @@ exports.server = {
         metrics: { type: ['object', 'boolean'] },
         proxy: { type: 'object' },
         enableMicroFrontendDebug: { type: 'boolean' },
+        disableFrameworkExt: { type: 'boolean' },
         watchOptions: { type: 'object' },
         compiler: { type: 'string' },
     },

package/dist/config/schema/tools.d.ts

@@ -35,5 +35,17 @@ export declare const tools: {
         styledComponents: {
             typeof: string[];
         };
+        htmlPlugin: {
+            typeof: string[];
+        };
+        esbuild: {
+            type: string;
+        };
+        sass: {
+            typeof: string[];
+        };
+        less: {
+            typeof: string[];
+        };
     };
 };

package/dist/config/schema/tools.js

@@ -16,5 +16,9 @@ exports.tools = {
         terser: { typeof: ['object', 'function'] },
         minifyCss: { typeof: ['object', 'function'] },
         styledComponents: { typeof: ['object', 'function'] },
+        htmlPlugin: { typeof: ['object', 'function'] },
+        esbuild: { type: 'object' },
+        sass: { typeof: ['object', 'function'] },
+        less: { typeof: ['object', 'function'] },
     },
 };

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

@@ -1,5 +1,5 @@
 import type { DevServerHttpsOptions, DevServerOptions } from '@modern-js/types';
-import type { MetaOptions, ChainIdentifier, WatchOptions } from '@modern-js/utils';
+import type { AliasOption, MetaOptions, ChainIdentifier, WatchOptions } from '@modern-js/utils';
 import type { BabelConfig } from '@modern-js/babel-preset-app';
 import type webpack from 'webpack';
 import type { RuleSetRule, Configuration as WebpackConfiguration, WebpackPluginInstance } from 'webpack';
@@ -8,11 +8,11 @@ import type autoprefixer from 'autoprefixer';
 import type { BasePluginOptions, TerserOptions as RawTerserOptions } from 'terser-webpack-plugin';
 import type { AcceptedPlugin as PostCSSPlugin } from 'postcss';
 import { TransformOptions } from '@babel/core';
-import type { PluginConfig } from '../../loadPlugins';
+import type { Options as HTMLPluginOptions } from 'html-webpack-plugin';
+import type { PluginConfig, NewPluginConfig } from '../../loadPlugins';
 import type { TestConfig, JestConfig } from './test';
 import type { SassConfig, SassLoaderOptions } from './sass';
 import type { LessConfig, LessLoaderOptions } from './less';
-import type { UnbundleConfig } from './unbundle';
 import type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions } from './ssg';
 import type { ElectronConfig } from './electron';
 import type { PostCSSLoaderOptions } from './postcss';
@@ -21,7 +21,7 @@ declare type AutoprefixerOptions = autoprefixer.Options;
 declare type TerserOptions = BasePluginOptions & {
     terserOptions?: Partial<RawTerserOptions>;
 };
-export type { TestConfig, JestConfig, BabelConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, };
+export type { TestConfig, JestConfig, BabelConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, PluginConfig, NewPluginConfig, };
 export interface SourceConfig {
     entries?: Record<string, string | {
         entry: string;
@@ -36,7 +36,7 @@ export interface SourceConfig {
     apiDir?: string;
     envVars?: Array<string>;
     globalVars?: Record<string, string>;
-    alias?: Record<string, string> | ((aliases: Record<string, string>) => Record<string, unknown>);
+    alias?: AliasOption;
     moduleScopes?: Array<string | RegExp> | ((scopes: Array<string | RegExp>) => void) | ((scopes: Array<string | RegExp>) => Array<string | RegExp>);
     include?: Array<string | RegExp>;
     /**
@@ -87,13 +87,6 @@ export interface OutputConfig {
     federation?: boolean;
     disableNodePolyfill?: boolean;
     enableTsLoader?: boolean;
-    /**
-     * Disables lazy import support for styles, currently supports antd and arco-design.
-     * The configuration of `output.disableAutoImportStyle` is provided by `unbundle` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
-     * @requires `unbundle` plugin
-     */
-    disableAutoImportStyle?: boolean;
     /**
      * The configuration of `output.ssg` is provided by `ssg` plugin.
      * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
@@ -110,8 +103,14 @@ export interface ServerConfig {
     publicRoutes?: {
         [filepath: string]: string;
     };
-    ssr?: boolean | Record<string, unknown>;
-    ssrByEntries?: Record<string, boolean | Record<string, unknown>>;
+    ssr?: boolean | {
+        mode?: 'string' | 'stream';
+        [property: string]: unknown;
+    };
+    ssrByEntries?: Record<string, boolean | {
+        mode?: 'string' | 'stream';
+        [property: string]: unknown;
+    }>;
     baseUrl?: string | Array<string>;
     port?: number;
     logger?: boolean | Record<string, any>;
@@ -119,6 +118,7 @@ export interface ServerConfig {
     enableMicroFrontendDebug?: boolean;
     watchOptions?: WatchOptions;
     compiler?: 'babel' | 'typescript';
+    disableFrameworkExt?: boolean;
 }
 export declare type DevProxyOptions = string | Record<string, string>;
 export interface DevConfig {
@@ -130,12 +130,6 @@ export interface DevConfig {
      * @requires `proxy` plugin
      */
     proxy?: DevProxyOptions;
-    /**
-     * The configuration of `dev.unbundle` is provided by `unbundle` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
-     * @requires `unbundle` plugin
-     */
-    unbundle?: UnbundleConfig;
 }
 export interface MicroFrontend {
     enableHtmlEntry?: boolean;
@@ -154,22 +148,22 @@ export declare type PostCSSConfigUtils = {
 export declare type PostCSSConfig = PostCSSLoaderOptions | ((options: PostCSSLoaderOptions, utils: PostCSSConfigUtils) => PostCSSLoaderOptions | void);
 export declare type WebpackConfigUtils = {
     env: string;
+    /** @deprecated Use target instead */
     name: string;
+    target: string;
     webpack: typeof webpack;
     HtmlWebpackPlugin: typeof import('html-webpack-plugin');
     addRules: (rules: RuleSetRule | RuleSetRule[]) => void;
     prependPlugins: (plugins: WebpackPluginInstance | WebpackPluginInstance[]) => void;
     appendPlugins: (plugins: WebpackPluginInstance | WebpackPluginInstance[]) => void;
     removePlugin: (pluginName: string) => void;
-    /**
-     * @deprecated please use `tools.webpackChain` instead.
-     */
-    chain: WebpackChain;
 };
 export declare type WebpackConfig = WebpackConfiguration | ((config: WebpackConfiguration, utils: WebpackConfigUtils) => WebpackConfiguration | void);
 export declare type WebpackChainConfigUtils = {
     env: string;
+    /** @deprecated Use target instead */
     name: string;
+    target: string;
     webpack: typeof webpack;
     CHAIN_ID: ChainIdentifier;
     HtmlWebpackPlugin: typeof import('html-webpack-plugin');
@@ -182,6 +176,10 @@ export declare type TsLoaderConfigUtils = {
 export declare type TsLoaderConfig = TsLoaderOptions | ((config: TsLoaderOptions, utils: TsLoaderConfigUtils) => TsLoaderOptions | void);
 export declare type AutoprefixerConfig = AutoprefixerOptions | ((config: AutoprefixerOptions) => AutoprefixerOptions | void);
 export declare type TerserConfig = TerserOptions | ((config: TerserOptions) => TerserOptions | void);
+export declare type HtmlPluginConfig = HTMLPluginOptions | ((options: HTMLPluginOptions, entryInfo: {
+    entryName: string;
+    entryValue: webpack.Configuration['entry'];
+}) => HTMLPluginOptions | void);
 export interface ToolsConfig {
     webpack?: WebpackConfig;
     webpackChain?: WebpackChainConfig;
@@ -195,6 +193,7 @@ export interface ToolsConfig {
     terser?: TerserConfig;
     minifyCss?: ConfigFunction;
     esbuild?: Record<string, unknown>;
+    htmlPlugin?: HtmlPluginConfig;
     /**
      * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
      * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
@@ -207,17 +206,7 @@ export interface ToolsConfig {
      * @requires `testing` plugin
      */
     jest?: TestConfig['jest'];
-    /**
-     * The configuration of `tools.sass` is provided by `sass` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
-     * @requires `sass` plugin
-     */
     sass?: SassConfig;
-    /**
-     * The configuration of `tools.less` is provided by `less` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
-     * @requires `less` plugin
-     */
     less?: LessConfig;
 }
 export interface RuntimeConfig {

package/dist/context.d.ts

@@ -1,7 +1,7 @@
-import type { IAppContext } from '@modern-js/types';
+import type { IAppContext, InternalPlugins } from '@modern-js/types';
 import { UserConfig } from './config';
 import { NormalizedConfig } from './config/mergeConfig';
-import type { LoadedPlugin } from './loadPlugins';
+import { CliPlugin } from './manager';
 export type { IAppContext };
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
 export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig>;
@@ -23,9 +23,9 @@ export declare const useConfigContext: () => UserConfig;
  * Get normalized content of user config.
  */
 export declare const useResolvedConfigContext: () => NormalizedConfig;
-export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, }: {
+export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }: {
     appDirectory: string;
-    plugins: LoadedPlugin[];
+    plugins: CliPlugin[];
     configFile: string | false;
     options?: {
         metaName?: string | undefined;
@@ -34,4 +34,5 @@ export declare const initAppContext: ({ appDirectory, plugins, configFile, optio
         sharedDir?: string | undefined;
     } | undefined;
     serverConfigFile: string;
+    serverInternalPlugins: InternalPlugins;
 }) => IAppContext;

package/dist/context.js

@@ -31,13 +31,14 @@ exports.useConfigContext = useConfigContext;
  */
 const useResolvedConfigContext = () => exports.ResolvedConfigContext.use().value;
 exports.useResolvedConfigContext = useResolvedConfigContext;
-const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, }) => {
+const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }) => {
     const { metaName = 'modern-js', srcDir = 'src', distDir = '', sharedDir = 'shared', } = options || {};
     return {
         metaName,
         appDirectory,
         configFile,
         serverConfigFile,
+        serverInternalPlugins,
         ip: utils_1.address.ip(),
         port: 0,
         packageName: require(path_1.default.resolve(appDirectory, './package.json')).name,

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { INTERNAL_PLUGINS } from '@modern-js/utils';
 import type { ErrorObject } from '@modern-js/utils/ajv';
+import { InternalPlugins } from '@modern-js/types';
 import { TransformPlugin } from './loadPlugins';
 import { IAppContext, initAppContext } from './context';
 export * from './config';
 export type { Hooks, ImportSpecifier, ImportStatement, RuntimePlugin, } from './types';
 export * from '@modern-js/plugin';
-export { manager, mountHook, usePlugins, createPlugin, registerHook, } from './manager';
+export { manager, mountHook, createPlugin, registerHook } from './manager';
 export type { CliHooks, CliPlugin, CliHookCallbacks } from './manager';
 export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, } from './pluginAPI';
 export type { PluginAPI } from './pluginAPI';
@@ -16,7 +16,10 @@ export interface CoreOptions {
     configFile?: string;
     serverConfigFile?: string;
     packageJsonConfig?: string;
-    plugins?: typeof INTERNAL_PLUGINS;
+    internalPlugins?: {
+        cli?: InternalPlugins;
+        server?: InternalPlugins;
+    };
     transformPlugin?: TransformPlugin;
     onSchemaError?: (error: ErrorObject) => void;
     options?: {
@@ -31,11 +34,9 @@ export declare const mergeOptions: (options?: CoreOptions) => {
     configFile?: string | undefined;
     serverConfigFile: string;
     packageJsonConfig?: string | undefined;
-    plugins?: {
-        [name: string]: {
-            cli?: string | undefined;
-            server?: string | undefined;
-        };
+    internalPlugins?: {
+        cli?: InternalPlugins | undefined;
+        server?: InternalPlugins | undefined;
     } | undefined;
     transformPlugin?: TransformPlugin | undefined;
     onSchemaError?: ((error: ErrorObject) => void) | undefined;

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAppContext = exports.initAppDir = exports.cli = exports.mergeOptions = exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = exports.registerHook = exports.createPlugin = exports.usePlugins = exports.mountHook = exports.manager = void 0;
+exports.initAppContext = exports.initAppDir = exports.cli = exports.mergeOptions = exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = exports.registerHook = exports.createPlugin = exports.mountHook = exports.manager = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@modern-js/utils");
 const commander_1 = require("./utils/commander");
@@ -34,7 +34,6 @@ __exportStar(require("@modern-js/plugin"), exports);
 var manager_2 = require("./manager");
 Object.defineProperty(exports, "manager", { enumerable: true, get: function () { return manager_2.manager; } });
 Object.defineProperty(exports, "mountHook", { enumerable: true, get: function () { return manager_2.mountHook; } });
-Object.defineProperty(exports, "usePlugins", { enumerable: true, get: function () { return manager_2.usePlugins; } });
 Object.defineProperty(exports, "createPlugin", { enumerable: true, get: function () { return manager_2.createPlugin; } });
 Object.defineProperty(exports, "registerHook", { enumerable: true, get: function () { return manager_2.registerHook; } });
 // TODO: remove export after refactor all plugins
@@ -76,7 +75,7 @@ const createCli = () => {
     let restartWithExistingPort = 0;
     let restartOptions;
     const init = async (argv = [], options) => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         manager_1.manager.clear();
         const mergedOptions = (0, exports.mergeOptions)(options);
         restartOptions = mergedOptions;
@@ -87,16 +86,17 @@ const createCli = () => {
         (0, loadEnv_1.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
         const loaded = await (0, config_1.loadUserConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
         const plugins = (0, loadPlugins_1.loadPlugins)(appDirectory, loaded.config, {
-            internalPlugins: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.plugins,
+            internalPlugins: (_c = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _c === void 0 ? void 0 : _c.cli,
             transformPlugin: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.transformPlugin,
         });
-        plugins.forEach(plugin => plugin.cli && manager_1.manager.usePlugin(plugin.cli));
+        plugins.forEach(plugin => plugin && manager_1.manager.usePlugin(plugin));
         const appContext = (0, context_1.initAppContext)({
             appDirectory,
             plugins,
             configFile: loaded.filePath,
             options: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options,
             serverConfigFile: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.serverConfigFile,
+            serverInternalPlugins: ((_d = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _d === void 0 ? void 0 : _d.server) || utils_1.INTERNAL_SERVER_PLUGINS,
         });
         // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
         (0, config_1.addServerConfigToDeps)(loaded.dependencies, appDirectory, mergedOptions.serverConfigFile);

package/dist/loadPlugins.d.ts

@@ -1,31 +1,16 @@
-import { INTERNAL_PLUGINS } from '@modern-js/utils';
+import { InternalPlugins } from '@modern-js/types';
 import type { UserConfig } from './config';
 import { CliPlugin } from './manager';
 declare type PluginItem = string | [string, any];
-export declare type LoadedPlugin = {
-    cli?: CliPlugin;
-    server?: string;
-    serverPkg?: string;
-};
 export declare type TransformPlugin = (plugin: PluginConfig, resolvedConfig: UserConfig, pluginOptions?: any) => PluginConfig;
 /**
  * @deprecated
  * Using NewPluginConfig instead.
  */
-declare type OldPluginConfig = Array<PluginItem | {
-    cli?: PluginItem;
-    server?: PluginItem;
-}>;
-declare type NewPluginConfig = CliPlugin[] | {
-    cli?: CliPlugin[];
-    /** Custom server plugin is not supported yet. */
-    server?: never;
-};
+declare type OldPluginConfig = Array<PluginItem>;
+export declare type NewPluginConfig<T = {}> = CliPlugin<T>[];
 export declare type PluginConfig = OldPluginConfig | NewPluginConfig;
-export declare function getAppPlugins(appDirectory: string, oldPluginConfig: OldPluginConfig, internalPlugins?: typeof INTERNAL_PLUGINS): (PluginItem | {
-    cli?: PluginItem | undefined;
-    server?: PluginItem | undefined;
-})[];
+export declare const isOldPluginConfig: (config?: PluginConfig) => config is OldPluginConfig;
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
@@ -35,7 +20,7 @@ export declare function getAppPlugins(appDirectory: string, oldPluginConfig: Old
  * @returns Plugin Objects has been required.
  */
 export declare const loadPlugins: (appDirectory: string, userConfig: UserConfig, options?: {
-    internalPlugins?: typeof INTERNAL_PLUGINS;
+    internalPlugins?: InternalPlugins;
     transformPlugin?: TransformPlugin;
-}) => LoadedPlugin[];
+}) => CliPlugin<{}>[];
 export {};

package/dist/loadPlugins.js

@@ -1,26 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPlugins = exports.getAppPlugins = void 0;
+exports.loadPlugins = exports.isOldPluginConfig = void 0;
 const utils_1 = require("@modern-js/utils");
 const manager_1 = require("./manager");
 const debug = (0, utils_1.createDebugger)('load-plugins');
-function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
-    const allPlugins = internalPlugins || utils_1.INTERNAL_PLUGINS;
-    const appPlugins = [
-        ...Object.keys(allPlugins)
-            .filter(name => {
-            const config = allPlugins[name];
-            if (config.forced === true) {
-                return true;
-            }
-            return (0, utils_1.isDepExists)(appDirectory, name);
-        })
-            .map(name => allPlugins[name]),
-        ...oldPluginConfig,
-    ];
-    return appPlugins;
-}
-exports.getAppPlugins = getAppPlugins;
 const resolveCliPlugin = (p, userConfig, appDirectory, transformPlugin) => {
     const pkg = typeof p === 'string' ? p : p[0];
     const pluginOptions = typeof p === 'string' ? undefined : p[1];
@@ -37,11 +20,9 @@ const resolveCliPlugin = (p, userConfig, appDirectory, transformPlugin) => {
 };
 const isOldPluginConfig = (config) => Array.isArray(config) &&
     config.some(item => {
-        if (typeof item === 'string' || Array.isArray(item)) {
-            return true;
-        }
-        return 'cli' in item || 'server' in item;
+        return typeof item === 'string' || Array.isArray(item);
     });
+exports.isOldPluginConfig = isOldPluginConfig;
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
@@ -52,35 +33,19 @@ const isOldPluginConfig = (config) => Array.isArray(config) &&
  */
 const loadPlugins = (appDirectory, userConfig, options = {}) => {
     const pluginConfig = userConfig.plugins;
-    const plugins = getAppPlugins(appDirectory, isOldPluginConfig(pluginConfig) ? pluginConfig : [], options.internalPlugins);
+    const plugins = [
+        ...(0, utils_1.getInternalPlugins)(appDirectory, options.internalPlugins),
+        ...((0, exports.isOldPluginConfig)(pluginConfig) ? pluginConfig : []),
+    ];
     const loadedPlugins = plugins.map(plugin => {
-        const _plugin = typeof plugin === 'string' || Array.isArray(plugin)
-            ? { cli: plugin }
-            : plugin;
-        const { cli, server } = _plugin;
-        const loadedPlugin = {};
-        if (cli) {
-            loadedPlugin.cli = resolveCliPlugin(cli, userConfig, appDirectory, options.transformPlugin);
-        }
+        const loadedPlugin = resolveCliPlugin(plugin, userConfig, appDirectory, options.transformPlugin);
         // server plugins don't support to accept params
-        if (server && typeof server === 'string') {
-            loadedPlugin.server = server;
-            loadedPlugin.serverPkg = server;
-        }
-        debug(`resolve plugin %s: %s`, plugin, {
-            cli: loadedPlugin.cli,
-            server: loadedPlugin.server,
-        });
+        debug(`resolve plugin %s: %s`, plugin, loadedPlugin);
         return loadedPlugin;
     });
-    if (!isOldPluginConfig(pluginConfig)) {
-        const cliPlugins = Array.isArray(pluginConfig)
-            ? pluginConfig
-            : pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.cli;
-        if (cliPlugins === null || cliPlugins === void 0 ? void 0 : cliPlugins.length) {
-            loadedPlugins.push(...cliPlugins.map(item => ({
-                cli: (0, manager_1.createPlugin)(item.setup, item),
-            })));
+    if (!(0, exports.isOldPluginConfig)(pluginConfig)) {
+        if (pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.length) {
+            loadedPlugins.push(...pluginConfig.map(item => (0, manager_1.createPlugin)(item.setup, item)));
         }
     }
     return loadedPlugins;

package/dist/manager.d.ts

@@ -51,7 +51,7 @@ export declare const manager: import("@modern-js/plugin").AsyncManager<CliHooks,
     useResolvedConfigContext: () => NormalizedConfig;
 }>;
 /** Plugin options of a cli plugin. */
-export declare type CliPlugin = PluginOptions<CliHooks, AsyncSetup<CliHooks, typeof pluginAPI>>;
+export declare type CliPlugin<ExtendHooks = {}> = PluginOptions<CliHooks, AsyncSetup<CliHooks & ExtendHooks, typeof pluginAPI>, ExtendHooks>;
 export declare const createPlugin: (setup?: AsyncSetup<CliHooks, {
     setAppContext: (value: import("@modern-js/types/cli").IAppContext) => void;
     useAppContext: () => import("@modern-js/types/cli").IAppContext;
@@ -62,11 +62,10 @@ export declare const createPlugin: (setup?: AsyncSetup<CliHooks, {
     useAppContext: () => import("@modern-js/types/cli").IAppContext;
     useConfigContext: () => UserConfig;
     useResolvedConfigContext: () => NormalizedConfig;
-}>> | undefined) => import("@modern-js/plugin").AsyncPlugin<CliHooks, {
+}>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").AsyncPlugin<CliHooks, {
     setAppContext: (value: import("@modern-js/types/cli").IAppContext) => void;
     useAppContext: () => import("@modern-js/types/cli").IAppContext;
     useConfigContext: () => UserConfig;
     useResolvedConfigContext: () => NormalizedConfig;
 }>, registerHook: (newHooks: Partial<CliHooks>) => void, mountHook: () => ToRunners<CliHooks>;
-export declare const usePlugins: (plugins: string[]) => void;
 export {};

package/dist/manager.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.usePlugins = exports.mountHook = exports.registerHook = exports.createPlugin = exports.manager = void 0;
+exports.mountHook = exports.registerHook = exports.createPlugin = exports.manager = void 0;
 const plugin_1 = require("@modern-js/plugin");
-const utils_1 = require("@modern-js/utils");
 const pluginAPI_1 = require("./pluginAPI");
 const baseHooks = {
     config: (0, plugin_1.createParallelWorkflow)(),
@@ -17,8 +16,3 @@ const baseHooks = {
 };
 exports.manager = (0, plugin_1.createAsyncManager)(baseHooks, pluginAPI_1.pluginAPI);
 exports.createPlugin = exports.manager.createPlugin, exports.registerHook = exports.manager.registerHook, exports.mountHook = exports.manager.useRunner;
-const usePlugins = (plugins) => plugins.forEach(pluginPath => {
-    const module = (0, utils_1.compatRequire)(require.resolve(pluginPath));
-    exports.manager.usePlugin(module);
-});
-exports.usePlugins = usePlugins;

package/dist/pluginAPI.d.ts

@@ -9,5 +9,5 @@ export declare const pluginAPI: {
 };
 export type { IAppContext } from '@modern-js/types';
 /** all apis for cli plugin */
-export declare type PluginAPI = typeof pluginAPI & CommonAPI<CliHooks>;
+export declare type PluginAPI<ExtendHooks = Record<string, any>> = typeof pluginAPI & CommonAPI<CliHooks & ExtendHooks>;
 export { AppContext, ConfigContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, };

package/dist/types/cli.d.ts

@@ -1,6 +1,5 @@
 import { AsyncWaterfall, AsyncWorkflow } from '@modern-js/plugin';
-import { Entrypoint, HtmlPartials, Route, ServerRoute } from '@modern-js/types';
-import { Compiler, Configuration, MultiCompiler } from 'webpack';
+import { Entrypoint, HtmlPartials, NestedRoute, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
 export interface ImportSpecifier {
     local?: string;
     imported?: string;
@@ -16,27 +15,10 @@ export interface RuntimePlugin {
     args?: string;
 }
 export interface Hooks {
-    beforeDev: AsyncWorkflow<void, unknown>;
-    afterDev: AsyncWorkflow<void, unknown>;
-    beforeCreateCompiler: AsyncWorkflow<{
-        webpackConfigs: Configuration[];
-    }, unknown>;
-    afterCreateCompiler: AsyncWorkflow<{
-        compiler: Compiler | MultiCompiler | undefined;
-    }, unknown>;
-    beforePrintInstructions: AsyncWaterfall<{
-        instructions: string;
-    }>;
-    beforeBuild: AsyncWorkflow<{
-        webpackConfigs: Configuration[];
-    }, unknown>;
-    afterBuild: AsyncWorkflow<void, unknown>;
     afterMonorepoDeploy: AsyncWorkflow<{
         operator: any;
         deployProjectNames: string[];
     }, void>;
-    beforeDeploy: AsyncWorkflow<Record<string, any>, unknown>;
-    afterDeploy: AsyncWorkflow<Record<string, any>, unknown>;
     modifyEntryExport: AsyncWaterfall<{
         entrypoint: Entrypoint;
         exportStatement: string;
@@ -59,7 +41,7 @@ export interface Hooks {
     }>;
     modifyFileSystemRoutes: AsyncWaterfall<{
         entrypoint: Entrypoint;
-        routes: Route[];
+        routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
     }>;
     modifyServerRoutes: AsyncWaterfall<{
         routes: ServerRoute[];

package/package.json

@@ -10,7 +10,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.3",
+  "version": "2.0.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -33,21 +33,21 @@
   "typesVersions": {
     "*": {
       "config": [
-        "./dist/config/index.d.ts"
+        "./dist/config/types/index.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "1.21.3",
-    "@modern-js/plugin": "1.21.3",
-    "@modern-js/utils": "1.21.3"
+    "@modern-js/node-bundle-require": "2.0.0-beta.0",
+    "@modern-js/plugin": "2.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/babel-preset-app": "1.21.3",
-    "@modern-js/types": "1.21.3",
-    "@scripts/build": "1.21.3",
-    "@scripts/jest-config": "1.21.3",
+    "@modern-js/babel-preset-app": "2.0.0-beta.0",
+    "@modern-js/types": "2.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__core": "^7.1.16",
     "@types/jest": "^27",
@@ -69,33 +69,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "tsc",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
+    "build": "tsc",
     "dev": "tsc --watch",
-    "test": "wireit"
+    "test": "jest"
   }
 }

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

@@ -1,25 +0,0 @@
-export declare type UnbundleConfig = {
-    /**
-     * Some package A may require another package B that is intended for Node.js
-     * use only. In such a case, if package B cannot be converted to ESM, it will
-     * cause package A to fail during unbundle development, even though package B
-     * is not really required. Package B can thus be safely ignored via this option
-     * to ensure transpilation of package A to ESM
-     */
-    ignore?: string | string[];
-    /**
-     * ignores cached esm modules and recompiles dependencies not available
-     * from PDN host on dev start.
-     * default: false
-     */
-    ignoreModuleCache?: boolean;
-    /**
-     * clears cache of downloaded esm modules (from PDN) on dev start.
-     * default: false
-     */
-    clearPdnCache?: boolean;
-    /**
-     * modifies host to attempt to download esm modules from
-     */
-    pdnHost?: string;
-};

package/dist/config/types/unbundle.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });