@modern-js/app-tools 1.3.1 → 1.3.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @modern-js/app-tools
 
+## 1.3.2
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+- Updated dependencies [b7c48198]
+  - @modern-js/core@1.3.2
+  - @modern-js/i18n-cli-language-detector@1.2.1
+  - @modern-js/plugin-analyze@1.2.1
+  - @modern-js/plugin-fast-refresh@1.2.1
+  - @modern-js/plugin-i18n@1.2.1
+  - @modern-js/webpack@1.2.1
+  - @modern-js/new-action@1.3.1
+  - @modern-js/server@1.3.2
+  - @modern-js/plugin@1.2.1
+  - @modern-js/types@1.2.1
+  - @modern-js/utils@1.2.2
+
 ## 1.3.1
 
 ### Patch Changes

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.1",
+  "version": "1.3.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -50,17 +50,17 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.3.1",
-    "@modern-js/types": "^1.2.0",
-    "@modern-js/i18n-cli-language-detector": "^1.2.0",
-    "@modern-js/new-action": "^1.3.0",
-    "@modern-js/plugin": "^1.2.0",
-    "@modern-js/plugin-analyze": "^1.2.0",
-    "@modern-js/plugin-fast-refresh": "^1.2.0",
-    "@modern-js/plugin-i18n": "^1.2.0",
-    "@modern-js/server": "^1.3.1",
-    "@modern-js/utils": "^1.2.1",
-    "@modern-js/webpack": "^1.2.0",
+    "@modern-js/core": "^1.3.2",
+    "@modern-js/types": "^1.2.1",
+    "@modern-js/i18n-cli-language-detector": "^1.2.1",
+    "@modern-js/new-action": "^1.3.1",
+    "@modern-js/plugin": "^1.2.1",
+    "@modern-js/plugin-analyze": "^1.2.1",
+    "@modern-js/plugin-fast-refresh": "^1.2.1",
+    "@modern-js/plugin-i18n": "^1.2.1",
+    "@modern-js/server": "^1.3.2",
+    "@modern-js/utils": "^1.2.2",
+    "@modern-js/webpack": "^1.2.1",
     "webpack": "^5.54.0"
   },
   "devDependencies": {

package/src/commands/build.ts

@@ -1,129 +0,0 @@
-import { Configuration, webpack } from 'webpack';
-import { WebpackConfigTarget, getWebpackConfig } from '@modern-js/webpack';
-import {
-  useAppContext,
-  useResolvedConfigContext,
-  mountHook,
-  ResolvedConfigContext,
-  manager,
-} from '@modern-js/core';
-import {
-  fs,
-  formatWebpackMessages,
-  measureFileSizesBeforeBuild,
-  printFileSizesAfterBuild,
-  printBuildError,
-  logger,
-  isUseSSRBundle,
-} from '@modern-js/utils';
-
-// These sizes are pretty large. We'll warn for bundles exceeding them.
-const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-
-interface CliOptions {
-  analyze?: boolean;
-}
-
-export const build = async (options?: CliOptions) => {
-  const webpackBuild = async (webpackConfig: Configuration, type?: string) => {
-    const compiler = webpack(webpackConfig);
-
-    return new Promise((resolve, reject) => {
-      let label = process.env.NODE_ENV || '';
-      if (type && type !== 'legacy') {
-        label += ` ${type}`;
-      }
-      logger.info(`Creating a ${label} build...`);
-
-      compiler.run((err, stats) => {
-        let messages: {
-          errors: any;
-          warnings: any;
-        };
-        if (!err) {
-          messages = formatWebpackMessages(
-            stats!.toJson({ all: false, warnings: true, errors: true }),
-          );
-
-          if (messages.errors.length === 0) {
-            logger.info(`File sizes after ${label} build:\n`);
-            printFileSizesAfterBuild(
-              stats,
-              previousFileSizes,
-              outputPath,
-              WARN_AFTER_BUNDLE_GZIP_SIZE,
-              WARN_AFTER_CHUNK_GZIP_SIZE,
-            );
-            logger.log();
-          }
-        }
-
-        // When using run or watch, call close and wait for it to finish before calling run or watch again.
-        // Concurrent compilations will corrupt the output files.
-        compiler.close(closeErr => {
-          if (closeErr) {
-            logger.error(closeErr);
-          }
-          if (err) {
-            reject(err);
-          } else {
-            if (messages.errors.length) {
-              reject(new Error(messages.errors.join('\n\n')));
-              return;
-            }
-            resolve({ warnings: messages.warnings });
-          }
-        });
-      });
-    });
-  };
-
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const resolvedConfig = useResolvedConfigContext();
-  const appContext = useAppContext();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
-  manager.run(() => {
-    ResolvedConfigContext.set({ ...resolvedConfig, cliOptions: options });
-  });
-
-  const outputPath = appContext.distDirectory;
-  const previousFileSizes = await measureFileSizesBeforeBuild(outputPath);
-  fs.emptyDirSync(outputPath);
-
-  const buildConfigs = [];
-
-  buildConfigs.push({
-    type: 'legacy',
-    config: getWebpackConfig(WebpackConfigTarget.CLIENT)!,
-  });
-
-  if (resolvedConfig.output.enableModernMode) {
-    buildConfigs.push({
-      type: 'modern',
-      config: getWebpackConfig(WebpackConfigTarget.MODERN)!,
-    });
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    buildConfigs.push({
-      type: 'ssr',
-      config: getWebpackConfig(WebpackConfigTarget.NODE)!,
-    });
-  }
-
-  await (mountHook() as any).beforeBuild({
-    webpackConfigs: buildConfigs.map(({ config }) => config),
-  });
-
-  for (const buildConfig of buildConfigs) {
-    const { type: buildType, config } = buildConfig;
-    try {
-      await webpackBuild(config, buildType);
-    } catch (error) {
-      printBuildError(error as Error);
-    }
-  }
-  await (mountHook() as any).afterBuild();
-};

package/src/commands/deploy.ts

@@ -1,6 +0,0 @@
-import { mountHook } from '@modern-js/core';
-
-export const deploy = async (options: any) => {
-  await (mountHook() as any).beforeDeploy(options);
-  await (mountHook() as any).afterDeploy(options);
-};

package/src/commands/dev.ts

@@ -1,80 +0,0 @@
-import {
-  Configuration,
-  getWebpackConfig,
-  WebpackConfigTarget,
-} from '@modern-js/webpack';
-import {
-  fs,
-  logger,
-  HMR_SOCK_PATH,
-  clearConsole,
-  chalk,
-  isSSR,
-} from '@modern-js/utils';
-import {
-  useAppContext,
-  useResolvedConfigContext,
-  mountHook,
-} from '@modern-js/core';
-import { createCompiler } from '../utils/createCompiler';
-import { createServer } from '../utils/createServer';
-
-export const dev = async () => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const appContext = useAppContext();
-  const userConfig = useResolvedConfigContext();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
-  const { appDirectory, distDirectory, port } = appContext;
-
-  fs.emptyDirSync(distDirectory);
-
-  await (mountHook() as any).beforeDev();
-
-  const webpackConfigs = [
-    isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE),
-    getWebpackConfig(WebpackConfigTarget.CLIENT),
-  ].filter(Boolean) as Configuration[];
-
-  const compiler = await createCompiler({
-    webpackConfigs,
-    userConfig,
-    appContext,
-  });
-
-  const app = await createServer({
-    dev: {
-      ...{
-        client: {
-          port: port!.toString(),
-          overlay: false,
-          logging: 'none',
-          path: HMR_SOCK_PATH,
-          host: 'localhost',
-        },
-        dev: { writeToDisk: (file: string) => !file.includes('.hot-update.') },
-        hot: true,
-        liveReload: true,
-        port,
-        https: userConfig.dev.https,
-      },
-      ...userConfig.tools.devServer,
-    },
-    compiler,
-    pwd: appDirectory,
-    config: userConfig as any,
-    plugins: appContext.plugins
-      .filter((p: any) => p.server)
-      .map((p: any) => p.server),
-  });
-
-  app.listen(port, (err: Error) => {
-    if (err) {
-      throw err;
-    }
-
-    clearConsole();
-
-    logger.log(chalk.cyan(`Starting the development server...`));
-  });
-};

