@modern-js/module-tools 2.43.0 → 2.44.0

package/dist/builder/build.js

@@ -76,7 +76,7 @@ const generatorDts = async (config, api, options) => {
   const { watch, dts } = options;
   const { buildType, input, sourceDir, alias, externals, tsconfig, footer: { dts: footer }, banner: { dts: banner }, format, autoExtension } = config;
   const { appDirectory } = api.useAppContext();
-  const { distPath, abortOnError, respectExternal } = dts;
+  const { distPath, abortOnError, respectExternal, enableTscBuild } = dts;
   var _dts_tsconfigPath;
   const tsconfigPath = (_dts_tsconfigPath = dts.tsconfigPath) !== null && _dts_tsconfigPath !== void 0 ? _dts_tsconfigPath : tsconfig;
   const { dtsExtension } = (0, import_utils2.getDefaultOutExtension)({
@@ -99,7 +99,8 @@ const generatorDts = async (config, api, options) => {
     alias,
     sourceDir,
     dtsExtension,
-    userTsconfig
+    userTsconfig,
+    enableTscBuild
   };
   const prevTime = Date.now();
   (0, import_debug.debug)(`${(0, import_debug.label)("dts")} Build Start`);

package/dist/builder/clear.js

@@ -35,23 +35,25 @@ const clearBuildConfigPaths = async (configs, projectAbsRootPath) => {
     }
     if (config.buildType === "bundleless" && config.dts) {
       const { compilerOptions } = await (0, import_utils2.getProjectTsconfig)(config.tsconfig);
-      const { composite, incremental, rootDir, tsBuildInfoFile = ".tsbuildinfo" } = compilerOptions || {};
+      const { composite, incremental, rootDir, outDir, 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);
+      if (outDir) {
+        if (rootDir) {
+          tsbuildInfoFilePath = (0, import_path.join)(outDir, (0, import_path.relative)((0, import_path.resolve)(tsconfigDir, rootDir), tsconfigDir), tsbuildInfoFilePath);
+        } else {
+          tsbuildInfoFilePath = (0, import_path.join)(outDir, tsbuildInfoFilePath);
+        }
       }
+      const tsbuildInfoFileAbsPath = (0, import_path.resolve)(tsconfigDir, tsbuildInfoFilePath);
       (0, import_debug.debug)("clear tsbuildinfo");
-      if (await import_utils.fs.pathExists(tsbuildInfoFilePath)) {
-        await import_utils.fs.remove(tsbuildInfoFilePath);
+      if (await import_utils.fs.pathExists(tsbuildInfoFileAbsPath)) {
+        await import_utils.fs.remove(tsbuildInfoFileAbsPath);
       } else {
-        (0, import_debug.debug)(`${tsbuildInfoFilePath} doesn't exist`);
+        (0, import_debug.debug)(`${tsbuildInfoFileAbsPath} doesn't exist`);
       }
     }
   }

package/dist/builder/dts/tsc.js

@@ -57,22 +57,23 @@ const resolveLog = async (childProgress, options) => {
   });
 };
 const runTscBin = async (api, config) => {
-  const { appDirectory, watch = false, abortOnError = true, tsconfigPath, userTsconfig, distPath } = config;
+  const { appDirectory, watch = false, abortOnError = true, tsconfigPath, userTsconfig, distPath, enableTscBuild } = config;
   const tscBinFile = await (0, import_utils2.getTscBinPath)(appDirectory);
   const params = [];
-  if (userTsconfig.references) {
+  if (enableTscBuild) {
     params.push("-b", tsconfigPath);
     var _userTsconfig_compilerOptions;
-    const { baseUrl = ".", outDir, emitDeclarationOnly, declaration } = (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) !== null && _userTsconfig_compilerOptions !== void 0 ? _userTsconfig_compilerOptions : {};
+    const { baseUrl = ".", outDir, emitDeclarationOnly, declaration, declarationDir } = (_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 (!outDir || import_path.default.resolve(abosultBaseUrl, outDir) !== distPath) {
+    if ((!outDir || import_path.default.resolve(abosultBaseUrl, outDir) !== distPath) && (!declarationDir || import_path.default.resolve(abosultBaseUrl, declarationDir) !== 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 info = outDir && !declarationDir ? "outDir" : "declarationDir";
+      import_utils.logger.error(`Please set ${info}: "${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)}`);
+        import_utils.logger.error(`Please set declaration: true and emitDeclarationOnly: true in ${import_utils.chalk.underline(tsconfigPath)}`);
       }
     } else {
       params.push("--declaration", "--emitDeclarationOnly");
@@ -82,7 +83,7 @@ const runTscBin = async (api, config) => {
       "-p",
       tsconfigPath,
       // Same as dts.distPath
-      "--outDir",
+      "--declarationDir",
       distPath,
       // Only emit d.ts files
       "--declaration",

package/dist/builder/feature/asset.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ICompiler, LoadResult, SvgrOptions } from '../../types';
+import { ICompiler } from '../../types';
 export declare const asset: {
     name: string;
     apply(compiler: ICompiler): void;
@@ -14,6 +14,5 @@ export declare const asset: {
  */
 export declare function getAssetContents(this: ICompiler, assetPath: string, rebaseFrom: string, calledOnLoad?: boolean): Promise<{
     contents: string | Buffer;
-    loader: "copy" | "text";
+    loader: "copy" | "jsx" | "text";
 }>;
-export declare function loadSvgr(path: string, options: boolean | SvgrOptions): Promise<LoadResult | undefined>;

package/dist/builder/feature/asset.js

@@ -29,8 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var asset_exports = {};
 __export(asset_exports, {
   asset: () => asset,
-  getAssetContents: () => getAssetContents,
-  loadSvgr: () => loadSvgr
+  getAssetContents: () => getAssetContents
 });
 module.exports = __toCommonJS(asset_exports);
 var import_path = require("path");
@@ -50,11 +49,7 @@ const asset = {
       name
     }, async (args) => {
       if (import_file.assetExt.find((ext) => ext === (0, import_path.extname)(args.path))) {
-        const { buildType, outDir, sourceDir, asset: asset2 } = compiler.config;
-        const svgrResult = await loadSvgr(args.path, asset2.svgr);
-        if (svgrResult) {
-          return svgrResult;
-        }
+        const { buildType, outDir, sourceDir } = compiler.config;
         const rebaseFrom = buildType === "bundle" ? outDir : (0, import_path.join)(outDir, (0, import_path.relative)(sourceDir, (0, import_path.dirname)(args.path)));
         const { contents, loader } = await getAssetContents.apply(compiler, [
           args.path,
@@ -75,7 +70,7 @@ function encodeSVG(buffer) {
 async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
   const fileContent = await import_fs.default.promises.readFile(assetPath);
   const { buildType, format, outDir } = this.config;
-  const { limit, path, publicPath } = this.config.asset;
+  const { limit, path, publicPath, svgr } = this.config.asset;
   const hash = (0, import_utils.getHash)(fileContent, null).slice(0, 8);
   const outputFileName = (0, import_path.basename)(assetPath).split(".").join(`.${hash}.`);
   const outputFilePath = (0, import_path.resolve)(outDir, path, outputFileName);
@@ -85,7 +80,24 @@ async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
   let emitAsset = true;
   let contents = normalizedPublicPath;
   let loader = "text";
-  if (buildType === "bundle") {
+  const config = typeof svgr === "boolean" ? {} : svgr;
+  const filter = (0, import_pluginutils.createFilter)(config.include || SVG_REGEXP, config.exclude);
+  if (svgr && filter(assetPath)) {
+    const previousExport = config.exportType === "named" ? `export default "${normalizedPublicPath}"` : null;
+    contents = await (0, import_core.transform)(fileContent.toString(), config, {
+      filePath: assetPath,
+      caller: {
+        name: "svgr",
+        defaultPlugins: [
+          import_plugin_svgo.default,
+          import_plugin_jsx.default
+        ],
+        previousExport
+      }
+    });
+    loader = "jsx";
+    emitAsset = false;
+  } else if (buildType === "bundle") {
     if (fileContent.length <= limit) {
       const mimetype = (await Promise.resolve().then(() => __toESM(require("@modern-js/utils/mime-types")))).default.lookup(assetPath);
       const isSVG = mimetype === "image/svg+xml";
@@ -115,35 +127,8 @@ async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
     loader
   };
 }
-async function loadSvgr(path, options) {
-  if (!options) {
-    return;
-  }
-  const config = typeof options === "boolean" ? {} : options;
-  const filter = (0, import_pluginutils.createFilter)(config.include || SVG_REGEXP, config.exclude);
-  if (!filter(path)) {
-    return;
-  }
-  const loader = "jsx";
-  const text = import_fs.default.readFileSync(path, "utf8");
-  const jsCode = await (0, import_core.transform)(text, config, {
-    filePath: path,
-    caller: {
-      name: "svgr",
-      defaultPlugins: [
-        import_plugin_svgo.default,
-        import_plugin_jsx.default
-      ]
-    }
-  });
-  return {
-    contents: jsCode,
-    loader
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   asset,
-  getAssetContents,
-  loadSvgr
+  getAssetContents
 });

package/dist/builder/feature/redirect.js

@@ -55,7 +55,7 @@ async function redirectImport(compiler, code, modules, aliasRecord, filePath, ou
     const { start, end } = module2;
     let { name: name2 } = module2;
     const ext = (0, import_path.extname)(name2);
-    const { redirect: redirect2, asset } = compiler.config;
+    const { redirect: redirect2 } = compiler.config;
     const { alias, style } = redirect2;
     if (alias) {
       let absoluteImportPath = matchPath ? matchPath(name2, void 0, void 0, extensions) : void 0;
@@ -119,16 +119,15 @@ async function redirectImport(compiler, code, modules, aliasRecord, filePath, ou
     if (redirect2.asset) {
       if (import_file.assetExt.filter((ext2) => name2.endsWith(ext2)).length) {
         const absPath = (0, import_path.resolve)((0, import_path.dirname)(filePath), name2);
-        const svgrResult = await (0, import_asset.loadSvgr)(absPath, asset.svgr);
-        if (svgrResult) {
+        const { contents: relativeImportPath, loader } = await import_asset.getAssetContents.apply(compiler, [
+          absPath,
+          outputDir
+        ]);
+        if (loader === "jsx") {
           const ext2 = (0, import_path.extname)(name2);
           const outputName = `${name2.slice(0, -ext2.length)}.js`;
           str.overwrite(start, end, outputName);
         } else {
-          const { contents: relativeImportPath } = await import_asset.getAssetContents.apply(compiler, [
-            absPath,
-            outputDir
-          ]);
           str.overwrite(start, end, `${relativeImportPath}`);
         }
       }

package/dist/constants/build.js

@@ -42,7 +42,8 @@ const getDefaultBuildConfig = () => {
       distPath: "./",
       tsconfigPath: void 0,
       abortOnError: true,
-      respectExternal: true
+      respectExternal: true,
+      enableTscBuild: false
     }),
     autoExtension: false,
     esbuildOptions: (c) => c,

package/dist/types/config/index.d.ts

@@ -41,6 +41,12 @@ export type Redirect = {
 export type DTSOptions = {
     abortOnError: boolean;
     distPath: string;
+    /**
+     * Build one or more projects and their dependencies, if out of date
+     * The same as 'tsc --build'
+     * @default false
+     */
+    enableTscBuild: boolean;
     only: boolean;
     /**
      * @deprecated

package/dist/types/dts.d.ts

@@ -14,6 +14,7 @@ export interface GeneratorDtsConfig {
     respectExternal: boolean;
     dtsExtension: string;
     userTsconfig: ITsconfig;
+    enableTscBuild: boolean;
 }
 export interface GeneratedDtsInfo {
     userTsconfig: ITsconfig;

package/dist/utils/dts.js

@@ -123,7 +123,12 @@ const processDtsFilesAfterTsc = async (config) => {
         return;
       }
       const { start, end, name } = module2;
-      const absoluteImportPath = matchPath(name);
+      const absoluteImportPath = matchPath(name, void 0, void 0, [
+        ".jsx",
+        ".tsx",
+        ".js",
+        ".ts"
+      ]);
       if (absoluteImportPath) {
         const relativePath = (0, import_path.relative)((0, import_path.dirname)(originalFilePath), absoluteImportPath);
         const relativeImportPath = (0, import_builder.normalizeSlashes)(relativePath.startsWith("..") ? relativePath : `./${relativePath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.43.0",
+  "version": "2.44.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -50,9 +50,9 @@
     "@ast-grep/napi": "0.12.0",
     "@modern-js/swc-plugins": "0.6.6",
     "@rollup/pluginutils": "4.1.1",
-    "@svgr/core": "8.0.0",
-    "@svgr/plugin-jsx": "8.0.1",
-    "@svgr/plugin-svgo": "8.0.1",
+    "@svgr/core": "8.1.0",
+    "@svgr/plugin-jsx": "8.1.0",
+    "@svgr/plugin-svgo": "8.1.0",
     "@swc/helpers": "0.5.3",
     "convert-source-map": "1.8.0",
     "enhanced-resolve": "5.12.0",
@@ -67,24 +67,24 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@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"
+    "@modern-js/core": "2.44.0",
+    "@modern-js/new-action": "2.44.0",
+    "@modern-js/plugin": "2.44.0",
+    "@modern-js/plugin-changeset": "2.44.0",
+    "@modern-js/plugin-i18n": "2.44.0",
+    "@modern-js/plugin-lint": "2.44.0",
+    "@modern-js/types": "2.44.0",
+    "@modern-js/upgrade": "2.44.0",
+    "@modern-js/utils": "2.44.0"
   },
   "devDependencies": {
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@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"
+    "@modern-js/builder-webpack-provider": "2.44.0",
+    "@scripts/build": "2.44.0",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.44.0",
+    "@scripts/vitest-config": "2.44.0"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"