@rsbuild/core 0.2.7 → 0.2.9

package/dist/rspack/preload/HtmlPreloadOrPrefetchPlugin.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,23 +15,15 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var HtmlPreloadOrPrefetchPlugin_exports = {};
 __export(HtmlPreloadOrPrefetchPlugin_exports, {
   HtmlPreloadOrPrefetchPlugin: () => HtmlPreloadOrPrefetchPlugin
 });
 module.exports = __toCommonJS(HtmlPreloadOrPrefetchPlugin_exports);
-var import_html_webpack_plugin = __toESM(require("html-webpack-plugin"));
 var import_shared = require("@rsbuild/shared");
 var import_helpers = require("./helpers");
+var import_htmlPluginUtil = require("../../provider/htmlPluginUtil");
 /**
  * @license
  * Copyright 2018 Google Inc.
@@ -140,7 +130,7 @@ class HtmlPreloadOrPrefetchPlugin {
   }
   apply(compiler) {
     compiler.hooks.compilation.tap(this.constructor.name, (compilation) => {
-      import_html_webpack_plugin.default.getHooks(compilation).beforeAssetTagGeneration.tap(
+      (0, import_htmlPluginUtil.getHTMLPlugin)().getHooks(compilation).beforeAssetTagGeneration.tap(
         `HTML${(0, import_shared.upperFirst)(this.type)}Plugin`,
         (htmlPluginData) => {
           this.resourceHints = generateLinks(
@@ -153,7 +143,7 @@ class HtmlPreloadOrPrefetchPlugin {
           return htmlPluginData;
         }
       );
-      import_html_webpack_plugin.default.getHooks(compilation).alterAssetTags.tap(
+      (0, import_htmlPluginUtil.getHTMLPlugin)().getHooks(compilation).alterAssetTags.tap(
         `HTML${(0, import_shared.upperFirst)(this.type)}Plugin`,
         (htmlPluginData) => {
           if (this.resourceHints) {

package/dist/rspack/preload/helpers/determineAsValue.d.ts

@@ -16,10 +16,7 @@
  * limitations under the License.
  */
 import type { As } from './type';
-export declare function determineAsValue({
-  href,
-  file
-}: {
-  href: string;
-  file: string;
-}): As;
+export declare function determineAsValue({ href, file, }: {
+    href: string;
+    file: string;
+}): As;

package/dist/rspack/preload/helpers/doesChunkBelongToHtml.d.ts

@@ -19,13 +19,10 @@ import type { Chunk } from 'webpack';
 import type { PreloadOrPreFetchOption } from '@rsbuild/shared';
 import { BeforeAssetTagGenerationHtmlPluginData } from './type';
 interface DoesChunkBelongToHtmlOptions {
-  chunk: Chunk;
-  compilation?: Compilation;
-  htmlPluginData: BeforeAssetTagGenerationHtmlPluginData;
-  pluginOptions?: PreloadOrPreFetchOption;
+    chunk: Chunk;
+    compilation?: Compilation;
+    htmlPluginData: BeforeAssetTagGenerationHtmlPluginData;
+    pluginOptions?: PreloadOrPreFetchOption;
 }
-export declare function doesChunkBelongToHtml({
-  chunk,
-  htmlPluginData
-}: DoesChunkBelongToHtmlOptions): boolean;
-export {};
+export declare function doesChunkBelongToHtml({ chunk, htmlPluginData, }: DoesChunkBelongToHtmlOptions): boolean;
+export {};

package/dist/rspack/preload/helpers/extractChunks.d.ts

@@ -18,11 +18,8 @@ import { Chunk, Compilation } from 'webpack';
 import type { PreloadIncludeType } from '@rsbuild/shared';
 export type ChunkGroup = Compilation['chunkGroups'][0];
 interface ExtractChunks {
-  compilation: Compilation;
-  includeType?: PreloadIncludeType;
+    compilation: Compilation;
+    includeType?: PreloadIncludeType;
 }
-export declare function extractChunks({
-  compilation,
-  includeType
-}: ExtractChunks): Chunk[];
-export {};
+export declare function extractChunks({ compilation, includeType, }: ExtractChunks): Chunk[];
+export {};

package/dist/rspack/preload/helpers/index.d.ts

@@ -1,4 +1,4 @@
 export * from './extractChunks';
 export * from './determineAsValue';
 export * from './doesChunkBelongToHtml';
-export * from './type';
+export * from './type';

package/dist/rspack/preload/helpers/type.d.ts

@@ -1,13 +1,13 @@
 import type HtmlWebpackPlugin from 'html-webpack-plugin';
 export type BeforeAssetTagGenerationHtmlPluginData = {
-  assets: {
-    publicPath: string;
-    js: Array<string>;
-    css: Array<string>;
-    favicon?: string;
-    manifest?: string;
-  };
-  outputName: string;
-  plugin: HtmlWebpackPlugin;
+    assets: {
+        publicPath: string;
+        js: Array<string>;
+        css: Array<string>;
+        favicon?: string;
+        manifest?: string;
+    };
+    outputName: string;
+    plugin: HtmlWebpackPlugin;
 };
