@modern-js/module-tools 2.42.2 → 2.43.0

package/dist/builder/clear.js

@@ -21,9 +21,11 @@ __export(clear_exports, {
   clearBuildConfigPaths: () => clearBuildConfigPaths
 });
 module.exports = __toCommonJS(clear_exports);
+var import_path = require("path");
 var import_utils = require("@modern-js/utils");
 var import_locale = require("../locale");
 var import_utils2 = require("../utils");
+var import_debug = require("../debug");
 const clearBuildConfigPaths = async (configs, projectAbsRootPath) => {
   for (const config of configs) {
     if (projectAbsRootPath === config.outDir) {
@@ -31,20 +33,25 @@ const clearBuildConfigPaths = async (configs, projectAbsRootPath) => {
     } else {
       await import_utils.fs.remove(config.outDir);
     }
-    if (config.buildType === "bundleless" && config.dts && // keep it same as https://github.com/web-infra-dev/modern.js/blob/main/packages/solutions/module-tools/src/builder/build.ts#L37
-    await import_utils.fs.pathExists(config.tsconfig)) {
-      const tscBinFile = await (0, import_utils2.getTscBinPath)(projectAbsRootPath);
-      const childProgress = (0, import_utils.execa)(tscBinFile, [
-        "--build",
-        "--clean"
-      ], {
-        stdio: "pipe",
-        cwd: projectAbsRootPath
-      });
-      try {
-        await childProgress;
-      } catch (e) {
-        import_utils.logger.error(e);
+    if (config.buildType === "bundleless" && config.dts) {
+      const { compilerOptions } = await (0, import_utils2.getProjectTsconfig)(config.tsconfig);
+      const { composite, incremental, rootDir, tsBuildInfoFile = ".tsbuildinfo" } = compilerOptions || {};
+      if (!composite && !incremental) {
+        return;
+      }
+      const outDir = config.dts.distPath;
+      const tsconfigDir = (0, import_path.dirname)(config.tsconfig);
+      let tsbuildInfoFilePath = `${(0, import_path.basename)(config.tsconfig, ".json")}${tsBuildInfoFile}`;
+      if (rootDir) {
+        tsbuildInfoFilePath = (0, import_path.resolve)(outDir, (0, import_path.relative)((0, import_path.resolve)(tsconfigDir, rootDir), tsconfigDir), tsbuildInfoFilePath);
+      } else {
+        tsbuildInfoFilePath = (0, import_path.resolve)(outDir, tsbuildInfoFilePath);
+      }
+      (0, import_debug.debug)("clear tsbuildinfo");
+      if (await import_utils.fs.pathExists(tsbuildInfoFilePath)) {
+        await import_utils.fs.remove(tsbuildInfoFilePath);
+      } else {
+        (0, import_debug.debug)(`${tsbuildInfoFilePath} doesn't exist`);
       }
     }
   }

package/dist/builder/esbuild/adapter.js

@@ -242,7 +242,7 @@ const adapterPlugin = (compiler) => {
           if (!item) {
             continue;
           }
-          if (absPath.endsWith(".js")) {
+          if ((0, import_utils2.isJsExt)(absPath)) {
             compiler.emitAsset(absPath, {
               type: "chunk",
               contents: item.text,

package/dist/builder/feature/style/lessAliasPlugin.js

@@ -34,8 +34,7 @@ module.exports = __toCommonJS(lessAliasPlugin_exports);
 var import_define_property = require("@swc/helpers/_/_define_property");
 var import_fs = __toESM(require("fs"));
 var import_utils = require("./utils");
-var LessAliasesPlugin;
-LessAliasesPlugin = class LessAliasesPlugin2 {
+class LessAliasesPlugin {
   install(less, pluginManager) {
     const getResolve = (filename, currentDirectory) => {
       return this.compiler.css_resolve(filename, currentDirectory || this.stdinDir);
@@ -68,4 +67,4 @@ LessAliasesPlugin = class LessAliasesPlugin2 {
     this.compiler = options.compiler;
     this.stdinDir = options.stdinDir;
   }
-};
+}

package/dist/builder/feature/style/postcssUrlPlugin.js

@@ -33,8 +33,11 @@ const postcssUrlPlugin = (options) => {
     postcssPlugin: "postcss-url",
     async Declaration(decl) {
       const isProcessed = decl[Processed];
+      if (isProcessed) {
+        return;
+      }
       decl.value = await (0, import_utils.rewriteCssUrls)(decl.value, false, async (URL) => {
-        if (URL && !HTTP_PATTERNS.test(URL) && !HASH_PATTERNS.test(URL) && !DATAURL_PATTERNS.test(URL) && !isProcessed) {
+        if (URL && !HTTP_PATTERNS.test(URL) && !HASH_PATTERNS.test(URL) && !DATAURL_PATTERNS.test(URL)) {
           let filePath = URL;
           const { outDir, sourceDir, buildType } = options.compilation.config;
           const { css_resolve } = options.compilation;

package/dist/builder/feature/style/utils.js

@@ -94,8 +94,12 @@ async function rebaseUrls(filepath, rootDir, resolver) {
     };
   }
 }
-function rewriteCssUrls(css, type, replacer) {
-  return asyncReplace(css, cssUrlRE, async (match) => {
+async function rewriteCssUrls(css, type, replacer) {
+  let match;
+  let remaining = css;
+  let rewritten = "";
+  while (match = cssUrlRE.exec(remaining)) {
+    rewritten += remaining.slice(0, match.index);
     const matched = match[0];
     let rawUrl = match[1];
     let wrap = "";
@@ -104,19 +108,8 @@ function rewriteCssUrls(css, type, replacer) {
       wrap = first;
       rawUrl = rawUrl.slice(1, -1);
     }
-    if (type === "less" && rawUrl.startsWith("@") || (type === "sass" || type === "scss") && rawUrl.startsWith("$") || isExternalUrl(rawUrl) || isDataUrl(rawUrl) || rawUrl.startsWith("#")) {
-      return matched;
-    }
-    return `url(${wrap}${(0, import_utils.normalizeSlashes)(await replacer(rawUrl))}${wrap})`;
-  });
-}
-async function asyncReplace(input, re, replacer) {
-  let match;
-  let remaining = input;
-  let rewritten = "";
-  while (match = re.exec(remaining)) {
-    rewritten += remaining.slice(0, match.index);
-    rewritten += await replacer(match);
+    const result = type === "less" && rawUrl.startsWith("@") || (type === "sass" || type === "scss") && rawUrl.startsWith("$") || isExternalUrl(rawUrl) || isDataUrl(rawUrl) || rawUrl.startsWith("#") ? matched : `url(${wrap}${(0, import_utils.normalizeSlashes)(await replacer(rawUrl))}${wrap})`;
+    rewritten += result;
     remaining = remaining.slice(match.index + match[0].length);
   }
   rewritten += remaining;

package/dist/types/dts.d.ts

@@ -36,6 +36,9 @@ export interface ITsconfig {
         paths?: Record<string, string[]>;
         target?: TsTarget;
         useDefineForClassFields?: boolean;
+        composite?: boolean;
+        incremental?: boolean;
+        tsBuildInfoFile?: string;
     } | undefined;
     include?: string[];
     exclude?: string[];

package/dist/utils/dts.js

@@ -144,12 +144,23 @@ ${footer}
       // users need to set esbuild out-extensions like { '.js': '.mjs' }
       filePath.replace(/\.d\.ts/, dtsExtension)
     );
-    return import_utils.fs.writeFile(
-      // only replace .d.ts, if tsc generate .d.m(c)ts, keep.
-      finalPath,
-      content
-    );
-  }));
+    const writeTask = () => {
+      return import_utils.fs.writeFile(
+        // only replace .d.ts, if tsc generate .d.m(c)ts, keep.
+        finalPath,
+        content
+      );
+    };
+    const removeTask = () => {
+      return import_utils.fs.remove(filePath);
+    };
+    return dtsExtension === ".d.ts" ? [
+      writeTask()
+    ] : [
+      writeTask(),
+      removeTask()
+    ];
+  }).flat());
 };
 const printOrThrowDtsErrors = async (error, options) => {
   const { InternalDTSError } = await Promise.resolve().then(() => __toESM(require("../error")));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.42.2",
+  "version": "2.43.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@ampproject/remapping": "^2.2.1",
     "@ast-grep/napi": "0.12.0",
-    "@modern-js/swc-plugins": "0.6.5",
+    "@modern-js/swc-plugins": "0.6.6",
     "@rollup/pluginutils": "4.1.1",
     "@svgr/core": "8.0.0",
     "@svgr/plugin-jsx": "8.0.1",
@@ -67,24 +67,24 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.42.2",
-    "@modern-js/plugin": "2.42.2",
-    "@modern-js/plugin-changeset": "2.42.2",
-    "@modern-js/plugin-i18n": "2.42.2",
-    "@modern-js/new-action": "2.42.2",
-    "@modern-js/plugin-lint": "2.42.2",
-    "@modern-js/types": "2.42.2",
-    "@modern-js/utils": "2.42.2",
-    "@modern-js/upgrade": "2.42.2"
+    "@modern-js/core": "2.43.0",
+    "@modern-js/new-action": "2.43.0",
+    "@modern-js/plugin": "2.43.0",
+    "@modern-js/plugin-i18n": "2.43.0",
+    "@modern-js/plugin-lint": "2.43.0",
+    "@modern-js/plugin-changeset": "2.43.0",
+    "@modern-js/types": "2.43.0",
+    "@modern-js/upgrade": "2.43.0",
+    "@modern-js/utils": "2.43.0"
   },
   "devDependencies": {
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.42.2",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.42.2",
-    "@scripts/build": "2.42.2",
-    "@scripts/vitest-config": "2.42.2"
+    "@modern-js/builder-webpack-provider": "2.43.0",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.43.0",
+    "@scripts/build": "2.43.0",
+    "@scripts/vitest-config": "2.43.0"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"