@modern-js/module-tools 1.4.2 → 1.4.3

package/dist/js/node/features/build/build.js

@@ -26,16 +26,14 @@ const lg = _utils.Import.lazy('./logger', require);
 
 const constants = _utils.Import.lazy('./constants', require);
 
-const core = _utils.Import.lazy('@modern-js/core', require);
-
-const buildSourceCode = async (config, _) => {
+const buildSourceCode = async (api, config, _) => {
   const {
     sourceDir,
     enableTscCompiler
   } = config;
   const {
     appDirectory
-  } = core.useAppContext();
+  } = api.useAppContext();
   const concurrency = os.cpus().length;
   const srcRootDir = path.join(appDirectory, sourceDir);
   const lm = new lg.LoggerManager();
@@ -51,15 +49,15 @@ const buildSourceCode = async (config, _) => {
   const copyLog = lm.createLoggerText({
     title: 'Copy Log:'
   });
-  const initCodeMapper = utils.getCodeInitMapper(config);
-  const taskMapper = [...utils.getCodeMapper({
+  const initCodeMapper = utils.getCodeInitMapper(api, config);
+  const taskMapper = [...utils.getCodeMapper(api, {
     logger: codeLog,
     taskPath: require.resolve("../../tasks/build-source-code"),
     config,
     willCompilerDirOrFile: sourceDir,
     initMapper: initCodeMapper,
     srcRootDir
-  }), ...(enableTscCompiler ? utils.getDtsMapper(config, dtsLog) : []), {
+  }), ...(enableTscCompiler ? utils.getDtsMapper(api, config, dtsLog) : []), {
     logger: styleLog,
     taskPath: require.resolve("../../tasks/build-style")
   }, {

package/dist/js/node/features/build/index.js

@@ -17,7 +17,7 @@ const buildWatchFeature = _utils.Import.lazy('./build-watch', require);
 
 const bp = _utils.Import.lazy('./build-platform', require);
 
-const build = async (config, modernConfig) => {
+const build = async (api, config, modernConfig) => {
   const {
     appDirectory,
     enableWatchMode,
@@ -33,7 +33,7 @@ const build = async (config, modernConfig) => {
 
   if (typeof platform === 'boolean' && platform) {
     if (process.env.RUN_PLATFORM) {
-      await bp.buildPlatform({
+      await bp.buildPlatform(api, {
         platform: 'all',
         isTsProject
       });
@@ -44,7 +44,7 @@ const build = async (config, modernConfig) => {
 
   if (typeof platform === 'string') {
     if (process.env.RUN_PLATFORM) {
-      await bp.buildPlatform({
+      await bp.buildPlatform(api, {
         platform,
         isTsProject
       });
@@ -58,9 +58,9 @@ const build = async (config, modernConfig) => {
   }
 
   if (enableWatchMode) {
-    await buildWatchFeature.buildInWatchMode(config, modernConfig);
+    await buildWatchFeature.buildInWatchMode(api, config, modernConfig);
   } else {
-    await buildFeature.buildSourceCode(config, modernConfig);
+    await buildFeature.buildSourceCode(api, config, modernConfig);
   }
 };
 

package/dist/js/node/features/build/utils.js

@@ -15,9 +15,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-const constants = _utils.Import.lazy('./constants', require);
-
-const core = _utils.Import.lazy('@modern-js/core', require); // 硬解字符串返回相应格式的对象
+const constants = _utils.Import.lazy('./constants', require); // 硬解字符串返回相应格式的对象
 
 
 const updateMapper = (packageFieldValue, outDir, mapper) => {
@@ -44,13 +42,13 @@ const updateMapper = (packageFieldValue, outDir, mapper) => {
   }
 };
 
-const getCodeInitMapper = _ => {
+const getCodeInitMapper = (api, _) => {
   const {
     output: {
       packageFields,
       packageMode
     }
-  } = core.useResolvedConfigContext();
+  } = api.useResolvedConfigContext();
   let initMapper = []; // 如果不存在packageFields配置或者packageFields为空对象，则使用 packageMode
 
   if (!packageFields || typeof packageFields === 'object' && Object.keys(packageFields).length === 0) {
@@ -82,7 +80,7 @@ const getCodeInitMapper = _ => {
 
 exports.getCodeInitMapper = getCodeInitMapper;
 
-const getCodeMapper = ({
+const getCodeMapper = (api, {
   logger,
   taskPath,
   config,
@@ -92,8 +90,8 @@ const getCodeMapper = ({
 }) => {
   const {
     appDirectory
-  } = core.useAppContext();
-  const modernConfig = core.useResolvedConfigContext();
+  } = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
   const {
     output: {
       enableSourceMap,
@@ -121,11 +119,11 @@ const getCodeMapper = ({
 
 exports.getCodeMapper = getCodeMapper;
 
-const getDtsMapper = (config, logger) => {
+const getDtsMapper = (api, config, logger) => {
   const {
     appDirectory
-  } = core.useAppContext();
-  const modernConfig = core.useResolvedConfigContext();
+  } = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
   const {
     output: {
       disableTsChecker,

package/dist/js/node/features/dev/index.js

@@ -11,14 +11,13 @@ var _chalk = _interopRequireDefault(require("chalk"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const core = _utils.Import.lazy('@modern-js/core', require);
-
 const inquirer = _utils.Import.lazy('inquirer', require);
 
 const color = _utils.Import.lazy('../../utils/color', require);
 
-const showMenu = async config => {
-  const metas = await core.mountHook().moduleToolsMenu(undefined);
+const showMenu = async (api, config) => {
+  const runners = api.useHookRunners();
+  const metas = await runners.moduleToolsMenu(undefined);
 
   if (metas.length <= 0) {
     console.info(_chalk.default.yellow('No runnable development features found.\nYou can use the `new` command to enable the development features')); // eslint-disable-next-line no-process-exit
@@ -44,8 +43,9 @@ const showMenu = async config => {
 
 exports.showMenu = showMenu;
 
-const devStorybook = async config => {
-  const metas = await core.mountHook().moduleToolsMenu(undefined);
+const devStorybook = async (api, config) => {
+  const runners = api.useHookRunners();
+  const metas = await runners.moduleToolsMenu(undefined);
   const findStorybook = metas.find(meta => meta.value === 'storybook');
 
   if (findStorybook) {
@@ -59,8 +59,9 @@ const devStorybook = async config => {
 
 exports.devStorybook = devStorybook;
 
-const runSubCmd = async (subCmd, config) => {
-  const metas = await core.mountHook().moduleToolsMenu(undefined);
+const runSubCmd = async (api, subCmd, config) => {
+  const runners = api.useHookRunners();
+  const metas = await runners.moduleToolsMenu(undefined);
   const devMeta = metas.find(meta => meta.value === subCmd || Array.isArray(meta.aliasValues) && meta.aliasValues.includes(subCmd));
 
   if (devMeta) {

package/dist/js/node/index.js

@@ -3,14 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defineConfig = exports.default = void 0;
+exports.default = void 0;
+Object.defineProperty(exports, "defineConfig", {
+  enumerable: true,
+  get: function () {
+    return _core.defineConfig;
+  }
+});
 
 var _utils = require("@modern-js/utils");
 
-const core = _utils.Import.lazy('@modern-js/core', require); // const { createPlugin, usePlugins, defineConfig } = core;
+var _pluginChangeset = _interopRequireDefault(require("@modern-js/plugin-changeset"));
+
+var _pluginAnalyze = _interopRequireDefault(require("@modern-js/plugin-analyze"));
+
+var _moduleToolsHooks = require("@modern-js/module-tools-hooks");
 
+var _core = require("@modern-js/core");
 
-const hooks = _utils.Import.lazy('@modern-js/module-tools-hooks', require);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const cli = _utils.Import.lazy('./cli', require);
 
@@ -20,45 +31,42 @@ const schema = _utils.Import.lazy('./schema', require);
 
 const lang = _utils.Import.lazy('./utils/language', require);
 
-const {
-  defineConfig
-} = core;
-exports.defineConfig = defineConfig;
-core.usePlugins([require.resolve('@modern-js/plugin-changeset/cli'), require.resolve('@modern-js/plugin-analyze/cli')]);
-
-var _default = core.createPlugin(() => {
-  const locale = lang.getLocaleLanguage();
-  local.i18n.changeLanguage({
-    locale
-  });
-  hooks.lifecycle();
-  return {
-    validateSchema() {
-      return schema.addSchema();
-    },
-
-    config() {
-      return {
-        output: {
-          enableSourceMap: false,
-          jsPath: 'js'
-        }
-      };
-    },
-
-    commands({
-      program
-    }) {
-      cli.devCli(program);
-      cli.buildCli(program);
-      cli.newCli(program, locale); // 便于其他插件辨别
-
-      program.$$libraryName = 'module-tools';
-    }
-
-  };
-}, {
-  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-changeset']
+var _default = () => ({
+  name: '@modern-js/module-tools',
+  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-changeset'],
+  registerHook: _moduleToolsHooks.hooks,
+  usePlugins: [(0, _pluginChangeset.default)(), (0, _pluginAnalyze.default)()],
+  setup: api => {
+    const locale = lang.getLocaleLanguage();
+    local.i18n.changeLanguage({
+      locale
+    });
+    return {
+      validateSchema() {
+        return schema.addSchema();
+      },
+
+      config() {
+        return {
+          output: {
+            enableSourceMap: false,
+            jsPath: 'js'
+          }
+        };
+      },
+
+      commands({
+        program
+      }) {
+        cli.devCli(program, api);
+        cli.buildCli(program, api);
+        cli.newCli(program, locale); // 便于其他插件辨别
+
+        program.$$libraryName = 'module-tools';
+      }
+
+    };
+  }
 });
 
 exports.default = _default;

package/dist/types/cli/build.d.ts

@@ -1,2 +1,3 @@
 import type { Command } from 'commander';
-export declare const buildCli: (program: Command) => void;
+import type { PluginAPI } from '@modern-js/core';
+export declare const buildCli: (program: Command, api: PluginAPI) => void;

package/dist/types/cli/dev.d.ts

@@ -1,2 +1,3 @@
+import type { PluginAPI } from '@modern-js/core';
 import type { Command } from 'commander';
-export declare const devCli: (program: Command) => void;
+export declare const devCli: (program: Command, api: PluginAPI) => void;

package/dist/types/commands/build.d.ts

@@ -1,3 +1,4 @@
+import type { PluginAPI } from '@modern-js/core';
 import type { Platform } from '../types';
 export interface IBuildOption {
   watch: boolean;
@@ -7,7 +8,7 @@ export interface IBuildOption {
   tsc: boolean;
   clear: boolean;
 }
-export declare const build: ({
+export declare const build: (api: PluginAPI, {
   watch,
   tsconfig: tsconfigName,
   tsc,

package/dist/types/commands/dev.d.ts

@@ -1,4 +1,5 @@
+import type { PluginAPI } from '@modern-js/core';
 export interface IDevOption {
   tsconfig: string;
 }
-export declare const dev: (option: IDevOption, subCmd?: string) => Promise<void>;
+export declare const dev: (api: PluginAPI, option: IDevOption, subCmd?: string) => Promise<void>;

package/dist/types/features/build/build-platform.d.ts

@@ -1,6 +1,7 @@
+import type { PluginAPI } from '@modern-js/core';
 export declare type Platform = 'all' | 'docs' | 'storybook';
 export interface IBuildPlatformOption {
   platform: Platform;
   isTsProject?: boolean;
 }
-export declare const buildPlatform: (option: IBuildPlatformOption) => Promise<void>;
+export declare const buildPlatform: (api: PluginAPI, option: IBuildPlatformOption) => Promise<void>;

package/dist/types/features/build/build-watch.d.ts

@@ -1,3 +1,3 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { IBuildConfig } from '../../types';
-export declare const buildInWatchMode: (config: IBuildConfig, _: NormalizedConfig) => Promise<void>;
+export declare const buildInWatchMode: (api: PluginAPI, config: IBuildConfig, _: NormalizedConfig) => Promise<void>;

package/dist/types/features/build/build.d.ts

@@ -1,3 +1,3 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { IBuildConfig } from '../../types';
-export declare const buildSourceCode: (config: IBuildConfig, _: NormalizedConfig) => Promise<void>;
+export declare const buildSourceCode: (api: PluginAPI, config: IBuildConfig, _: NormalizedConfig) => Promise<void>;

package/dist/types/features/build/index.d.ts

@@ -1,3 +1,3 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { IBuildConfig } from '../../types';
-export declare const build: (config: IBuildConfig, modernConfig: NormalizedConfig) => Promise<void>;
+export declare const build: (api: PluginAPI, config: IBuildConfig, modernConfig: NormalizedConfig) => Promise<void>;

package/dist/types/features/build/utils.d.ts

@@ -1,7 +1,8 @@
+import type { PluginAPI } from '@modern-js/core';
 import type { IBuildConfig, IPackageModeValue, ITaskMapper } from '../../types';
 import type { LoggerText } from './logger';
-export declare const getCodeInitMapper: (_: IBuildConfig) => IPackageModeValue[];
-export declare const getCodeMapper: ({
+export declare const getCodeInitMapper: (api: PluginAPI, _: IBuildConfig) => IPackageModeValue[];
+export declare const getCodeMapper: (api: PluginAPI, {
   logger,
   taskPath,
   config,
@@ -18,7 +19,7 @@ export declare const getCodeMapper: ({
   taskPath: string;
   params: string[];
 }[];
-export declare const getDtsMapper: (config: IBuildConfig, logger: LoggerText) => {
+export declare const getDtsMapper: (api: PluginAPI, config: IBuildConfig, logger: LoggerText) => {
   logger: LoggerText;
   taskPath: string;
   params: string[];

package/dist/types/features/dev/index.d.ts

@@ -1,8 +1,9 @@
+import type { PluginAPI } from '@modern-js/core';
 export interface IDevConfig {
   appDirectory: string;
   isTsProject: boolean;
 }
 export declare type DevTaskType = 'storybook' | 'docsite' | 'unknow';
-export declare const showMenu: (config: IDevConfig) => Promise<void>;
-export declare const devStorybook: (config: IDevConfig) => Promise<void>;
-export declare const runSubCmd: (subCmd: string, config: IDevConfig) => Promise<void>;
+export declare const showMenu: (api: PluginAPI, config: IDevConfig) => Promise<void>;
+export declare const devStorybook: (api: PluginAPI, config: IDevConfig) => Promise<void>;
+export declare const runSubCmd: (api: PluginAPI, subCmd: string, config: IDevConfig) => Promise<void>;

package/dist/types/index.d.ts

@@ -1,22 +1,6 @@
-export declare const defineConfig: (config: import("@modern-js/core/src/config").ConfigParam) => import("@modern-js/core/src/config").ConfigParam;
+import type { CliPlugin } from '@modern-js/core';
+export { defineConfig } from '@modern-js/core';
 
-declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
-  config: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  resolvedConfig: import("@modern-js/core").AsyncWaterfall<{
-    resolved: import("@modern-js/core").NormalizedConfig;
-  }>;
-  validateSchema: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  prepare: import("@modern-js/core").AsyncWorkflow<void, void>;
-  commands: import("@modern-js/core").AsyncWorkflow<{
-    program: import("commander").Command;
-  }, void>;
-  watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  fileChange: import("@modern-js/core").AsyncWorkflow<{
-    filename: string;
-    eventType: "add" | "unlink" | "change";
-  }, void>;
-  beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
-  beforeRestart: import("@modern-js/core").AsyncWorkflow<void, void>;
-} & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
+declare const _default: () => CliPlugin;
 
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.2",
+  "version": "1.4.3",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -46,24 +46,24 @@
     }
   },
   "dependencies": {
-    "@modern-js/core": "^1.4.4",
+    "@modern-js/core": "^1.6.0",
     "@babel/generator": "^7.15.0",
     "@babel/parser": "^7.15.2",
     "@babel/runtime": "^7",
     "@babel/traverse": "^7.15.0",
-    "@babel/types": "^7.15.0",
+    "@babel/types": "^7.17.0",
     "@modern-js/babel-compiler": "^1.2.2",
     "@modern-js/babel-preset-module": "^1.3.1",
     "@modern-js/css-config": "^1.2.2",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
-    "@modern-js/module-tools-hooks": "^1.2.2",
+    "@modern-js/module-tools-hooks": "^1.2.3",
     "@modern-js/new-action": "^1.3.3",
-    "@modern-js/plugin-analyze": "^1.3.3",
-    "@modern-js/plugin-changeset": "^1.2.2",
-    "@modern-js/plugin-fast-refresh": "^1.2.1",
+    "@modern-js/plugin-analyze": "^1.3.4",
+    "@modern-js/plugin-changeset": "^1.2.3",
+    "@modern-js/plugin-fast-refresh": "^1.2.2",
     "@modern-js/plugin-i18n": "^1.2.1",
     "@modern-js/style-compiler": "^1.2.2",
-    "@modern-js/utils": "^1.3.3",
+    "@modern-js/utils": "^1.3.6",
     "chalk": "^4.1.2",
     "dotenv": "^10.0.0",
     "execa": "^5.1.1",

package/tests/dev-cli.test.ts

@@ -1,3 +1,4 @@
+import { manager } from '@modern-js/core';
 import { program } from 'commander';
 import { devCli } from '../src/cli/dev';
 
@@ -11,15 +12,48 @@ describe('dev cli subCmd', () => {
       dev: mockCommandDev,
     }));
   });
-  it('should be storybook with "dev storybook"', () => {
-    devCli(program);
-    program.parse(['', '', 'dev', 'storybook']);
-    expect(mockCommandDev.mock.calls[0][1]).toBe('storybook');
+  it('should be storybook with "dev storybook"', async () => {
+    const mockAPI = {
+      useAppContext: jest.fn((): any => ({
+        existSrc: false,
+        distDirectory: '',
+      })),
+      useResolvedConfigContext: jest.fn(),
+      useHookRunners: (): any => ({}),
+    };
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      setup(api) {
+        devCli(program, api);
+        program.parse(['', '', 'dev', 'storybook']);
+        expect(mockCommandDev.mock.calls[0][2]).toBe('storybook');
+      },
+    });
+    await cloned.init();
   });
 
-  it('should be undefined with "dev"', () => {
-    devCli(program);
-    program.parse(['', '', 'dev']);
-    expect(mockCommandDev.mock.calls[0][1]).toBe(undefined);
+  it('should be undefined with "dev"', async () => {
+    const mockBeforeBuild = jest.fn();
+    const mockAfterBuild = jest.fn();
+    const mockAPI = {
+      useAppContext: jest.fn((): any => ({
+        existSrc: false,
+        distDirectory: '',
+      })),
+      useResolvedConfigContext: jest.fn(),
+      useHookRunners: (): any => ({
+        afterBuild: mockAfterBuild,
+        beforeBuild: mockBeforeBuild,
+      }),
+    };
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      setup(api) {
+        devCli(program, api);
+        program.parse(['', '', 'dev']);
+        expect(mockCommandDev.mock.calls[0][2]).toBe(undefined);
+      },
+    });
+    await cloned.init();
   });
 });

package/tests/dev-command.test.ts

@@ -1,3 +1,4 @@
+import { manager } from '@modern-js/core';
 import { dev } from '../src/commands/dev';
 
 const mockRunSubCmd = jest.fn();
@@ -6,11 +7,6 @@ jest.mock('../src/features/dev', () => ({
   runSubCmd: mockRunSubCmd,
   devStorybook: jest.fn(),
 }));
-jest.mock('@modern-js/core', () => ({
-  __esModule: true,
-  useAppContext: jest.fn(() => ({ appDirectory: '' })),
-  useResolvedConfigContext: jest.fn(),
-}));
 
 jest.mock('dotenv', () => ({
   __esModule: true,
@@ -32,13 +28,43 @@ describe('dev command with subCmd', () => {
     jest.clearAllMocks();
   });
   it('should call runSubCmd with storybook param', async () => {
-    await dev({ tsconfig: 'tsconfig.json' }, 'storybook');
-    expect(mockRunSubCmd.mock.calls.length).toBe(1);
-    expect(mockRunSubCmd.mock.calls[0][0]).toBe('storybook');
+    const mockAPI = {
+      useAppContext: jest.fn((): any => ({
+        existSrc: false,
+        distDirectory: '',
+        appDirectory: '',
+      })),
+      useResolvedConfigContext: jest.fn(),
+    };
+
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await dev(api, { tsconfig: 'tsconfig.json' }, 'storybook');
+        expect(mockRunSubCmd.mock.calls.length).toBe(1);
+        expect(mockRunSubCmd.mock.calls[0][1]).toBe('storybook');
+      },
+    });
+    await cloned.init();
   });
 
   it('should not call runSubCmd with nothing param', async () => {
-    await dev({ tsconfig: 'tsconfig.json' });
-    expect(mockRunSubCmd.mock.calls.length).toBe(0);
+    const mockAPI = {
+      useAppContext: jest.fn((): any => ({
+        existSrc: false,
+        distDirectory: '',
+        appDirectory: '',
+      })),
+      useResolvedConfigContext: jest.fn(),
+    };
+
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await dev(api, { tsconfig: 'tsconfig.json' });
+        expect(mockRunSubCmd.mock.calls.length).toBe(0);
+      },
+    });
+    await cloned.init();
   });
 });