@modern-js/app-tools 1.6.6 → 1.6.7

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @modern-js/app-tools
 
+## 1.6.7
+
+### Patch Changes
+
+- 64cf62697: feat(app-tools): support modern inspect command
+- b7a1cea52: feat: support utils in tools.babel
+- Updated dependencies [ded45811c]
+- Updated dependencies [209d0a927]
+- Updated dependencies [9d649884b]
+- Updated dependencies [9377d2d9d]
+- Updated dependencies [8e1cedd8a]
+- Updated dependencies [8c9ad1749]
+- Updated dependencies [6b2523f44]
+- Updated dependencies [b7a1cea52]
+- Updated dependencies [002dab527]
+- Updated dependencies [1ac68424f]
+- Updated dependencies [3dfee700c]
+  - @modern-js/webpack@1.11.0
+  - @modern-js/server@1.4.20
+  - @modern-js/core@1.12.0
+  - @modern-js/utils@1.7.7
+  - @modern-js/plugin@1.3.7
+  - @modern-js/plugin-analyze@1.4.6
+  - @modern-js/prod-server@1.1.8
+
 ## 1.6.6
 
 ### Patch Changes

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

@@ -4,7 +4,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 { fs, logger, chalk, isSSR } from '@modern-js/utils';
 import { manager, ResolvedConfigContext } from '@modern-js/core';
 import { createCompiler } from "../utils/createCompiler";
 import { createServer } from "../utils/createServer";
@@ -93,7 +93,6 @@ export const dev = async (api, options) => {
       return printInstructions(hookRunners, appContext, userConfig);
     }
 
-    clearConsole();
     return logger.log(chalk.cyan(`Starting the development server...`));
   });
 };

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

@@ -0,0 +1,69 @@
+import path from 'path';
+import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
+import { fs, logger, signale, 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();
+  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));
+  }
+
+  signale.success('Inspect succeed, you can open following files to view the full webpack config: \n');
+  outputFiles.forEach(file => {
+    signale.log(`  - ${chalk.yellow(path.relative(appContext.appDirectory, file))}`);
+  });
+  signale.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/index.js

@@ -64,6 +64,12 @@ 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)).action(async options => {
+          const {
+            inspect
+          } = await import("./commands/inspect");
+          inspect(api, options);
+        });
       },
 
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart

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

@@ -24,6 +24,12 @@ export const EN_LOCALE = {
       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'
+    },
+    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

@@ -24,6 +24,12 @@ export const ZH_LOCALE = {
       config: '生成器运行默认配置(JSON 字符串)',
       distTag: '生成器使用特殊的 npm Tag 版本',
       registry: '生成器运行过程中定制 npm Registry'
+    },
+    inspect: {
+      env: '查看指定环境下的配置',
+      output: '指定在 dist 目录下输出的路径',
+      noConsole: '不在终端中输出完整结果',
+      verbose: '在结果中展示函数的完整内容'
     }
   }
 };

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

@@ -117,7 +117,6 @@ const dev = async (api, options) => {
       return (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
     }
 
-    (0, _utils.clearConsole)();
     return _utils.logger.log(_utils.chalk.cyan(`Starting the development server...`));
   });
 };

package/dist/js/node/commands/inspect.js

@@ -0,0 +1,98 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.printInspectResult = exports.inspect = exports.getTagByWebpackTarget = exports.formatWebpackConfig = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _webpack = require("@modern-js/webpack");
+
+var _utils = require("@modern-js/utils");
+
+var _webpackChain = _interopRequireDefault(require("@modern-js/utils/webpack-chain"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const formatWebpackConfig = (config, verbose) => {
+  const stringify = _webpackChain.default.toString;
+  return `module.exports = ${stringify(config, {
+    verbose
+  })};`;
+};
+
+exports.formatWebpackConfig = formatWebpackConfig;
+
+const inspect = (api, options) => {
+  process.env.NODE_ENV = options.env;
+  const resolvedConfig = api.useResolvedConfigContext();
+  const appContext = api.useAppContext();
+  const outputFiles = [];
+  outputFiles.push(printInspectResult(_webpack.WebpackConfigTarget.CLIENT, appContext, resolvedConfig, options));
+
+  if (resolvedConfig.output.enableModernMode) {
+    outputFiles.push(printInspectResult(_webpack.WebpackConfigTarget.MODERN, appContext, resolvedConfig, options));
+  }
+
+  if ((0, _utils.isUseSSRBundle)(resolvedConfig)) {
+    outputFiles.push(printInspectResult(_webpack.WebpackConfigTarget.NODE, appContext, resolvedConfig, options));
+  }
+
+  _utils.signale.success('Inspect succeed, you can open following files to view the full webpack config: \n');
+
+  outputFiles.forEach(file => {
+    _utils.signale.log(`  - ${_utils.chalk.yellow(_path.default.relative(appContext.appDirectory, file))}`);
+  });
+
+  _utils.signale.log();
+};
+
+exports.inspect = inspect;
+
+const getTagByWebpackTarget = webpackTarget => {
+  switch (webpackTarget) {
+    case _webpack.WebpackConfigTarget.CLIENT:
+      return 'client';
+
+    case _webpack.WebpackConfigTarget.MODERN:
+      return 'modern';
+
+    case _webpack.WebpackConfigTarget.NODE:
+      return 'ssr';
+
+    default:
+      throw Error(`Unsupported webpack target: ${webpackTarget}`);
+  }
+};
+
+exports.getTagByWebpackTarget = getTagByWebpackTarget;
+
+const printInspectResult = (webpackTarget, appContext, resolvedConfig, options) => {
+  const webpackConfig = (0, _webpack.getWebpackConfig)(webpackTarget, appContext, resolvedConfig);
+  const {
+    output,
+    verbose,
+    console = true
+  } = options;
+  const outputPath = output ? _path.default.posix.join(appContext.distDirectory, output) : appContext.distDirectory;
+  const tag = getTagByWebpackTarget(webpackTarget);
+  const outputFile = `webpack.${tag}.inspect.js`;
+
+  const outputFilePath = _path.default.posix.join(outputPath, outputFile);
+
+  const rawWebpackConfig = formatWebpackConfig(webpackConfig, verbose);
+
+  _utils.fs.outputFileSync(outputFilePath, rawWebpackConfig);
+
+  if (console) {
+    _utils.logger.log(`
+webpack config for ${tag} build:
+${rawWebpackConfig}
+    `);
+  }
+
+  return outputFilePath;
+};
+
+exports.printInspectResult = printInspectResult;

package/dist/js/node/index.js

@@ -94,6 +94,12 @@ var _default = () => ({
             locale
           }));
         });
