@modern-js/module-tools 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # @modern-js/module-tools
 
+## 1.4.0
+
+### Minor Changes
+
+- 67503500: add alais subCmd
+
+### Patch Changes
+
+- Updated dependencies [118da5b4]
+- Updated dependencies [b376c8d6]
+- Updated dependencies [e62c4efd]
+- Updated dependencies [6891e4c2]
+- Updated dependencies [e2a8233f]
+  - @modern-js/css-config@1.2.2
+  - @modern-js/style-compiler@1.2.2
+  - @modern-js/core@1.4.2
+  - @modern-js/plugin-analyze@1.3.2
+
+## 1.3.2
+
+### Patch Changes
+
+- c78400c7: fix: remove stylus support
+- Updated dependencies [b7a9eeba]
+- Updated dependencies [53aca274]
+- Updated dependencies [78279953]
+- Updated dependencies [e116ace5]
+- Updated dependencies [4d72edea]
+  - @modern-js/plugin-analyze@1.3.1
+  - @modern-js/core@1.4.1
+  - @modern-js/utils@1.3.1
+
+## 1.3.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+- Updated dependencies [b7c48198]
+  - @modern-js/babel-preset-module@1.3.1
+  - @modern-js/core@1.3.2
+  - @modern-js/css-config@1.2.1
+  - @modern-js/i18n-cli-language-detector@1.2.1
+  - @modern-js/plugin-analyze@1.2.1
+  - @modern-js/plugin-changeset@1.2.1
+  - @modern-js/plugin-fast-refresh@1.2.1
+  - @modern-js/plugin-i18n@1.2.1
+  - @modern-js/new-action@1.3.1
+  - @modern-js/babel-compiler@1.2.1
+  - @modern-js/style-compiler@1.2.1
+  - @modern-js/module-tools-hooks@1.2.1
+  - @modern-js/utils@1.2.2
+
 ## 1.3.0
 
 ### Minor Changes

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

