chore: bump rsbuild to support environment plugin

e2e/package.json

@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@playwright/test": "1.43.1",
-    "@rsbuild/core": "1.0.1-beta.3",
+    "@rsbuild/core": "0.0.0-next-20240723074951",
     "@rslib/core": "workspace:*",
     "@rslib/tsconfig": "workspace:*",
     "@types/fs-extra": "^11.0.4",

packages/core/package.json

@@ -38,7 +38,7 @@
     "prebundle": "prebundle"
   },
   "dependencies": {
-    "@rsbuild/core": "1.0.1-beta.3",
+    "@rsbuild/core": "0.0.0-next-20240723074951",
     "rsbuild-plugin-dts": "workspace:*"
   },
   "devDependencies": {

packages/core/src/config.ts

@@ -429,11 +429,6 @@ export async function initRsbuild(rslibConfig: RslibConfig) {
   return createRsbuild({
     rsbuildConfig: {
       environments: rsbuildConfigObject,
-      // TODO: temporarily inject the plugin externally
-      ...getDefaultDtsConfig(
-        rslibConfig.lib[0]?.dts,
-        rslibConfig.lib[0]?.bundle,
-      ),
     },
   });
 }

packages/plugin-dts/package.json

@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.47.2",
-    "@rsbuild/core": "1.0.1-beta.3",
+    "@rsbuild/core": "0.0.0-next-20240723074951",
     "@rslib/tsconfig": "workspace:*",
     "typescript": "^5.5.3"
   },

packages/plugin-dts/src/apiExtractor.ts

@@ -5,13 +5,15 @@ import {
   type ExtractorResult,
 } from '@microsoft/api-extractor';
 import { logger } from '@rsbuild/core';
-import { ensureTempDeclarationDir } from './utils';
 
-export function bundleDts(outDir: string, tsconfigPath = 'tsconfig.json') {
-  const cwd = process.cwd();
+export function bundleDts(
+  cwd: string,
+  outDir: string,
+  entry = 'index.d.ts',
+  tsconfigPath = 'tsconfig.json',
+) {
   const internalConfig = {
-    // TODO: use source.entry.main
-    mainEntryPointFilePath: join(ensureTempDeclarationDir(), 'index.d.ts'),
+    mainEntryPointFilePath: entry,
     // TODO: use !externals
     // bundledPackages: [],
     dtsRollup: {

packages/plugin-dts/src/index.ts

@@ -1,3 +1,4 @@
+import { join } from 'node:path';
 import type { RsbuildPlugin } from '@rsbuild/core';
 import { bundleDts } from './apiExtractor';
 import { emitDts } from './tsc';
@@ -24,11 +25,14 @@ export const pluginDts = (
   setup(api) {
     const { tsconfigPath } = options;
 
-    api.onAfterBuild(async () => {
-      const { outDir } = emitDts(options);
+    api.onAfterBuild(async ({ environments }) => {
+      const { outDir, cwd, dtsFileMap } = emitDts(options);
 
       if (options.bundle === true) {
-        bundleDts(outDir, tsconfigPath);
+        const entry = environments.esm?.config.source.entry?.main as string;
+        const entryDtsFile = dtsFileMap.get(join(cwd, entry));
+
+        bundleDts(cwd, outDir, entryDtsFile, tsconfigPath);
       }
     });
   },

packages/plugin-dts/src/tsc.ts

@@ -6,6 +6,8 @@ import { ensureTempDeclarationDir, loadTsconfig } from './utils';
 
 export function emitDts(options: pluginDtsOptions): {
   outDir: string;
+  cwd: string;
+  dtsFileMap: Map<string, string>;
 } {
   const { tsconfigPath, distPath, bundle } = options;
   const cwd = process.cwd();
@@ -30,6 +32,8 @@ export function emitDts(options: pluginDtsOptions): {
     emitDeclarationOnly: true,
   };
 
+  const currentDirectory = ts.sys.getCurrentDirectory();
+
   const host: ts.CompilerHost = ts.createCompilerHost(compilerOptions);
 
   const program: ts.Program = ts.createProgram(
@@ -38,7 +42,33 @@ export function emitDts(options: pluginDtsOptions): {
     host,
   );
 
-  const emitResult = program.emit();
+  const dtsFileMap = new Map<string, string>();
+
+  const writeFile: ts.WriteFileCallback = (
+    fileName,
+    text,
+    writeByteOrderMark,
+    onError,
+    sourceFiles,
+    data,
+  ) => {
+    const sourceFileName = sourceFiles?.[0]?.fileName;
+
+    if (sourceFileName) {
+      dtsFileMap.set(sourceFileName, fileName);
+    }
+
+    return host.writeFile(
+      fileName,
+      text,
+      writeByteOrderMark,
+      onError,
+      sourceFiles,
+      data,
+    );
+  };
+
+  const emitResult = program.emit(undefined, writeFile, undefined, true);
 
   const allDiagnostics = ts
     .getPreEmitDiagnostics(program)
@@ -79,5 +109,7 @@ export function emitDts(options: pluginDtsOptions): {
 
   return {
     outDir: outDir || './dist',
+    cwd: currentDirectory,
+    dtsFileMap,
   };
 }