-export type As = 'audio' | 'document' | 'embed' | 'fetch' | 'font' | 'image' | 'object' | 'script' | 'style' | 'track' | 'worker' | 'video';
+export type As = 'audio' | 'document' | 'embed' | 'fetch' | 'font' | 'image' | 'object' | 'script' | 'style' | 'track' | 'worker' | 'video';

package/dist/server/compilerDevMiddleware.d.ts

@@ -4,9 +4,9 @@ import type { IncomingMessage } from 'http';
 import type { Socket } from 'net';
 import type { DevMiddlewaresConfig, DevMiddlewareAPI, DevMiddleware as CustomDevMiddleware } from '@rsbuild/shared';
 type Options = {
-  publicPaths: string[];
-  dev: DevMiddlewaresConfig;
-  devMiddleware: CustomDevMiddleware;
+    publicPaths: string[];
+    dev: DevMiddlewaresConfig;
+    devMiddleware: CustomDevMiddleware;
 };
 /**
  * Setup compiler-related logic:
@@ -14,20 +14,16 @@ type Options = {
  * 2. establish webSocket connect
  */
 export declare class CompilerDevMiddleware {
-  middleware: DevMiddlewareAPI;
-  private devOptions;
-  private devMiddleware;
-  private publicPaths;
-  private socketServer;
-  constructor({
-    dev,
-    devMiddleware,
-    publicPaths
-  }: Options);
-  init(): void;
-  upgrade(req: IncomingMessage, sock: Socket, head: any): void;
-  close(): void;
-  sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
-  private setupDevMiddleware;
+    middleware: DevMiddlewareAPI;
+    private devOptions;
+    private devMiddleware;
+    private publicPaths;
+    private socketServer;
+    constructor({ dev, devMiddleware, publicPaths }: Options);
+    init(): void;
+    upgrade(req: IncomingMessage, sock: Socket, head: any): void;
+    close(): void;
+    sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
+    private setupDevMiddleware;
 }
-export {};
+export {};

package/dist/server/devServer.d.ts

@@ -1,20 +1,12 @@
 import { CreateDevMiddlewareReturns, StartDevServerOptions, StartServerResult, DevServerAPIs } from '@rsbuild/shared';
 import type { Context } from '../types';
 export declare function getServerAPIs<Options extends {
-  context: Context;
-}>(options: Options, createDevMiddleware: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevMiddlewareReturns>, {
-  compiler: customCompiler,
-  getPortSilently
-}?: StartDevServerOptions & {
-  defaultPort?: number;
+    context: Context;
+}>(options: Options, createDevMiddleware: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevMiddlewareReturns>, { compiler: customCompiler, getPortSilently, }?: StartDevServerOptions & {
+    defaultPort?: number;
 }): Promise<DevServerAPIs>;
 export declare function startDevServer<Options extends {
-  context: Context;
-}>(options: Options, createDevMiddleware: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevMiddlewareReturns>, {
-  compiler,
-  printURLs,
-  logger: customLogger,
-  getPortSilently
-}?: StartDevServerOptions & {
-  defaultPort?: number;
-}): Promise<StartServerResult>;
+    context: Context;
+}>(options: Options, createDevMiddleware: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevMiddlewareReturns>, { compiler, printURLs, logger: customLogger, getPortSilently, }?: StartDevServerOptions & {
+    defaultPort?: number;
+}): Promise<StartServerResult>;

package/dist/server/devServer.js

@@ -164,18 +164,16 @@ async function startDevServer(options, createDevMiddleware, {
         }
         (0, import_shared.debug)("listen dev server done");
         await serverAPIs.afterStart();
-        const onClose = async () => {
+        const closeServer = async () => {
           await devMiddlewares.close();
           httpServer.close();
         };
-        (0, import_restart.registerCleaner)(onClose);
+        (0, import_restart.onBeforeRestartServer)(closeServer);
         resolve({
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: async () => {
-              await onClose();
-            }
+            close: closeServer
           }
         });
       }

package/dist/server/getDevMiddlewares.d.ts