package/src/commands/index.ts

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

package/src/commands/start.ts

@@ -1,30 +0,0 @@
-import { logger, chalk } from '@modern-js/utils';
-import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
-import server from '@modern-js/server';
-import { printInstructions } from '../utils/printInstructions';
-
-export const start = async () => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const appContext = useAppContext();
-  const userConfig = useResolvedConfigContext();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
-  const { appDirectory, port } = appContext;
-
-  logger.log(chalk.cyan(`Starting the modern server...`));
-
-  const app = await server({
-    pwd: appDirectory,
-    config: userConfig as any,
-    plugins: appContext.plugins
-      .filter((p: any) => p.server)
-      .map((p: any) => p.server),
-  });
-
-  app.listen(port, async (err: Error) => {
-    if (err) {
-      throw err;
-    }
-    await printInstructions(appContext, userConfig);
-  });
-};

package/src/index.ts

@@ -1,99 +0,0 @@
-import { createPlugin, defineConfig, usePlugins, cli } from '@modern-js/core';
-import { lifecycle } from './lifecycle';
-import { i18n, localeKeys } from './locale';
-import { getLocaleLanguage } from './utils/language';
-import { start } from './commands/start';
-import { dev } from './commands/dev';
-
-export { defineConfig };
-
-// eslint-disable-next-line react-hooks/rules-of-hooks
-usePlugins([
-  require.resolve('@modern-js/plugin-analyze/cli'),
-  require.resolve('@modern-js/plugin-fast-refresh/cli'),
-]);
-
-export default createPlugin(
-  (() => {
-    const locale = getLocaleLanguage();
-    i18n.changeLanguage({ locale });
-
-    lifecycle();
-
-    return {
-      commands({ program }: any) {
-        program
-          .command('dev')
-          .usage('[options]')
-          .description(i18n.t(localeKeys.command.dev.describe))
-          .option('-c --config <config>', i18n.t(localeKeys.command.dev.config))
-          .action(async () => {
-            await dev();
-          });
-
-        program
-          .command('build')
-          .usage('[options]')
-          .description(i18n.t(localeKeys.command.build.describe))
-          .option('--analyze', i18n.t(localeKeys.command.build.analyze))
-          .action(async (options: any) => {
-            const { build } = await import('./commands/build');
-            await build(options);
-            // force exit after build.
-            // eslint-disable-next-line no-process-exit
-            process.exit(0);
-          });
-
-        program
-          .command('start')
-          .usage('[options]')
-          .description(i18n.t(localeKeys.command.start.describe))
-          .action(async () => {
-            await start();
-          });
-
-        program
-          .command('deploy')
-          .usage('[options]')
-          .description(i18n.t(localeKeys.command.deploy.describe))
-          .action(async (options: any) => {
-            const { build } = await import('./commands/build');
-            await build();
-            const { deploy } = await import('./commands/deploy');
-            await deploy(options);
-            // eslint-disable-next-line no-process-exit
-            process.exit(0);
-          });
-
-        program
-          .command('new')
-          .usage('[options]')
-          .description(i18n.t(localeKeys.command.new.describe))
-          .option('-d, --debug', i18n.t(localeKeys.command.new.debug), false)
-          .option(
-            '-c, --config <config>',
-            i18n.t(localeKeys.command.new.config),
-          )
-          .option('--dist-tag <tag>', i18n.t(localeKeys.command.new.distTag))
-          .option('--registry', i18n.t(localeKeys.command.new.registry))
-          .action(async (options: any) => {
-            const { MWANewAction } = await import('@modern-js/new-action');
-            await MWANewAction({ ...options, locale });
-          });
-      },
-      async fileChange() {
-        await cli.restart();
-      },
-    };
-  }) as any,
-  {
-    post: [
-      '@modern-js/plugin-analyze',
-      '@modern-js/plugin-fast-refresh',
-      '@modern-js/plugin-ssr',
-      '@modern-js/plugin-state',
-      '@modern-js/plugin-router',
-      '@modern-js/plugin-polyfill',
-    ],
-  },
-);

