fix(dts): align tinyglobby root resolution (#1591)

Author: Timeless0911

packages/core/package.json

@@ -59,7 +59,7 @@
     "rsbuild-plugin-publint": "^0.3.4",
     "rslib": "npm:@rslib/core@0.21.0",
     "rslog": "^2.1.1",
-    "tinyglobby": "^0.2.15",
+    "tinyglobby": "^0.2.16",
     "tsconfck": "3.1.6",
     "typescript": "^6.0.2"
   },

packages/plugin-dts/package.json

@@ -43,7 +43,7 @@
     "prebundle": "1.6.4",
     "rsbuild-plugin-publint": "^0.3.4",
     "rslib": "npm:@rslib/core@0.21.0",
-    "tinyglobby": "^0.2.15",
+    "tinyglobby": "^0.2.16",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^6.0.2"
   },

packages/plugin-dts/src/index.ts

@@ -161,7 +161,7 @@ export const pluginDts: (options?: PluginDtsOptions) => RsbuildPlugin = (
 
         // clean dts files and maps
         if (config.output.cleanDistPath !== false) {
-          await cleanDtsFiles(dtsEmitPath);
+          await cleanDtsFiles(cwd, dtsEmitPath);
         }
 
         // clean .rslib temp folder

packages/plugin-dts/src/tsc.ts

@@ -45,6 +45,7 @@ async function handleDiagnosticsAndProcessFiles(
   diagnostics: readonly Diagnostic[],
   configPath: string,
   bundle: boolean,
+  cwd: string,
   declarationDir: string,
   dtsExtension: string,
   redirect: DtsRedirect,
@@ -66,6 +67,7 @@ async function handleDiagnosticsAndProcessFiles(
 
   await processDtsFiles(
     bundle,
+    cwd,
     declarationDir,
     dtsExtension,
     redirect,
@@ -105,6 +107,7 @@ export async function emitDtsTsc(
     name,
     dtsExtension,
     rootDir,
+    cwd,
     banner,
     footer,
     paths,
@@ -161,6 +164,7 @@ export async function emitDtsTsc(
       }
       await processDtsFiles(
         bundle,
+        cwd,
         declarationDir,
         dtsExtension,
         redirect,
@@ -177,6 +181,7 @@ export async function emitDtsTsc(
       logger.error(logPrefixTsc, message);
       await processDtsFiles(
         bundle,
+        cwd,
         declarationDir,
         dtsExtension,
         redirect,
@@ -255,6 +260,7 @@ export async function emitDtsTsc(
         sortAndDeduplicateDiagnostics,
         configPath,
         bundle,
+        cwd,
         declarationDir,
         dtsExtension,
         redirect,
@@ -325,6 +331,7 @@ export async function emitDtsTsc(
         sortAndDeduplicateDiagnostics,
         configPath,
         bundle,
+        cwd,
         declarationDir,
         dtsExtension,
         redirect,
@@ -360,6 +367,7 @@ export async function emitDtsTsc(
 
       await processDtsFiles(
         bundle,
+        cwd,
         declarationDir,
         dtsExtension,
         redirect,

packages/plugin-dts/src/tsgo.ts

@@ -79,6 +79,7 @@ async function handleDiagnosticsAndProcessFiles(
   tsConfigResult: ts.ParsedCommandLine,
   configPath: string,
   bundle: boolean,
+  cwd: string,
   declarationDir: string,
   dtsExtension: string,
   redirect: DtsRedirect,
@@ -89,7 +90,7 @@ async function handleDiagnosticsAndProcessFiles(
   name?: string,
 ): Promise<void> {
   if (!bundle) {
-    const dtsFiles = await globDtsFiles(declarationDir, [
+    const dtsFiles = await globDtsFiles(cwd, declarationDir, [
       '/**/*.d.ts',
       '/**/*.d.ts.map',
     ]);
@@ -114,6 +115,7 @@ async function handleDiagnosticsAndProcessFiles(
 
   await processDtsFiles(
     bundle,
+    cwd,
     declarationDir,
     dtsExtension,
     redirect,
@@ -208,6 +210,7 @@ export async function emitDtsTsgo(
           tsConfigResult,
           configPath,
           bundle,
+          cwd,
           declarationDir,
           dtsExtension,
           redirect,

packages/plugin-dts/src/utils.ts

@@ -511,6 +511,7 @@ export async function redirectDtsImports(
 
 export async function processDtsFiles(
   bundle: boolean,
+  cwd: string,
   dir: string,
   dtsExtension: string,
   redirect: DtsRedirect,
@@ -548,7 +549,7 @@ export async function processDtsFiles(
     );
   }
 
-  const dtsFiles = await globDtsFiles(dir, [`/**/*${dtsExtension}`]);
+  const dtsFiles = await globDtsFiles(cwd, dir, [`/**/*${dtsExtension}`]);
 
   await Promise.all(
     dtsFiles.map(async (file) => {
@@ -651,12 +652,14 @@ export async function calcLongestCommonPath(
 }
 
 export const globDtsFiles = async (
+  cwd: string,
   dir: string,
   patterns: string[],
 ): Promise<string[]> => {
   const dtsFiles = await Promise.all(
     patterns.map(async (pattern) =>
       glob(convertPath(join(dir, pattern)), {
+        cwd,
         absolute: true,
         dot: true,
       }),
@@ -666,7 +669,7 @@ export const globDtsFiles = async (
   return dtsFiles.flat();
 };
 
-export async function cleanDtsFiles(dir: string): Promise<void> {
+export async function cleanDtsFiles(cwd: string, dir: string): Promise<void> {
   const patterns = [
     '/**/*.d.ts',
     '/**/*.d.cts',
@@ -675,7 +678,7 @@ export async function cleanDtsFiles(dir: string): Promise<void> {
     '/**/*.d.cts.map',
     '/**/*.d.mts.map',
   ];
-  const allFiles = await globDtsFiles(dir, patterns);
+  const allFiles = await globDtsFiles(cwd, dir, patterns);
 
   await Promise.all(
     allFiles.map(async (file) => fsP.rm(file, { force: true })),

pnpm-lock.yaml

@@ -33,6 +33,6 @@
     "fs-extra": "^11.3.4",
     "path-serializer": "0.6.0",
     "test-helper": "workspace:*",
-    "tinyglobby": "^0.2.15"
+    "tinyglobby": "^0.2.16"
   }
 }

tests/package.json

@@ -148,6 +148,7 @@ export type BuildResult = {
 export async function getResults(
   rslibConfig: RslibConfig,
   type: 'js' | 'dts' | 'css',
+  cwd: string,
 ): Promise<Omit<BuildResult, 'rspackConfig' | 'rsbuildConfig' | 'isSuccess'>> {
   const files: Record<string, string[]> = {};
   const contents: Record<string, Record<string, string>> = {};
@@ -202,6 +203,7 @@ export async function getResults(
           : /\.(js|cjs|mjs|jsx)(\.map)?$/;
 
     const content: Record<string, string> = await globContentJSON(globFolder, {
+      cwd,
       absolute: true,
     });
 
@@ -334,9 +336,9 @@ export async function buildAndGetResults({
     origin: { bundlerConfigs, rsbuildConfig },
   } = await rslib.inspectConfig({ verbose: true });
   if (type === 'all') {
-    const jsResults = await getResults(rslibConfig, 'js');
-    const dtsResults = await getResults(rslibConfig, 'dts');
-    const cssResults = await getResults(rslibConfig, 'css');
+    const jsResults = await getResults(rslibConfig, 'js', fixturePath);
+    const dtsResults = await getResults(rslibConfig, 'dts', fixturePath);
+    const cssResults = await getResults(rslibConfig, 'css', fixturePath);
     return {
       js: {
         contents: jsResults.contents,
@@ -367,7 +369,7 @@ export async function buildAndGetResults({
       },
     };
   }
-  const results = await getResults(rslibConfig, type);
+  const results = await getResults(rslibConfig, type, fixturePath);
   return {
     contents: results.contents,
     files: results.files,