@modern-js/app-tools 1.21.5 → 2.0.0-beta.1

package/dist/js/modern/builder/share.js

@@ -0,0 +1,44 @@
+import path from 'path';
+import { template as lodashTemplate } from '@modern-js/utils/lodash';
+import { removeTailSlash } from '@modern-js/utils';
+export function createCopyPattern(appContext, config, patternsType, chain) {
+  const configDir = path.resolve(appContext.appDirectory, config.source.configDir);
+  const uploadDir = path.posix.join(configDir.replace(/\\/g, '/'), 'upload');
+  const publicDir = path.posix.join(configDir.replace(/\\/g, '/'), 'public');
+  const minifiedJsRexExp = /\.min\.js/;
+  const info = file => ({
+    // If the file name ends with `.min.js`, we assume it's a compressed file.
+    // So we don't want copy-webpack-plugin to minify it.
+    // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
+    minimized: minifiedJsRexExp.test(file.sourceFilename)
+  });
+  if (patternsType === 'public') {
+    if (!chain) {
+      throw new Error("expect get a webpackChain, but receive 'undefined'");
+    }
+    return {
+      info,
+      from: '**/*',
+      to: 'public',
+      context: publicDir,
+      noErrorOnMissing: true,
+      // eslint-disable-next-line node/prefer-global/buffer
+      transform: (content, absoluteFrom) => {
+        if (!/\.html?$/.test(absoluteFrom)) {
+          return content;
+        }
+        return lodashTemplate(content.toString('utf8'))({
+          assetPrefix: removeTailSlash(chain.output.get('publicPath'))
+        });
+      }
+    };
+  } else {
+    return {
+      info,
+      from: '**/*',
+      to: 'upload',
+      context: uploadDir,
+      noErrorOnMissing: true
+    };
+  }
+}

package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js

@@ -0,0 +1,29 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+export class HtmlAsyncChunkPlugin {
+  constructor(htmlWebpackPlugin) {
+    _defineProperty(this, "name", void 0);
+    _defineProperty(this, "htmlWebpackPlugin", void 0);
+    this.name = 'HtmlAsyncChunkPlugin';
+    this.htmlWebpackPlugin = htmlWebpackPlugin;
+  }
+  apply(compiler) {
+    compiler.hooks.compilation.tap(this.name, compilation => {
+      const hooks = this.htmlWebpackPlugin.getHooks(compilation);
+      hooks.alterAssetTagGroups.tap(this.name, assets => {
+        const tags = [...assets.headTags, ...assets.bodyTags];
+        for (const tag of tags) {
+          if (tag.tagName === 'script') {
+            const {
+              attributes
+            } = tag;
+            if (attributes && attributes.defer === true) {
+              attributes.async = true;
+              delete attributes.defer;
+            }
+          }
+        }
+        return assets;
+      });
+    });
+  }
+}

package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js

