@modern-js/module-tools 2.35.1 → 2.37.0

package/dist/utils/onExit.js

@@ -1,16 +1,38 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "addExitListener", {
-  enumerable: true,
-  get: function() {
-    return addExitListener;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var onExit_exports = {};
+__export(onExit_exports, {
+  addExitListener: () => addExitListener
 });
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+module.exports = __toCommonJS(onExit_exports);
 const addExitListener = async (fn) => {
-  const { default: onExit } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../../compiled/signal-exit")));
+  const { default: onExit } = await Promise.resolve().then(() => __toESM(require("../../compiled/signal-exit")));
   onExit(async (code) => {
     if (code === 0) {
       return;
@@ -18,5 +40,7 @@ const addExitListener = async (fn) => {
     await fn();
   });
 };
-
-//# sourceMappingURL=onExit.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  addExitListener
+});

package/dist/utils/print.d.ts

@@ -1,12 +1,12 @@
-import type { ILibuilder } from '@modern-js/libuild';
 import type { RollupOutput } from '../../compiled/rollup/types/rollup';
+import { Chunk } from '../types';
 type Files = {
   name: string;
   size: number;
 };
 export declare const bundleFiles: Files[];
 export declare const bundlelessFiles: Files[];
-export declare const addOutputChunk: (outputChunk: ILibuilder['outputChunk'], appDirectory: string, isBundle: boolean) => void;
+export declare const addOutputChunk: (outputChunk: Map<string, Chunk>, appDirectory: string, isBundle: boolean) => void;
 export declare const addRollupChunk: (rollupOutput: RollupOutput, appDirectory: string, distDir: string) => void;
 export declare const addDtsFiles: (distDir: string, appDirectory: string) => Promise<void>;
 export declare const printFileSize: () => void;

package/dist/utils/print.js

@@ -1,47 +1,42 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  bundleFiles: function() {
-    return bundleFiles;
-  },
-  bundlelessFiles: function() {
-    return bundlelessFiles;
-  },
-  addOutputChunk: function() {
-    return addOutputChunk;
-  },
-  addRollupChunk: function() {
-    return addRollupChunk;
-  },
-  addDtsFiles: function() {
-    return addDtsFiles;
-  },
-  printFileSize: function() {
-    return printFileSize;
-  },
-  printSucceed: function() {
-    return printSucceed;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var print_exports = {};
+__export(print_exports, {
+  addDtsFiles: () => addDtsFiles,
+  addOutputChunk: () => addOutputChunk,
+  addRollupChunk: () => addRollupChunk,
+  bundleFiles: () => bundleFiles,
+  bundlelessFiles: () => bundlelessFiles,
+  printFileSize: () => printFileSize,
+  printSucceed: () => printSucceed
 });
-const _path = require("path");
-const _utils = require("@modern-js/utils");
-const _log = require("../constants/log");
+module.exports = __toCommonJS(print_exports);
+var import_path = require("path");
+var import_utils = require("@modern-js/utils");
+var import_log = require("../constants/log");
 const bundleFiles = [];
 const bundlelessFiles = [];
 const addOutputChunk = (outputChunk, appDirectory, isBundle) => {
   const files = Array.from(outputChunk).map((val) => {
     const [path, chunk] = val;
     return {
-      name: (0, _path.relative)(appDirectory, path),
+      name: (0, import_path.relative)(appDirectory, path),
       size: chunk.contents.length
     };
   });
@@ -55,19 +50,19 @@ const addRollupChunk = (rollupOutput, appDirectory, distDir) => {
   const { output } = rollupOutput;
   bundleFiles.push(...output.map((o) => {
     return {
-      name: (0, _path.relative)(appDirectory, (0, _path.resolve)(distDir, o.fileName)),
+      name: (0, import_path.relative)(appDirectory, (0, import_path.resolve)(distDir, o.fileName)),
       // only d.ts, is outputChunk not outputAsset
       size: o.code.length
     };
   }));
 };
 const addDtsFiles = async (distDir, appDirectory) => {
-  const files = await (0, _utils.fastGlob)(`${(0, _utils.slash)(distDir)}/**/*.d.ts`, {
+  const files = await (0, import_utils.fastGlob)(`${(0, import_utils.slash)(distDir)}/**/*.d.ts`, {
     stats: true
   });
   bundlelessFiles.push(...files.map((file) => {
     return {
-      name: (0, _path.relative)(appDirectory, file.path),
+      name: (0, import_path.relative)(appDirectory, file.path),
       size: file.stats.size
     };
   }));
@@ -77,8 +72,8 @@ const printFileSize = () => {
   printBundleFiles();
 };
 const printSucceed = (totalDuration) => {
-  const time = _utils.chalk.cyan(`${totalDuration / 1e3}s`);
-  _utils.logger.info(`${_log.buildSuccessText} in ${time}`);
+  const time = import_utils.chalk.cyan(`${(totalDuration / 1e3).toFixed(1)}s`);
+  import_utils.logger.info(`${import_log.buildSuccessText} in ${time}`);
 };
 const prettyBytes = (bytes) => {
   if (bytes === 0) {
@@ -96,20 +91,20 @@ const prettyBytes = (bytes) => {
     "YB"
   ];
   const exp = Math.floor(Math.log(bytes) / Math.log(1024));
-  return `${(bytes / Math.pow(1024, exp)).toFixed(2)} ${unit[exp]}`;
+  return `${(bytes / Math.pow(1024, exp)).toFixed(1)} ${unit[exp]}`;
 };
 const printBundleFiles = () => {
   if (bundleFiles.length === 0) {
     return;
   }
-  const longestFileLength = bundleFiles.reduce((max, str) => Math.max(max, str.name.length), _log.reportFile1LineText.length);
-  _utils.logger.info(`Bundle generated ${bundleFiles.length} files
+  const longestFileLength = bundleFiles.reduce((max, str) => Math.max(max, str.name.length), import_log.reportFile1LineText.length);
+  import_utils.logger.info(`Bundle generated ${bundleFiles.length} files
 `);
-  const headerRow = _log.reportFile1LineText + " ".repeat(longestFileLength - 10) + _log.reportFile2LineText;
-  _utils.logger.log(_utils.chalk.bold(_utils.chalk.green(headerRow)));
+  const headerRow = import_log.reportFile1LineText + " ".repeat(longestFileLength - 10) + import_log.reportFile2LineText;
+  import_utils.logger.log(import_utils.chalk.bold(import_utils.chalk.green(headerRow)));
   bundleFiles.forEach(({ name, size }) => {
     const infoRow = `${name}${" ".repeat(longestFileLength - name.length + 2)}${prettyBytes(size)}`;
-    _utils.logger.log(infoRow);
+    import_utils.logger.log(infoRow);
   });
 };
 const printBundlelessInfo = () => {
@@ -120,8 +115,16 @@ const printBundlelessInfo = () => {
   const totalSize = bundlelessFiles.reduce((total, file) => {
     return total + file.size;
   }, 0);
-  const info = `Bundleless generated ${count} files, the total size is ${_utils.chalk.cyan(prettyBytes(totalSize))}`;
-  _utils.logger.info(info);
+  const info = `Bundleless generated ${count} files, the total size is ${import_utils.chalk.cyan(prettyBytes(totalSize))}`;
+  import_utils.logger.info(info);
 };
-
-//# sourceMappingURL=print.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  addDtsFiles,
+  addOutputChunk,
+  addRollupChunk,
+  bundleFiles,
+  bundlelessFiles,
+  printFileSize,
+  printSucceed
+});

package/dist/utils/style.d.ts

@@ -1,30 +1,12 @@
-/// <reference types="less" />
-import type { PostcssOptions } from '@modern-js/libuild';
-import type { PartialBaseBuildConfig } from '../types';
-export declare const getLessConfig: (config: PartialBaseBuildConfig) => Promise<{
-  additionalData?: (string | ((filePath: string) => string)) | undefined;
-  implementation?: string | object | undefined;
-  lessOptions?: Less.Options | undefined;
-}>;
-export declare const getSassConfig: (config: PartialBaseBuildConfig) => Promise<{
-  additionalData?: (string | ((filePath: string) => string)) | undefined;
-  implementation?: string | object | undefined;
-  sassOptions?: import("@modern-js/libuild").sassOptions | undefined;
-}>;
+import type { PartialBaseBuildConfig, PostcssOptions, LessOptions, SassOptions } from '../types';
+export declare const getLessConfig: (config: PartialBaseBuildConfig) => Promise<LessOptions>;
+export declare const getSassConfig: (config: PartialBaseBuildConfig) => Promise<SassOptions>;
 export declare const getPostcssConfig: (config: PartialBaseBuildConfig) => Promise<PostcssOptions & {
   $$tools?: string | undefined;
 }>;
 export declare const getStyleConfig: (config: PartialBaseBuildConfig) => Promise<{
-  less: {
-    additionalData?: (string | ((filePath: string) => string)) | undefined;
-    implementation?: string | object | undefined;
-    lessOptions?: Less.Options | undefined;
-  };
-  sass: {
-    additionalData?: (string | ((filePath: string) => string)) | undefined;
-    implementation?: string | object | undefined;
-    sassOptions?: import("@modern-js/libuild").sassOptions | undefined;
-  };
+  less: LessOptions;
+  sass: SassOptions;
   postcss: PostcssOptions & {
     $$tools?: string | undefined;
   };

package/dist/utils/style.js

@@ -1,44 +1,59 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  getLessConfig: function() {
-    return getLessConfig;
-  },
-  getSassConfig: function() {
-    return getSassConfig;
-  },
-  getPostcssConfig: function() {
-    return getPostcssConfig;
-  },
-  getStyleConfig: function() {
-    return getStyleConfig;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var style_exports = {};
+__export(style_exports, {
+  getLessConfig: () => getLessConfig,
+  getPostcssConfig: () => getPostcssConfig,
+  getSassConfig: () => getSassConfig,
+  getStyleConfig: () => getStyleConfig
 });
-const _utils = require("@modern-js/utils");
-const _path = require("./path");
+module.exports = __toCommonJS(style_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+const getCompiledPath = async (packageName) => {
+  const { slash } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  return slash(import_path.default.join(__dirname, "../../compiled", packageName));
+};
 const getLessConfig = async (config) => {
   var _config_style;
-  const mergedOptions = (0, _utils.applyOptionsChain)({
+  const mergedOptions = (0, import_utils.applyOptionsChain)({
     lessOptions: {
       javascriptEnabled: true
     },
-    implementation: await (0, _path.getCompiledPath)("less")
+    implementation: await getCompiledPath("less")
   }, (config === null || config === void 0 ? void 0 : (_config_style = config.style) === null || _config_style === void 0 ? void 0 : _config_style.less) || {});
   return mergedOptions;
 };
 const getSassConfig = async (config) => {
   var _config_style;
-  const mergedOptions = (0, _utils.applyOptionsChain)({
-    implementation: await (0, _path.getCompiledPath)("sass")
+  const mergedOptions = (0, import_utils.applyOptionsChain)({
+    implementation: await getCompiledPath("sass")
   }, (config === null || config === void 0 ? void 0 : (_config_style = config.style) === null || _config_style === void 0 ? void 0 : _config_style.sass) || {});
   return mergedOptions;
 };
@@ -56,19 +71,19 @@ const getPostcssConfig = async (config) => {
   };
   const targetLegacyBrowsers = config.target === "es5";
   const getLegacyPostCSSPlugins = async () => [
-    require(await (0, _path.getCompiledPath)("postcss-custom-properties")),
-    require(await (0, _path.getCompiledPath)("postcss-initial")),
-    require(await (0, _path.getCompiledPath)("postcss-page-break")),
-    require(await (0, _path.getCompiledPath)("postcss-font-variant"))
+    require(await getCompiledPath("postcss-custom-properties")),
+    require(await getCompiledPath("postcss-initial")),
+    require(await getCompiledPath("postcss-page-break")),
+    require(await getCompiledPath("postcss-font-variant"))
   ];
-  const mergedConfig = (0, _utils.applyOptionsChain)({
+  const mergedConfig = (0, import_utils.applyOptionsChain)({
     // TODO: when schema support redefine
     // $$tools: 'module-tools',
     plugins: [
       ...targetLegacyBrowsers ? await getLegacyPostCSSPlugins() : [],
-      require(await (0, _path.getCompiledPath)("postcss-flexbugs-fixes")),
-      require(await (0, _path.getCompiledPath)("postcss-media-minmax")),
-      require(await (0, _path.getCompiledPath)("postcss-nesting"))
+      require(await getCompiledPath("postcss-flexbugs-fixes")),
+      require(await getCompiledPath("postcss-media-minmax")),
+      require(await getCompiledPath("postcss-nesting"))
     ].filter(Boolean)
   }, (config === null || config === void 0 ? void 0 : (_config_style = config.style) === null || _config_style === void 0 ? void 0 : _config_style.postcss) || {}, utils);
   if (extraPlugins.length) {
@@ -86,5 +101,10 @@ const getStyleConfig = async (config) => {
     postcss: postcssConfig
   };
 };
-
-//# sourceMappingURL=style.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLessConfig,
+  getPostcssConfig,
+  getSassConfig,
+  getStyleConfig
+});

package/dist/utils/tspath.js

@@ -0,0 +1,114 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var tspath_exports = {};
+__export(tspath_exports, {
+  transformDtsAlias: () => transformDtsAlias
+});
+module.exports = __toCommonJS(tspath_exports);
+var path = __toESM(require("path"));
+var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
+var import_utils = require("@modern-js/utils");
+var parser = __toESM(require("@babel/parser"));
+var import_generator = __toESM(require("@babel/generator"));
+var t = __toESM(require("@babel/types"));
+var import_traverse = __toESM(require("@babel/traverse"));
+var import_file = require("../constants/file");
+function mapPathString(nodePath, { filename, baseUrl, paths }) {
+  if (!t.isStringLiteral(nodePath)) {
+    return;
+  }
+  const sourcePath = nodePath.node.value;
+  const currentFile = filename;
+  const matchPath = (0, import_tsconfig_paths.createMatchPath)(baseUrl, paths, [
+    "index"
+  ]);
+  const result = matchPath(sourcePath, (packageJsonPath) => {
+    if (!import_utils.fs.existsSync(packageJsonPath)) {
+      return void 0;
+    }
+    return import_utils.fs.readJSONSync(packageJsonPath);
+  }, (filePath) => import_utils.fs.existsSync(filePath), import_file.dtsAliasExts);
+  if (result) {
+    const relativePath = path.relative(path.dirname(currentFile), path.dirname(result));
+    const fileName = path.basename(result);
+    const filePath = path.normalize(`${relativePath.length === 0 ? "." : relativePath}/${fileName}`);
+    const replaceString = filePath.startsWith(".") ? filePath : `./${filePath}`;
+    nodePath.replaceWith(t.stringLiteral(replaceString));
+  }
+}
+const transformImport = (option) => (nodePath) => {
+  mapPathString(nodePath.get("source"), option);
+};
+const transformExport = (option) => (nodePath) => {
+  mapPathString(nodePath.get("source"), option);
+};
+const transformSingleFileAlias = ({ filename, baseUrl, paths }) => {
+  const sourceCode = import_utils.fs.readFileSync(filename, "utf-8");
+  const ast = parser.parse(sourceCode, {
+    sourceType: "module",
+    errorRecovery: true,
+    plugins: [
+      "typescript"
+    ]
+  });
+  (0, import_traverse.default)(ast, {
+    // d.ts file content not have callExpression which can be parsed;
+    // CallExpression: transformCall({ filename, baseUrl, paths }) as any,
+    ImportDeclaration: transformImport({
+      filename,
+      baseUrl,
+      paths
+    }),
+    ExportDeclaration: transformExport({
+      filename,
+      baseUrl,
+      paths
+    })
+  });
+  return (0, import_generator.default)(ast).code;
+};
+const transformDtsAlias = (option) => {
+  const { filenames = [], baseUrl, paths } = option;
+  const transformResult = [];
+  for (const filename of filenames) {
+    transformResult.push({
+      path: filename,
+      content: transformSingleFileAlias({
+        filename,
+        baseUrl,
+        paths
+      })
+    });
+  }
+  return transformResult;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  transformDtsAlias
+});