@@ -1,14 +1,14 @@
 import type { UpgradeEvent, RequestHandler, DevMiddlewaresConfig, CompileMiddlewareAPI } from '@rsbuild/shared';
 export type RsbuildDevMiddlewareOptions = {
-  pwd: string;
-  dev: DevMiddlewaresConfig;
-  compileMiddlewareAPI?: CompileMiddlewareAPI;
-  output: {
-    distPath: string;
-  };
+    pwd: string;
+    dev: DevMiddlewaresConfig;
+    compileMiddlewareAPI?: CompileMiddlewareAPI;
+    output: {
+        distPath: string;
+    };
 };
 export declare const getMiddlewares: (options: RsbuildDevMiddlewareOptions) => Promise<{
-  close: () => Promise<void>;
-  onUpgrade: UpgradeEvent;
-  middlewares: RequestHandler[];
-}>;
+    close: () => Promise<void>;
+    onUpgrade: UpgradeEvent;
+    middlewares: RequestHandler[];
+}>;

package/dist/server/httpServer.d.ts

@@ -3,6 +3,6 @@
 import type { ServerConfig } from '@rsbuild/shared';
 import type connect from '@rsbuild/shared/connect';
 export declare const createHttpServer: (options: {
-  https?: ServerConfig['https'];
-  middlewares: connect.Server;
-}) => Promise<import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>;
+    https?: ServerConfig['https'];
+    middlewares: connect.Server;
+}) => Promise<import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>;

package/dist/server/index.d.ts

@@ -1,2 +1,2 @@
 export { startDevServer, getServerAPIs } from './devServer';
-export { startProdServer } from './prodServer';
+export { startProdServer } from './prodServer';

package/dist/server/middlewares.d.ts

@@ -2,7 +2,7 @@ import { RequestHandler as Middleware, HtmlFallback } from '@rsbuild/shared';
 export declare const faviconFallbackMiddleware: Middleware;
 export declare const notFoundMiddleware: Middleware;
 export declare const getHtmlFallbackMiddleware: (params: {
-  distPath: string;
-  callback?: Middleware;
-  htmlFallback?: HtmlFallback;
-}) => Middleware;
+    distPath: string;
+    callback?: Middleware;
+    htmlFallback?: HtmlFallback;
+}) => Middleware;

package/dist/server/prodServer.d.ts

@@ -4,25 +4,22 @@ import connect from '@rsbuild/shared/connect';
 import { type ServerConfig, type RsbuildConfig, type StartServerResult, type PreviewServerOptions } from '@rsbuild/shared';
 import type { Context } from '../types';
 type RsbuildProdServerOptions = {
-  pwd: string;
-  output: {
-    path: string;
-    assetPrefix?: string;
-  };
-  serverConfig: ServerConfig;
+    pwd: string;
+    output: {
+        path: string;
+        assetPrefix?: string;
+    };
+    serverConfig: ServerConfig;
 };
 export declare class RsbuildProdServer {
-  private app;
-  private options;
-  middlewares: connect.Server;
-  constructor(options: RsbuildProdServerOptions);
-  onInit(app: Server): Promise<void>;
-  private applyDefaultMiddlewares;
-  private applyStaticAssetMiddleware;
-  close(): void;
+    private app;
+    private options;
+    middlewares: connect.Server;
+    constructor(options: RsbuildProdServerOptions);
+    onInit(app: Server): Promise<void>;
+    private applyDefaultMiddlewares;
+    private applyStaticAssetMiddleware;
+    close(): void;
 }
-export declare function startProdServer(context: Context, rsbuildConfig: RsbuildConfig, {
-  printURLs,
-  getPortSilently
-}?: PreviewServerOptions): Promise<StartServerResult>;
-export {};
+export declare function startProdServer(context: Context, rsbuildConfig: RsbuildConfig, { printURLs, getPortSilently }?: PreviewServerOptions): Promise<StartServerResult>;
+export {};

package/dist/server/proxy.d.ts

@@ -1,6 +1,6 @@
 import { type ProxyDetail, type RequestHandler as Middleware, type ProxyOptions, type UpgradeEvent } from '@rsbuild/shared';
 export declare function formatProxyOptions(proxyOptions: ProxyOptions): ProxyDetail[];
 export declare const createProxyMiddleware: (proxyOptions: ProxyOptions) => {
-  middlewares: Middleware[];
-  upgrade: UpgradeEvent;
-};
+    middlewares: Middleware[];
+    upgrade: UpgradeEvent;
+};

package/dist/server/restart.d.ts

@@ -2,10 +2,8 @@ type Cleaner = () => Promise<unknown> | unknown;
 /**
  * Add a cleaner to handle side effects
  */
