@modern-js/module-tools 1.2.0 → 1.3.0

package/.eslintrc.js

@@ -1,7 +1,10 @@
 module.exports = {
   extends: ['@modern-js'],
   parserOptions: {
-    project: require.resolve('./tsconfig.json'),
+    project: [
+      require.resolve('./tsconfig.json'),
+      require.resolve('./tests/tsconfig.json'),
+    ],
   },
   ignorePatterns: ['types.d.ts'],
 };

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @modern-js/module-tools
 
+## 1.3.0
+
+### Minor Changes
+
+- c5973e7a: add dev sub commands
+- 0d9516f3: fix resolve static file and add -p params
+
+### Patch Changes
+
+- c1455cd6: fix module-tools type file
+- Updated dependencies [823809c6]
+- Updated dependencies [4584cc04]
+- Updated dependencies [7c19fd94]
+- Updated dependencies [0d9516f3]
+  - @modern-js/utils@1.2.1
+  - @modern-js/core@1.3.1
+  - @modern-js/babel-preset-module@1.3.0
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/js/modern/cli/build.js

@@ -3,7 +3,7 @@ const local = Import.lazy('../locale/index', require);
 const commands = Import.lazy('../commands', require);
 export const buildCli = program => {
   // TODO: 初始化环境变量
-  program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('--platform [platform]', local.i18n.t(local.localeKeys.command.build.platform)).option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).action(async subCommand => {
+  program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('-p, --platform [platform]', local.i18n.t(local.localeKeys.command.build.platform)).option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).action(async subCommand => {
     await commands.build(subCommand);
   });
 };

package/dist/js/modern/cli/dev.js

@@ -2,7 +2,7 @@ import { Import } from '@modern-js/utils';
 const local = Import.lazy('../locale', require);
 const commands = Import.lazy('../commands', require);
 export const devCli = program => {
-  program.command('dev').usage('[options]').description(local.i18n.t(local.localeKeys.command.dev.describe)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').action(async params => {
-    await commands.dev(params);
+  program.command('dev [subCmd]').usage('[options]').description(local.i18n.t(local.localeKeys.command.dev.describe)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').action(async (subCmd, params) => {
+    await commands.dev(params, subCmd);
   });
 };

package/dist/js/modern/commands/dev.js

@@ -5,7 +5,10 @@ const core = Import.lazy('@modern-js/core', require);
 const dotenv = Import.lazy('dotenv', require);
 const tsConfigutils = Import.lazy('../utils/tsconfig', require);
 const valid = Import.lazy('../utils/valide', require);