@@ -41,7 +41,7 @@ export const devStorybook = async config => {
 };
 export const runSubCmd = async (subCmd, config) => {
   const metas = await core.mountHook().moduleToolsMenu(undefined);
-  const devMeta = metas.find(meta => meta.value === subCmd);
+  const devMeta = metas.find(meta => meta.value === subCmd || Array.isArray(meta.aliasValues) && meta.aliasValues.includes(subCmd));
 
   if (devMeta) {
     await devMeta.runTask(config);

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

@@ -61,7 +61,7 @@ exports.devStorybook = devStorybook;
 
 const runSubCmd = async (subCmd, config) => {
   const metas = await core.mountHook().moduleToolsMenu(undefined);
-  const devMeta = metas.find(meta => meta.value === subCmd);
+  const devMeta = metas.find(meta => meta.value === subCmd || Array.isArray(meta.aliasValues) && meta.aliasValues.includes(subCmd));
 
   if (devMeta) {
     await devMeta.runTask(config);

package/dist/types/index.d.ts

@@ -13,8 +13,10 @@ declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@m
   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>>>>;
 
 export default _default;

package/lib/types.d.ts

@@ -70,11 +70,6 @@ declare module '*.less' {
   export default classes;
 }
 
-declare module '*.styl' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
 declare module '*.sass' {
   const classes: { readonly [key: string]: string };
   export default classes;
@@ -95,11 +90,6 @@ declare module '*.module.less' {
   export default classes;
 }
 
-declare module '*.module.styl' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
 declare module '*.module.sass' {
   const classes: { readonly [key: string]: string };
   export default classes;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.0",
+  "version": "1.4.0",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -51,19 +51,19 @@
     "@babel/runtime": "^7",
     "@babel/traverse": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@modern-js/babel-compiler": "^1.2.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",
-    "@modern-js/new-action": "^1.3.0",
-    "@modern-js/plugin-analyze": "^1.2.0",
-    "@modern-js/plugin-changeset": "^1.2.0",
-    "@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.1",
+    "@modern-js/babel-compiler": "^1.2.1",
+    "@modern-js/babel-preset-module": "^1.3.1",
+    "@modern-js/core": "^1.4.2",
+    "@modern-js/css-config": "^1.2.2",
+    "@modern-js/i18n-cli-language-detector": "^1.2.1",
+    "@modern-js/module-tools-hooks": "^1.2.1",
+    "@modern-js/new-action": "^1.3.1",
+    "@modern-js/plugin-analyze": "^1.3.2",
+    "@modern-js/plugin-changeset": "^1.2.1",
+    "@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.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "dotenv": "^10.0.0",
@@ -82,7 +82,7 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.15.0",
-    "@modern-js/babel-chain": "^1.2.0",
+    "@modern-js/babel-chain": "^1.2.1",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
@@ -107,8 +107,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/dev-feature.test.ts

@@ -12,7 +12,7 @@ jest.mock('@modern-js/core', () => ({
 
 describe('dev feature with subCmd', () => {
   beforeEach(() => {
-    console.info('asdas');
+    jest.clearAllMocks();
   });
   it('should run task with "storybook" params when storybook plugin exist', async () => {
     mockModuleToolsMenu.mockReturnValue([
@@ -27,4 +27,20 @@ describe('dev feature with subCmd', () => {
     await runSubCmd('storybook', { isTsProject: true, appDirectory: '' });
     expect(exit).toHaveBeenCalled();
   });
+
+  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);
+  });
+
+  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);
+  });
 });

package/src/.eslintrc.json

@@ -1,5 +0,0 @@
-{
-  "rules": {
-    "react-hooks/rules-of-hooks": "off"
-  }
-}

package/src/cli/build.ts

@@ -1,39 +0,0 @@
-import { Import } from '@modern-js/utils';
-import type { Command } from 'commander';
-import type { IBuildOption } from '../commands/build';
-
-const local: typeof import('../locale') = Import.lazy(
-  '../locale/index',
-  require,
-);
-const commands: typeof import('../commands') = Import.lazy(
-  '../commands',
-  require,
-);
-
-export const buildCli = (program: Command) => {
-  // 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(
-      '-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: IBuildOption) => {
-      await commands.build(subCommand);
-    });
-};

package/src/cli/dev.ts

@@ -1,24 +0,0 @@
-import { Import } from '@modern-js/utils';
-import type { Command } from 'commander';
-import type { IDevOption } from '../commands/dev';
-
-const local: typeof import('../locale') = Import.lazy('../locale', require);
-const commands: typeof import('../commands') = Import.lazy(
-  '../commands',
-  require,
-);
-
-export const devCli = (program: Command) => {
-  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: string, params: IDevOption) => {
-      await commands.dev(params, subCmd);
-    });
-};

package/src/cli/index.ts

@@ -1,3 +0,0 @@
-export * from './build';
-export * from './dev';
-export * from './new';

package/src/cli/new.ts

@@ -1,32 +0,0 @@
-import type { Command } from 'commander';
-import { Import } from '@modern-js/utils';
-
-const newAction: typeof import('@modern-js/new-action') = Import.lazy(
-  '@modern-js/new-action',
-  require,
-);
-const local: typeof import('../locale') = Import.lazy('../locale', require);
-
-export const newCli = (program: Command, locale?: string) => {
-  program
-    .command('new')
-    .usage('[options]')
-    .description(local.i18n.t(local.localeKeys.command.new.describe))
-    .option(
-      '-d, --debug',
-      local.i18n.t(local.localeKeys.command.new.debug),
-      false,
-    )
-    .option(
-      '-c, --config <config>',
-      local.i18n.t(local.localeKeys.command.new.config),
-    )
-    .option(
-      '--dist-tag <tag>',
-      local.i18n.t(local.localeKeys.command.new.distTag),
-    )
-    .option('--registry', local.i18n.t(local.localeKeys.command.new.registry))
-    .action(async options => {
-      await newAction.ModuleNewAction({ ...options, locale });
-    });
-};

package/src/commands/build.ts

@@ -1,74 +0,0 @@
-import * as path from 'path';
-import { fs, Import } from '@modern-js/utils';
-import type { Platform } from '../types';
-
-const tsConfigutils: typeof import('../utils/tsconfig') = Import.lazy(
-  '../utils/tsconfig',
-  require,
-);
-
-const valid: typeof import('../utils/valide') = Import.lazy(
-  '../utils/valide',
-  require,
-);
-const buildFeature: typeof import('../features/build') = Import.lazy(
-  '../features/build',
-  require,
-);
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-const dotenv: typeof import('dotenv') = Import.lazy('dotenv', require);
-
-export interface IBuildOption {
-  watch: boolean;
-  tsconfig: string;
-  platform: boolean | Exclude<Platform, 'all'>;
-  styleOnly: boolean;
-  tsc: boolean;
-  clear: boolean;
-}
-
-export const build = async ({
-  watch = false,
-  tsconfig: tsconfigName,
-  tsc,
-  clear = true,
-  platform,
-}: IBuildOption) => {
-  const { appDirectory } = core.useAppContext();
-  const modernConfig = core.useResolvedConfigContext();
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
-  dotenv.config();
-  const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
-  const enableTscCompiler = isTsProject && tsc;
-
-  valid.valideBeforeTask({ modernConfig, tsconfigPath });
-
-  // TODO: 一些配置只需要从modernConfig中获取
-  await buildFeature.build(
-    {
-      appDirectory,
-      enableWatchMode: watch,
-      isTsProject,
-      platform,
-      sourceDir: 'src',
-      tsconfigName,
-      enableTscCompiler,
-      clear,
-    },
-    modernConfig,
-  );
-
-  process.on('SIGBREAK', () => {
-    console.info('exit');
-    const tempTsconfigFilePath = path.join(
-      appDirectory,
-      './tsconfig.temp.json',
-    );
-    if (fs.existsSync(tempTsconfigFilePath)) {
-      fs.removeSync(tempTsconfigFilePath);
-    }
-  });
-};

package/src/commands/dev.ts

@@ -1,52 +0,0 @@
-import * as path from 'path';
-import { Import } from '@modern-js/utils';
-
-const devFeature: typeof import('../features/dev') = Import.lazy(
-  '../features/dev',
-  require,
-);
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-const dotenv: typeof import('dotenv') = Import.lazy('dotenv', require);
-const tsConfigutils: typeof import('../utils/tsconfig') = Import.lazy(
-  '../utils/tsconfig',
-  require,
-);
-const valid: typeof import('../utils/valide') = Import.lazy(
-  '../utils/valide',
-  require,
-);
-
-export interface IDevOption {
-  tsconfig: string;
-}
-
-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();
-  const { appDirectory } = appContext;
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
-
-  dotenv.config();
-
-  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 {
-    await devFeature.devStorybook({ isTsProject, appDirectory });
-  }
-};

package/src/commands/index.ts

@@ -1,2 +0,0 @@
-export { dev } from './dev';
-export { build } from './build';

package/src/features/build/build-platform.ts

@@ -1,83 +0,0 @@
-import { Import, chalk } from '@modern-js/utils';
-import type { LoggerText } from './logger';
-
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-const execa: typeof import('execa') = Import.lazy('execa', require);
-const lg: typeof import('./logger') = Import.lazy('./logger', require);
-const pMap: typeof import('p-map') = Import.lazy('p-map', require);
-
-export type Platform = 'all' | 'docs' | 'storybook';
-
-export interface IBuildPlatformOption {
-  platform: Platform;
-  isTsProject?: boolean;
-}
-
-export const buildPlatform = async (option: IBuildPlatformOption) => {
-  const { isTsProject = false, platform } = option;
-  const lm = new lg.LoggerManager();
-  // 获取platforms的参数
-  const buildTasks = await (core.mountHook() as any).platformBuild({
-    isTsProject,
-  });
-
-  if (buildTasks.length <= 0) {
-    console.info(
-      chalk.yellow(
-        'No build tasks detected.\nYou can use the `new` command to enable the more features',
-      ),
-    );
-    return;
-  }
-
-  const loggerMap: Record<string, LoggerText> = {};
-  const taskMapper = buildTasks
-    .filter((task: any) => platform === 'all' || task.name === platform)
-    .map((params: any) => {
-      const logger = lm.createLoggerText({ title: params.title });
-      loggerMap[params.name] = logger;
-      return {
-        logger,
-        ...params,
-      };
-    });
-  if (taskMapper.length <= 0) {
-    console.info(chalk.yellow(`'${platform}' is undefined task`));
-    return;
-  }
-
-  lm.showCompiling();
-  await pMap(
-    taskMapper,
-    async ({ taskPath, params, logger: _ }: any) => {
-      const childProcess = execa.node(taskPath, params, {
-        stdio: 'inherit',
-        all: true,
-      });
-
-      // lm.addStdout(logger, childProcess.stdout, {
-      //   event: { data: true, error: true },
-      // });
-
-      // lm.addStderr(logger, childProcess.stderr);
-      try {
-        await childProcess;
-      } catch {
-        // eslint-disable-next-line no-process-exit
-        process.exit(1);
-      }
-      // lm.disappearCompiling();
-      // console.info(lg.colors.title(title));
-      // console.info(a.all);
-    },
-    { concurrency: 1 },
-  );
-
-  // lm.disappearCompiling();
-  // for (const key of Object.keys(loggerMap)) {
-  //   console.info(loggerMap[key].value);
-  // }
-};

package/src/features/build/build-watch.ts

@@ -1,99 +0,0 @@
-import * as path from 'path';
-import * as os from 'os';
-import { Import } from '@modern-js/utils';
-
-import type { NormalizedConfig } from '@modern-js/core';
-import type { IBuildConfig, ITaskMapper } from '../../types';
-
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-const execa: typeof import('execa') = Import.lazy('execa', require);
-const lg: typeof import('./logger') = Import.lazy('./logger', require);
-const pMap: typeof import('p-map') = Import.lazy('p-map', require);
-const utils: typeof import('./utils') = Import.lazy('./utils', require);
-const constants: typeof import('./constants') = Import.lazy(
-  './constants',
-  require,
-);
-
-export const buildInWatchMode = async (
-  config: IBuildConfig,
-  _: NormalizedConfig,
-) => {
-  const { appDirectory } = core.useAppContext();
-  const { sourceDir, enableTscCompiler } = config;
-  const srcRootDir = path.join(appDirectory, sourceDir);
-  const concurrency = os.cpus().length;
-  const lm = new lg.LoggerManager();
-  const codeLog = lm.createLoggerText({
-    title: constants.runBabelCompilerTitle,
-  });
-  const dtsLog = lm.createLoggerText({ title: constants.runTscWatchTitle });
-  const styleLog = lm.createLoggerText({
-    title: constants.runStyleCompilerTitle,
-  });
-  const copyLog = lm.createLoggerText({ title: 'Copy Log:' });
-  const initCodeMapper = utils.getCodeInitMapper(config);
-  const taskMapper: ITaskMapper[] = [
-    ...utils.getCodeMapper({
-      logger: codeLog,
-      taskPath: require.resolve('../../tasks/build-watch-source-code'),
-      config,
-      willCompilerDirOrFile: sourceDir,
-      initMapper: initCodeMapper,
-      srcRootDir,
-    }),
-    ...(enableTscCompiler ? utils.getDtsMapper(config, dtsLog) : []),
-    {
-      logger: styleLog,
-      taskPath: require.resolve('../../tasks/build-watch-style'),
-    },
-    {
-      logger: copyLog,
-      taskPath: require.resolve('../../tasks/copy-assets'),
-      params: ['--watch'],
-    },
-  ];
-  lm.on('data', () => {
-    console.info(constants.clearFlag);
-    enableTscCompiler && console.info(dtsLog.value);
-    console.info(codeLog.value);
-    console.info(styleLog.value);
-  });
-  await pMap(
-    taskMapper,
-    async ({ logger, taskPath, params }) => {
-      const childProcess = execa.node(taskPath, params, { stdio: 'pipe' });
-      if (logger === codeLog) {
-        lm.addStdout(logger, childProcess.stdout, {
-          event: { error: true, data: true },
-          // colors: { data: s => s },
-        });
-        lm.addStderr(logger, childProcess.stderr);
-      }
-
-      if (logger === dtsLog) {
-        lm.addStdout(logger, childProcess.stdout, {
-          event: { data: true, error: true },
-          colors: {
-            // tsc 的log信息无论是错误还是正确都是从 data event 中获取到的
-            data: s => s,
-          },
-        });
-      }
-
-      if (logger === styleLog || logger === copyLog) {
-        lm.addStdout(logger, childProcess.stdout, {
-          event: { error: true, data: true },
-          // colors: { data: s => s },
-        });
-        lm.addStderr(logger, childProcess.stderr);
-      }
-
-      await childProcess;
-    },
-    { concurrency },
-  );
-};