@rsbuild/core 0.7.0-beta.5 → 0.7.0-beta.6

package/dist-types/provider/createCompiler.d.ts

@@ -1,8 +1,34 @@
-import { type CreateDevMiddlewareReturns, type RspackCompiler, type RspackConfig, type RspackMultiCompiler } from '@rsbuild/shared';
-import type { InternalContext } from '../types';
+import { type Rspack, type RspackConfig } from '@rsbuild/shared';
+import type { DevMiddlewareAPI } from '../server/devMiddleware';
+import type { DevConfig, InternalContext } from '../types';
 import { type InitConfigsOptions } from './initConfigs';
 export declare function createCompiler({ context, rspackConfigs, }: {
     context: InternalContext;
     rspackConfigs: RspackConfig[];
-}): Promise<RspackCompiler | RspackMultiCompiler>;
-export declare function createDevMiddleware(options: InitConfigsOptions, customCompiler?: RspackCompiler | RspackMultiCompiler): Promise<CreateDevMiddlewareReturns>;
+}): Promise<Rspack.Compiler | Rspack.MultiCompiler>;
+export type MiddlewareCallbacks = {
+    onInvalid: () => void;
+    onDone: (stats: any) => void;
+};
+export type DevMiddlewareOptions = {
+    /** To ensure HMR works, the devMiddleware need inject the hmr client path into page when HMR enable. */
+    clientPaths?: string[];
+    clientConfig: DevConfig['client'];
+    publicPath?: string;
+    /** When liveReload is disabled, the page does not reload. */
+    liveReload?: boolean;
+    etag?: 'weak' | 'strong';
+    /** The options need by compiler middleware (like webpackMiddleware) */
+    headers?: Record<string, string | string[]>;
+    writeToDisk?: boolean | ((filename: string) => boolean);
+    stats?: boolean;
+    /** should trigger when compiler hook called */
+    callbacks: MiddlewareCallbacks;
+    /** whether use Server Side Render */
+    serverSideRender?: boolean;
+};
+export type CreateDevMiddlewareReturns = {
+    devMiddleware: (options: DevMiddlewareOptions) => DevMiddlewareAPI;
+    compiler: Rspack.Compiler | Rspack.MultiCompiler;
+};
+export declare function createDevMiddleware(options: InitConfigsOptions, customCompiler?: Rspack.Compiler | Rspack.MultiCompiler): Promise<CreateDevMiddlewareReturns>;

package/dist-types/server/compilerDevMiddleware.d.ts

@@ -2,7 +2,8 @@
 /// <reference types="node" />
 import type { IncomingMessage } from 'node:http';
 import type { Socket } from 'node:net';