@@ -0,0 +1,33 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+export class BottomTemplatePlugin {
+  constructor(htmlWebpackPlugin) {
+    _defineProperty(this, "htmlWebpackPlugin", void 0);
+    _defineProperty(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
+    _defineProperty(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
+    _defineProperty(this, "name", void 0);
+    this.htmlWebpackPlugin = htmlWebpackPlugin;
+    this.name = 'bottom-template';
+  }
+  apply(compiler) {
+    compiler.hooks.compilation.tap(this.name, compilation => {
+      this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, data => {
+        var _data$plugin$options;
+        if (!((_data$plugin$options = data.plugin.options) !== null && _data$plugin$options !== void 0 && _data$plugin$options.__internal__)) {
+          return data;
+        }
+        // 含有 <!--<?- bottomTemplate ?>--> 占位符时才需要注入 bottom.html
+        if (this.bottomTemplateReg.test(data.html)) {
+          // 清空占位符
+          data.html = data.html.replace(this.bottomTemplateReg, '');
+          const {
+            bottomTemplate
+          } = data.plugin.options;
+          if (bottomTemplate) {
+            data.html = data.html.replace(this.bodyRegExp, match => `\n${bottomTemplate}\n${match}`);
+          }
+        }
+        return data;
+      });
+    });
+  }
+}

package/dist/js/modern/builder/webpackPlugins/routerPlugin.js

@@ -0,0 +1,97 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+import path from 'path';
+import { fs, ROUTE_MANIFEST, logger, ROUTE_MINIFEST_FILE } from '@modern-js/utils';
+const PLUGIN_NAME = 'ModernjsRoutePlugin';
+export default class RouterPlugin {
+  constructor(options) {
+    _defineProperty(this, "existNestedRoutes", void 0);
+    this.existNestedRoutes = options.existNestedRoutes;
+  }
+  apply(compiler) {
+    const {
+      existNestedRoutes
+    } = this;
+    const {
+      target
+    } = compiler.options;
+    if (target === 'node' || Array.isArray(target) && target.includes('node')) {
+      return;
+    }
+    if (!existNestedRoutes) {
+      return;
+    }
+    const {
+      webpack
+    } = compiler;
+    const {
+      Compilation,
+      sources
+    } = webpack;
+    const {
+      RawSource
+    } = sources;
+    const {
+      PROCESS_ASSETS_STAGE_REPORT
+    } = Compilation;
+    const outputPath = compiler.options.output.path;
+    const newAssetsMap = new Map();
+    const normalizePath = path => {
+      if (!path.endsWith('/')) {
+        return `${path}/`;
+      }
+      return path;
+    };
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+      compilation.hooks.processAssets.tapPromise({
+        name: PLUGIN_NAME,
+        stage: PROCESS_ASSETS_STAGE_REPORT
+      }, async () => {
+        const stats = compilation.getStats().toJson({
+          chunkGroups: true,
+          chunks: true
+        });
+        const {
+          publicPath
+        } = stats;
+        const routeAssets = {};
+        const {
+          namedChunkGroups,
+          assetsByChunkName
+        } = stats;
+        if (!namedChunkGroups || !assetsByChunkName) {
+          logger.warn('Route manifest does not exist, performance will be affected');
+          return;
+        }
+        for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
+          routeAssets[name] = {
+            chunkIds: chunkGroup.chunks,
+            assets: assetsByChunkName[name].map(item => publicPath ? normalizePath(publicPath) + item : item)
+          };
+        }
+        const manifest = {
+          routeAssets
+        };
+        const injectedContent = `
+            ;(function(){
+              window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest)};
+            })();
+          `;
+        const entrypointsArray = Array.from(compilation.entrypoints.entries());
+        const entryChunkIds = entrypointsArray.map(entrypoint => entrypoint[0]);
+        const entryChunks = [...compilation.chunks].filter(chunk => {
+          return entryChunkIds.includes(chunk.name);
+        });
+        const entryChunkFiles = entryChunks.map(chunk => [...chunk.files][0]);
+        for (const file of entryChunkFiles) {
+          const asset = compilation.assets[file];
+          const newContent = `${injectedContent}${asset.source().toString()}`;
+          newAssetsMap.set(path.join(outputPath, file), newContent);
+          compilation.updateAsset(file, new RawSource(newContent));
+        }
+        const filename = path.join(outputPath, ROUTE_MINIFEST_FILE);
+        await fs.ensureFile(filename);
+        await fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+      });
+    });
+  }
+}

package/dist/js/modern/commands/build.js