-export const dev = async option => {
+
+const existSubCmd = subCmd => subCmd.length > 0;
+
+export const dev = async (option, subCmd = '') => {
   const {
     tsconfig: tsconfigName
   } = option;
@@ -22,6 +25,15 @@ export const dev = async option => {
   });
   const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
 
+  if (existSubCmd(subCmd)) {
+    await devFeature.runSubCmd(subCmd, {
+      isTsProject,
+      appDirectory
+    });
+    return;
+  } // Compatible with the use of jupiter, RUN_PLATFORM is used in jupiter
+
+
   if (process.env.RUN_PLATFORM) {
     await devFeature.showMenu({
       isTsProject,

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

@@ -36,6 +36,17 @@ export const devStorybook = async config => {
   } else {
     console.info(chalk.yellow('No development features found.\nYou can use the `new` command to enable the development features')); // eslint-disable-next-line no-process-exit
 
+    process.exit(0);
+  }
+};
+export const runSubCmd = async (subCmd, config) => {
+  const metas = await core.mountHook().moduleToolsMenu(undefined);
+  const devMeta = metas.find(meta => meta.value === subCmd);
+
+  if (devMeta) {
+    await devMeta.runTask(config);
+  } else {
+    // eslint-disable-next-line no-process-exit
     process.exit(0);
   }
 };

package/dist/js/node/cli/build.js

@@ -13,7 +13,7 @@ const commands = _utils.Import.lazy('../commands', require);
 
 const buildCli = program => {
   // TODO: 初始化环境变量
-  program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('--platform [platform]', local.i18n.t(local.localeKeys.command.build.platform)).option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).action(async subCommand => {
+  program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('-p, --platform [platform]', local.i18n.t(local.localeKeys.command.build.platform)).option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).action(async subCommand => {
     await commands.build(subCommand);
   });
 };

package/dist/js/node/cli/dev.js

@@ -12,8 +12,8 @@ const local = _utils.Import.lazy('../locale', require);
 const commands = _utils.Import.lazy('../commands', require);
 
 const devCli = program => {
-  program.command('dev').usage('[options]').description(local.i18n.t(local.localeKeys.command.dev.describe)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').action(async params => {
-    await commands.dev(params);
+  program.command('dev [subCmd]').usage('[options]').description(local.i18n.t(local.localeKeys.command.dev.describe)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').action(async (subCmd, params) => {
+    await commands.dev(params, subCmd);
   });
 };
 

package/dist/js/node/commands/dev.js

@@ -23,7 +23,9 @@ const tsConfigutils = _utils.Import.lazy('../utils/tsconfig', require);
 
 const valid = _utils.Import.lazy('../utils/valide', require);
 
-const dev = async option => {
+const existSubCmd = subCmd => subCmd.length > 0;
+
+const dev = async (option, subCmd = '') => {
   const {
     tsconfig: tsconfigName
   } = option;
@@ -40,6 +42,15 @@ const dev = async option => {
   });
   const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
 
+  if (existSubCmd(subCmd)) {
+    await devFeature.runSubCmd(subCmd, {
+      isTsProject,
+      appDirectory
+    });
+    return;
+  } // Compatible with the use of jupiter, RUN_PLATFORM is used in jupiter
+
+
   if (process.env.RUN_PLATFORM) {
     await devFeature.showMenu({
       isTsProject,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showMenu = exports.devStorybook = void 0;
+exports.showMenu = exports.runSubCmd = exports.devStorybook = void 0;
 
 var _utils = require("@modern-js/utils");
 
@@ -57,4 +57,18 @@ const devStorybook = async config => {
   }
 };
 
-exports.devStorybook = devStorybook;
+exports.devStorybook = devStorybook;
+
+const runSubCmd = async (subCmd, config) => {
+  const metas = await core.mountHook().moduleToolsMenu(undefined);
+  const devMeta = metas.find(meta => meta.value === subCmd);
+
+  if (devMeta) {
+    await devMeta.runTask(config);
+  } else {
+    // eslint-disable-next-line no-process-exit
+    process.exit(0);
+  }
+};
+
+exports.runSubCmd = runSubCmd;

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

@@ -1,4 +1,4 @@
 export interface IDevOption {
   tsconfig: string;
 }
-export declare const dev: (option: IDevOption) => Promise<void>;
+export declare const dev: (option: IDevOption, subCmd?: string) => Promise<void>;

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

@@ -4,4 +4,5 @@ export interface IDevConfig {
 }
 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 devStorybook: (config: IDevConfig) => Promise<void>;
+export declare const runSubCmd: (subCmd: string, config: IDevConfig) => Promise<void>;

package/lib/types.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 /// <reference types="react" />
 /// <reference types="react-dom" />
-/// <reference path="../dist/types/index.d.ts" />
 
 declare namespace NodeJS {
   interface ProcessEnv {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.0",
+  "version": "1.3.0",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -40,8 +40,8 @@
   },
   "typesVersions": {
     "*": {
-      "build": [
-        "./dist/types/build.d.ts"
+      "type": [
+        "./lib/types.d.ts"
       ]
     }
   },
@@ -52,8 +52,8 @@
     "@babel/traverse": "^7.15.0",
     "@babel/types": "^7.15.0",
     "@modern-js/babel-compiler": "^1.2.0",
-    "@modern-js/babel-preset-module": "^1.2.0",
-    "@modern-js/core": "^1.3.0",
+    "@modern-js/babel-preset-module": "^1.3.0",
+    "@modern-js/core": "^1.3.1",
     "@modern-js/css-config": "^1.2.0",
     "@modern-js/i18n-cli-language-detector": "^1.2.0",
     "@modern-js/module-tools-hooks": "^1.2.0",
@@ -63,7 +63,7 @@
     "@modern-js/plugin-fast-refresh": "^1.2.0",
     "@modern-js/plugin-i18n": "^1.2.0",
     "@modern-js/style-compiler": "^1.2.0",
-    "@modern-js/utils": "^1.2.0",
+    "@modern-js/utils": "^1.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "dotenv": "^10.0.0",

package/src/cli/build.ts

@@ -28,7 +28,7 @@ export const buildCli = (program: Command) => {
       local.i18n.t(local.localeKeys.command.build.style_only),
     )
     .option(
-      '--platform [platform]',
+      '-p, --platform [platform]',
       local.i18n.t(local.localeKeys.command.build.platform),
     )
     .option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc))

package/src/cli/dev.ts

@@ -10,7 +10,7 @@ const commands: typeof import('../commands') = Import.lazy(
 
 export const devCli = (program: Command) => {
   program
-    .command('dev')
+    .command('dev [subCmd]')
     .usage('[options]')
     .description(local.i18n.t(local.localeKeys.command.dev.describe))
     .option(
@@ -18,7 +18,7 @@ export const devCli = (program: Command) => {
       local.i18n.t(local.localeKeys.command.build.tsconfig),
       './tsconfig.json',
     )
-    .action(async (params: IDevOption) => {
-      await commands.dev(params);
+    .action(async (subCmd: string, params: IDevOption) => {
+      await commands.dev(params, subCmd);
     });
 };

package/src/commands/dev.ts

@@ -23,7 +23,9 @@ export interface IDevOption {
   tsconfig: string;
 }
 
-export const dev = async (option: IDevOption) => {
+const existSubCmd = (subCmd: string) => subCmd.length > 0;
+
+export const dev = async (option: IDevOption, subCmd = '') => {
   const { tsconfig: tsconfigName } = option;
   const appContext = core.useAppContext();
   const modernConfig = core.useResolvedConfigContext();
@@ -35,6 +37,13 @@ export const dev = async (option: IDevOption) => {
   valid.valideBeforeTask({ modernConfig, tsconfigPath });
 
   const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
+
+  if (existSubCmd(subCmd)) {
+    await devFeature.runSubCmd(subCmd, { isTsProject, appDirectory });
+    return;
+  }
+
+  // Compatible with the use of jupiter, RUN_PLATFORM is used in jupiter
   if (process.env.RUN_PLATFORM) {
     await devFeature.showMenu({ isTsProject, appDirectory });
   } else {

package/src/features/dev/index.ts

@@ -60,3 +60,15 @@ export const devStorybook = async (config: IDevConfig) => {
     process.exit(0);
   }
 };
+
+export const runSubCmd = async (subCmd: string, config: IDevConfig) => {
+  const metas = await (core.mountHook() as any).moduleToolsMenu(undefined);
+
+  const devMeta = metas.find((meta: any) => meta.value === subCmd);
+  if (devMeta) {
+    await devMeta.runTask(config);
+  } else {
+    // eslint-disable-next-line no-process-exit
+    process.exit(0);
+  }
+};

package/tests/dev-cli.test.ts

@@ -0,0 +1,25 @@
+import { program } from 'commander';
+import { devCli } from '../src/cli/dev';
+
+const mockCommandDev = jest.fn();
+
+describe('dev cli subCmd', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.mock('../src/commands', () => ({
+      __esModule: true,
+      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 undefined with "dev"', () => {
+    devCli(program);
+    program.parse(['', '', 'dev']);
+    expect(mockCommandDev.mock.calls[0][1]).toBe(undefined);
+  });
+});

package/tests/dev-command.test.ts

@@ -0,0 +1,44 @@
+import { dev } from '../src/commands/dev';
+
+const mockRunSubCmd = jest.fn();
+jest.mock('../src/features/dev', () => ({
+  __esModule: true,
+  runSubCmd: mockRunSubCmd,
+  devStorybook: jest.fn(),
+}));
+jest.mock('@modern-js/core', () => ({
+  __esModule: true,
+  useAppContext: jest.fn(() => ({ appDirectory: '' })),
+  useResolvedConfigContext: jest.fn(),
+}));
+
+jest.mock('dotenv', () => ({
+  __esModule: true,
+  config: jest.fn(),
+}));
+
+jest.mock('../src/utils/valide', () => ({
+  __esModule: true,
+  valideBeforeTask: jest.fn(),
+}));
+
+jest.mock('../src/utils/tsconfig', () => ({
+  __esModule: true,
+  existTsConfigFile: jest.fn(),
+}));
+
+describe('dev command with subCmd', () => {
+  beforeEach(() => {
+    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');
+  });
+
+  it('should not call runSubCmd with nothing param', async () => {
+    await dev({ tsconfig: 'tsconfig.json' });
+    expect(mockRunSubCmd.mock.calls.length).toBe(0);
+  });
+});

package/tests/dev-feature.test.ts

@@ -0,0 +1,30 @@
+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(() => ({
+    moduleToolsMenu: mockModuleToolsMenu,
+  })),
+}));
+
+describe('dev feature with subCmd', () => {
+  beforeEach(() => {
+    console.info('asdas');
+  });
+  it('should run task with "storybook" params when storybook plugin exist', async () => {
+    mockModuleToolsMenu.mockReturnValue([
+      { value: 'storybook', runTask: mockDevMeta },
+    ]);
+    await runSubCmd('storybook', { isTsProject: true, appDirectory: '' });
+    expect(mockDevMeta.mock.calls.length).toBe(1);
+  });
+
+  it('should run task with "storybook" params when storybook plugin not exist', async () => {
+    mockModuleToolsMenu.mockReturnValue([]);
+    await runSubCmd('storybook', { isTsProject: true, appDirectory: '' });
+    expect(exit).toHaveBeenCalled();
+  });
+});

package/tests/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": false,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "paths": {}
+  }
+}

package/tsconfig.json

@@ -5,7 +5,8 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {}
+    "paths": {},
+    "types": ["jest"]
   },
   "include": ["src"]
 }