package/src/lifecycle.ts

@@ -1,43 +0,0 @@
-import { createAsyncWaterfall, createAsyncWorkflow } from '@modern-js/plugin';
-import { registerHook } from '@modern-js/core';
-
-import type { Compiler, Configuration, MultiCompiler } from '@modern-js/types';
-
-export const beforeDev = createAsyncWorkflow();
-
-export const afterDev = createAsyncWorkflow();
-
-export const beforeCreateCompiler = createAsyncWorkflow<{
-  webpackConfigs: Configuration[];
-}>();
-
-export const afterCreateCompiler = createAsyncWorkflow<{
-  compiler: Compiler | MultiCompiler | undefined;
-}>();
-
-export const beforePrintInstructions =
-  createAsyncWaterfall<{ instructions: string }>();
-
-export const beforeBuild = createAsyncWorkflow<{
-  webpackConfigs: Configuration[];
-}>();
-
-export const afterBuild = createAsyncWorkflow();
-
-export const beforeDeploy = createAsyncWorkflow<Record<string, any>>();
-
-export const afterDeploy = createAsyncWorkflow<Record<string, any>>();
-
-export const lifecycle = () => {
-  registerHook({
-    beforeDev,
-    afterDev,
-    beforeCreateCompiler,
-    afterCreateCompiler,
-    beforePrintInstructions,
-    beforeBuild,
-    afterBuild,
-    beforeDeploy,
-    afterDeploy,
-  });
-};