@@ -1,17 +1,10 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { webpack, getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import { ResolvedConfigContext } from '@modern-js/core';
-import { formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle, emptyDir } from '@modern-js/utils';
+import { logger, printBuildError } from '@modern-js/utils';
 import { generateRoutes } from "../utils/routes";
-import { buildServerConfig, emitResolvedConfig } from "../utils/config";
-// 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;
+import { buildServerConfig } from "../utils/config";
 export const build = async (api, options) => {
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
@@ -19,16 +12,15 @@ export const build = async (api, options) => {
   const {
     apiOnly
   } = appContext;
-
   if (apiOnly) {
     const {
       appDirectory,
       distDirectory,
       serverConfigFile
     } = appContext;
-    await emptyDir(distDirectory);
     await hookRunners.beforeBuild({
-      webpackConfigs: []
+      // "null" bundlerConfigs
+      bundlerConfigs: undefined
     });
     await buildServerConfig({
       appDirectory,
@@ -36,61 +28,12 @@ export const build = async (api, options) => {
       configFile: serverConfigFile
     });
     await generateRoutes(appContext);
-    await hookRunners.afterBuild();
+    await hookRunners.afterBuild({
+      // "null" stats
+      stats: undefined
+    });
     return;
   }
-
-  const webpackBuild = async (webpackConfig, type) => {
-    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;
-
-        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, distDirectory, 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
-            });
-          }
-        });
-      });
-    });
-  };
-
   resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
     cliOptions: options
   });
@@ -100,55 +43,18 @@ export const build = async (api, options) => {
     appDirectory,
     serverConfigFile
   } = appContext;
-  const previousFileSizes = await measureFileSizesBeforeBuild(distDirectory);
-  await emptyDir(distDirectory);
   await buildServerConfig({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile
   });
-  const buildConfigs = [];
-  buildConfigs.push({
-    type: 'legacy',
-    config: getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, resolvedConfig)
-  });
-
-  if (resolvedConfig.output.enableModernMode) {
-    buildConfigs.push({
-      type: 'modern',
-      config: getWebpackConfig(WebpackConfigTarget.MODERN, appContext, resolvedConfig)
-    });
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    buildConfigs.push({
-      type: 'ssr',
-      config: getWebpackConfig(WebpackConfigTarget.NODE, appContext, resolvedConfig)
-    });
-  }
-
-  await hookRunners.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); // eslint-disable-next-line no-process-exit
-
-      process.exit(1);
-    }
+  try {
+    var _appContext$builder;
+    logger.info('Create a production build...\n');
+    await ((_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.build());
+  } catch (error) {
+    printBuildError(error);
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
   }
-
-  await generateRoutes(appContext);
-  await hookRunners.afterBuild();
-  await emitResolvedConfig(appDirectory, resolvedConfig);
 };

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

@@ -1,15 +1,11 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { fs, logger, chalk, isSSR } from '@modern-js/utils';
+import { logger } from '@modern-js/utils';
 import { ResolvedConfigContext } from '@modern-js/core';
-import { createCompiler } from "../utils/createCompiler";
-import { createServer } from "../utils/createServer";
-import { generateRoutes } from "../utils/routes";
 import { printInstructions } from "../utils/printInstructions";
+import { createServer, injectDataLoaderPlugin } from "../utils/createServer";
+import { generateRoutes } from "../utils/routes";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
 export const dev = async (api, options) => {
@@ -26,14 +22,14 @@ export const dev = async (api, options) => {
     port,
     apiOnly,
     entrypoints,
-    serverConfigFile
+    serverConfigFile,
+    serverInternalPlugins
   } = appContext;
   const checkedEntries = await getSpecifiedEntries(options.entry || false, entrypoints);
   api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
     checkedEntries
   }));
   appContext.checkedEntries = checkedEntries;
-  fs.emptyDirSync(distDirectory);
   await buildServerConfig({
     appDirectory,
     distDirectory,
@@ -46,21 +42,10 @@ export const dev = async (api, options) => {
   });
   await hookRunners.beforeDev();
   let compiler = null;
-
   if (!apiOnly) {
-    const {
-      getWebpackConfig,
-      WebpackConfigTarget
-    } = await import('@modern-js/webpack');
-    const webpackConfigs = [isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE, appContext, userConfig), getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, userConfig)].filter(Boolean);
-    compiler = await createCompiler({
-      api,
-      webpackConfigs,
-      userConfig,
-      appContext
-    });
+    var _appContext$builder;
+    compiler = await ((_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.createCompiler());
   }
