@modern-js/module-tools 2.42.1 → 2.43.0

package/dist/builder/clear.js

@@ -21,8 +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) {
@@ -30,6 +33,27 @@ const clearBuildConfigPaths = async (configs, projectAbsRootPath) => {
     } else {
       await import_utils.fs.remove(config.outDir);
     }
+    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`);
+      }
+    }
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/builder/dts/tsc.js

@@ -61,18 +61,33 @@ const runTscBin = async (api, config) => {
   const tscBinFile = await (0, import_utils2.getTscBinPath)(appDirectory);
   const params = [];
   if (userTsconfig.references) {
-    var _userTsconfig;
     params.push("-b", tsconfigPath);
-    var _compilerOptions;
-    (_compilerOptions = (_userTsconfig = userTsconfig).compilerOptions) !== null && _compilerOptions !== void 0 ? _compilerOptions : _userTsconfig.compilerOptions = {};
-    const { baseUrl = ".", outDir = "dist" } = userTsconfig.compilerOptions;
+    var _userTsconfig_compilerOptions;
+    const { baseUrl = ".", outDir, emitDeclarationOnly, declaration } = (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) !== null && _userTsconfig_compilerOptions !== void 0 ? _userTsconfig_compilerOptions : {};
     const abosultBaseUrl = import_path.default.isAbsolute(baseUrl) ? baseUrl : import_path.default.join(import_path.default.dirname(tsconfigPath), baseUrl);
-    if (import_path.default.resolve(abosultBaseUrl, outDir) !== distPath) {
-      userTsconfig.compilerOptions.outDir = import_path.default.relative(abosultBaseUrl, distPath);
-      import_utils.fs.writeFileSync(tsconfigPath, JSON.stringify(userTsconfig, null, 2));
+    if (!outDir || import_path.default.resolve(abosultBaseUrl, outDir) !== distPath) {
+      const correctOutDir = import_path.default.relative(abosultBaseUrl, distPath);
+      throw new Error(`Please set outDir: "${correctOutDir}" in ${import_utils.chalk.underline(tsconfigPath)} to keep it same as buildConfig.`);
+    }
+    const tsVersion = await (0, import_utils2.detectTSVersion)(appDirectory);
+    if (tsVersion !== 5) {
+      if (!declaration || !emitDeclarationOnly) {
+        throw new Error(`Please set declaration: true and emitDeclaration: true in ${import_utils.chalk.underline(tsconfigPath)}`);
+      }
+    } else {
+      params.push("--declaration", "--emitDeclarationOnly");
     }
   } else {
-    params.push("-p", tsconfigPath, "--outDir", distPath);
+    params.push(
+      "-p",
+      tsconfigPath,
+      // Same as dts.distPath
+      "--outDir",
+      distPath,
+      // Only emit d.ts files
+      "--declaration",
+      "--emitDeclarationOnly"
+    );
   }
   if (watch) {
     params.push("-w");
@@ -82,10 +97,7 @@ const runTscBin = async (api, config) => {
     /* Required parameter, use it stdout have color */
     "--pretty",
     // https://github.com/microsoft/TypeScript/issues/21824
-    "--preserveWatchOutput",
-    // Only emit d.ts files
-    "--declaration",
-    "--emitDeclarationOnly"
+    "--preserveWatchOutput"
   ], {
     stdio: "pipe",
     cwd: appDirectory

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/builder/feature/swc.js

@@ -150,7 +150,11 @@ const swcRenderChunk = {
           module: format === "umd" ? {
             type: "umd"
           } : void 0,
-          isModule: "unknown"
+          // If `chunk.contents` is recognized as [Script](https://swc.rs/docs/configuration/compilation#ismodule),
+          // then it will not be converted to umd format content.
+          // so we need to set `isModule` to `true`.
+          // eg: when `autoExternal` is false, then chunk.contents will be recognized as [Script]
+          isModule: format === "umd" ? true : "unknown"
         });
         const result = await swcCompiler.transform(name2, chunk.contents.toString());
         return {

package/dist/command.js

@@ -56,7 +56,7 @@ const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
   await runner.beforeDev(devToolMetas);
-  const devProgram = program.command("dev").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.dev.describe)).option("--tsconfig [tsconfig]", import_locale.i18n.t(import_locale.localeKeys.command.dev.tsconfig)).action(async (options) => {
+  const devProgram = program.command("dev").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.dev.describe)).option("--tsconfig [tsconfig]", import_locale.i18n.t(import_locale.localeKeys.command.dev.tsconfig)).option("-c, --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).action(async (options) => {
     const context = await initModuleContext(api);
     const { dev } = await Promise.resolve().then(() => __toESM(require("./dev")));
     await dev(options, devToolMetas, api, context);

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.d.ts

@@ -1,5 +1,6 @@
 import type { ITsconfig, GeneratorDtsConfig, BuildType, TsTarget } from '../types';
 export declare const getProjectTsconfig: (tsconfigPath: string) => Promise<ITsconfig>;
+export declare function detectTSVersion(appDirectory?: string): Promise<number | undefined>;
 export declare const getTscBinPath: (appDirectory: string) => Promise<string>;
 export declare const processDtsFilesAfterTsc: (config: GeneratorDtsConfig) => Promise<void>;
 export declare const printOrThrowDtsErrors: (error: unknown, options: {

package/dist/utils/dts.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dts_exports = {};
 __export(dts_exports, {
+  detectTSVersion: () => detectTSVersion,
   getProjectTsconfig: () => getProjectTsconfig,
   getTscBinPath: () => getTscBinPath,
   printOrThrowDtsErrors: () => printOrThrowDtsErrors,
@@ -47,6 +48,15 @@ const getProjectTsconfig = async (tsconfigPath) => {
   }
   return import_utils.json5.parse(import_utils.fs.readFileSync(tsconfigPath, "utf-8"));
 };
+async function detectTSVersion(appDirectory) {
+  const cwd = appDirectory !== null && appDirectory !== void 0 ? appDirectory : process.cwd();
+  const typescriptPath = (0, import_path.join)(cwd, "node_modules", "typescript");
+  if (await import_utils.fs.pathExists(typescriptPath)) {
+    const typescriptPkg = await import_utils.fs.readJson((0, import_path.join)(typescriptPath, "package.json"));
+    const version = Number(typescriptPkg.version.split(".")[0]);
+    return version;
+  }
+}
 const getTscBinPath = async (appDirectory) => {
   const { default: findUp, exists: pathExists } = await Promise.resolve().then(() => __toESM(require("../../compiled/find-up")));
   const tscBinFile = await findUp(async (directory) => {
@@ -134,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")));
@@ -161,6 +182,7 @@ const printOrThrowDtsErrors = async (error, options) => {
 const tsTargetAtOrAboveES2022 = (target) => target === "es2022" || target === "esnext";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  detectTSVersion,
   getProjectTsconfig,
   getTscBinPath,
   printOrThrowDtsErrors,

package/dist/utils/map.d.ts

@@ -1,4 +1,4 @@
-import { RawSourceMap } from '@ampproject/remapping/dist/types/types';
+import type { RawSourceMap } from '@ampproject/remapping';
 import type { SourceMap } from '../types';
 interface Options {
     needSourceMap: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.42.1",
+  "version": "2.43.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -46,9 +46,9 @@
     "modern-module": "./bin/modern.js"
   },
   "dependencies": {
-    "@ampproject/remapping": "1.0.2",
+    "@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.1",
-    "@modern-js/new-action": "2.42.1",
-    "@modern-js/plugin": "2.42.1",
-    "@modern-js/plugin-i18n": "2.42.1",
-    "@modern-js/plugin-changeset": "2.42.1",
-    "@modern-js/types": "2.42.1",
-    "@modern-js/upgrade": "2.42.1",
-    "@modern-js/utils": "2.42.1",
-    "@modern-js/plugin-lint": "2.42.1"
+    "@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/self": "npm:@modern-js/module-tools@2.42.1",
-    "@modern-js/builder-webpack-provider": "2.42.1",
-    "@scripts/build": "2.42.1",
-    "@scripts/vitest-config": "2.42.1"
+    "@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"