@modern-js/module-tools 1.4.2 → 1.4.5

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

@@ -1,8 +1,7 @@
-import { TransformOptions } from '@babel/core';
-import { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig } from '@modern-js/core';
 import { IPackageModeValue } from '../types';
 export declare const getFinalAlias: any;
 export declare const resolveBabelConfig: (appDirectory: string, modernConfig: NormalizedConfig, option: Pick<IPackageModeValue, 'syntax' | 'type'> & {
   sourceAbsDir: string;
   tsconfigPath: string;
-}) => TransformOptions;
+}) => import("@modern-js/core").TransformOptions;

package/jest.config.js

@@ -1,10 +1,7 @@
 const sharedConfig = require('@scripts/jest-config');
 
-console.info(sharedConfig.coveragePathIgnorePatterns);
-
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.2",
+  "version": "1.4.5",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -40,39 +40,38 @@
   },
   "typesVersions": {
     "*": {
+      "types": [
+        "./lib/types.d.ts"
+      ],
       "type": [
         "./lib/types.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@modern-js/core": "^1.4.4",
     "@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/core": "^1.7.0",
+    "@modern-js/css-config": "^1.2.3",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
-    "@modern-js/module-tools-hooks": "^1.2.2",
-    "@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-i18n": "^1.2.1",
-    "@modern-js/style-compiler": "^1.2.2",
-    "@modern-js/utils": "^1.3.3",
-    "chalk": "^4.1.2",
+    "@modern-js/new-action": "^1.3.5",
+    "@modern-js/plugin": "^1.3.2",
+    "@modern-js/plugin-analyze": "^1.3.6",
+    "@modern-js/plugin-changeset": "^1.2.4",
+    "@modern-js/plugin-fast-refresh": "^1.2.3",
+    "@modern-js/plugin-i18n": "^1.2.3",
+    "@modern-js/style-compiler": "^1.2.3",
+    "@modern-js/utils": "^1.4.0",
     "dotenv": "^10.0.0",
-    "execa": "^5.1.1",
     "fast-glob": "^3.2.5",
-    "glob": "^7.1.7",
     "globby": "^11",
     "inquirer": "^8.1.5",
     "json5": "^2.2.0",
-    "lodash.merge": "^4.6.2",
     "normalize-path": "^3.0.0",
     "p-map": "^4",
     "process.argv": "^0.6.0",
@@ -81,22 +80,20 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.15.0",
     "@modern-js/babel-chain": "^1.2.1",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
     "@types/glob": "^7.1.4",
     "@types/inquirer": "^8.1.1",
     "@types/jest": "^26",
-    "@types/lodash.merge": "^4.6.6",
     "@types/node": "^14",
     "@types/normalize-path": "^3.0.0",
-    "commander": "^8.1.0",
-    "typescript": "^4",
-    "@scripts/build": "0.0.0",
-    "jest": "^27",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "@scripts/jest-config": "0.0.0"
+    "jest": "^27",
+    "typescript": "^4"
   },
   "sideEffects": false,
   "modernConfig": {

package/tests/dev-cli.test.ts

@@ -1,4 +1,5 @@
-import { program } from 'commander';
+import { manager } from '@modern-js/core';
+import { program } from '@modern-js/utils';
 import { devCli } from '../src/cli/dev';
 
 const mockCommandDev = jest.fn();
@@ -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();
   });
 });

package/tests/dev-feature.test.ts

@@ -1,14 +1,16 @@
+import { manager } from '@modern-js/core';
 import { runSubCmd } from '../src/features/dev';
 
 const mockModuleToolsMenu = jest.fn();
 const mockDevMeta = jest.fn();
 const exit = jest.spyOn(process, 'exit').mockImplementation();
-jest.mock('@modern-js/core', () => ({
-  __esModule: true,
-  mountHook: jest.fn(() => ({
+const mockAPI = {
+  useAppContext: jest.fn((): any => ({})),
+  useResolvedConfigContext: jest.fn(),
+  useHookRunners: (): any => ({
     moduleToolsMenu: mockModuleToolsMenu,
-  })),
-}));
+  }),
+};
 
 describe('dev feature with subCmd', () => {
   beforeEach(() => {
@@ -18,29 +20,59 @@ describe('dev feature with subCmd', () => {
     mockModuleToolsMenu.mockReturnValue([
       { value: 'storybook', runTask: mockDevMeta },
     ]);
-    await runSubCmd('storybook', { isTsProject: true, appDirectory: '' });
-    expect(mockDevMeta.mock.calls.length).toBe(1);
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await runSubCmd(api, 'storybook', {
+          isTsProject: true,
+          appDirectory: '',
+        });
+        expect(mockDevMeta.mock.calls.length).toBe(1);
+      },
+    });
+    await cloned.init();
   });
 
   it('should run task with "storybook" params when storybook plugin not exist', async () => {
     mockModuleToolsMenu.mockReturnValue([]);
-    await runSubCmd('storybook', { isTsProject: true, appDirectory: '' });
-    expect(exit).toHaveBeenCalled();
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await runSubCmd(api, 'storybook', {
+          isTsProject: true,
+          appDirectory: '',
+        });
+        expect(exit).toHaveBeenCalled();
+      },
+    });
+    await cloned.init();
   });
 
   it('should run task with alias name "story" params when storybook plugin exist', async () => {
     mockModuleToolsMenu.mockReturnValue([
       { value: 'storybook', aliasValues: ['story'], runTask: mockDevMeta },
     ]);
-    await runSubCmd('story', { isTsProject: true, appDirectory: '' });
-    expect(mockDevMeta.mock.calls.length).toBe(1);
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await runSubCmd(api, 'story', { isTsProject: true, appDirectory: '' });
+        expect(mockDevMeta.mock.calls.length).toBe(1);
+      },
+    });
+    await cloned.init();
   });
 
   it('should run task with alias name "story1" params when storybook plugin exist', async () => {
     mockModuleToolsMenu.mockReturnValue([
       { value: 'storybook', aliasValues: ['story'], runTask: mockDevMeta },
     ]);
-    await runSubCmd('story1', { isTsProject: true, appDirectory: '' });
-    expect(mockDevMeta.mock.calls.length).toBe(0);
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await runSubCmd(api, 'story1', { isTsProject: true, appDirectory: '' });
+        expect(mockDevMeta.mock.calls.length).toBe(0);
+      },
+    });
+    await cloned.init();
   });
 });

package/tests/generate-dts.test.ts

@@ -0,0 +1,9 @@
+import { getTscBinPath } from '../src/tasks/generator-dts/utils';
+
+describe('generate dts', () => {
+  test('should throw error when tsc bin is not exist', () => {
+    expect(() => {
+      getTscBinPath('/foo');
+    }).toThrowError();
+  });
+});

package/tests/generator-dts.test.ts

@@ -9,17 +9,6 @@ jest.mock('@modern-js/core', () => ({
   },
 }));
 jest.mock('process.argv', () => () => (o: any) => ({ ...o, tsCheck: false }));
-jest.mock('execa', () => () => {
-  // eslint-disable-next-line prefer-promise-reject-errors
-  const fn = Promise.reject('error');
-  (fn as any).stdout = {
-    on: () => 0,
-  };
-  (fn as any).stderr = {
-    on: () => 0,
-  };
-  return fn;
-});
 jest.mock('../src/tasks/generator-dts/utils');
 jest.mock('@modern-js/utils', () => {
   const originalModule = jest.requireActual('@modern-js/utils');