package/src/locale/en.ts

@@ -1,18 +0,0 @@
-export const EN_LOCALE = {
-  command: {
-    dev: {
-      describe: 'start dev server',
-      config: 'specify config file',
-    },
-    build: { describe: 'build application', analyze: 'analyze bundle' },
-    start: { describe: 'start server' },
-    deploy: { describe: 'deploy application' },
-    new: {
-      describe: 'generator runner for MWA project',
-      debug: 'using debug mode to log something',
-      config: 'set default generator config(json string)',
-      distTag: `use specified tag version for it's generator`,
-      registry: 'set npm registry url to run npm command',
-    },
-  },
-};

package/src/locale/index.ts

@@ -1,9 +0,0 @@
-import { I18n } from '@modern-js/plugin-i18n';
-import { ZH_LOCALE } from './zh';
-import { EN_LOCALE } from './en';
-
-const i18n = new I18n();
-
-const localeKeys = i18n.init('zh', { zh: ZH_LOCALE, en: EN_LOCALE });
-
-export { i18n, localeKeys };

package/src/locale/zh.ts

@@ -1,18 +0,0 @@
-export const ZH_LOCALE = {
-  command: {
-    dev: {
-      describe: '本地开发命令',
-      config: '制定配置文件路径',
-    },
-    build: { describe: '构建应用命令', analyze: '分析构建产物' },
-    start: { describe: '应用启动命令' },
-    deploy: { describe: '部署应用命令' },
-    new: {
-      describe: 'MWA 项目中中执行生成器',
-      debug: '开启 Debug 模式，打印调试日志信息',
-      config: '生成器运行默认配置(JSON 字符串)',
-      distTag: '生成器使用特殊的 npm Tag 版本',
-      registry: '生成器运行过程中定制 npm Registry',
-    },
-  },
-};

package/src/utils/createCompiler.ts

