@modern-js/core 2.10.0 → 2.11.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @modern-js/core
 
+## 2.11.0
+
+### Patch Changes
+
+- 0bd018b: feat: support use node api run dev & build & deploy command
+  feat: 支持通过 node api 运行 dev & build & deploy 命令
+- 7178795: fix(core): beforeExit should be sync workflow
+
+  fix(core): beforeExit 需要使用同步的 workflow
+
+- Updated dependencies [cfb058f]
+- Updated dependencies [0bd018b]
+- Updated dependencies [5d624fd]
+- Updated dependencies [e2466a1]
+- Updated dependencies [02bb383]
+- Updated dependencies [381a3b9]
+- Updated dependencies [7a60f10]
+- Updated dependencies [274b2e5]
+- Updated dependencies [b9e1c54]
+  - @modern-js/utils@2.11.0
+  - @modern-js/node-bundle-require@2.11.0
+  - @modern-js/plugin@2.11.0
+
 ## 2.10.0
 
 ### Minor Changes

package/dist/config/createLoadedConfig.d.ts

@@ -3,4 +3,4 @@ import { LoadedConfig, UserConfig } from '../types';
  * Assign the pkg config into the user config.
  */
 export declare const assignPkgConfig: (userConfig?: UserConfig, pkgConfig?: UserConfig) => UserConfig;
-export declare function createLoadedConfig(appDirectory: string, filePath?: string, packageJsonConfig?: string): Promise<LoadedConfig<{}>>;
+export declare function createLoadedConfig(appDirectory: string, filePath?: string, packageJsonConfig?: string, loadedConfig?: UserConfig): Promise<LoadedConfig<{}>>;

package/dist/config/createLoadedConfig.js

@@ -53,9 +53,9 @@ async function loadLocalConfig(appDirectory, configFile) {
     }
     return null;
 }
