fix(module-tools): only invoke svgr in load hook (#5609)

web-infra-dev · Apr 1, 2024 · 5d135ea · 5d135ea
1 parent 4ca9f4c
commit 5d135ea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.changeset/poor-pandas-share.md b/.changeset/poor-pandas-share.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/module-tools': patch
+---
+
+fix: only invoke svgr in load hook
+fix: 只在 load hook 里调用 svgr 逻辑
diff --git a/packages/solutions/module-tools/src/builder/feature/asset.ts b/packages/solutions/module-tools/src/builder/feature/asset.ts
@@ -116,7 +116,7 @@ export async function getAssetContents(
     typeof svgr === 'boolean' ? defaultConfig : _.merge(defaultConfig, svgr);
 
   const filter = createFilter(config.include || SVG_REGEXP, config.exclude);
-  if (svgr && filter(assetPath)) {
+  if (svgr && filter(assetPath) && calledOnLoad) {
     // svgr jsx-loader
 
     // HACK: only support public path, the same as url-loader of webpack and rollup,

diff --git a/packages/solutions/module-tools/src/builder/feature/redirect.ts b/packages/solutions/module-tools/src/builder/feature/redirect.ts
@@ -161,7 +161,8 @@ async function redirectImport(
           // asset
           const absPath = resolve(dirname(filePath), name);
           const { contents: relativeImportPath, loader } =
-            await getAssetContents.apply(compiler, [absPath, outputDir]);
+            // HACK: set callOnLoad true to invoke svgr
+            await getAssetContents.apply(compiler, [absPath, outputDir, true]);
           if (loader === 'jsx') {
             // svgr
             const ext = extname(name);