@modern-js/core 2.0.0-beta.2 → 2.0.0-beta.4

package/CHANGELOG.md

@@ -1,5 +1,193 @@
 # @modern-js/core
 
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 92f0eade39: feat:
+
+  1. core: 增加 test 函数
+  2. module plugins: 增加 `babel`, `mainField`, `target` 插件
+  3. storybook: 修改部分逻辑并且增加 tspath webpack 插件
+  4. 增加 designSystem 配置
+
+  feat:
+
+  1. core: add test method
+  2. module plugins: add `babel`, `mainField`, `target` plugin
+  3. storybook: change some logic and add tspath webpack plugin
+  4. add `designSystem` config
+
+- edd1cfb1af: feat: modernjs Access builder compiler
+  feat: modernjs 接入 builder 构建
+- d5a31df781: refactor: remove unbundle configs and types
+
+  refactor: 移除 unbundle 相关的配置项和类型定义
+
+- b8494ef: feat: remove use plugin types restrict
+  feat: 移除使用 plugin 类型限制
+- e4558a0: feat:
+
+  1. add `runBin` function
+  2. config internal plugins constants in the app/module/doc tools
+  3. add app/module/doc tools internal plugins
+
+  feat:
+
+  1. 添加 `runBin` 函数
+  2. 在 app/module/doc tools 里配置内部插件
+  3. 增加 app/module/doc tools 使用的插件常量
+
+### Patch Changes
+
+- 85edee888c: feat(app-tools): support tools.htmlPlugin config
+
+  feat(app-tools): 支持 tools.htmlPlugin 配置项
+
+- b8bbe036c7: feat: change type logic
+  feat: 修改类型相关的逻辑
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- b7a96c35fc: fix(app-tools): loose CLI init options after restart
+
+  fix(app-tools): 修复重启 CLI 后丢失 init options 的问题
+
+- cce8ecee2d: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- ea7cf06: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [7879e8f]
+- Updated dependencies [6aca875]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [f179749375]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.4
+  - @modern-js/node-bundle-require@2.0.0-beta.4
+  - @modern-js/plugin@2.0.0-beta.4
+
+## 2.0.0-beta.3
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 92f0eade39: feat:
+
+  1. core: 增加 test 函数
+  2. module plugins: 增加 `babel`, `mainField`, `target` 插件
+  3. storybook: 修改部分逻辑并且增加 tspath webpack 插件
+  4. 增加 designSystem 配置
+
+  feat:
+
+  1. core: add test method
+  2. module plugins: add `babel`, `mainField`, `target` plugin
+  3. storybook: change some logic and add tspath webpack plugin
+  4. add `designSystem` config
+
+- edd1cfb1af: feat: modernjs Access builder compiler
+  feat: modernjs 接入 builder 构建
+- d5a31df781: refactor: remove unbundle configs and types
+
+  refactor: 移除 unbundle 相关的配置项和类型定义
+
+- e4558a0: feat:
+
+  1. add `runBin` function
+  2. config internal plugins constants in the app/module/doc tools
+  3. add app/module/doc tools internal plugins
+
+  feat:
+
+  1. 添加 `runBin` 函数
+  2. 在 app/module/doc tools 里配置内部插件
+  3. 增加 app/module/doc tools 使用的插件常量
+
+### Patch Changes
+
+- 85edee888c: feat(app-tools): support tools.htmlPlugin config
+
+  feat(app-tools): 支持 tools.htmlPlugin 配置项
+
+- b8bbe036c7: feat: change type logic
+  feat: 修改类型相关的逻辑
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- b7a96c3: fix(app-tools): loose CLI init options after restart
+
+  fix(app-tools): 修复重启 CLI 后丢失 init options 的问题
+
+- cce8ece: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- ea7cf06: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [6aca875]
+- Updated dependencies [2e60319]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb]
+- Updated dependencies [f179749375]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.3
+  - @modern-js/node-bundle-require@2.0.0-beta.3
+  - @modern-js/plugin@2.0.0-beta.3
+
 ## 2.0.0-beta.2
 
 ### Major Changes

package/dist/config/createResolvedConfig.js

@@ -70,7 +70,6 @@ loaded, configs, schemas, onSchemaError = showAdditionalPropertiesError) => {
             indent: 2,
         });
     };
