@modern-js/app-tools 1.6.5 → 1.6.6

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/app-tools
 
+## 1.6.6
+
+### Patch Changes
+
+- a1198d509: feat: bump babel 7.18.0
+- d12686040: feat(app-tools): support dev --analyze
+- 8ee2b1b29: fix: remove some unnecessary logs during dev
+- 8f7c0f898: feat(app-tools): support specify config file in build and deploy command
+- Updated dependencies [8d508c6ed]
+- Updated dependencies [0eff2473c]
+- Updated dependencies [a1198d509]
+- Updated dependencies [29728812e]
+- Updated dependencies [f25d6a62e]
+- Updated dependencies [a18926bbd]
+- Updated dependencies [c7e38b4e6]
+- Updated dependencies [147e090f7]
+- Updated dependencies [18892c65c]
+- Updated dependencies [a1198d509]
+- Updated dependencies [8f7c0f898]
+  - @modern-js/core@1.11.2
+  - @modern-js/webpack@1.10.0
+  - @modern-js/server@1.4.18
+  - @modern-js/i18n-cli-language-detector@1.2.4
+  - @modern-js/plugin-analyze@1.4.6
+  - @modern-js/plugin-i18n@1.2.7
+  - @modern-js/new-action@1.3.10
+  - @modern-js/prod-server@1.1.8
+  - @modern-js/node-bundle-require@1.3.5
+  - @modern-js/plugin@1.3.6
+
 ## 1.6.5
 
 ### Patch Changes

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

