@modern-js/module-tools 2.10.1-beta.1 → 2.11.0

package/dist/utils/print.js

@@ -106,9 +106,8 @@ const printFileSize = () => {
   printBundleFiles();
 };
 const printSucceed = (totalDuration) => {
-  import_utils.logger.info(
-    import_utils.chalk.bold(import_utils.chalk.blue(`${import_log.buildSuccessText}: ${totalDuration / 1e3}s`))
-  );
+  const time = import_utils.chalk.cyan(`${totalDuration / 1e3}s`);
+  import_utils.logger.info(`${import_log.buildSuccessText} in ${time}`);
 };
 const prettyBytes = (bytes) => {
   if (bytes === 0) {
@@ -126,10 +125,9 @@ const printBundleFiles = () => {
     (max, str) => Math.max(max, str.name.length),
     import_log.reportFile1LineText.length
   );
-  const info = `Bundle generated ${bundleFiles.length} files
-`;
+  import_utils.logger.info(`Bundle generated ${bundleFiles.length} files
+`);
   const headerRow = import_log.reportFile1LineText + " ".repeat(longestFileLength - 10) + import_log.reportFile2LineText;
-  import_utils.logger.info(import_utils.chalk.bold(import_utils.chalk.blue(info)));
   import_utils.logger.log(import_utils.chalk.bold(import_utils.chalk.green(headerRow)));
   bundleFiles.forEach(({ name, size }) => {
     const infoRow = `${name}${" ".repeat(
@@ -146,10 +144,10 @@ const printBundlelessInfo = () => {
   const totalSize = bundlelessFiles.reduce((total, file) => {
     return total + file.size;
   }, 0);
-  const info = `Bundleless generated ${count} files, the total size is ${prettyBytes(
-    totalSize
+  const info = `Bundleless generated ${count} files, the total size is ${import_utils.chalk.cyan(
+    prettyBytes(totalSize)
   )}`;
-  import_utils.logger.info(import_utils.chalk.bold(import_utils.chalk.blue(info)));
+  import_utils.logger.info(info);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/utils/print.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":"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","names":[],"sources":["../../src/utils/print.ts"],"sourcesContent":["import { relative, resolve } from 'path';\nimport type { ILibuilder } from '@modern-js/libuild';\nimport { chalk, logger } from '@modern-js/utils';\nimport type {\n  RollupOutput,\n  OutputChunk,\n} from '../../compiled/rollup/types/rollup';\nimport {\n  buildSuccessText,\n  reportFile1LineText,\n  reportFile2LineText,\n} from '../constants/log';\n\ntype Files = {\n  name: string;\n  size: number;\n};\n\nexport const bundleFiles: Files[] = [];\n\nexport const bundlelessFiles: Files[] = [];\n\nexport const addOutputChunk = (\n  outputChunk: ILibuilder['outputChunk'],\n  appDirectory: string,\n  isBundle: boolean,\n) => {\n  const files = Array.from(outputChunk).map(val => {\n    const [path, chunk] = val;\n    return {\n      name: relative(appDirectory, path),\n      size: chunk.contents.length,\n    };\n  });\n  if (isBundle) {\n    bundleFiles.push(...files);\n  } else {\n    bundlelessFiles.push(...files);\n  }\n};\n\nexport const addRollupChunk = (\n  rollupOutput: RollupOutput,\n  appDirectory: string,\n  distDir: string,\n) => {\n  const { output } = rollupOutput;\n  bundleFiles.push(\n    ...output.map(o => {\n      return {\n        name: relative(appDirectory, resolve(distDir, o.fileName)),\n        // only d.ts, is outputChunk not outputAsset\n        size: (o as OutputChunk).code.length,\n      };\n    }),\n  );\n};\n\nexport const addDtsFiles = async (distDir: string, appDirectory: string) => {\n  const { fastGlob, slash } = await import('@modern-js/utils');\n  const files = await fastGlob(`${slash(distDir)}**/*.d.ts`, {\n    stats: true,\n  });\n  bundlelessFiles.push(\n    ...files.map(file => {\n      return {\n        name: relative(appDirectory, file.path),\n        size: file.stats.size,\n      };\n    }),\n  );\n};\n\nexport const printFileSize = () => {\n  printBundlelessInfo();\n  printBundleFiles();\n};\n\nexport const printSucceed = (totalDuration: number) => {\n  logger.info(\n    chalk.bold(chalk.blue(`${buildSuccessText}: ${totalDuration / 1000}s`)),\n  );\n};\n\nconst prettyBytes = (bytes: number) => {\n  if (bytes === 0) {\n    return '0 B';\n  }\n  const unit = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];\n  const exp = Math.floor(Math.log(bytes) / Math.log(1024));\n  return `${(bytes / Math.pow(1024, exp)).toFixed(2)} ${unit[exp]}`;\n};\n\nconst printBundleFiles = () => {\n  if (bundleFiles.length === 0) {\n    return;\n  }\n  const longestFileLength = bundleFiles.reduce(\n    (max, str) => Math.max(max, str.name.length),\n    reportFile1LineText.length,\n  );\n  const info = `Bundle generated ${bundleFiles.length} files\\n`;\n\n  const headerRow =\n    reportFile1LineText +\n    ' '.repeat(longestFileLength - 10) +\n    reportFile2LineText;\n\n  logger.info(chalk.bold(chalk.blue(info)));\n  logger.log(chalk.bold(chalk.green(headerRow)));\n\n  bundleFiles.forEach(({ name, size }) => {\n    const infoRow = `${name}${' '.repeat(\n      longestFileLength - name.length + 2,\n    )}${prettyBytes(size)}`;\n    logger.log(infoRow);\n  });\n};\n\nconst printBundlelessInfo = () => {\n  if (bundlelessFiles.length === 0) {\n    return;\n  }\n\n  const count = bundlelessFiles.length;\n  const totalSize = bundlelessFiles.reduce((total, file) => {\n    return total + file.size;\n  }, 0);\n  const info = `Bundleless generated ${count} files, the total size is ${prettyBytes(\n    totalSize,\n  )}`;\n  logger.info(chalk.bold(chalk.blue(info)));\n};\n"]}
+{"version":3,"file":null,"mappings":"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","names":[],"sources":["../../src/utils/print.ts"],"sourcesContent":["import { relative, resolve } from 'path';\nimport type { ILibuilder } from '@modern-js/libuild';\nimport { chalk, logger } from '@modern-js/utils';\nimport type {\n  RollupOutput,\n  OutputChunk,\n} from '../../compiled/rollup/types/rollup';\nimport {\n  buildSuccessText,\n  reportFile1LineText,\n  reportFile2LineText,\n} from '../constants/log';\n\ntype Files = {\n  name: string;\n  size: number;\n};\n\nexport const bundleFiles: Files[] = [];\n\nexport const bundlelessFiles: Files[] = [];\n\nexport const addOutputChunk = (\n  outputChunk: ILibuilder['outputChunk'],\n  appDirectory: string,\n  isBundle: boolean,\n) => {\n  const files = Array.from(outputChunk).map(val => {\n    const [path, chunk] = val;\n    return {\n      name: relative(appDirectory, path),\n      size: chunk.contents.length,\n    };\n  });\n  if (isBundle) {\n    bundleFiles.push(...files);\n  } else {\n    bundlelessFiles.push(...files);\n  }\n};\n\nexport const addRollupChunk = (\n  rollupOutput: RollupOutput,\n  appDirectory: string,\n  distDir: string,\n) => {\n  const { output } = rollupOutput;\n  bundleFiles.push(\n    ...output.map(o => {\n      return {\n        name: relative(appDirectory, resolve(distDir, o.fileName)),\n        // only d.ts, is outputChunk not outputAsset\n        size: (o as OutputChunk).code.length,\n      };\n    }),\n  );\n};\n\nexport const addDtsFiles = async (distDir: string, appDirectory: string) => {\n  const { fastGlob, slash } = await import('@modern-js/utils');\n  const files = await fastGlob(`${slash(distDir)}**/*.d.ts`, {\n    stats: true,\n  });\n  bundlelessFiles.push(\n    ...files.map(file => {\n      return {\n        name: relative(appDirectory, file.path),\n        size: file.stats.size,\n      };\n    }),\n  );\n};\n\nexport const printFileSize = () => {\n  printBundlelessInfo();\n  printBundleFiles();\n};\n\nexport const printSucceed = (totalDuration: number) => {\n  const time = chalk.cyan(`${totalDuration / 1000}s`);\n  logger.info(`${buildSuccessText} in ${time}`);\n};\n\nconst prettyBytes = (bytes: number) => {\n  if (bytes === 0) {\n    return '0 B';\n  }\n  const unit = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];\n  const exp = Math.floor(Math.log(bytes) / Math.log(1024));\n  return `${(bytes / Math.pow(1024, exp)).toFixed(2)} ${unit[exp]}`;\n};\n\nconst printBundleFiles = () => {\n  if (bundleFiles.length === 0) {\n    return;\n  }\n  const longestFileLength = bundleFiles.reduce(\n    (max, str) => Math.max(max, str.name.length),\n    reportFile1LineText.length,\n  );\n\n  logger.info(`Bundle generated ${bundleFiles.length} files\\n`);\n\n  const headerRow =\n    reportFile1LineText +\n    ' '.repeat(longestFileLength - 10) +\n    reportFile2LineText;\n  logger.log(chalk.bold(chalk.green(headerRow)));\n\n  bundleFiles.forEach(({ name, size }) => {\n    const infoRow = `${name}${' '.repeat(\n      longestFileLength - name.length + 2,\n    )}${prettyBytes(size)}`;\n    logger.log(infoRow);\n  });\n};\n\nconst printBundlelessInfo = () => {\n  if (bundlelessFiles.length === 0) {\n    return;\n  }\n\n  const count = bundlelessFiles.length;\n  const totalSize = bundlelessFiles.reduce((total, file) => {\n    return total + file.size;\n  }, 0);\n  const info = `Bundleless generated ${count} files, the total size is ${chalk.cyan(\n    prettyBytes(totalSize),\n  )}`;\n  logger.info(info);\n};\n"]}

package/package.json

@@ -11,7 +11,7 @@
     "module-tools",
     "lib-tools"
   ],
-  "version": "2.10.1-beta.1",
+  "version": "2.11.0",
   "bin": {
     "modern": "./bin/modern.js",
     "modern-module": "./bin/modern.js"
@@ -39,17 +39,16 @@
     "@modern-js/libuild": "~0.11.0",
     "@modern-js/libuild-plugin-svgr": "~0.11.0",
     "@modern-js/libuild-plugin-swc": "~0.11.0",
-    "@modern-js/core": "2.10.0",
-    "@modern-js/new-action": "2.10.0",
-    "@modern-js/plugin": "2.10.0",
-    "@modern-js/plugin-changeset": "2.10.0",
-    "@modern-js/plugin-i18n": "2.10.0",
-    "@modern-js/plugin-lint": "2.10.0",
-    "@modern-js/upgrade": "2.10.0",
-    "@modern-js/utils": "2.10.0"
+    "@modern-js/core": "2.11.0",
+    "@modern-js/new-action": "2.11.0",
+    "@modern-js/plugin": "2.11.0",
+    "@modern-js/plugin-changeset": "2.11.0",
+    "@modern-js/plugin-i18n": "2.11.0",
+    "@modern-js/plugin-lint": "2.11.0",
+    "@modern-js/upgrade": "2.11.0",
+    "@modern-js/utils": "2.11.0"
   },
   "devDependencies": {
-    "@modern-js/self": "npm:@modern-js/module-tools@*",
     "@types/fs-extra": "9.0.13",
     "@types/jest": "^29",
     "@types/node": "^14",
@@ -61,9 +60,10 @@
     "postcss-alias": "2.0.0",
     "react": "17",
     "typescript": "^4",
-    "@scripts/build": "2.10.0",
-    "@modern-js/builder-webpack-provider": "2.10.0",
-    "@scripts/jest-config": "2.10.0"
+    "@modern-js/builder-webpack-provider": "2.11.0",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.11.0",
+    "@scripts/jest-config": "2.11.0",
+    "@scripts/build": "2.11.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",