feat: use isWatch from onBeforeBuild

web-infra-dev · Jul 31, 2024 · eb9d6da · eb9d6da
1 parent bc82d40
commit eb9d6da
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 49 deletions.
diff --git a/e2e/package.json b/e2e/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@playwright/test": "1.43.1",
-    "@rsbuild/core": "1.0.1-beta.6",
+    "@rsbuild/core": "1.0.1-beta.8",
     "@rslib/core": "workspace:*",
     "@rslib/tsconfig": "workspace:*",
     "@types/fs-extra": "^11.0.4",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -38,7 +38,7 @@
     "prebundle": "prebundle"
   },
   "dependencies": {
-    "@rsbuild/core": "1.0.1-beta.6",
+    "@rsbuild/core": "1.0.1-beta.8",
     "rsbuild-plugin-dts": "workspace:*"
   },
   "devDependencies": {

diff --git a/packages/core/src/build.ts b/packages/core/src/build.ts
@@ -3,7 +3,7 @@ import { initRsbuild } from './config';
 import type { RslibConfig } from './types/config';
 
 export async function build(config: RslibConfig, options?: BuildOptions) {
-  const rsbuildInstance = await initRsbuild(config, options);
+  const rsbuildInstance = await initRsbuild(config);
 
   await rsbuildInstance.build({
     mode: 'production',

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -1,7 +1,6 @@
 import fs from 'node:fs';
 import path, { dirname, isAbsolute, join } from 'node:path';
 import {
-  type BuildOptions,
   type RsbuildConfig,
   createRsbuild,
   defineConfig as defineRsbuildConfig,
@@ -298,7 +297,6 @@ const getBundleConfig = (bundle = true): RsbuildConfig => {
 const getDefaultDtsConfig = (
   libConfig: LibConfig,
   entryConfig: RsbuildConfig,
-  isWatch = false,
 ): RsbuildConfig => {
   const { dts, bundle, output } = libConfig;
 
@@ -312,7 +310,6 @@ const getDefaultDtsConfig = (
         tsconfigPath: dts?.tsconfigPath ?? 'tsconfig.json',
         // TODO: temporarily use main as dts entry
         entryPath: entryConfig.source?.entry?.main as string,
-        isWatch,
       }),
     ],
   };
@@ -345,7 +342,6 @@ async function postUpdateRsbuildConfig(
   libConfig: LibConfig,
   rsbuildConfig: RsbuildConfig,
   configPath: string,
-  options?: BuildOptions,
 ) {
   const defaultTargetConfig = getDefaultTargetConfig(
     rsbuildConfig.output?.target ?? 'web',
@@ -357,11 +353,7 @@ async function postUpdateRsbuildConfig(
     dirname(configPath),
   );
 
-  const defaultDtsConfig = getDefaultDtsConfig(
-    libConfig,
-    defaultEntryConfig,
-    options?.watch,
-  );
+  const defaultDtsConfig = getDefaultDtsConfig(libConfig, defaultEntryConfig);
 
   return mergeRsbuildConfig(
     defaultTargetConfig,
@@ -393,7 +385,6 @@ const getDefaultTargetConfig = (target: string): RsbuildConfig => {
 
 export async function composeCreateRsbuildConfig(
   rslibConfig: RslibConfig,
-  options?: BuildOptions,
 ): Promise<Partial<Record<Format, RsbuildConfig>>> {
   const internalRsbuildConfig = await createInternalRsbuildConfig();
   const configPath = rslibConfig._privateMeta?.configFilePath ?? process.cwd();
@@ -427,7 +418,6 @@ export async function composeCreateRsbuildConfig(
       libConfig,
       mergedRsbuildConfig,
       configPath,
-      options,
     );
 
     // Reset some fields as they will be totally overridden by the following merge
@@ -447,14 +437,8 @@ export async function composeCreateRsbuildConfig(
   return composedRsbuildConfig;
 }
 
-export async function initRsbuild(
-  rslibConfig: RslibConfig,
-  options?: BuildOptions,
-) {
-  const rsbuildConfigObject = await composeCreateRsbuildConfig(
-    rslibConfig,
-    options,
-  );
+export async function initRsbuild(rslibConfig: RslibConfig) {
+  const rsbuildConfigObject = await composeCreateRsbuildConfig(rslibConfig);
 
   return createRsbuild({
     rsbuildConfig: {

diff --git a/packages/plugin-dts/package.json b/packages/plugin-dts/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.47.4",
-    "@rsbuild/core": "1.0.1-beta.6",
+    "@rsbuild/core": "1.0.1-beta.8",
     "@rslib/tsconfig": "workspace:*",
     "typescript": "^5.5.3"
   },

diff --git a/packages/plugin-dts/src/dts.ts b/packages/plugin-dts/src/dts.ts
@@ -6,8 +6,8 @@ import { ensureTempDeclarationDir, loadTsconfig } from './utils';
 
 export async function generateDts(data: sendData) {
   logger.info('Generating DTS...');
-  const { options: pluginOptions } = data;
-  const { tsconfigPath, distPath, bundle, entryPath, isWatch } = pluginOptions;
+  const { options: pluginOptions, isWatch } = data;
+  const { tsconfigPath, distPath, bundle, entryPath } = pluginOptions;
   const cwd = process.cwd();
   const configPath = tsconfigPath
     ? join(cwd, tsconfigPath)
@@ -79,7 +79,7 @@ process.on('message', async (data: sendData) => {
 
   await generateDts(data);
 
-  if (!data.options.isWatch) {
+  if (!data.isWatch) {
     process.exit();
   }
 });
diff --git a/packages/plugin-dts/src/index.ts b/packages/plugin-dts/src/index.ts
@@ -7,11 +7,11 @@ export type pluginDtsOptions = {
   distPath?: string;
   tsconfigPath?: string;
   entryPath?: string;
-  isWatch?: boolean;
 };
 
 export type sendData = {
   options: pluginDtsOptions;
+  isWatch: boolean;
 };
 
 export const PLUGIN_DTS_NAME = 'rsbuild:dts';
@@ -26,15 +26,18 @@ export const pluginDts = (
 ): RsbuildPlugin => ({
   name: PLUGIN_DTS_NAME,
 
-  setup() {
-    const childProcess = fork(join(__dirname, './dts.js'), [], {
-      stdio: 'inherit',
-    });
+  setup(api) {
+    api.onBeforeBuild(({ isWatch }) => {
+      const childProcess = fork(join(__dirname, './dts.js'), [], {
+        stdio: 'inherit',
+      });
 
-    const sendData = {
-      options,
-    };
+      const sendData = {
+        options,
+        isWatch,
+      };
 
-    childProcess.send(sendData);
+      childProcess.send(sendData);
+    });
   },
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml