chore: update

Author: SoonIter

packages/core/src/config.ts

@@ -18,6 +18,7 @@ import {
   DEFAULT_CONFIG_EXTENSIONS,
   DEFAULT_CONFIG_NAME,
   DTS_EXTENSIONS_PATTERN,
+  JS_EXTENSIONS_PATTERN,
   RSLIB_ENTRY_QUERY,
   SWC_HELPERS,
 } from './constant';
@@ -1060,6 +1061,7 @@ const composeBundlelessExternalConfig = (
   const styleRedirectExtension = redirect.style?.extension ?? true;
   const jsRedirectPath = redirect.js?.path ?? true;
   const jsRedirectExtension = redirect.js?.extension ?? true;
+  const assetRedirect = redirect.asset ?? true;
 
   let resolver: RspackResolver | undefined;
 
@@ -1154,15 +1156,26 @@ const composeBundlelessExternalConfig = (
               // If data.request already have an extension, we replace it with new extension
               // This may result in a change in semantics,
               // user should use copy to keep origin file or use another separate entry to deal this
-              if (jsRedirectExtension && resolvedRequest.startsWith('.')) {
+              if (resolvedRequest.startsWith('.')) {
                 const ext = extname(resolvedRequest);
                 if (ext) {
                   // 1. js files hit JS_EXTENSIONS_PATTERN, ./foo.ts -> ./foo.mjs
-                  // 2. asset files, does not match jsExtensionsPattern, eg: ./foo.png -> ./foo.mjs
-                  resolvedRequest = resolvedRequest.replace(
-                    /\.[^.]+$/,
-                    jsExtension,
-                  );
+                  if (JS_EXTENSIONS_PATTERN.test(resolvedRequest)) {
+                    if (jsRedirectExtension) {
+                      resolvedRequest = resolvedRequest.replace(
+                        /\.[^.]+$/,
+                        jsExtension,
+                      );
+                    }
+                  } else {
+                    // 2. asset files, does not match jsExtensionsPattern, eg: ./foo.png -> ./foo.mjs
+                    if (assetRedirect) {
+                      resolvedRequest = resolvedRequest.replace(
+                        /\.[^.]+$/,
+                        jsExtension,
+                      );
+                    }
+                  }
                 } else {
                   resolvedRequest = `${resolvedRequest}${jsExtension}`;
                 }

packages/core/src/types/config.ts

@@ -188,8 +188,8 @@ export type Redirect = {
   js?: JsRedirect;
   /** Controls the redirect of the import paths of output style files. */
   style?: StyleRedirect;
-  // TODO: support other redirects
-  // asset?: boolean;
+  /** Controls the redirect of the import paths of output asset files. */
+  asset?: boolean;
   // dts?: DtsRedirect;
 };
 

tests/integration/asset/svgr/src/defaultImport.js

@@ -1,3 +1,3 @@
 import svgUrl from './assets/logo.svg';
 
-console.log(svgUrl);
+console.log('default Import', 'reexport', svgUrl);

tests/integration/asset/svgr/src/namedImport.js

@@ -1,3 +1,3 @@
 import { ReactComponent } from './assets/logo.svg';
 
-console.log(ReactComponent);
+console.log('namedImport', 'ReactComponent', ReactComponent);

tests/integration/asset/svgr/src/queryImport.js

@@ -1,3 +1,3 @@
-import logo from './assets/logo.svg?react';
+import ReactComponent from './assets/logo.svg?react';
 
-console.log(logo);
+console.log('queryImport', 'ReactComponent', ReactComponent);

tests/integration/bundle-false/svgr/rslib.config.ts

@@ -19,7 +19,6 @@ export default defineConfig({
   },
   output: {
     target: 'web',
-    minify: false,
   },
   plugins: [pluginReact(), pluginSvgr({ mixedImport: true })],
 });