-    // FIXME: pass temporarily
     if (!valid && ((_a = validate.errors) === null || _a === void 0 ? void 0 : _a.length)) {
         await onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
         const errors = formatValidateError(userConfig);

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin, UserConfig, IAppContext, InternalPlugins, NormalizedConfig } from './types';
+import type { CliPlugin, UserConfig, IAppContext, InternalPlugins, NormalizedConfig, ToolsType } from './types';
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
 export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig<any, {}, {}, {}>>;
 export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig<any, {}, {}, {}>>;
@@ -19,7 +19,7 @@ export declare const useConfigContext: <Extends extends Record<string, any>>() =
  * Get normalized content of user config.
  */
 export declare const useResolvedConfigContext: <Extends extends Record<string, any>>() => NormalizedConfig<Extends>;
-export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }: {
+export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, toolsType, }: {
     appDirectory: string;
     plugins: CliPlugin[];
     configFile: string | false;
@@ -31,4 +31,5 @@ export declare const initAppContext: ({ appDirectory, plugins, configFile, optio
     } | undefined;
     serverConfigFile: string;
     serverInternalPlugins: InternalPlugins;
+    toolsType?: ToolsType | undefined;
 }) => IAppContext;

package/dist/context.js

@@ -31,7 +31,7 @@ exports.useConfigContext = useConfigContext;
  */
 const useResolvedConfigContext = () => exports.ResolvedConfigContext.use().value;
 exports.useResolvedConfigContext = useResolvedConfigContext;
