@modern-js/module-tools 2.48.0 → 2.48.1

package/dist/builder/esbuild/index.js

@@ -32,7 +32,6 @@ __export(esbuild_exports, {
   createCompiler: () => createCompiler
 });
 module.exports = __toCommonJS(esbuild_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path = __toESM(require("path"));
 var import_esbuild = require("esbuild");
 var tapable = __toESM(require("tapable"));
@@ -231,23 +230,11 @@ class EsbuildCompiler {
     }
   }
   constructor(context2) {
-    (0, import_define_property._)(this, "instance", void 0);
-    (0, import_define_property._)(this, "result", void 0);
-    (0, import_define_property._)(this, "hookList", void 0);
-    (0, import_define_property._)(this, "reBuildCount", void 0);
-    (0, import_define_property._)(this, "buildOptions", void 0);
-    (0, import_define_property._)(this, "context", void 0);
-    (0, import_define_property._)(this, "config", void 0);
-    (0, import_define_property._)(this, "hooks", void 0);
-    (0, import_define_property._)(this, "api", void 0);
-    (0, import_define_property._)(this, "outputChunk", /* @__PURE__ */ new Map());
-    (0, import_define_property._)(this, "watchedFiles", /* @__PURE__ */ new Set());
-    (0, import_define_property._)(this, "css_resolve", void 0);
-    (0, import_define_property._)(this, "node_resolve", void 0);
-    (0, import_define_property._)(this, "watcher", void 0);
-    (0, import_define_property._)(this, "virtualModule", /* @__PURE__ */ new Map());
-    (0, import_define_property._)(this, "transformContextMap", /* @__PURE__ */ new Map());
-    (0, import_define_property._)(this, "sourcemapContextMap", /* @__PURE__ */ new Map());
+    this.outputChunk = /* @__PURE__ */ new Map();
+    this.watchedFiles = /* @__PURE__ */ new Set();
+    this.virtualModule = /* @__PURE__ */ new Map();
+    this.transformContextMap = /* @__PURE__ */ new Map();
+    this.sourcemapContextMap = /* @__PURE__ */ new Map();
     const { api, config, root } = context2;
     this.reBuildCount = 0;
     this.context = context2;

package/dist/builder/esbuild/sourcemap.js

@@ -21,7 +21,6 @@ __export(sourcemap_exports, {
   SourcemapContext: () => SourcemapContext
 });
 module.exports = __toCommonJS(sourcemap_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_utils = require("../../utils");
 class SourcemapContext {
   markSourceMapStatus(dirty) {
@@ -67,12 +66,6 @@ class SourcemapContext {
     return id;
   }
   constructor(enableSourceMap) {
-    (0, import_define_property._)(this, "enableSourceMap", void 0);
-    (0, import_define_property._)(this, "sourceMapChain", void 0);
-    (0, import_define_property._)(this, "sourceMapDirty", void 0);
-    (0, import_define_property._)(this, "cachedInlineSourceMap", void 0);
-    (0, import_define_property._)(this, "cachedSourceMap", void 0);
-    (0, import_define_property._)(this, "pluginIdMap", void 0);
     this.enableSourceMap = enableSourceMap;
     this.sourceMapChain = [];
     this.sourceMapDirty = false;

package/dist/builder/esbuild/transform.js

@@ -21,7 +21,6 @@ __export(transform_exports, {
   TransformContext: () => TransformContext
 });
 module.exports = __toCommonJS(transform_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_sourcemap = require("./sourcemap");
 class TransformContext extends import_sourcemap.SourcemapContext {
   addTransformResult(pluginId, result) {
@@ -36,7 +35,7 @@ class TransformContext extends import_sourcemap.SourcemapContext {
   }
   constructor(...args) {
     super(...args);
-    (0, import_define_property._)(this, "cachedTransformResult", /* @__PURE__ */ new Map());
+    this.cachedTransformResult = /* @__PURE__ */ new Map();
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/builder/feature/redirect.js

@@ -167,68 +167,72 @@ const redirect = {
         }
         return result;
       }, {});
-      let matchModule = [];
       try {
         const sgNode = import_napi.js.parse(code).root();
-        const funcPattern = [
-          `require($MATCH)`,
-          `import($MATCH)`
-        ];
-        const staticPattern = [
-          `import $VAR from '$MATCH'`,
-          `import $VAR from "$MATCH"`,
-          `export {$$$VAR} from '$MATCH'`,
-          `export {$$$VAR} from "$MATCH"`,
-          `export * from '$MATCH'`,
-          `export * from "$MATCH"`,
-          `export * as $VAR from '$MATCH'`,
-          `export * as $VAR from "$MATCH"`,
-          `import '$MATCH'`,
-          `import "$MATCH"`
-        ];
-        const funcMatchModule = funcPattern.map((p) => {
-          return sgNode.findAll(p);
-        }).flat().map((node) => {
-          const matchNode = node.getMatch("MATCH");
-          return {
-            name: matchNode.text().slice(1, -1),
-            start: matchNode.range().start.index + 1,
-            end: matchNode.range().end.index - 1
-          };
-        });
-        const staticMatchModule = staticPattern.map((p) => sgNode.findAll(p)).flat().map((node) => {
-          const matchNode = node.getMatch("MATCH");
+        const matcher = {
+          rule: {
+            kind: "string_fragment",
+            any: [
+              {
+                inside: {
+                  stopBy: "end",
+                  kind: "import_statement",
+                  field: "source"
+                }
+              },
+              {
+                inside: {
+                  stopBy: "end",
+                  kind: "export_statement",
+                  field: "source"
+                }
+              },
+              {
+                inside: {
+                  kind: "string",
+                  inside: {
+                    kind: "arguments",
+                    inside: {
+                      kind: "call_expression",
+                      has: {
+                        field: "function",
+                        regex: "^(import|require)$"
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        };
+        const matchModule = sgNode.findAll(matcher).map((matchNode) => {
           return {
             name: matchNode.text(),
             start: matchNode.range().start.index,
             end: matchNode.range().end.index
           };
         });
-        matchModule = [
-          ...funcMatchModule,
-          ...staticMatchModule
-        ];
+        if (matchModule.length > 0) {
+          const { jsExtension, isModule } = (0, import_utils2.getDefaultOutExtension)({
+            format,
+            root,
+            autoExtension
+          });
+          const outputPath = (0, import_path.resolve)(outDir, (0, import_path.relative)(sourceDir, id));
+          const str = await redirectImport(compiler, code, matchModule, absoluteAlias, id, (0, import_path.dirname)(outputPath), jsExtension, isModule, matchPath);
+          return {
+            ...args,
+            code: str.toString(),
+            map: str.generateMap({
+              hires: true,
+              includeContent: true
+            })
+          };
+        }
       } catch (e) {
         import_utils.logger.error("[parse error]", e);
       }
-      if (!matchModule.length) {
-        return args;
-      }
-      const { jsExtension, isModule } = (0, import_utils2.getDefaultOutExtension)({
-        format,
-        root,
-        autoExtension
-      });
-      const outputPath = (0, import_path.resolve)(outDir, (0, import_path.relative)(sourceDir, id));
-      const str = await redirectImport(compiler, code, matchModule, absoluteAlias, id, (0, import_path.dirname)(outputPath), jsExtension, isModule, matchPath);
-      return {
-        ...args,
-        code: str.toString(),
-        map: str.generateMap({
-          hires: true,
-          includeContent: true
-        })
-      };
+      return args;
     });
   }
 };

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

@@ -31,7 +31,6 @@ __export(lessAliasPlugin_exports, {
   default: () => LessAliasesPlugin
 });
 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");
 class LessAliasesPlugin {
@@ -51,7 +50,6 @@ class LessAliasesPlugin {
       }
       constructor(options) {
         super();
-        (0, import_define_property._)(this, "compiler", void 0);
         this.compiler = options.compiler;
         this.stdinDir = options.stdinDir;
       }
@@ -62,8 +60,6 @@ class LessAliasesPlugin {
     }));
   }
   constructor(options) {
-    (0, import_define_property._)(this, "compiler", void 0);
-    (0, import_define_property._)(this, "stdinDir", void 0);
     this.compiler = options.compiler;
     this.stdinDir = options.stdinDir;
   }

package/dist/builder/feature/swc.js

@@ -126,13 +126,14 @@ const swcTransform = (userTsconfig) => ({
     });
   }
 });
+const JS_REGEX = /\.(?:js|mjs|cjs)$/;
 const swcRenderChunk = {
   name: "swc:renderChunk",
   apply(compiler) {
     compiler.hooks.renderChunk.tapPromise({
       name: "swc:renderChunk"
     }, async (chunk) => {
-      if (chunk.fileName.endsWith(".js") && chunk.type === "chunk") {
+      if (JS_REGEX.test(chunk.fileName) && chunk.type === "chunk") {
         const { umdModuleName, format } = compiler.config;
         const name2 = typeof umdModuleName === "function" ? umdModuleName(chunk.fileName) : umdModuleName;
         const swcCompiler = new import_swc_plugins.Compiler({

package/dist/error.js

@@ -26,7 +26,6 @@ __export(error_exports, {
   padSpaceWith: () => padSpaceWith
 });
 module.exports = __toCommonJS(error_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_utils = require("@modern-js/utils");
 const padSpaceWith = (str, targetL, opts = {}) => {
   const { endStr = "|", style } = opts;
@@ -77,9 +76,6 @@ Detailed Information: `));
   }
   constructor(e, opts) {
     super(e.stack);
-    (0, import_define_property._)(this, "buildType", void 0);
-    (0, import_define_property._)(this, "target", void 0);
-    (0, import_define_property._)(this, "format", void 0);
     Error.captureStackTrace(this, this.constructor);
     this.buildType = opts.buildType;
     this.target = opts.target;
@@ -106,8 +102,6 @@ class InternalDTSError extends Error {
   }
   constructor(e, opts) {
     super(e.message);
-    (0, import_define_property._)(this, "buildType", void 0);
-    (0, import_define_property._)(this, "e", void 0);
     Error.captureStackTrace(this, this.constructor);
     this.e = e;
     this.buildType = opts.buildType;

package/dist/types/dts.d.ts

@@ -43,7 +43,7 @@ export interface ITsconfig {
     } | undefined;
     include?: string[];
     exclude?: string[];
-    extends?: string;
+    extends?: string | string[];
     references?: {
         path?: string;
     }[];

package/dist/utils/dts.d.ts

@@ -1,5 +1,5 @@
 import type { ITsconfig, GeneratorDtsConfig, BuildType, TsTarget } from '../types';
-export declare const getProjectTsconfig: (tsconfigPath: string) => Promise<ITsconfig>;
+export declare const getProjectTsconfig: (tsconfigPath: string, resolutionContext?: Record<string, boolean>) => 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>;

package/dist/utils/dts.js

@@ -38,15 +38,41 @@ __export(dts_exports, {
 module.exports = __toCommonJS(dts_exports);
 var import_path = require("path");
 var import_utils = require("@modern-js/utils");
+var import_lodash = require("@modern-js/utils/lodash");
 var import_magic_string = __toESM(require("magic-string"));
 var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
 var import_napi = require("@ast-grep/napi");
 var import_builder = require("./builder");
-const getProjectTsconfig = async (tsconfigPath) => {
+const getProjectTsconfig = async (tsconfigPath, resolutionContext = {}) => {
   if (!import_utils.fs.existsSync(tsconfigPath)) {
     return {};
   }
-  return import_utils.json5.parse(import_utils.fs.readFileSync(tsconfigPath, "utf-8"));
+  const absolutePath = (0, import_path.resolve)(tsconfigPath);
+  if (resolutionContext[absolutePath]) {
+    return {};
+  }
+  resolutionContext[absolutePath] = true;
+  const tsConfig = await import_utils.json5.parse(import_utils.fs.readFileSync(tsconfigPath, "utf-8"));
+  if (!tsConfig.extends) {
+    return tsConfig;
+  }
+  const extendsResolutionTarget = tsConfig.extends instanceof Array ? tsConfig.extends : [
+    tsConfig.extends
+  ];
+  const resolveParentTsConfigPromises = extendsResolutionTarget.map(async (target) => {
+    let parentTsconfigPath;
+    try {
+      parentTsconfigPath = require.resolve(target);
+      if (!parentTsconfigPath.endsWith(".json")) {
+        parentTsconfigPath = require.resolve(`${target}/tsconfig.json`);
+      }
+    } catch {
+      parentTsconfigPath = (0, import_path.resolve)((0, import_path.dirname)(tsconfigPath), target);
+    }
+    return await getProjectTsconfig(parentTsconfigPath, resolutionContext);
+  });
+  const parentTsConfigs = await Promise.all(resolveParentTsConfigPromises);
+  return (0, import_lodash.mergeWith)({}, ...parentTsConfigs, tsConfig);
 };
 async function detectTSVersion(appDirectory) {
   const cwd = appDirectory !== null && appDirectory !== void 0 ? appDirectory : process.cwd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.48.0",
+  "version": "2.48.1",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -57,7 +57,7 @@
     "enhanced-resolve": "5.12.0",
     "esbuild": "0.19.2",
     "magic-string": "0.30.5",
-    "postcss": "8.4.31",
+    "postcss": "^8.4.35",
     "postcss-modules": "4.3.0",
     "safe-identifier": "0.4.2",
     "source-map": "0.7.4",
@@ -66,22 +66,22 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.48.0",
-    "@modern-js/plugin": "2.48.0",
-    "@modern-js/plugin-changeset": "2.48.0",
-    "@modern-js/types": "2.48.0",
-    "@modern-js/plugin-lint": "2.48.0",
-    "@modern-js/plugin-i18n": "2.48.0",
-    "@modern-js/utils": "2.48.0"
+    "@modern-js/core": "2.48.1",
+    "@modern-js/plugin": "2.48.1",
+    "@modern-js/plugin-changeset": "2.48.1",
+    "@modern-js/plugin-i18n": "2.48.1",
+    "@modern-js/utils": "2.48.1",
+    "@modern-js/types": "2.48.1",
+    "@modern-js/plugin-lint": "2.48.1"
   },
   "devDependencies": {
-    "@rsbuild/core": "0.4.8",
+    "@rsbuild/core": "0.4.15",
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.48.0",
-    "@scripts/build": "2.48.0",
-    "@scripts/vitest-config": "2.48.0"
+    "@modern-js/self": "npm:@modern-js/module-tools@2.48.1",
+    "@scripts/vitest-config": "2.48.1",
+    "@scripts/build": "2.48.1"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"