+        program.command('inspect').description('inspect internal webpack config').option(`--env <env>`, _locale.i18n.t(_locale.localeKeys.command.inspect.env), 'development').option('--output <output>', _locale.i18n.t(_locale.localeKeys.command.inspect.output), '/').option('--no-console', _locale.i18n.t(_locale.localeKeys.command.inspect.noConsole)).option('--verbose', _locale.i18n.t(_locale.localeKeys.command.inspect.verbose)).action(async options => {
+          const {
+            inspect
+          } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/inspect")));
+          inspect(api, options);
+        });
       },
 
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart

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

@@ -30,6 +30,12 @@ const EN_LOCALE = {
       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'
+    },
+    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/node/locale/zh.js

@@ -30,6 +30,12 @@ const ZH_LOCALE = {
       config: '生成器运行默认配置(JSON 字符串)',
       distTag: '生成器使用特殊的 npm Tag 版本',
       registry: '生成器运行过程中定制 npm Registry'
+    },
+    inspect: {
+      env: '查看指定环境下的配置',
+      output: '指定在 dist 目录下输出的路径',
+      noConsole: '不在终端中输出完整结果',
+      verbose: '在结果中展示函数的完整内容'
     }
   }
 };

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

@@ -0,0 +1,7 @@
+import { Configuration, WebpackConfigTarget } from '@modern-js/webpack';
+import type { PluginAPI, NormalizedConfig, IAppContext } from '@modern-js/core';
+import type { InspectOptions } from '../utils/types';
+export declare const formatWebpackConfig: (config: Configuration, verbose?: boolean | undefined) => string;
+export declare const inspect: (api: PluginAPI, options: InspectOptions) => void;
+export declare const getTagByWebpackTarget: (webpackTarget: WebpackConfigTarget) => "modern" | "client" | "ssr";
+export declare const printInspectResult: (webpackTarget: WebpackConfigTarget, appContext: IAppContext, resolvedConfig: NormalizedConfig, options: InspectOptions) => string;

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

@@ -25,5 +25,11 @@ export declare const EN_LOCALE: {
       distTag: string;
       registry: string;
     };
+    inspect: {
+      env: string;
+      output: string;
+      noConsole: string;
+      verbose: string;
+    };
   };
 };

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

@@ -27,6 +27,12 @@ declare const localeKeys: {
       distTag: string;
       registry: string;
     };
+    inspect: {
+      env: string;
+      output: string;
+      noConsole: string;
+      verbose: string;
+    };
   };
 } | {
   command: {
@@ -55,6 +61,12 @@ declare const localeKeys: {
       distTag: string;
       registry: string;
     };
+    inspect: {
+      env: string;
+      output: string;
+      noConsole: string;
+      verbose: string;
+    };
   };
 };
 export { i18n, localeKeys };

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

@@ -25,5 +25,11 @@ export declare const ZH_LOCALE: {
       distTag: string;
       registry: string;
     };
+    inspect: {
+      env: string;
+      output: string;
+      noConsole: string;
+      verbose: string;
+    };
   };
 };

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

@@ -13,4 +13,10 @@ export declare type DeployOptions = {
 };
 export declare type StartOptions = {
   apiOnly?: boolean;
+};
+export declare type InspectOptions = {
+  env?: string;
+  output?: string;
+  console?: boolean;
+  verbose?: boolean;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.6",
+  "version": "1.6.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -57,18 +57,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/core": "^1.11.2",
+    "@modern-js/core": "^1.12.0",
     "@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": "^1.3.7",
     "@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/server": "^1.4.20",
     "@modern-js/types": "^1.5.4",
-    "@modern-js/utils": "^1.7.6",
-    "@modern-js/webpack": "^1.10.0"
+    "@modern-js/utils": "^1.7.7",
+    "@modern-js/webpack": "^1.11.0"
   },
   "devDependencies": {
     "@modern-js/server-core": "1.3.5",