@@ -5,6 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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, clearConsole } from '@modern-js/utils';
+import { manager, ResolvedConfigContext } from '@modern-js/core';
 import { createCompiler } from "../utils/createCompiler";
 import { createServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
@@ -12,9 +13,15 @@ import { printInstructions } from "../utils/printInstructions";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
 export const dev = async (api, options) => {
+  let userConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
-  const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
+  manager.run(() => {
+    userConfig = _objectSpread(_objectSpread({}, userConfig), {}, {
+      cliOptions: options
+    });
+    ResolvedConfigContext.set(userConfig);
+  });
   const {
     appDirectory,
     distDirectory,

package/dist/js/modern/index.js

@@ -29,10 +29,10 @@ export default (() => ({
       commands({
         program
       }) {
-        program.command('dev').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.dev.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).action(async options => {
+        program.command('dev').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).action(async options => {
           await dev(api, options);
         });
-        program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('--analyze', i18n.t(localeKeys.command.build.analyze)).action(async options => {
+        program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).action(async options => {
           const {
             build
           } = await import("./commands/build");
@@ -44,7 +44,7 @@ export default (() => ({
         program.command('start').usage('[options]').description(i18n.t(localeKeys.command.start.describe)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).action(async () => {
           await start(api);
         });
-        program.command('deploy').usage('[options]').description(i18n.t(localeKeys.command.deploy.describe)).action(async options => {
+        program.command('deploy').usage('[options]').option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).description(i18n.t(localeKeys.command.deploy.describe)).action(async options => {
           const {
             build
           } = await import("./commands/build");

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

@@ -1,14 +1,16 @@
 export const EN_LOCALE = {
   command: {
+    shared: {
+      analyze: 'analyze bundle size',
+      config: 'specify config file'
+    },
     dev: {
       describe: 'start dev server',
-      config: 'specify config file',
       entry: 'compiler by entry',
       apiOnly: 'start api server only'
     },
     build: {
-      describe: 'build application',
-      analyze: 'analyze bundle'
+      describe: 'build application'
     },
     start: {
       describe: 'start server'

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

@@ -1,14 +1,16 @@
 export const ZH_LOCALE = {
   command: {
+    shared: {
+      analyze: '分析构建产物体积，查看各个模块打包后的大小',
+      config: '指定配置文件路径，可以为相对路径或绝对路径'
+    },
     dev: {
       describe: '本地开发命令',
-      config: '制定配置文件路径',
-      entry: '按入口编译',
+      entry: '指定入口，编译特定的页面',
       apiOnly: '仅启动 API 接口服务'
     },
     build: {
-      describe: '构建应用命令',
-      analyze: '分析构建产物体积，查看各个模块打包后的大小'
+      describe: '构建应用命令'
     },
     start: {
       describe: '应用启动命令'

package/dist/js/modern/utils/createCompiler.js

@@ -1,13 +1,6 @@
 import { webpack } from '@modern-js/webpack';
 import { chalk, logger, formatWebpackMessages, clearConsole } from '@modern-js/utils';
 import { printInstructions } from "./printInstructions";
-
-const prettyTime = stats => {
-  var _stats$children;
-
-  return Math.max(...(((_stats$children = stats.children) === null || _stats$children === void 0 ? void 0 : _stats$children.map(child => child.time || 0)) || []));
-};
-
 export const createCompiler = async ({
   api,
   webpackConfigs,
@@ -30,7 +23,6 @@ export const createCompiler = async ({
       logger.log('Compiling...');
     });
     compiler.hooks.done.tap('done', async stats => {
-      clearConsole();
       const statsData = stats.toJson({
         all: false,
         warnings: true,
@@ -53,8 +45,6 @@ export const createCompiler = async ({
           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(hookRunners, appContext, userConfig);

package/dist/js/modern/utils/printInstructions.js

@@ -1,14 +1,6 @@
-import { prettyInstructions, logger, isDev, chalk } from '@modern-js/utils';
+import { prettyInstructions, logger } from '@modern-js/utils';
 export const printInstructions = async (hookRunners, appContext, config) => {
-  let message = prettyInstructions(appContext, config);
-  const {
-    apiOnly
-  } = appContext;
-
-  if (isDev() && !apiOnly) {
-    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 message = prettyInstructions(appContext, config); // call beforePrintInstructions hook.
 
   const {
     instructions

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

@@ -7,6 +7,8 @@ exports.dev = void 0;
 
 var _utils = require("@modern-js/utils");
 
+var _core = require("@modern-js/core");
+
 var _createCompiler = require("../utils/createCompiler");
 
 var _createServer = require("../utils/createServer");
@@ -30,9 +32,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 const dev = async (api, options) => {
+  let userConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
-  const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
+
+  _core.manager.run(() => {
+    userConfig = _objectSpread(_objectSpread({}, userConfig), {}, {
+      cliOptions: options
+    });
+
+    _core.ResolvedConfigContext.set(userConfig);
+  });
+
   const {
     appDirectory,
     distDirectory,

package/dist/js/node/index.js

@@ -59,10 +59,10 @@ var _default = () => ({
       commands({
         program
       }) {
-        program.command('dev').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.dev.describe)).option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.dev.config)).option('-e --entry [entry...]', _locale.i18n.t(_locale.localeKeys.command.dev.entry)).option('--api-only', _locale.i18n.t(_locale.localeKeys.command.dev.apiOnly)).action(async options => {
+        program.command('dev').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.dev.describe)).option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.shared.config)).option('-e --entry [entry...]', _locale.i18n.t(_locale.localeKeys.command.dev.entry)).option('--analyze', _locale.i18n.t(_locale.localeKeys.command.shared.analyze)).option('--api-only', _locale.i18n.t(_locale.localeKeys.command.dev.apiOnly)).action(async options => {
           await (0, _dev.dev)(api, options);
         });
-        program.command('build').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.build.describe)).option('--analyze', _locale.i18n.t(_locale.localeKeys.command.build.analyze)).action(async options => {
+        program.command('build').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.build.describe)).option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.shared.config)).option('--analyze', _locale.i18n.t(_locale.localeKeys.command.shared.analyze)).action(async options => {
           const {
             build
           } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/build")));
@@ -74,7 +74,7 @@ var _default = () => ({
         program.command('start').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.start.describe)).option('--api-only', _locale.i18n.t(_locale.localeKeys.command.dev.apiOnly)).action(async () => {
           await (0, _start.start)(api);
         });
-        program.command('deploy').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.deploy.describe)).action(async options => {
+        program.command('deploy').usage('[options]').option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.shared.config)).description(_locale.i18n.t(_locale.localeKeys.command.deploy.describe)).action(async options => {
           const {
             build
           } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/build")));

package/dist/js/node/locale/en.js

@@ -6,15 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.EN_LOCALE = void 0;
 const EN_LOCALE = {
   command: {
+    shared: {
+      analyze: 'analyze bundle size',
+      config: 'specify config file'
+    },
     dev: {
       describe: 'start dev server',
-      config: 'specify config file',
       entry: 'compiler by entry',
       apiOnly: 'start api server only'
     },
     build: {
-      describe: 'build application',
-      analyze: 'analyze bundle'
+      describe: 'build application'
     },
     start: {
       describe: 'start server'

package/dist/js/node/locale/zh.js

@@ -6,15 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.ZH_LOCALE = void 0;
 const ZH_LOCALE = {
   command: {
+    shared: {
+      analyze: '分析构建产物体积，查看各个模块打包后的大小',
+      config: '指定配置文件路径，可以为相对路径或绝对路径'
+    },
     dev: {
       describe: '本地开发命令',
-      config: '制定配置文件路径',
-      entry: '按入口编译',
+      entry: '指定入口，编译特定的页面',
       apiOnly: '仅启动 API 接口服务'
     },
     build: {
-      describe: '构建应用命令',
-      analyze: '分析构建产物体积，查看各个模块打包后的大小'
+      describe: '构建应用命令'
     },
     start: {
       describe: '应用启动命令'

package/dist/js/node/utils/createCompiler.js

@@ -11,12 +11,6 @@ var _utils = require("@modern-js/utils");
 
 var _printInstructions = require("./printInstructions");
 
-const prettyTime = stats => {
-  var _stats$children;
-
-  return Math.max(...(((_stats$children = stats.children) === null || _stats$children === void 0 ? void 0 : _stats$children.map(child => child.time || 0)) || []));
-};
-
 const createCompiler = async ({
   api,
   webpackConfigs,
@@ -40,7 +34,6 @@ const createCompiler = async ({
       _utils.logger.log('Compiling...');
     });
     compiler.hooks.done.tap('done', async stats => {
-      (0, _utils.clearConsole)();
       const statsData = stats.toJson({
         all: false,
         warnings: true,
@@ -67,8 +60,6 @@ const createCompiler = async ({
           _utils.logger.log(warnings.join('\n\n'));
 
           _utils.logger.log();
-        } else {
-          _utils.logger.log(_utils.chalk.green(`Compiled successfully in ${prettyTime(statsData)} ms.\n`));
         }
 
         await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);

package/dist/js/node/utils/printInstructions.js

@@ -8,15 +8,7 @@ exports.printInstructions = void 0;
 var _utils = require("@modern-js/utils");
 
 const printInstructions = async (hookRunners, appContext, config) => {
-  let message = (0, _utils.prettyInstructions)(appContext, config);
-  const {
-    apiOnly
-  } = appContext;
-
-  if ((0, _utils.isDev)() && !apiOnly) {
-    message += `\n${_utils.chalk.cyanBright([`Note that the development build is not optimized.`, `To create a production build, execute build command.`].join('\n'))}`;
-  } // call beforePrintInstructions hook.
-
+  const message = (0, _utils.prettyInstructions)(appContext, config); // call beforePrintInstructions hook.
 
   const {
     instructions

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

@@ -1,3 +1,3 @@
-import type { PluginAPI } from '@modern-js/core';
+import { PluginAPI } from '@modern-js/core';
 import { DevOptions } from '../utils/types';
 export declare const dev: (api: PluginAPI, options: DevOptions) => Promise<void>;

package/dist/types/locale/en.d.ts

@@ -1,14 +1,16 @@
 export declare const EN_LOCALE: {
   command: {
+    shared: {
+      analyze: string;
+      config: string;
+    };
     dev: {
       describe: string;
-      config: string;
       entry: string;
       apiOnly: string;
     };
     build: {
       describe: string;
-      analyze: string;
     };
     start: {
       describe: string;

package/dist/types/locale/index.d.ts

@@ -2,15 +2,17 @@ import { I18n } from '@modern-js/plugin-i18n';
 declare const i18n: I18n;
 declare const localeKeys: {
   command: {
+    shared: {
+      analyze: string;
+      config: string;
+    };
     dev: {
       describe: string;
-      config: string;
       entry: string;
       apiOnly: string;
     };
     build: {
       describe: string;
-      analyze: string;
     };
     start: {
       describe: string;
@@ -28,15 +30,17 @@ declare const localeKeys: {
   };
 } | {
   command: {
+    shared: {
+      analyze: string;
+      config: string;
+    };
     dev: {
       describe: string;
-      config: string;
       entry: string;
       apiOnly: string;
     };
     build: {
       describe: string;
-      analyze: string;
     };
     start: {
       describe: string;

package/dist/types/locale/zh.d.ts

@@ -1,14 +1,16 @@
 export declare const ZH_LOCALE: {
   command: {
+    shared: {
+      analyze: string;
+      config: string;
+    };
     dev: {
       describe: string;
-      config: string;
       entry: string;
       apiOnly: string;
     };
     build: {
       describe: string;
-      analyze: string;
     };
     start: {
       describe: string;

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

@@ -1,10 +1,16 @@
 export declare type DevOptions = {
   entry?: string[] | boolean;
+  config?: string;
   apiOnly?: boolean;
+  analyze?: boolean;
 };
 export declare type BuildOptions = {
+  config?: string;
   analyze?: boolean;
 };
+export declare type DeployOptions = {
+  config?: string;
+};
 export declare type StartOptions = {
   apiOnly?: boolean;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.5",
+  "version": "1.6.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -56,19 +56,19 @@
     "modern": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/runtime": "^7",
-    "@modern-js/core": "^1.11.1",
-    "@modern-js/i18n-cli-language-detector": "^1.2.3",
-    "@modern-js/new-action": "^1.3.9",
-    "@modern-js/node-bundle-require": "^1.3.3",
-    "@modern-js/plugin": "^1.3.4",
-    "@modern-js/plugin-analyze": "^1.4.5",
-    "@modern-js/plugin-i18n": "^1.2.6",
-    "@modern-js/prod-server": "^1.1.6",
-    "@modern-js/server": "^1.4.16",
+    "@babel/runtime": "^7.18.0",
+    "@modern-js/core": "^1.11.2",
+    "@modern-js/i18n-cli-language-detector": "^1.2.4",
+    "@modern-js/new-action": "^1.3.10",
+    "@modern-js/node-bundle-require": "^1.3.5",
+    "@modern-js/plugin": "^1.3.6",
+    "@modern-js/plugin-analyze": "^1.4.6",
+    "@modern-js/plugin-i18n": "^1.2.7",
+    "@modern-js/prod-server": "^1.1.8",
+    "@modern-js/server": "^1.4.18",
     "@modern-js/types": "^1.5.4",
     "@modern-js/utils": "^1.7.6",
-    "@modern-js/webpack": "^1.9.0"
+    "@modern-js/webpack": "^1.10.0"
   },
   "devDependencies": {
     "@modern-js/server-core": "1.3.5",