-async function createLoadedConfig(appDirectory, filePath, packageJsonConfig) {
+async function createLoadedConfig(appDirectory, filePath, packageJsonConfig, loadedConfig) {
     const configFile = (0, loadConfig_1.getConfigFilePath)(appDirectory, filePath);
-    const loaded = await (0, loadConfig_1.loadConfig)(appDirectory, configFile, packageJsonConfig);
+    const loaded = await (0, loadConfig_1.loadConfig)(appDirectory, configFile, packageJsonConfig, loadedConfig);
     if (!loaded.config && !loaded.pkgConfig) {
         utils_1.logger.warn(`Can not find any config file in the current project, please check if you have a correct config file.`);
         utils_1.logger.warn(`Current project path: ${utils_1.chalk.yellow(appDirectory)}`);

package/dist/config/loadConfig.d.ts

@@ -27,7 +27,7 @@ export declare const getConfigFilePath: (appDirectory: string, filePath?: string
  * @param configFile - Specific absolute config file path.
  * @returns Object contain config file path, user config object and dependency files used by config file.
  */
-export declare const loadConfig: <T>(appDirectory: string, configFile: string | false, packageJsonConfig?: string) => Promise<{
+export declare const loadConfig: <T>(appDirectory: string, configFile: string | false, packageJsonConfig?: string, loadedConfig?: T | undefined) => Promise<{
     path: string | false;
     config?: T | undefined;
     dependencies?: string[] | undefined;

package/dist/config/loadConfig.js

@@ -101,13 +101,16 @@ exports.getConfigFilePath = getConfigFilePath;
  * @param configFile - Specific absolute config file path.
  * @returns Object contain config file path, user config object and dependency files used by config file.
  */
-const loadConfig = async (appDirectory, configFile, packageJsonConfig) => {
+const loadConfig = async (appDirectory, configFile, packageJsonConfig, loadedConfig) => {
     const pkgConfig = (0, exports.getPackageConfig)(appDirectory, packageJsonConfig);
     let config;
     const dependencies = pkgConfig
         ? [path_1.default.resolve(appDirectory, './package.json')]
         : [];
-    if (configFile) {
+    if (loadedConfig) {
+        config = loadedConfig;
+    }
+    else if (configFile) {
         delete require.cache[configFile];
         const mod = await bundleRequireWithCatch(configFile, { appDirectory });
         config = mod.default || mod;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { ErrorObject } from '@modern-js/utils/ajv';
 import { InternalPlugins } from '@modern-js/types';
 import { initAppContext } from './context';
-import type { ToolsType } from './types';
+import type { ToolsType, UserConfig } from './types';
 export * from './types';
 export * from '@modern-js/plugin';
 export { manager, createPlugin, registerHook } from './manager';
@@ -28,6 +28,8 @@ export interface CoreOptions {
     toolsType?: ToolsType;
     /** force the modern-js core auto register plugin exist in the package.json  */
     forceAutoLoadPlugins?: boolean;
+    /** config for Node API */
+    loadedConfig?: UserConfig;
 }
 export declare const mergeOptions: (options?: CoreOptions) => {
     cwd?: string | undefined;
@@ -49,6 +51,7 @@ export declare const mergeOptions: (options?: CoreOptions) => {
     } | undefined;
     toolsType?: ToolsType | undefined;
     forceAutoLoadPlugins?: boolean | undefined;
+    loadedConfig?: UserConfig<{}, {}, {}, {}> | undefined;
 };
 export declare const cli: {
     init: (options?: CoreOptions) => Promise<{
@@ -60,6 +63,7 @@ export declare const cli: {
         coreOptions?: CoreOptions;
         disableWatcher?: boolean;
     }) => Promise<void>;
+    runCommand: (command: string, commandOptions?: string[], options?: CoreOptions) => Promise<void>;
     getPrevInitOptions: () => CoreOptions | undefined;
 };
 export { initAppDir, initAppContext };

package/dist/index.js

@@ -79,7 +79,7 @@ const createCli = () => {
         setProgramVersion(options === null || options === void 0 ? void 0 : options.version);
         const metaName = (_b = (_a = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options) === null || _a === void 0 ? void 0 : _a.metaName) !== null && _b !== void 0 ? _b : 'MODERN';
         (0, loadEnv_1.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
-        const loaded = await (0, config_1.createLoadedConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);
+        const loaded = await (0, config_1.createLoadedConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.loadedConfig);
         const plugins = await (0, loadPlugins_1.loadPlugins)(appDirectory, loaded.config, {
             internalPlugins: (_c = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _c === void 0 ? void 0 : _c.cli,
             autoLoad: (_d = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.internalPlugins) === null || _d === void 0 ? void 0 : _d.autoLoad,
@@ -101,7 +101,7 @@ const createCli = () => {
         hooksRunner = await manager_1.manager.init();
         ['SIGINT', 'SIGTERM', 'unhandledRejection', 'uncaughtException'].forEach(event => {
             process.on(event, async (err) => {
-                await hooksRunner.beforeExit();
+                hooksRunner.beforeExit();
                 if (err instanceof Error) {
                     utils_1.logger.error(err.stack);
                 }
@@ -137,6 +137,17 @@ const createCli = () => {
             utils_1.logger.warn('No command found, please make sure you have registered plugins correctly.');
         }
     }
+    async function runCommand(command, commandOptions = [], options) {
+        const argv = process.argv
+            .slice(0, 2)
+            .concat(command)
+            .concat(commandOptions);
+        process.env.MODERN_ARGV = argv.join(' ');
+        const { appContext } = await init(options);
+        await hooksRunner.commands({ program: utils_1.program });
+        await (0, utils_2.createFileWatcher)(appContext, hooksRunner);
+        utils_1.program.parse(argv);
+    }
     async function test(argv, options) {
         const newProgram = new utils_1.Command();
         const { coreOptions } = options !== null && options !== void 0 ? options : {};
@@ -148,6 +159,7 @@ const createCli = () => {
         init,
         run,
         test,
+        runCommand,
         getPrevInitOptions: () => initOptions,
     };
 };

package/dist/manager.d.ts

@@ -15,7 +15,7 @@ export declare const manager: import("@modern-js/plugin").AsyncManager<{
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }, BasePluginAPI<{}, {}, {}, {}>>;
 export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSetup<{
@@ -34,7 +34,7 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }, BasePluginAPI<{}, {}, {}, {}>> | undefined, options?: import("@modern-js/plugin").PluginOptions<{
     config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
@@ -52,7 +52,7 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }, import("@modern-js/plugin").AsyncSetup<{
     config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
@@ -70,7 +70,7 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }, BasePluginAPI<{}, {}, {}, {}>>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
     config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
@@ -88,7 +88,7 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }, BasePluginAPI<{}, {}, {}, {}>>, registerHook: (newHooks: Partial<{
     config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}, {}, {}, {}>>;
@@ -106,6 +106,6 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
-    beforeExit: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    beforeExit: import("@modern-js/plugin").Workflow<void, void>;
     addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
 }>) => void;

package/dist/manager.js

@@ -13,7 +13,7 @@ const baseHooks = {
     commands: (0, plugin_1.createAsyncWorkflow)(),
     watchFiles: (0, plugin_1.createParallelWorkflow)(),
     fileChange: (0, plugin_1.createAsyncWorkflow)(),
-    beforeExit: (0, plugin_1.createAsyncWorkflow)(),
+    beforeExit: (0, plugin_1.createWorkflow)(),
     addRuntimeExports: (0, plugin_1.createAsyncWaterfall)(),
 };
 // eslint-disable-next-line @typescript-eslint/ban-types

package/dist/node-api.d.ts

@@ -0,0 +1,4 @@
+import { CoreOptions } from '.';
+export declare const dev: (options?: CoreOptions, commandOptions?: string[]) => void;
+export declare const build: (options?: CoreOptions, commandOptions?: string[]) => void;
+export declare const deploy: (options?: CoreOptions, commandOptions?: string[]) => void;

package/dist/node-api.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deploy = exports.build = exports.dev = void 0;
+const _1 = require(".");
+const dev = (options, commandOptions = []) => {
+    _1.cli.runCommand('dev', commandOptions, options);
+};
+exports.dev = dev;
+const build = (options, commandOptions = []) => {
+    _1.cli.runCommand('build', commandOptions, options);
+};
+exports.build = build;
+const deploy = (options, commandOptions = []) => {
+    _1.cli.runCommand('deploy', commandOptions, options);
+};
+exports.deploy = deploy;

package/dist/types/hooks.d.ts

@@ -1,4 +1,4 @@
-import { ParallelWorkflow, AsyncWaterfall, AsyncWorkflow, ToRunners, ToThreads } from '@modern-js/plugin';
+import { Workflow, ParallelWorkflow, AsyncWaterfall, AsyncWorkflow, ToRunners, ToThreads } from '@modern-js/plugin';
 import type { Command } from '@modern-js/utils';
 import type { UserConfig, NormalizedConfig } from './config';
 export type BaseHooks<Extends extends {
@@ -21,7 +21,7 @@ export type BaseHooks<Extends extends {
     commands: AsyncWorkflow<{
         program: Command;
     }, void>;
-    beforeExit: AsyncWorkflow<void, void>;
+    beforeExit: Workflow<void, void>;
     addRuntimeExports: AsyncWaterfall<void>;
 };
 export type CliHooksRunner<Extends extends {

package/package.json

@@ -10,7 +10,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.10.0",
+  "version": "2.11.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -24,6 +24,11 @@
       },
       "default": "./dist/index.js"
     },
+    "./node": {
+      "jsnext:source": "./src/node-api.ts",
+      "types": "./dist/node-api.d.ts",
+      "default": "./dist/node-api.js"
+    },
     "./bin": {
       "jsnext:source": "./src/bin.ts",
       "default": "./dist/bin.js"
@@ -51,15 +56,18 @@
       "types": [
         "./dist/types/index.d.ts"
       ],
+      "node": [
+        "./dist/node-api.d.ts"
+      ],
       "runBin": [
         "./dist/runBin.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.10.0",
-    "@modern-js/plugin": "2.10.0",
-    "@modern-js/utils": "2.10.0"
+    "@modern-js/node-bundle-require": "2.11.0",
+    "@modern-js/plugin": "2.11.0",
+    "@modern-js/utils": "2.11.0"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
@@ -76,11 +84,11 @@
     "terser-webpack-plugin": "^5.1.4",
     "typescript": "^4",
     "webpack": "^5.76.2",
-    "@modern-js/builder-shared": "2.10.0",
-    "@modern-js/babel-preset-app": "2.10.0",
-    "@modern-js/types": "2.10.0",
-    "@scripts/build": "2.10.0",
-    "@scripts/jest-config": "2.10.0"
+    "@modern-js/builder-shared": "2.11.0",
+    "@modern-js/babel-preset-app": "2.11.0",
+    "@modern-js/types": "2.11.0",
+    "@scripts/jest-config": "2.11.0",
+    "@scripts/build": "2.11.0"
   },
   "sideEffects": false,
   "publishConfig": {