-import type { DevMiddleware as CustomDevMiddleware, DevConfig, DevMiddlewareAPI, ServerConfig } from '@rsbuild/shared';
+import type { DevConfig, ServerConfig } from '@rsbuild/shared';
+import type { DevMiddleware as CustomDevMiddleware, DevMiddlewareAPI } from './devMiddleware';
 type Options = {
     publicPaths: string[];
     dev: DevConfig;

package/dist-types/server/devMiddleware.d.ts

@@ -1,5 +1,8 @@
-import { type CompilerTapFn, type DevMiddleware } from '@rsbuild/shared';
+/// <reference types="node" />
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import { type CompilerTapFn, type NextFunction } from '@rsbuild/shared';
 import type { Compiler, MultiCompiler } from '@rspack/core';
+import type { DevMiddlewareOptions } from '../provider/createCompiler';
 type ServerCallbacks = {
     onInvalid: () => void;
     onDone: (stats: any) => void;
@@ -14,5 +17,16 @@ export declare const setupServerHooks: (compiler: {
         done: CompilerTapFn<ServerCallbacks['onDone']>;
     };
 }, hookCallbacks: ServerCallbacks) => void;
+export type Middleware = (req: IncomingMessage, res: ServerResponse, next: NextFunction) => Promise<void>;
+export type DevMiddlewareAPI = Middleware & {
+    close: (callback: (err: Error | null | undefined) => void) => any;
+};
+/**
+ * The rsbuild/server do nothing about compiler, the devMiddleware need do such things to ensure dev works well:
+ * - Call compiler.watch （normally did by webpack-dev-middleware）.
+ * - Inject the hmr client path into page （the hmr client rsbuild/server already provide）.
+ * - Notify server when compiler hooks are triggered.
+ */
+export type DevMiddleware = (options: DevMiddlewareOptions) => DevMiddlewareAPI;
 export declare const getDevMiddleware: (multiCompiler: Compiler | MultiCompiler) => Promise<NonNullable<DevMiddleware>>;
 export {};

package/dist-types/server/devServer.d.ts

@@ -1,4 +1,5 @@
-import { type CreateDevMiddlewareReturns, type CreateDevServerOptions, type RsbuildDevServer, type StartDevServerOptions } from '@rsbuild/shared';
+import { type CreateDevServerOptions, type RsbuildDevServer, type StartDevServerOptions } from '@rsbuild/shared';
+import type { CreateDevMiddlewareReturns } from '../provider/createCompiler';
 import type { InternalContext } from '../types';
 export declare function createDevServer<Options extends {
     context: InternalContext;

package/dist-types/server/getDevMiddlewares.d.ts

@@ -1,14 +1,21 @@
-import type { CompileMiddlewareAPI, DevConfig, Middlewares, OutputFileSystem, ServerConfig, UpgradeEvent } from '@rsbuild/shared';
+import type { DevConfig, RequestHandler, Rspack, ServerAPIs, ServerConfig, UpgradeEvent } from '@rsbuild/shared';
+export type CompileMiddlewareAPI = {
+    middleware: RequestHandler;
+    sockWrite: ServerAPIs['sockWrite'];
+    onUpgrade: UpgradeEvent;
+    close: () => void;
+};
 export type RsbuildDevMiddlewareOptions = {
     pwd: string;
     dev: DevConfig;
     server: ServerConfig;
     compileMiddlewareAPI?: CompileMiddlewareAPI;
-    outputFileSystem: OutputFileSystem;
+    outputFileSystem: Rspack.OutputFileSystem;
     output: {
         distPath: string;
     };
 };
+export type Middlewares = Array<RequestHandler | [string, RequestHandler]>;
 export declare const getMiddlewares: (options: RsbuildDevMiddlewareOptions) => Promise<{
     close: () => Promise<void>;
     onUpgrade: UpgradeEvent;

package/dist-types/server/middlewares.d.ts

@@ -1,4 +1,4 @@
-import { type HtmlFallback, type RequestHandler as Middleware, type OutputFileSystem } from '@rsbuild/shared';
+import { type HtmlFallback, type RequestHandler as Middleware, type Rspack } from '@rsbuild/shared';
 import type Connect from '@rsbuild/shared/connect';
 export declare const faviconFallbackMiddleware: Middleware;
 export declare const getRequestLoggerMiddleware: () => Promise<Connect.NextHandleFunction>;
@@ -7,5 +7,5 @@ export declare const getHtmlFallbackMiddleware: (params: {
     distPath: string;
     callback?: Middleware;
     htmlFallback?: HtmlFallback;
-    outputFileSystem: OutputFileSystem;
+    outputFileSystem: Rspack.OutputFileSystem;
 }) => Middleware;

package/dist-types/server/watchFiles.d.ts

@@ -1,4 +1,5 @@
-import type { CompileMiddlewareAPI, DevConfig, ServerConfig } from '@rsbuild/shared';
+import type { DevConfig, ServerConfig } from '@rsbuild/shared';
+import type { CompileMiddlewareAPI } from './getDevMiddlewares';
 type WatchFilesOptions = {
     dev: DevConfig;
     server: ServerConfig;

package/dist-types/types.d.ts

@@ -5,6 +5,15 @@ declare module '@rspack/core' {
         __rsbuildTransformer?: Record<string, TransformHandler>;
     }
 }
+export type RspackSourceMap = {
+    version: number;
+    sources: string[];
+    mappings: string;
+    file?: string;
+    sourceRoot?: string;
+    sourcesContent?: string[];
+    names?: string[];
+};
 export type { RsbuildPlugin, RsbuildPlugins, RsbuildPluginAPI };
 /** The inner context. */
 export type InternalContext = RsbuildContext & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.7.0-beta.5",
+  "version": "0.7.0-beta.6",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -46,19 +46,19 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "0.7.0-beta.0",
+    "@rspack/core": "0.7.0-beta.1",
     "@swc/helpers": "0.5.3",
     "core-js": "~3.36.0",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2",
     "postcss": "^8.4.38",
-    "@rsbuild/shared": "0.7.0-beta.5"
+    "@rsbuild/shared": "0.7.0-beta.6"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/node": "18.x",
     "@types/on-finished": "2.3.4",
     "@types/ws": "^8.5.10",
-    "commander": "^12.0.0",
+    "commander": "^12.1.0",
     "connect-history-api-fallback": "^2.0.0",
     "css-loader": "7.1.1",
     "dotenv": "16.4.5",