@modern-js/module-tools 2.48.4 → 2.48.5

package/dist/builder/feature/asset.js

@@ -102,7 +102,7 @@ async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
   const defaultConfig = getDefaultSVGRConfig();
   const config = typeof svgr === "boolean" ? defaultConfig : import_lodash.default.merge(defaultConfig, svgr);
   const filter = (0, import_pluginutils.createFilter)(config.include || SVG_REGEXP, config.exclude);
-  if (svgr && filter(assetPath)) {
+  if (svgr && filter(assetPath) && calledOnLoad) {
     const previousExport = config.exportType === "named" ? `export default "${normalizedPublicPath}"` : null;
     contents = await (0, import_core.transform)(fileContent.toString(), config, {
       filePath: assetPath,

package/dist/builder/feature/redirect.js

@@ -119,10 +119,14 @@ 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 { contents: relativeImportPath, loader } = await import_asset.getAssetContents.apply(compiler, [
-          absPath,
-          outputDir
-        ]);
+        const { contents: relativeImportPath, loader } = (
+          // HACK: set callOnLoad true to invoke svgr
+          await import_asset.getAssetContents.apply(compiler, [
+            absPath,
+            outputDir,
+            true
+          ])
+        );
         if (loader === "jsx") {
           const ext2 = (0, import_path.extname)(name2);
           const outputName = `${name2.slice(0, -ext2.length)}.js`;

package/dist/utils/dts.js

@@ -113,54 +113,76 @@ const processDtsFilesAfterTsc = async (config) => {
   }
   const { absoluteBaseUrl, paths, mainFields, addMatchAll } = result;
   const matchPath = (0, import_tsconfig_paths.createMatchPath)(absoluteBaseUrl, paths, mainFields, addMatchAll);
-  const Pattern = [
-    `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")`
-  ];
   await Promise.all(dtsFilesPath.map((filePath) => {
     var _userTsconfig_compilerOptions;
     const code = import_utils.fs.readFileSync(filePath, "utf8");
-    let matchModule = [];
+    const str = new import_magic_string.default(code);
+    const originalFilePath = (0, import_path.resolve)(absoluteBaseUrl, (userTsconfig === null || userTsconfig === void 0 ? void 0 : (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) === null || _userTsconfig_compilerOptions === void 0 ? void 0 : _userTsconfig_compilerOptions.rootDir) || "src", (0, import_path.relative)(distPath, filePath));
     try {
-      const sgNode = import_napi.ts.parse(code).root();
-      matchModule = Pattern.map((p) => sgNode.findAll(p)).flat().map((node) => {
-        const matchNode = node.getMatch("MATCH");
+      const sgNode = import_napi.js.parse(code).root();
+      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.forEach((module2) => {
+        if (!module2.name) {
+          return;
+        }
+        const { start, end, name } = module2;
+        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}`);
+          str.overwrite(start, end, relativeImportPath);
+        }
+      });
     } catch (e) {
       import_utils.logger.error("[parse error]", e);
     }
-    const str = new import_magic_string.default(code);
-    const originalFilePath = (0, import_path.resolve)(absoluteBaseUrl, (userTsconfig === null || userTsconfig === void 0 ? void 0 : (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) === null || _userTsconfig_compilerOptions === void 0 ? void 0 : _userTsconfig_compilerOptions.rootDir) || "src", (0, import_path.relative)(distPath, filePath));
-    matchModule.forEach((module2) => {
-      if (!module2.name) {
-        return;
-      }
-      const { start, end, name } = module2;
-      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}`);
-        str.overwrite(start, end, relativeImportPath);
-      }
-    });
     banner && str.prepend(`${banner}
 `);
     footer && str.append(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.48.4",
+  "version": "2.48.5",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -24,6 +24,10 @@
     "./defineConfig": {
       "jsnext:source": "./src/config/defineConfig.ts",
       "default": "./dist/config/defineConfig.js"
+    },
+    "./utils": {
+      "jsnext:source": "./src/utils/index.ts",
+      "default": "./dist/utils/assert.js"
     }
   },
   "main": "./dist/index.js",
@@ -66,22 +70,22 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.48.4",
-    "@modern-js/plugin-i18n": "2.48.4",
-    "@modern-js/plugin-changeset": "2.48.4",
-    "@modern-js/plugin-lint": "2.48.4",
-    "@modern-js/plugin": "2.48.4",
-    "@modern-js/utils": "2.48.4",
-    "@modern-js/types": "2.48.4"
+    "@modern-js/core": "2.48.5",
+    "@modern-js/plugin": "2.48.5",
+    "@modern-js/plugin-i18n": "2.48.5",
+    "@modern-js/types": "2.48.5",
+    "@modern-js/plugin-lint": "2.48.5",
+    "@modern-js/plugin-changeset": "2.48.5",
+    "@modern-js/utils": "2.48.5"
   },
   "devDependencies": {
     "@rsbuild/core": "0.5.4",
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.48.4",
-    "@scripts/build": "2.48.4",
-    "@scripts/vitest-config": "2.48.4"
+    "@modern-js/self": "npm:@modern-js/module-tools@2.48.5",
+    "@scripts/build": "2.48.5",
+    "@scripts/vitest-config": "2.48.5"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"