-const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }) => {
+const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, toolsType, }) => {
     const { metaName = 'modern-js', srcDir = 'src', distDir = '', sharedDir = 'shared', } = options || {};
     return {
         metaName,
@@ -55,6 +55,7 @@ const initAppContext = ({ appDirectory, plugins, configFile, options, serverConf
         apiOnly: false,
         internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
         internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`,
+        toolsType,
     };
 };
 exports.initAppContext = initAppContext;

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import type { ErrorObject } from '@modern-js/utils/ajv';
 import { InternalPlugins } from '@modern-js/types';
 import { TransformPlugin } from './loadPlugins';
 import { initAppContext } from './context';
+import type { ToolsType } from './types';
 export * from './types';
 export * from '@modern-js/plugin';
 export { manager, mountHook, createPlugin, registerHook } from './manager';
@@ -25,6 +26,7 @@ export interface CoreOptions {
         distDir?: string;
         sharedDir?: string;
     };
+    toolsType?: ToolsType;
 }
 export declare const mergeOptions: (options?: CoreOptions) => {
     cwd?: string | undefined;
@@ -44,15 +46,19 @@ export declare const mergeOptions: (options?: CoreOptions) => {
         distDir?: string | undefined;
         sharedDir?: string | undefined;
     } | undefined;
+    toolsType?: ToolsType | undefined;
 };
 export declare const cli: {
-    init: (options?: CoreOptions) => Promise<void>;
+    init: (options?: CoreOptions) => Promise<{
+        resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;
+        appContext: import("./types").IAppContext;
+    }>;
     run: (options?: CoreOptions) => Promise<void>;
     test: (argv: string[], options?: {
         coreOptions?: CoreOptions;
         disableWatcher?: boolean;
     }) => Promise<void>;
-    initOptions: CoreOptions | undefined;
+    getPrevInitOptions: () => CoreOptions | undefined;
 };
 export { initAppDir, initAppContext };
 declare module '@modern-js/utils/compiled/commander' {

package/dist/index.js

@@ -87,6 +87,7 @@ const createCli = () => {
         });
         plugins.forEach(plugin => plugin && manager_1.manager.usePlugin(plugin));
         const appContext = (0, context_1.initAppContext)({
+            toolsType: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.toolsType,
             appDirectory,
             plugins,
             configFile: loaded.filePath,
@@ -115,13 +116,15 @@ const createCli = () => {
         const { resolved } = await hooksRunner.resolvedConfig({
             resolved: normalizedConfig,
         });
-        // FIXME: Why need to configContext again?
         // update context value
         context_1.ConfigContext.set(loaded.config);
         context_1.ResolvedConfigContext.set(resolved);
-        // TODO: confirm the `addRuntimeExports` run order
         await hooksRunner.addRuntimeExports();
         await hooksRunner.prepare();
+        return {
+            resolved,
+            appContext: (0, context_1.useAppContext)(),
+        };
     };
     async function run(options) {
         await init(options);
@@ -139,7 +142,7 @@ const createCli = () => {
         init,
         run,
         test,
-        initOptions,
+        getPrevInitOptions: () => initOptions,
     };
 };
 exports.cli = createCli();

package/dist/manager.d.ts

@@ -48,7 +48,7 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }, void>;
     beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-}, BasePluginAPI<{}, {}, {}, {}>>, Record<string, unknown>, any, any> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
+}, BasePluginAPI<{}, {}, {}, {}>>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
     config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
         resolved: import("./types").NormalizedConfig<{}, {}, {}, {}>;

package/dist/runBin.d.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import { CoreOptions } from '.';
+export declare const run: (otherCoreOptions?: CoreOptions, options?: {
+    override?: boolean | ((coreOptions: CoreOptions) => Promise<CoreOptions> | CoreOptions) | undefined;
+}) => Promise<void>;

package/dist/runBin.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const utils_1 = require("@modern-js/utils");
+const _1 = require(".");
+const run = async (otherCoreOptions = {}, options = {}) => {
+    const command = process.argv[2];
+    if (!process.env.NODE_ENV) {
+        if (['build', 'start', 'deploy', 'release'].includes(command)) {
+            process.env.NODE_ENV = 'production';
+        }
+        else if (command === 'test') {
+            process.env.NODE_ENV = 'test';
+        }
+        else {
+            process.env.NODE_ENV = 'development';
+        }
+    }
+    const { version } = require('../package.json');
+    const cliParams = (0, utils_1.minimist)(process.argv.slice(2));
+    const runOptions = {
+        version,
+    };
+    /**
+     * Commands that support specify config files
+     * Some commands can't support this feature, such as `new`
+     */
+    const SUPPORT_CONFIG_PARAM_COMMANDS = [
+        'dev',
+        'build',
+        'deploy',
+        'start',
+        'inspect',
+    ];
+    const customConfigFile = cliParams.config || cliParams.c;
+    if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command) && customConfigFile) {
+        runOptions.configFile = customConfigFile;
+    }
+    if (typeof options.override === 'boolean' && options.override) {
+        await _1.cli.run(otherCoreOptions);
+    }
+    else if (typeof (options === null || options === void 0 ? void 0 : options.override) === 'function') {
+        await _1.cli.run(await options.override(runOptions));
+    }
+    else {
+        await _1.cli.run(utils_1.lodash.merge({}, runOptions, otherCoreOptions));
+    }
+};
+exports.run = run;

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

@@ -7,25 +7,21 @@ export declare type UserConfig<Extends extends {
     userConfig?: ExtendUserConfig;
     normalizedConfig?: ExtendNormalizedConfig;
 } = {}, ExtendHooks extends Record<string, any> = {}, ExtendUserConfig extends {
-    source?: Record<string, any>;
-    tools?: Record<string, any>;
     testing?: Record<string, any>;
     [property: string]: any;
 } = {}, ExtendNormalizedConfig extends Record<string, any> = {}> = {
     testing?: BaseTestingUserConfig<DropUndefined<Extends['userConfig']>['testing']>;
-    plugins?: PluginConfig<Extends>;
+    plugins?: PluginConfig<any>;
 } & Omit<Extends['userConfig'], 'plugins' | 'testing'>;
 export declare type NormalizedConfig<Extends extends {
     hooks?: ExtendHooks;
     userConfig?: ExtendUserConfig;
     normalizedConfig?: ExtendNormalizedConfig;
 } = {}, ExtendHooks extends Record<string, any> = {}, ExtendUserConfig extends Record<string, any> = {}, ExtendNormalizedConfig extends {
-    source?: Record<string, any>;
-    tools?: Record<string, any>;
     testing?: Record<string, any>;
     [property: string]: any;
 } = {}> = {
-    plugins: PluginConfig<Extends>;
+    plugins: PluginConfig<any>;
     testing: BaseTestingNormalizedConfig<DropUndefined<Extends['normalizedConfig']>['testing']>;
 } & Omit<Extends['normalizedConfig'], 'plugins' | 'testing'>;
 export declare type LoadedConfig<Extends extends {

package/dist/types/context.d.ts

@@ -1,5 +1,6 @@
 import { Entrypoint, InternalPlugins, ServerRoute, HtmlTemplates } from '@modern-js/types';
 import { BuilderInstance } from '@modern-js/builder-shared';
+export declare type ToolsType = 'app-tools' | 'module-tools' | 'doc-tools' | 'monorepo-tools';
 export interface IAppContext {
     metaName: string;
     appDirectory: string;
@@ -9,6 +10,7 @@ export interface IAppContext {
     ip?: string;
     port?: number;
     distDirectory: string;
+    toolsType?: ToolsType;
     packageName: string;
     srcDirectory: string;
     sharedDirectory: string;

package/dist/types/hooks.d.ts

@@ -24,3 +24,21 @@ export declare type CliHooksRunner<Extends extends {
     normalizedConfig?: ExtendNormalizedConfig;
 } = {}, ExtendHooks extends {} = {}, ExtendUserConfig extends Record<string, any> = {}, ExtendNormalizedConfig extends Record<string, any> = {}> = ToRunners<BaseHooks<Extends> & Extends['hooks']>;
 export declare type CliHookCallbacks = ToThreads<BaseHooks<{}>>;
+export interface DevToolData<DevOptions = any> {
+    name: string;
+    subCommands?: string[];
+    menuItem?: {
+        name: string;
+        value: string;
+    };
+    disableRunBuild?: boolean;
+    action: (options: DevOptions, context: {
+        isTsProject?: boolean;
+    }) => void | Promise<void>;
+}
+export interface RegisterBuildPlatformResult {
+    platform: string | string[];
+    build: (currentPlatform: string, context: {
+        isTsProject: boolean;
+    }) => void | Promise<void>;
+}

package/dist/types/plugin.d.ts

@@ -7,7 +7,7 @@ export declare type CliPlugin<Extends extends {
     hooks?: ExtendHooks;
     userConfig?: ExtendUserConfig;
     normalizedConfig?: ExtendNormalizedConfig;
-} = {}, ExtendHooks extends Record<string, any> = {}, ExtendUserConfig extends Record<string, any> = {}, ExtendNormalizedConfig extends Record<string, any> = {}> = PluginOptions<BaseHooks<Extends>, AsyncSetup<BaseHooks<Extends> & Extends['hooks'], BasePluginAPI<Extends>>, Extends['hooks'], BaseHooks<Extends> | BaseHooks<{}>, AsyncSetup<BaseHooks<Extends> & Extends['hooks'], BasePluginAPI<Extends>> | AsyncSetup<BaseHooks<{}>, BasePluginAPI<{}>>>;
+} = {}, ExtendHooks extends Record<string, any> = {}, ExtendUserConfig extends Record<string, any> = {}, ExtendNormalizedConfig extends Record<string, any> = {}> = PluginOptions<BaseHooks<Extends>, AsyncSetup<BaseHooks<Extends> & Extends['hooks'], BasePluginAPI<Extends>>, Extends['hooks']>;
 export declare type PluginItem = string | [string, any];
 /**
  * @deprecated

package/package.json

@@ -10,7 +10,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -29,6 +29,10 @@
       "jsnext:source": "./src/bin.ts",
       "default": "./dist/bin.js"
     },
+    "./runBin": {
+      "jsnext:source": "./src/runBin.ts",
+      "default": "./dist/runBin.js"
+    },
     "./types": {
       "default": "./dist/types/index.js"
     }
@@ -40,13 +44,16 @@
       ],
       "types": [
         "./dist/types/index.d.ts"
+      ],
+      "runBin": [
+        "./dist/runBin.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.0.0-beta.2",
-    "@modern-js/plugin": "2.0.0-beta.2",
-    "@modern-js/utils": "2.0.0-beta.2"
+    "@modern-js/node-bundle-require": "2.0.0-beta.4",
+    "@modern-js/plugin": "2.0.0-beta.4",
+    "@modern-js/utils": "2.0.0-beta.4"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
@@ -64,12 +71,12 @@
     "sass": "^1.45.0",
     "terser-webpack-plugin": "^5.1.4",
     "typescript": "^4",
-    "webpack": "^5.74.0",
-    "@modern-js/builder-shared": "2.0.0-beta.2",
-    "@modern-js/babel-preset-app": "2.0.0-beta.2",
-    "@modern-js/types": "2.0.0-beta.2",
-    "@scripts/build": "2.0.0-beta.2",
-    "@scripts/jest-config": "2.0.0-beta.2"
+    "webpack": "^5.75.0",
+    "@modern-js/builder-shared": "2.0.0-beta.4",
+    "@modern-js/babel-preset-app": "2.0.0-beta.4",
+    "@modern-js/types": "2.0.0-beta.4",
+    "@scripts/build": "2.0.0-beta.4",
+    "@scripts/jest-config": "2.0.0-beta.4"
   },
   "sideEffects": false,
   "publishConfig": {