-export declare const registerCleaner: (cleaner: Cleaner) => void;
-export declare const restartDevServer: ({
-  filePath
-}: {
-  filePath: string;
+export declare const onBeforeRestartServer: (cleaner: Cleaner) => void;
+export declare const restartDevServer: ({ filePath }: {
+    filePath: string;
 }) => Promise<void>;
-export {};
+export {};

package/dist/server/restart.js

@@ -28,15 +28,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var restart_exports = {};
 __export(restart_exports, {
-  registerCleaner: () => registerCleaner,
+  onBeforeRestartServer: () => onBeforeRestartServer,
   restartDevServer: () => restartDevServer
 });
 module.exports = __toCommonJS(restart_exports);
 var import_path = __toESM(require("path"));
 var import_shared = require("@rsbuild/shared");
 var import_commands = require("../cli/commands");
-const cleaners = [];
-const registerCleaner = (cleaner) => {
+let cleaners = [];
+const onBeforeRestartServer = (cleaner) => {
   cleaners.push(cleaner);
 };
 const clearConsole = () => {
@@ -51,6 +51,7 @@ const restartDevServer = async ({ filePath }) => {
 `);
   for (const cleaner of cleaners) {
     await cleaner();
+    cleaners = [];
   }
   const rsbuild = await (0, import_commands.init)({ isRestart: true });
   if (!rsbuild) {
@@ -60,6 +61,6 @@ const restartDevServer = async ({ filePath }) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  registerCleaner,
+  onBeforeRestartServer,
   restartDevServer
 });

package/dist/server/socketServer.d.ts

@@ -5,20 +5,20 @@ import type { Socket } from 'net';
 import ws from '../../compiled/ws';
 import { type Stats, type DevMiddlewaresConfig } from '@rsbuild/shared';
 export declare class SocketServer {
-  private wsServer;
-  private readonly sockets;
-  private readonly options;
-  private stats?;
-  private timer;
-  constructor(options: DevMiddlewaresConfig);
-  upgrade(req: IncomingMessage, sock: Socket, head: any): void;
-  prepare(): void;
-  updateStats(stats: Stats): void;
-  sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
-  singleWrite(socket: ws, type: string, data?: Record<string, any> | string | boolean): void;
-  close(): void;
-  private onConnect;
-  private getStats;
-  private sendStats;
-  private send;
-}
+    private wsServer;
+    private readonly sockets;
+    private readonly options;
+    private stats?;
+    private timer;
+    constructor(options: DevMiddlewaresConfig);
+    upgrade(req: IncomingMessage, sock: Socket, head: any): void;
+    prepare(): void;
+    updateStats(stats: Stats): void;
+    sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
+    singleWrite(socket: ws, type: string, data?: Record<string, any> | string | boolean): void;
+    close(): void;
+    private onConnect;
+    private getStats;
+    private sendStats;
+    private send;
+}

package/dist/types.d.ts

@@ -3,15 +3,15 @@ import type { Hooks } from './provider/core/initHooks';
 export type { RsbuildPlugin, RsbuildPluginAPI };
 /** The inner context. */
 export type Context = BaseContext & {
-  /** All hooks. */
-  hooks: Readonly<Hooks>;
-  /** Current Rsbuild config. */
-  config: Readonly<RsbuildConfig>;
-  /** The original Rsbuild config passed from the createRsbuild method. */
-  originalConfig: Readonly<RsbuildConfig>;
-  /** The normalized Rsbuild config. */
-  normalizedConfig?: NormalizedConfig;
-  /** The plugin API. */
-  pluginAPI?: RsbuildPluginAPI;
+    /** All hooks. */
+    hooks: Readonly<Hooks>;
+    /** Current Rsbuild config. */
+    config: Readonly<RsbuildConfig>;
+    /** The original Rsbuild config passed from the createRsbuild method. */
+    originalConfig: Readonly<RsbuildConfig>;
+    /** The normalized Rsbuild config. */
+    normalizedConfig?: NormalizedConfig;
+    /** The plugin API. */
+    pluginAPI?: RsbuildPluginAPI;
 };
-export type { RsbuildConfig, NormalizedConfig, DevConfig, HtmlConfig, ToolsConfig, SourceConfig, OutputConfig, SecurityConfig, PerformanceConfig, NormalizedDevConfig, NormalizedHtmlConfig, NormalizedToolsConfig, NormalizedSourceConfig, NormalizedOutputConfig, NormalizedSecurityConfig, NormalizedPerformanceConfig } from '@rsbuild/shared';
+export type { RsbuildConfig, NormalizedConfig, DevConfig, HtmlConfig, ToolsConfig, SourceConfig, OutputConfig, SecurityConfig, PerformanceConfig, NormalizedDevConfig, NormalizedHtmlConfig, NormalizedToolsConfig, NormalizedSourceConfig, NormalizedOutputConfig, NormalizedSecurityConfig, NormalizedPerformanceConfig, } from '@rsbuild/shared';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -56,11 +56,11 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "0.4.3",
+    "@rspack/core": "0.4.4",
     "core-js": "~3.32.2",
-    "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
+    "html-webpack-plugin": "npm:html-rspack-plugin@5.6.0",
     "postcss": "8.4.31",
-    "@rsbuild/shared": "0.2.7"
+    "@rsbuild/shared": "0.2.9"
   },
   "devDependencies": {
     "@types/node": "16.x",