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

package/dist/utils/print.js

@@ -25,6 +25,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve2, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve2(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 var print_exports = {};
 __export(print_exports, {
   addDtsFiles: () => addDtsFiles,
@@ -67,9 +87,9 @@ const addRollupChunk = (rollupOutput, appDirectory, distDir) => {
     })
   );
 };
-const addDtsFiles = async (distDir, appDirectory) => {
-  const { fastGlob, slash } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
-  const files = await fastGlob(`${slash(distDir)}**/*.d.ts`, {
+const addDtsFiles = (distDir, appDirectory) => __async(void 0, null, function* () {
+  const { fastGlob, slash } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const files = yield fastGlob(`${slash(distDir)}**/*.d.ts`, {
     stats: true
   });
   bundlelessFiles.push(
@@ -80,7 +100,7 @@ const addDtsFiles = async (distDir, appDirectory) => {
       };
     })
   );
-};
+});
 const printFileSize = () => {
   printBundlelessInfo();
   printBundleFiles();

package/dist/utils/print.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAkC;AAElC,mBAA8B;AAK9B,iBAIO;AAOA,MAAM,cAAuB,CAAC;AAE9B,MAAM,kBAA2B,CAAC;AAElC,MAAM,iBAAiB,CAC5B,aACA,cACA,aACG;AACH,QAAM,QAAQ,MAAM,KAAK,WAAW,EAAE,IAAI,SAAO;AAC/C,UAAM,CAAC,MAAM,KAAK,IAAI;AACtB,WAAO;AAAA,MACL,UAAM,sBAAS,cAAc,IAAI;AAAA,MACjC,MAAM,MAAM,SAAS;AAAA,IACvB;AAAA,EACF,CAAC;AACD,MAAI,UAAU;AACZ,gBAAY,KAAK,GAAG,KAAK;AAAA,EAC3B,OAAO;AACL,oBAAgB,KAAK,GAAG,KAAK;AAAA,EAC/B;AACF;AAEO,MAAM,iBAAiB,CAC5B,cACA,cACA,YACG;AACH,QAAM,EAAE,OAAO,IAAI;AACnB,cAAY;AAAA,IACV,GAAG,OAAO,IAAI,OAAK;AACjB,aAAO;AAAA,QACL,UAAM,sBAAS,kBAAc,qBAAQ,SAAS,EAAE,QAAQ,CAAC;AAAA;AAAA,QAEzD,MAAO,EAAkB,KAAK;AAAA,MAChC;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEO,MAAM,cAAc,OAAO,SAAiB,iBAAyB;AAC1E,QAAM,EAAE,UAAU,MAAM,IAAI,MAAM,6CAAO,kBAAkB;AAC3D,QAAM,QAAQ,MAAM,SAAS,GAAG,MAAM,OAAO,cAAc;AAAA,IACzD,OAAO;AAAA,EACT,CAAC;AACD,kBAAgB;AAAA,IACd,GAAG,MAAM,IAAI,UAAQ;AACnB,aAAO;AAAA,QACL,UAAM,sBAAS,cAAc,KAAK,IAAI;AAAA,QACtC,MAAM,KAAK,MAAM;AAAA,MACnB;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEO,MAAM,gBAAgB,MAAM;AACjC,sBAAoB;AACpB,mBAAiB;AACnB;AAEO,MAAM,eAAe,CAAC,kBAA0B;AACrD,sBAAO;AAAA,IACL,mBAAM,KAAK,mBAAM,KAAK,GAAG,gCAAqB,gBAAgB,MAAO,CAAC;AAAA,EACxE;AACF;AAEA,MAAM,cAAc,CAAC,UAAkB;AACrC,MAAI,UAAU,GAAG;AACf,WAAO;AAAA,EACT;AACA,QAAM,OAAO,CAAC,KAAK,MAAM,MAAM,MAAM,MAAM,MAAM,MAAM,MAAM,IAAI;AACjE,QAAM,MAAM,KAAK,MAAM,KAAK,IAAI,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC;AACvD,SAAO,IAAI,QAAQ,KAAK,IAAI,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,KAAK,GAAG;AAChE;AAEA,MAAM,mBAAmB,MAAM;AAC7B,MAAI,YAAY,WAAW,GAAG;AAC5B;AAAA,EACF;AACA,QAAM,oBAAoB,YAAY;AAAA,IACpC,CAAC,KAAK,QAAQ,KAAK,IAAI,KAAK,IAAI,KAAK,MAAM;AAAA,IAC3C,+BAAoB;AAAA,EACtB;AACA,QAAM,OAAO,oBAAoB,YAAY;AAAA;AAE7C,QAAM,YACJ,iCACA,IAAI,OAAO,oBAAoB,EAAE,IACjC;AAEF,sBAAO,KAAK,mBAAM,KAAK,mBAAM,KAAK,IAAI,CAAC,CAAC;AACxC,sBAAO,IAAI,mBAAM,KAAK,mBAAM,MAAM,SAAS,CAAC,CAAC;AAE7C,cAAY,QAAQ,CAAC,EAAE,MAAM,KAAK,MAAM;AACtC,UAAM,UAAU,GAAG,OAAO,IAAI;AAAA,MAC5B,oBAAoB,KAAK,SAAS;AAAA,IACpC,IAAI,YAAY,IAAI;AACpB,wBAAO,IAAI,OAAO;AAAA,EACpB,CAAC;AACH;AAEA,MAAM,sBAAsB,MAAM;AAChC,MAAI,gBAAgB,WAAW,GAAG;AAChC;AAAA,EACF;AAEA,QAAM,QAAQ,gBAAgB;AAC9B,QAAM,YAAY,gBAAgB,OAAO,CAAC,OAAO,SAAS;AACxD,WAAO,QAAQ,KAAK;AAAA,EACtB,GAAG,CAAC;AACJ,QAAM,OAAO,wBAAwB,kCAAkC;AAAA,IACrE;AAAA,EACF;AACA,sBAAO,KAAK,mBAAM,KAAK,mBAAM,KAAK,IAAI,CAAC,CAAC;AAC1C;;;;;;;;;;;","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  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"]}

package/dist/utils/style.js

@@ -25,6 +25,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 var style_exports = {};
 __export(style_exports, {
   getLessConfig: () => getLessConfig,
@@ -33,32 +53,35 @@ __export(style_exports, {
   getStyleConfig: () => getStyleConfig
 });
 module.exports = __toCommonJS(style_exports);
-const getLessConfig = async (config) => {
-  const { applyOptionsChain } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
-  const { getCompiledPath } = await Promise.resolve().then(() => __toESM(require("./path")));
+const getLessConfig = (config) => __async(void 0, null, function* () {
+  var _a;
+  const { applyOptionsChain } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const { getCompiledPath } = yield Promise.resolve().then(() => __toESM(require("./path")));
   const mergedOptions = applyOptionsChain(
     {
       lessOptions: { javascriptEnabled: true },
-      implementation: await getCompiledPath("less")
+      implementation: yield getCompiledPath("less")
     },
-    config?.style?.less || {}
+    ((_a = config == null ? void 0 : config.style) == null ? void 0 : _a.less) || {}
   );
   return mergedOptions;
-};
-const getSassConfig = async (config) => {
-  const { applyOptionsChain } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
-  const { getCompiledPath } = await Promise.resolve().then(() => __toESM(require("./path")));
+});
+const getSassConfig = (config) => __async(void 0, null, function* () {
+  var _a;
+  const { applyOptionsChain } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const { getCompiledPath } = yield Promise.resolve().then(() => __toESM(require("./path")));
   const mergedOptions = applyOptionsChain(
     {
-      implementation: await getCompiledPath("sass")
+      implementation: yield getCompiledPath("sass")
     },
-    config?.style?.sass || {}
+    ((_a = config == null ? void 0 : config.style) == null ? void 0 : _a.sass) || {}
   );
   return mergedOptions;
-};
-const getPostcssConfig = async (config) => {
-  const { applyOptionsChain } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
-  const { getCompiledPath } = await Promise.resolve().then(() => __toESM(require("./path")));
+});
+const getPostcssConfig = (config) => __async(void 0, null, function* () {
+  var _a;
+  const { applyOptionsChain } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const { getCompiledPath } = yield Promise.resolve().then(() => __toESM(require("./path")));
   const extraPlugins = [];
   const utils = {
     addPlugins(plugins) {
@@ -74,33 +97,33 @@ const getPostcssConfig = async (config) => {
       // TODO: when schema support redefine
       // $$tools: 'module-tools',
       plugins: [
-        require(await getCompiledPath("postcss-flexbugs-fixes")),
-        require(await getCompiledPath("postcss-custom-properties")),
-        require(await getCompiledPath("postcss-initial")),
-        require(await getCompiledPath("postcss-page-break")),
-        require(await getCompiledPath("postcss-font-variant")),
-        require(await getCompiledPath("postcss-media-minmax")),
-        require(await getCompiledPath("postcss-nesting"))
+        require(yield getCompiledPath("postcss-flexbugs-fixes")),
+        require(yield getCompiledPath("postcss-custom-properties")),
+        require(yield getCompiledPath("postcss-initial")),
+        require(yield getCompiledPath("postcss-page-break")),
+        require(yield getCompiledPath("postcss-font-variant")),
+        require(yield getCompiledPath("postcss-media-minmax")),
+        require(yield getCompiledPath("postcss-nesting"))
       ].filter(Boolean)
     },
-    config?.style?.postcss || {},
+    ((_a = config == null ? void 0 : config.style) == null ? void 0 : _a.postcss) || {},
     utils
   );
   if (extraPlugins.length) {
     mergedConfig.plugins.push(...extraPlugins);
   }
   return mergedConfig;
-};
-const getStyleConfig = async (config) => {
-  const postcssConfig = await getPostcssConfig(config);
-  const lessConfig = await getLessConfig(config);
-  const sassConfig = await getSassConfig(config);
+});
+const getStyleConfig = (config) => __async(void 0, null, function* () {
+  const postcssConfig = yield getPostcssConfig(config);
+  const lessConfig = yield getLessConfig(config);
+  const sassConfig = yield getSassConfig(config);
   return {
     less: lessConfig,
     sass: sassConfig,
     postcss: postcssConfig
   };
-};
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getLessConfig,

package/dist/utils/style.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASO,MAAM,gBAAgB,OAAO,WAAmC;AACrE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO,kBAAkB;AAC7D,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO,QAAQ;AAEjD,QAAM,gBAAgB;AAAA,IACpB;AAAA,MACE,aAAa,EAAE,mBAAmB,KAAK;AAAA,MACvC,gBAAgB,MAAM,gBAAgB,MAAM;AAAA,IAC9C;AAAA,IACA,QAAQ,OAAO,QAAQ,CAAC;AAAA,EAC1B;AAEA,SAAO;AACT;AAEO,MAAM,gBAAgB,OAAO,WAAmC;AACrE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO,kBAAkB;AAC7D,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO,QAAQ;AAEjD,QAAM,gBAAgB;AAAA,IACpB;AAAA,MACE,gBAAgB,MAAM,gBAAgB,MAAM;AAAA,IAC9C;AAAA,IACA,QAAQ,OAAO,QAAQ,CAAC;AAAA,EAC1B;AAEA,SAAO;AACT;AAEO,MAAM,mBAAmB,OAAO,WAAmC;AACxE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO,kBAAkB;AAC7D,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO,QAAQ;AACjD,QAAM,eAAiC,CAAC;AAExC,QAAM,QAAQ;AAAA,IACZ,WAAW,SAA4C;AACrD,UAAI,MAAM,QAAQ,OAAO,GAAG;AAC1B,qBAAa,KAAK,GAAG,OAAO;AAAA,MAC9B,OAAO;AACL,qBAAa,KAAK,OAAO;AAAA,MAC3B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,eAAe;AAAA,IAInB;AAAA;AAAA;AAAA,MAGE,SAAS;AAAA,QACP,QAAQ,MAAM,gBAAgB,wBAAwB,CAAC;AAAA,QACvD,QAAQ,MAAM,gBAAgB,2BAA2B,CAAC;AAAA,QAC1D,QAAQ,MAAM,gBAAgB,iBAAiB,CAAC;AAAA,QAChD,QAAQ,MAAM,gBAAgB,oBAAoB,CAAC;AAAA,QACnD,QAAQ,MAAM,gBAAgB,sBAAsB,CAAC;AAAA,QACrD,QAAQ,MAAM,gBAAgB,sBAAsB,CAAC;AAAA,QACrD,QAAQ,MAAM,gBAAgB,iBAAiB,CAAC;AAAA,MAClD,EAAE,OAAO,OAAO;AAAA,IAClB;AAAA,IACA,QAAQ,OAAO,WAAW,CAAC;AAAA,IAC3B;AAAA,EACF;AACA,MAAI,aAAa,QAAQ;AACvB,iBAAa,QAAS,KAAK,GAAG,YAAY;AAAA,EAC5C;AAEA,SAAO;AACT;AAEO,MAAM,iBAAiB,OAAO,WAAmC;AACtE,QAAM,gBAAgB,MAAM,iBAAiB,MAAM;AACnD,QAAM,aAAa,MAAM,cAAc,MAAM;AAC7C,QAAM,aAAa,MAAM,cAAc,MAAM;AAC7C,SAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AACF;;;;;;;;","names":[],"sources":["../../src/utils/style.ts"],"sourcesContent":["import type { AcceptedPlugin } from 'postcss';\nimport type { PostcssOptions } from '@modern-js/libuild';\nimport type {\n  PartialBaseBuildConfig,\n  PostCSSConfigUtils,\n  LessOptions,\n  SassOptions,\n} from '../types';\n\nexport const getLessConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n\n  const mergedOptions = applyOptionsChain<LessOptions, never>(\n    {\n      lessOptions: { javascriptEnabled: true },\n      implementation: await getCompiledPath('less'),\n    },\n    config?.style?.less || {},\n  );\n\n  return mergedOptions;\n};\n\nexport const getSassConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n\n  const mergedOptions = applyOptionsChain<SassOptions, never>(\n    {\n      implementation: await getCompiledPath('sass'),\n    },\n    config?.style?.sass || {},\n  );\n\n  return mergedOptions;\n};\n\nexport const getPostcssConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n  const extraPlugins: AcceptedPlugin[] = [];\n\n  const utils = {\n    addPlugins(plugins: AcceptedPlugin | AcceptedPlugin[]) {\n      if (Array.isArray(plugins)) {\n        extraPlugins.push(...plugins);\n      } else {\n        extraPlugins.push(plugins);\n      }\n    },\n  };\n\n  const mergedConfig = applyOptionsChain<\n    PostcssOptions & { $$tools?: string },\n    PostCSSConfigUtils\n  >(\n    {\n      // TODO: when schema support redefine\n      // $$tools: 'module-tools',\n      plugins: [\n        require(await getCompiledPath('postcss-flexbugs-fixes')),\n        require(await getCompiledPath('postcss-custom-properties')),\n        require(await getCompiledPath('postcss-initial')),\n        require(await getCompiledPath('postcss-page-break')),\n        require(await getCompiledPath('postcss-font-variant')),\n        require(await getCompiledPath('postcss-media-minmax')),\n        require(await getCompiledPath('postcss-nesting')),\n      ].filter(Boolean),\n    },\n    config?.style?.postcss || {},\n    utils,\n  );\n  if (extraPlugins.length) {\n    mergedConfig.plugins!.push(...extraPlugins);\n  }\n\n  return mergedConfig;\n};\n\nexport const getStyleConfig = async (config: PartialBaseBuildConfig) => {\n  const postcssConfig = await getPostcssConfig(config);\n  const lessConfig = await getLessConfig(config);\n  const sassConfig = await getSassConfig(config);\n  return {\n    less: lessConfig,\n    sass: sassConfig,\n    postcss: postcssConfig,\n  };\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASO,MAAM,gBAAgB,CAAO,WAAmC;AATvE;AAUE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO,kBAAkB;AAC7D,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO,QAAQ;AAEjD,QAAM,gBAAgB;AAAA,IACpB;AAAA,MACE,aAAa,EAAE,mBAAmB,KAAK;AAAA,MACvC,gBAAgB,MAAM,gBAAgB,MAAM;AAAA,IAC9C;AAAA,MACA,sCAAQ,UAAR,mBAAe,SAAQ,CAAC;AAAA,EAC1B;AAEA,SAAO;AACT;AAEO,MAAM,gBAAgB,CAAO,WAAmC;AAxBvE;AAyBE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO,kBAAkB;AAC7D,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO,QAAQ;AAEjD,QAAM,gBAAgB;AAAA,IACpB;AAAA,MACE,gBAAgB,MAAM,gBAAgB,MAAM;AAAA,IAC9C;AAAA,MACA,sCAAQ,UAAR,mBAAe,SAAQ,CAAC;AAAA,EAC1B;AAEA,SAAO;AACT;AAEO,MAAM,mBAAmB,CAAO,WAAmC;AAtC1E;AAuCE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO,kBAAkB;AAC7D,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO,QAAQ;AACjD,QAAM,eAAiC,CAAC;AAExC,QAAM,QAAQ;AAAA,IACZ,WAAW,SAA4C;AACrD,UAAI,MAAM,QAAQ,OAAO,GAAG;AAC1B,qBAAa,KAAK,GAAG,OAAO;AAAA,MAC9B,OAAO;AACL,qBAAa,KAAK,OAAO;AAAA,MAC3B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,eAAe;AAAA,IAInB;AAAA;AAAA;AAAA,MAGE,SAAS;AAAA,QACP,QAAQ,MAAM,gBAAgB,wBAAwB,CAAC;AAAA,QACvD,QAAQ,MAAM,gBAAgB,2BAA2B,CAAC;AAAA,QAC1D,QAAQ,MAAM,gBAAgB,iBAAiB,CAAC;AAAA,QAChD,QAAQ,MAAM,gBAAgB,oBAAoB,CAAC;AAAA,QACnD,QAAQ,MAAM,gBAAgB,sBAAsB,CAAC;AAAA,QACrD,QAAQ,MAAM,gBAAgB,sBAAsB,CAAC;AAAA,QACrD,QAAQ,MAAM,gBAAgB,iBAAiB,CAAC;AAAA,MAClD,EAAE,OAAO,OAAO;AAAA,IAClB;AAAA,MACA,sCAAQ,UAAR,mBAAe,YAAW,CAAC;AAAA,IAC3B;AAAA,EACF;AACA,MAAI,aAAa,QAAQ;AACvB,iBAAa,QAAS,KAAK,GAAG,YAAY;AAAA,EAC5C;AAEA,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAO,WAAmC;AACtE,QAAM,gBAAgB,MAAM,iBAAiB,MAAM;AACnD,QAAM,aAAa,MAAM,cAAc,MAAM;AAC7C,QAAM,aAAa,MAAM,cAAc,MAAM;AAC7C,SAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AACF;;;;;;;;","names":[],"sources":["../../src/utils/style.ts"],"sourcesContent":["import type { AcceptedPlugin } from 'postcss';\nimport type { PostcssOptions } from '@modern-js/libuild';\nimport type {\n  PartialBaseBuildConfig,\n  PostCSSConfigUtils,\n  LessOptions,\n  SassOptions,\n} from '../types';\n\nexport const getLessConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n\n  const mergedOptions = applyOptionsChain<LessOptions, never>(\n    {\n      lessOptions: { javascriptEnabled: true },\n      implementation: await getCompiledPath('less'),\n    },\n    config?.style?.less || {},\n  );\n\n  return mergedOptions;\n};\n\nexport const getSassConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n\n  const mergedOptions = applyOptionsChain<SassOptions, never>(\n    {\n      implementation: await getCompiledPath('sass'),\n    },\n    config?.style?.sass || {},\n  );\n\n  return mergedOptions;\n};\n\nexport const getPostcssConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n  const extraPlugins: AcceptedPlugin[] = [];\n\n  const utils = {\n    addPlugins(plugins: AcceptedPlugin | AcceptedPlugin[]) {\n      if (Array.isArray(plugins)) {\n        extraPlugins.push(...plugins);\n      } else {\n        extraPlugins.push(plugins);\n      }\n    },\n  };\n\n  const mergedConfig = applyOptionsChain<\n    PostcssOptions & { $$tools?: string },\n    PostCSSConfigUtils\n  >(\n    {\n      // TODO: when schema support redefine\n      // $$tools: 'module-tools',\n      plugins: [\n        require(await getCompiledPath('postcss-flexbugs-fixes')),\n        require(await getCompiledPath('postcss-custom-properties')),\n        require(await getCompiledPath('postcss-initial')),\n        require(await getCompiledPath('postcss-page-break')),\n        require(await getCompiledPath('postcss-font-variant')),\n        require(await getCompiledPath('postcss-media-minmax')),\n        require(await getCompiledPath('postcss-nesting')),\n      ].filter(Boolean),\n    },\n    config?.style?.postcss || {},\n    utils,\n  );\n  if (extraPlugins.length) {\n    mergedConfig.plugins!.push(...extraPlugins);\n  }\n\n  return mergedConfig;\n};\n\nexport const getStyleConfig = async (config: PartialBaseBuildConfig) => {\n  const postcssConfig = await getPostcssConfig(config);\n  const lessConfig = await getLessConfig(config);\n  const sassConfig = await getSassConfig(config);\n  return {\n    less: lessConfig,\n    sass: sassConfig,\n    postcss: postcssConfig,\n  };\n};\n"]}

package/lib/types.d.ts

@@ -45,104 +45,6 @@ declare module '*.webp' {
 }
 
 declare module '*.svg' {
-  import * as React from 'react';
-
-  export const ReactComponent: React.FunctionComponent<
-    React.SVGProps<SVGSVGElement>
-  >;
-
-  const src: string;
-  export default src;
-}
-
-declare module '*.bmp?inline' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.gif?inline' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.jpg?inline' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.jpeg?inline' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.png?inline' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.ico?inline' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.webp?inline' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.svg?inline' {
-  import * as React from 'react';
-
-  export const ReactComponent: React.FunctionComponent<
-    React.SVGProps<SVGSVGElement>
-  >;
-
-  const src: string;
-  export default src;
-}
-
-declare module '*.bmp?url' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.gif?url' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.jpg?url' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.jpeg?url' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.png?url' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.ico?url' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.webp?url' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.svg?url' {
-  import * as React from 'react';
-
-  export const ReactComponent: React.FunctionComponent<
-    React.SVGProps<SVGSVGElement>
-  >;
-
   const src: string;
   export default src;
 }

package/package.json

@@ -11,7 +11,7 @@
     "module-tools",
     "lib-tools"
   ],
-  "version": "2.10.1-beta.0",
+  "version": "2.10.1-beta.1",
   "bin": {
     "modern": "./bin/modern.js",
     "modern-module": "./bin/modern.js"
@@ -43,10 +43,10 @@
     "@modern-js/new-action": "2.10.0",
     "@modern-js/plugin": "2.10.0",
     "@modern-js/plugin-changeset": "2.10.0",
-    "@modern-js/upgrade": "2.10.0",
-    "@modern-js/utils": "2.10.0",
     "@modern-js/plugin-i18n": "2.10.0",
-    "@modern-js/plugin-lint": "2.10.0"
+    "@modern-js/plugin-lint": "2.10.0",
+    "@modern-js/upgrade": "2.10.0",
+    "@modern-js/utils": "2.10.0"
   },
   "devDependencies": {
     "@modern-js/self": "npm:@modern-js/module-tools@*",
@@ -61,8 +61,8 @@
     "postcss-alias": "2.0.0",
     "react": "17",
     "typescript": "^4",
-    "@modern-js/builder-webpack-provider": "2.10.0",
     "@scripts/build": "2.10.0",
+    "@modern-js/builder-webpack-provider": "2.10.0",
     "@scripts/jest-config": "2.10.0"
   },
   "publishConfig": {