cr1

Author: fi3ework

packages/core/src/config.ts

@@ -39,7 +39,6 @@ import type {
   DeepRequired,
   ExcludesFalse,
   Format,
-  GetAsyncFunctionFromUnion,
   JsRedirect,
   LibConfig,
   LibOnlyConfig,
@@ -53,6 +52,7 @@ import type {
   RslibConfigAsyncFn,
   RslibConfigExport,
   RslibConfigSyncFn,
+  RspackResolver,
   Shims,
   Syntax,
 } from './types';
@@ -971,14 +971,11 @@ const composeBundlelessExternalConfig = (
 } => {
   if (bundle) return { config: {} };
 
-  const doesRedirectStyle = redirect.style ?? true;
+  const isStyleRedirected = redirect.style ?? true;
   const jsRedirectPath = redirect.js?.path ?? true;
   const jsRedirectExtension = redirect.js?.extension ?? true;
 
-  type Resolver = GetAsyncFunctionFromUnion<
-    ReturnType<NonNullable<Rspack.ExternalItemFunctionData['getResolve']>>
-  >;
-  let resolver: Resolver | undefined;
+  let resolver: RspackResolver | undefined;
 
   return {
     resolvedJsRedirect: {
@@ -995,7 +992,7 @@ const composeBundlelessExternalConfig = (
             }
 
             if (!resolver) {
-              resolver = (await getResolve()) as Resolver;
+              resolver = (await getResolve()) as RspackResolver;
             }
 
             // Issuer is not empty string when the module is imported by another module.
@@ -1008,7 +1005,7 @@ const composeBundlelessExternalConfig = (
                 callback,
                 jsExtension,
                 cssModulesAuto,
-                doesRedirectStyle,
+                isStyleRedirected,
               );
 
               if (cssExternal !== false) {

packages/core/src/types/config.ts

@@ -1,5 +1,6 @@
-import type { RsbuildConfig } from '@rsbuild/core';
+import type { RsbuildConfig, Rspack } from '@rsbuild/core';
 import type { PluginDtsOptions } from 'rsbuild-plugin-dts';
+import type { GetAsyncFunctionFromUnion } from './utils';
 
 export type Format = 'esm' | 'cjs' | 'umd' | 'mf';
 
@@ -28,6 +29,9 @@ export type RsbuildConfigEntry = NonNullable<
   NonNullable<RsbuildConfig['source']>['entry']
 >;
 export type RsbuildConfigEntryItem = RsbuildConfigEntry[string];
+export type RspackResolver = GetAsyncFunctionFromUnion<
+  ReturnType<NonNullable<Rspack.ExternalItemFunctionData['getResolve']>>
+>;
 
 export type RsbuildConfigOutputTarget = NonNullable<
   RsbuildConfig['output']

website/docs/en/config/lib/redirect.mdx

@@ -38,7 +38,7 @@ Configure the redirect for import paths in output files. In bundleless mode, the
 
 Common scenarios that require redirect:
 
-- Automatically convert `paths` in `tsconfig.json` to correct relative path
+- Automatically convert `compilerOptions.paths` in tsconfig.json to correct relative path
 
   For example, set `compilerOptions.paths` to `{ "@/*": ["src/*"] }` in tsconfig.json, the output file will be redirected to the correct relative path:
 

website/docs/zh/config/lib/redirect.mdx

@@ -38,7 +38,7 @@ const defaultRedirect = {
 
 常见的需要 redirect 的场景：
 
-- 自动将 tsconfig.json 路径转换为正确的相对路径
+- 自动将 tsconfig.json 中 `compilerOptions.paths` 转换为正确的相对路径
 
   例如，在 tsconfig.json 中将 `compilerOptions.paths` 设置为 `{ "@/*": ["src/*"] }`，输出文件将被重定向到正确的相对路径：