@@ -1,81 +0,0 @@
-import webpack, { Configuration, StatsCompilation } from 'webpack';
-import { IAppContext, NormalizedConfig, mountHook } from '@modern-js/core';
-import {
-  chalk,
-  logger,
-  formatWebpackMessages,
-  clearConsole,
-} from '@modern-js/utils';
-import { printInstructions } from './printInstructions';
-
-const prettyTime = (stats: StatsCompilation) =>
-  Math.max(...(stats.children?.map(child => child.time || 0) || []));
-
-export const createCompiler = async ({
-  webpackConfigs,
-  // TODO: params
-  userConfig,
-  appContext,
-}: {
-  webpackConfigs: Configuration[];
-  userConfig: NormalizedConfig;
-  appContext: IAppContext;
-}) => {
-  try {
-    await (mountHook() as any).beforeCreateCompiler({ webpackConfigs });
-    const compiler = webpack(webpackConfigs);
-
-    await (mountHook() as any).afterCreateCompiler({ compiler });
-
-    let isFirstCompile = true;
-
-    compiler.hooks.invalid.tap('invalid', () => {
-      clearConsole();
-      logger.log('Compiling...');
-    });
-
-    compiler.hooks.done.tap('done', async (stats: any) => {
-      clearConsole();
-
-      const statsData = stats.toJson({
-        all: false,
-        warnings: true,
-        errors: true,
-        timings: true,
-      });
-
-      const { errors, warnings } = formatWebpackMessages(statsData);
-
-      if (errors.length) {
-        logger.log(chalk.red(`Failed to compile.\n`));
-        logger.log(errors.join('\n\n'));
-        logger.log();
-      } else if (process.stdout.isTTY || isFirstCompile) {
-        await (mountHook() as any).afterDev();
-        if (warnings.length) {
-          logger.log(chalk.yellow(`Compiled with warnings.\n`));
-          logger.log(warnings.join('\n\n'));
-          logger.log();
-        } else {
-          logger.log(
-            chalk.green(
-              `Compiled successfully in ${prettyTime(statsData)} ms.\n`,
-            ),
-          );
-        }
-        await printInstructions(appContext, userConfig);
-      }
-      // eslint-disable-next-line require-atomic-updates
-      isFirstCompile = false;
-    });
-
-    return compiler;
-  } catch (err) {
-    logger.log(chalk.red(`Failed to compile.`));
-    logger.log();
-    logger.log(err as any);
-    // FIXME: 这里最好抛出异常，执行 process.exit 的地方尽可能少或者控制在几个统一的地方比较合适
-    // eslint-disable-next-line no-process-exit
-    process.exit(1);
-  }
-};

package/src/utils/createServer.ts

@@ -1,16 +0,0 @@
-import { Server, ModernServerOptions } from '@modern-js/server';
-
-let server: Server;
-
-export const createServer = async (options: ModernServerOptions) => {
-  if (server) {
-    await server.close();
-  }
-
-  // eslint-disable-next-line require-atomic-updates
-  server = new Server(options);
-
-  const app = await server.init();
-
-  return app;
-};

package/src/utils/language.ts

@@ -1,6 +0,0 @@
-import { I18CLILanguageDetector } from '@modern-js/i18n-cli-language-detector';
-
-export function getLocaleLanguage() {
-  const detector = new I18CLILanguageDetector();
-  return detector.detect();
-}

package/src/utils/printInstructions.ts

@@ -1,25 +0,0 @@
-import { prettyInstructions, logger, isDev, chalk } from '@modern-js/utils';
-import { mountHook, IAppContext, NormalizedConfig } from '@modern-js/core';
-
-export const printInstructions = async (
-  appContext: IAppContext,
-  config: NormalizedConfig,
-) => {
-  let message = prettyInstructions(appContext, config);
-
-  if (isDev()) {
-    message += `\n${chalk.cyanBright(
-      [
-        `Note that the development build is not optimized.`,
-        `To create a production build, execute build command.`,
-      ].join('\n'),
-    )}`;
-  }
-
-  // call beforePrintInstructions hook.
-  const { instructions } = await (mountHook() as any).beforePrintInstructions({
-    instructions: message,
-  });
-
-  logger.log(instructions);
-};