-
   await generateRoutes(appContext);
   const app = await createServer({
     dev: _objectSpread(_objectSpread({}, {
@@ -79,17 +64,16 @@ export const dev = async (api, options) => {
     pwd: appDirectory,
     config: userConfig,
     serverConfigFile,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
   });
   app.listen(port, async err => {
     if (err) {
       throw err;
     }
-
-    if (apiOnly) {
-      return printInstructions(hookRunners, appContext, userConfig);
+    if (!apiOnly) {
+      logger.info(`Starting dev server...\n`);
+    } else {
+      printInstructions(hookRunners, appContext, userConfig);
     }
-
-    return logger.log(chalk.cyan(`Starting the development server...`));
   });
 };

package/dist/js/modern/commands/inspect.js

@@ -1,69 +1,11 @@
-import path from 'path';
-import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
-import { fs, logger, isUseSSRBundle, chalk } from '@modern-js/utils';
-import WebpackChain from '@modern-js/utils/webpack-chain';
-export const formatWebpackConfig = (config, verbose) => {
-  const stringify = WebpackChain.toString;
-  return `module.exports = ${stringify(config, {
-    verbose
-  })};`;
-};
-export const inspect = (api, options) => {
-  process.env.NODE_ENV = options.env;
-  const resolvedConfig = api.useResolvedConfigContext();
+import { join } from 'path';
+export const inspect = async (api, options) => {
+  var _appContext$builder;
   const appContext = api.useAppContext();
-  const outputFiles = [];
-  outputFiles.push(printInspectResult(WebpackConfigTarget.CLIENT, appContext, resolvedConfig, options));
-
-  if (resolvedConfig.output.enableModernMode) {
-    outputFiles.push(printInspectResult(WebpackConfigTarget.MODERN, appContext, resolvedConfig, options));
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    outputFiles.push(printInspectResult(WebpackConfigTarget.NODE, appContext, resolvedConfig, options));
-  }
-
-  logger.success('Inspect succeed, you can open following files to view the full webpack config: \n');
-  outputFiles.forEach(file => {
-    logger.log(`  - ${chalk.yellow(path.relative(appContext.appDirectory, file))}`);
+  return (_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.inspectConfig({
+    env: options.env,
+    verbose: options.verbose,
+    outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+    writeToDisk: true
   });
-  logger.log();
-};
-export const getTagByWebpackTarget = webpackTarget => {
-  switch (webpackTarget) {
-    case WebpackConfigTarget.CLIENT:
-      return 'client';
-
-    case WebpackConfigTarget.MODERN:
-      return 'modern';
-
-    case WebpackConfigTarget.NODE:
-      return 'ssr';
-
-    default:
-      throw Error(`Unsupported webpack target: ${webpackTarget}`);
-  }
-};
-export const printInspectResult = (webpackTarget, appContext, resolvedConfig, options) => {
-  const webpackConfig = getWebpackConfig(webpackTarget, appContext, resolvedConfig);
-  const {
-    output,
-    verbose,
-    console = true
-  } = options;
-  const outputPath = output ? path.posix.join(appContext.distDirectory, output) : appContext.distDirectory;
-  const tag = getTagByWebpackTarget(webpackTarget);
-  const outputFile = `webpack.${tag}.inspect.js`;
-  const outputFilePath = path.posix.join(outputPath, outputFile);
-  const rawWebpackConfig = formatWebpackConfig(webpackConfig, verbose);
-  fs.outputFileSync(outputFilePath, rawWebpackConfig);
-
-  if (console) {
-    logger.log(`
-webpack config for ${tag} build:
-${rawWebpackConfig}
-    `);
-  }
-
-  return outputFilePath;
 };

package/dist/js/modern/commands/start.js

@@ -1,9 +1,9 @@
 import { logger, chalk, isApiOnly } from '@modern-js/utils';
 import server from '@modern-js/prod-server';
 import { printInstructions } from "../utils/printInstructions";
+import { injectDataLoaderPlugin } from "../utils/createServer";
 export const start = async api => {
   var _userConfig$source;
-
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
@@ -17,15 +17,14 @@ export const start = async api => {
   const app = await server({
     pwd: appDirectory,
     config: userConfig,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server),
     serverConfigFile,
+    internalPlugins: injectDataLoaderPlugin(appContext.serverInternalPlugins),
     apiOnly
   });
   app.listen(port, async err => {
     if (err) {
       throw err;
     }
-
     await printInstructions(hookRunners, appContext, userConfig);
   });
 };

package/dist/js/modern/index.js

@@ -1,22 +1,20 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import path from 'path';
 import { defineConfig, cli } from '@modern-js/core';
-import LintPlugin from '@modern-js/plugin-jarvis';
-import { cleanRequireCache, Import } from '@modern-js/utils';
+import LintPlugin from '@modern-js/plugin-lint';
+import { cleanRequireCache, emptyDir, Import } from '@modern-js/utils';
 import AnalyzePlugin from "./analyze";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
-export { defineConfig };
+import { getCommand } from "./utils/commands";
+export { defineConfig, hooks };
 const upgradeModel = Import.lazy('@modern-js/upgrade', require);
 export default (() => ({
   name: '@modern-js/app-tools',
-  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill'],
+  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-document', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-router-legacy', '@modern-js/plugin-polyfill'],
   registerHook: hooks,
   usePlugins: [AnalyzePlugin(), LintPlugin()],
   setup: api => {
@@ -38,9 +36,9 @@ export default (() => ({
           const {
             build
           } = await import("./commands/build");
-          await build(api, options); // force exit after build.
+          await build(api, 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)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).action(async () => {
@@ -57,8 +55,8 @@ export default (() => ({
           const {
             deploy
           } = await import("./commands/deploy");
-          await deploy(api, options); // eslint-disable-next-line no-process-exit
-
+          await deploy(api, 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 => {
@@ -69,7 +67,7 @@ export default (() => ({
             locale
           }));
         });
-        program.command('inspect').description('inspect internal webpack config').option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), 'development').option('--output <output>', i18n.t(localeKeys.command.inspect.output), '/').option('--no-console', i18n.t(localeKeys.command.inspect.noConsole)).option('--verbose', i18n.t(localeKeys.command.inspect.verbose)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).action(async options => {
+        program.command('inspect').description('inspect internal webpack config').option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), 'development').option('--output <output>', i18n.t(localeKeys.command.inspect.output), '/').option('--verbose', i18n.t(localeKeys.command.inspect.verbose)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).action(async options => {
           const {
             inspect
           } = await import("./commands/inspect");
@@ -77,7 +75,13 @@ export default (() => ({
         });
         upgradeModel.defineCommand(program.command('upgrade'));
       },
-
+      async prepare() {
+        const command = getCommand();
+        if (command === 'dev' || command === 'build') {
+          const appContext = api.useAppContext();
+          await emptyDir(appContext.distDirectory);
+        }
+      },
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
       async fileChange(e) {
         const {
@@ -90,7 +94,6 @@ export default (() => ({
           srcDirectory
         } = appContext;
         const absolutePath = path.resolve(appDirectory, filename);
-
         if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
           const {
             closeServer
@@ -99,11 +102,9 @@ export default (() => ({
           await cli.restart();
         }
       },
-
       async beforeRestart() {
         cleanRequireCache([require.resolve("./analyze")]);
       }
-
     };
   }
 }));

package/dist/js/modern/locale/en.js

@@ -28,7 +28,6 @@ export const EN_LOCALE = {
     inspect: {
       env: 'specify env mode',
       output: 'specify inspect content output path',
-      noConsole: 'do not log the result in terminal',
       verbose: 'show full function definitions in output'
     }
   }

package/dist/js/modern/locale/zh.js

@@ -28,7 +28,6 @@ export const ZH_LOCALE = {
     inspect: {
       env: '查看指定环境下的配置',
       output: '指定在 dist 目录下输出的路径',
-      noConsole: '不在终端中输出完整结果',
       verbose: '在结果中展示函数的完整内容'
     }
   }