@rsbuild/core 0.1.1 → 0.1.3

package/dist/rspack-provider/index.js

@@ -21,18 +21,19 @@ __export(rspack_provider_exports, {
   createContextByConfig: () => import_createContext.createContextByConfig,
   createPublicContext: () => import_createContext.createPublicContext,
   getRspackVersion: () => import_shared.getRspackVersion,
-  rspackProvider: () => import_provider.rspackProvider,
-  updateContextByNormalizedConfig: () => import_createContext.updateContextByNormalizedConfig
+  initRsbuildConfig: () => import_initConfigs.initRsbuildConfig,
+  rspackProvider: () => import_provider.rspackProvider
 });
 module.exports = __toCommonJS(rspack_provider_exports);
 var import_shared = require("./shared");
 var import_provider = require("./provider");
 var import_createContext = require("./core/createContext");
+var import_initConfigs = require("./core/initConfigs");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createContextByConfig,
   createPublicContext,
   getRspackVersion,
-  rspackProvider,
-  updateContextByNormalizedConfig
+  initRsbuildConfig,
+  rspackProvider
 });

package/dist/rspack-provider/plugins/css.js

@@ -164,7 +164,6 @@ const pluginCss = () => {
       });
       api.modifyRspackConfig(
         async (rspackConfig, { isProd, isServer, isWebWorker }) => {
-          var _a;
           const config = api.getNormalizedConfig();
           if (!enableNativeCss(config)) {
             (0, import_shared.setConfig)(rspackConfig, "experiments.css", false);
@@ -183,7 +182,7 @@ const pluginCss = () => {
             localIdentName,
             exportsOnly: isServer || isWebWorker
           });
-          const rules = (_a = rspackConfig.module) == null ? void 0 : _a.rules;
+          const rules = rspackConfig.module?.rules;
           applyCSSModuleRule(rules, import_shared.CSS_REGEX, config);
         }
       );

package/dist/rspack-provider/plugins/less.js

@@ -63,10 +63,9 @@ function pluginLess() {
         rule.use(utils.CHAIN_ID.USE.LESS).loader(utils.getCompiledPath("less-loader")).options(options);
       });
       api.modifyRspackConfig(async (rspackConfig) => {
-        var _a;
         const { applyCSSModuleRule } = await Promise.resolve().then(() => __toESM(require("./css")));
         const config = api.getNormalizedConfig();
-        const rules = (_a = rspackConfig.module) == null ? void 0 : _a.rules;
+        const rules = rspackConfig.module?.rules;
         applyCSSModuleRule(rules, import_shared.LESS_REGEX, config);
       });
     }

package/dist/rspack-provider/plugins/progress.js

@@ -36,12 +36,9 @@ const pluginProgress = () => ({
   name: "rsbuild:progress",
   setup(api) {
     api.modifyBundlerChain(async (chain, { target, CHAIN_ID }) => {
-      var _a;
       const config = api.getNormalizedConfig();
-      const options = (_a = config.dev.progressBar) != null ? _a : (
-        // enable progress bar in production by default
-        (0, import_shared.isProd)()
-      );
+      const options = config.dev.progressBar ?? // enable progress bar in production by default
+      (0, import_shared.isProd)();
       if (!options) {
         return;
       }

package/dist/rspack-provider/plugins/rspackProfile.js

@@ -52,8 +52,7 @@ const stopProfiler = (output, profileSession) => {
 const pluginRspackProfile = () => ({
   name: "rsbuild:rspack-profile",
   setup(api) {
-    var _a;
-    const RSPACK_PROFILE = (_a = process.env.RSPACK_PROFILE) == null ? void 0 : _a.toUpperCase();
+    const RSPACK_PROFILE = process.env.RSPACK_PROFILE?.toUpperCase();
     if (!RSPACK_PROFILE) {
       return;
     }

package/dist/rspack-provider/plugins/sass.js

@@ -68,10 +68,9 @@ function pluginSass() {
         }).end().use(utils.CHAIN_ID.USE.SASS).loader(utils.getCompiledPath("sass-loader")).options(options);
       });
       api.modifyRspackConfig(async (rspackConfig) => {
-        var _a;
         const { applyCSSModuleRule } = await Promise.resolve().then(() => __toESM(require("./css")));
         const config = api.getNormalizedConfig();
-        const rules = (_a = rspackConfig.module) == null ? void 0 : _a.rules;
+        const rules = rspackConfig.module?.rules;
         applyCSSModuleRule(rules, import_shared.SASS_REGEX, config);
       });
     }

package/dist/rspack-provider/plugins/swc.js

@@ -123,19 +123,19 @@ async function applyCoreJs(swcConfig, chain, polyfillMode) {
   });
 }
 function applyTransformImport(swcConfig, pluginImport) {
-  var _a, _b, _c;
+  var _a;
   if (pluginImport !== false && pluginImport) {
-    (_a = swcConfig.rspackExperiments) != null ? _a : swcConfig.rspackExperiments = {};
-    (_c = (_b = swcConfig.rspackExperiments).import) != null ? _c : _b.import = [];
+    swcConfig.rspackExperiments ?? (swcConfig.rspackExperiments = {});
+    (_a = swcConfig.rspackExperiments).import ?? (_a.import = []);
     swcConfig.rspackExperiments.import.push(...pluginImport);
   }
 }
 function applyDecorator(swcConfig, enableLatestDecorators) {
-  var _a, _b;
+  var _a;
   if (enableLatestDecorators) {
     import_shared.logger.warn("Cannot use latestDecorator in Rspack mode.");
   }
-  (_b = (_a = swcConfig.jsc).transform) != null ? _b : _a.transform = {};
+  (_a = swcConfig.jsc).transform ?? (_a.transform = {});
   swcConfig.jsc.transform.legacyDecorator = true;
   swcConfig.jsc.transform.decoratorMetadata = true;
 }

package/dist/rspack-provider/provider.d.ts

@@ -1,6 +1,6 @@
-import { type RsbuildProvider, type RspackConfig, type RspackCompiler, type RspackMultiCompiler } from '@rsbuild/shared';
+import { type RsbuildProvider, type RspackConfig } from '@rsbuild/shared';
 import type { RsbuildConfig, NormalizedConfig } from '../types';
-export type RspackProvider = RsbuildProvider<RsbuildConfig, RspackConfig, NormalizedConfig, RspackCompiler | RspackMultiCompiler>;
+export type RspackProvider = RsbuildProvider<RsbuildConfig, RspackConfig, NormalizedConfig>;
 export declare function rspackProvider({
   rsbuildConfig: originalRsbuildConfig
 }: {

package/dist/rspack-provider/provider.js

@@ -41,13 +41,6 @@ function rspackProvider({
 }) {
   const rsbuildConfig = (0, import_shared.pickRsbuildConfig)(originalRsbuildConfig);
   return async ({ pluginStore, rsbuildOptions, plugins }) => {
-    if (!await (0, import_shared2.isSatisfyRspackMinimumVersion)()) {
-      throw new Error(
-        `The current Rspack version does not meet the requirements, the minimum supported version of Rspack is ${import_shared.color.green(
-          import_shared2.supportedRspackMinimumVersion
-        )}`
-      );
-    }
     const context = await (0, import_createContext.createContext)(rsbuildOptions, rsbuildConfig);
     const pluginAPI = (0, import_initPlugins.getPluginAPI)({ context, pluginStore });
     context.pluginAPI = pluginAPI;
@@ -73,6 +66,7 @@ function rspackProvider({
       async startDevServer(options) {
         const { startDevServer } = await Promise.resolve().then(() => __toESM(require("../server/devServer")));
         const { createDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
+        await (0, import_initConfigs.initRsbuildConfig)({ context, pluginStore });
         return startDevServer(
           { context, pluginStore, rsbuildOptions },
           createDevMiddleware,
@@ -81,6 +75,7 @@ function rspackProvider({
       },
       async preview(options) {
         const { startProdServer } = await Promise.resolve().then(() => __toESM(require("../server/prodServer")));
+        await (0, import_initConfigs.initRsbuildConfig)({ context, pluginStore });
         return startProdServer(context, context.config, options);
       },
       async build(options) {

package/dist/rspack-provider/shared.d.ts

@@ -2,7 +2,7 @@ import { RsbuildPlugin } from '../types';
 import { Plugins } from '@rsbuild/shared';
 export declare const applyDefaultPlugins: (plugins: Plugins) => import("@rsbuild/shared").AwaitableGetter<RsbuildPlugin>;
 export declare const getRspackVersion: () => Promise<string>;
-export declare const supportedRspackMinimumVersion = "0.3.6";
-export declare const isSatisfyRspackMinimumVersion: (customVersion?: string) => Promise<boolean>;
+export declare const rspackMinVersion = "0.3.6";
+export declare const isSatisfyRspackVersion: (version: string) => Promise<boolean>;
 export declare const getCompiledPath: (packageName: string) => string;
 export declare const BUILTIN_LOADER = "builtin:";

package/dist/rspack-provider/shared.js

@@ -32,8 +32,8 @@ __export(shared_exports, {
   applyDefaultPlugins: () => applyDefaultPlugins,
   getCompiledPath: () => getCompiledPath,
   getRspackVersion: () => getRspackVersion,
-  isSatisfyRspackMinimumVersion: () => isSatisfyRspackMinimumVersion,
-  supportedRspackMinimumVersion: () => supportedRspackMinimumVersion
+  isSatisfyRspackVersion: () => isSatisfyRspackVersion,
+  rspackMinVersion: () => rspackMinVersion
 });
 module.exports = __toCommonJS(shared_exports);
 var import_path = require("path");
@@ -81,20 +81,19 @@ const getRspackVersion = async () => {
   try {
     const core = require.resolve("@rspack/core");
     const pkg = await Promise.resolve().then(() => __toESM(require((0, import_path.join)(core, "../../package.json"))));
-    return pkg == null ? void 0 : pkg.version;
+    return pkg?.version;
   } catch (err) {
     console.error(err);
     return "";
   }
 };
-const supportedRspackMinimumVersion = "0.3.6";
-const isSatisfyRspackMinimumVersion = async (customVersion) => {
-  let version = customVersion || await getRspackVersion();
+const rspackMinVersion = "0.3.6";
+const isSatisfyRspackVersion = async (version) => {
   const semver = await Promise.resolve().then(() => __toESM(require("semver")));
   if (version.includes("-canary")) {
     version = version.split("-canary")[0];
   }
-  return version ? semver.lte(supportedRspackMinimumVersion, version) : true;
+  return version ? semver.lte(rspackMinVersion, version) : true;
 };
 const getCompiledPath = (packageName) => {
   const providerCompilerPath = (0, import_path.join)(__dirname, "../../compiled", packageName);
@@ -111,6 +110,6 @@ const BUILTIN_LOADER = "builtin:";
   applyDefaultPlugins,
   getCompiledPath,
   getRspackVersion,
-  isSatisfyRspackMinimumVersion,
-  supportedRspackMinimumVersion
+  isSatisfyRspackVersion,
+  rspackMinVersion
 });

package/dist/server/dev-middleware/index.js

@@ -36,10 +36,10 @@ var import_socketServer = __toESM(require("./socketServer"));
 const noop = () => {
 };
 function getHMRClientPath(client) {
-  const protocol = (client == null ? void 0 : client.protocol) ? `&protocol=${client.protocol}` : "";
-  const host = (client == null ? void 0 : client.host) ? `&host=${client.host}` : "";
-  const path = (client == null ? void 0 : client.path) ? `&path=${client.path}` : "";
-  const port = (client == null ? void 0 : client.port) ? `&port=${client.port}` : "";
+  const protocol = client?.protocol ? `&protocol=${client.protocol}` : "";
+  const host = client?.host ? `&host=${client.host}` : "";
+  const path = client?.path ? `&path=${client.path}` : "";
+  const port = client?.port ? `&port=${client.port}` : "";
   const clientEntry = `${require.resolve("@rsbuild/core/client/hmr")}?${host}${path}${port}${protocol}`;
   return clientEntry;
 }
@@ -63,9 +63,8 @@ class DevMiddleware extends import_events.EventEmitter {
     });
   }
   close() {
-    var _a;
     this.socketServer.close();
-    (_a = this.middleware) == null ? void 0 : _a.close(noop);
+    this.middleware?.close(noop);
   }
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);

package/dist/server/dev-middleware/socketServer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { Server } from 'http';
-import ws from 'ws';
-import { Stats, DevConfig } from '@rsbuild/shared';
+import type { Server } from 'http';
+import ws from '../../../compiled/ws';
+import { type Stats, type DevConfig } from '@rsbuild/shared';
 export default class SocketServer {
   private wsServer;
   private readonly sockets;

package/dist/server/dev-middleware/socketServer.js

@@ -31,7 +31,7 @@ __export(socketServer_exports, {
   default: () => SocketServer
 });
 module.exports = __toCommonJS(socketServer_exports);
-var import_ws = __toESM(require("ws"));
+var import_ws = __toESM(require("../../../compiled/ws"));
 var import_shared = require("@rsbuild/shared");
 class SocketServer {
   constructor(options) {
@@ -41,11 +41,10 @@ class SocketServer {
   }
   // create socket, install socket handler, bind socket event
   prepare(app) {
-    var _a;
     this.app = app;
     this.wsServer = new import_ws.default.Server({
       noServer: true,
-      path: (_a = this.options.client) == null ? void 0 : _a.path
+      path: this.options.client?.path
     });
     this.app.on("upgrade", (req, sock, head) => {
       if (!this.wsServer.shouldHandle(req)) {

package/dist/server/devServer.d.ts

@@ -3,8 +3,9 @@
 /// <reference types="node" />
 import { Server } from 'http';
 import type { ListenOptions } from 'net';
-import { RsbuildDevServerOptions, CreateDevMiddlewareReturns, DevServerContext, StartDevServerOptions, StartServerResult } from '@rsbuild/shared';
+import { RsbuildDevServerOptions, CreateDevMiddlewareReturns, StartDevServerOptions, StartServerResult } from '@rsbuild/shared';
 import connect from '@rsbuild/shared/connect';
+import type { Context } from '../types';
 export declare class RsbuildDevServer {
   private readonly dev;
   private readonly devMiddleware;
@@ -21,9 +22,8 @@ export declare class RsbuildDevServer {
   close(): void;
 }
 export declare function startDevServer<Options extends {
-  context: DevServerContext;
+  context: Context;
 }>(options: Options, createDevMiddleware: (options: Options, compiler: StartDevServerOptions['compiler']) => Promise<CreateDevMiddlewareReturns>, {
-  open,
   compiler: customCompiler,
   printURLs,
   strictPort,

package/dist/server/devServer.js

@@ -94,7 +94,7 @@ class RsbuildDevServer {
     this.middlewares.use((req, res, next) => {
       res.setHeader("Access-Control-Allow-Origin", "*");
       const path = req.url ? import_url.default.parse(req.url).pathname : "";
-      if (path == null ? void 0 : path.includes("hot-update")) {
+      if (path?.includes("hot-update")) {
         res.setHeader("Access-Control-Allow-Credentials", "false");
       }
       const confHeaders = dev.headers;
@@ -143,7 +143,7 @@ class RsbuildDevServer {
   }
   listen(options, listener) {
     const callback = () => {
-      listener == null ? void 0 : listener();
+      listener?.();
     };
     if (typeof options === "object") {
       this.app.listen(options, callback);
@@ -157,19 +157,17 @@ class RsbuildDevServer {
   }
 }
 async function startDevServer(options, createDevMiddleware, {
-  open,
   compiler: customCompiler,
   printURLs = true,
   strictPort = false,
   logger: customLogger,
   getPortSilently
 } = {}) {
-  var _a, _b, _c, _d;
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "development";
   }
   const rsbuildConfig = options.context.config;
-  const logger = customLogger != null ? customLogger : import_shared.logger;
+  const logger = customLogger ?? import_shared.logger;
   const { devServerConfig, port, host, https } = await (0, import_shared.getDevOptions)({
     rsbuildConfig,
     strictPort,
@@ -178,14 +176,13 @@ async function startDevServer(options, createDevMiddleware, {
   options.context.devServer = {
     hostname: host,
     port,
-    https,
-    open
+    https
   };
   const protocol = https ? "https" : "http";
   let urls = (0, import_shared.getAddressUrls)(protocol, port, host);
   const routes = (0, import_shared.formatRoutes)(
     options.context.entry,
-    (_b = (_a = rsbuildConfig.output) == null ? void 0 : _a.distPath) == null ? void 0 : _b.html
+    rsbuildConfig.output?.distPath?.html
   );
   (0, import_shared.debug)("create dev server");
   const { devMiddleware, compiler } = await createDevMiddleware(
@@ -198,7 +195,7 @@ async function startDevServer(options, createDevMiddleware, {
     devMiddleware,
     dev: devServerConfig,
     output: {
-      distPath: ((_d = (_c = rsbuildConfig.output) == null ? void 0 : _c.distPath) == null ? void 0 : _d.root) || import_shared.ROOT_DIST_DIR,
+      distPath: rsbuildConfig.output?.distPath?.root || import_shared.ROOT_DIST_DIR,
       publicPaths
     }
   });

package/dist/server/middlewares.js

@@ -67,8 +67,7 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback }) => {
       outputFileSystem = devMiddleware.outputFileSystem;
     }
     const rewrite = (newUrl) => {
-      var _a;
-      (_a = import_shared.debug) == null ? void 0 : _a(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
+      (0, import_shared.debug)?.(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
       req.url = newUrl;
       if (callback) {
         return callback(req, res, (...args) => {

package/dist/server/prodServer.d.ts

@@ -4,7 +4,8 @@
 import type { ListenOptions } from 'net';
 import { Server } from 'http';
 import connect from '@rsbuild/shared/connect';
-import { type Context, type ServerConfig, type RsbuildConfig, type StartServerResult, type PreviewServerOptions } from '@rsbuild/shared';
+import { type ServerConfig, type RsbuildConfig, type StartServerResult, type PreviewServerOptions } from '@rsbuild/shared';
+import type { Context } from '../types';
 type RsbuildProdServerOptions = {
   pwd: string;
   output: {
@@ -22,7 +23,7 @@ export declare class RsbuildProdServer {
   private applyDefaultMiddlewares;
   private applyStaticAssetMiddleware;
   createHTTPServer(): Promise<Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>;
-  listen(options?: number | ListenOptions | undefined, listener?: () => void): void;
+  listen(options?: number | ListenOptions | undefined, listener?: () => Promise<void>): void;
   close(): void;
 }
 export declare function startProdServer(context: Context, rsbuildConfig: RsbuildConfig, {

package/dist/server/prodServer.js

@@ -100,7 +100,7 @@ class RsbuildProdServer {
     });
     this.middlewares.use((req, res, next) => {
       const url = req.url;
-      if (assetPrefix && (url == null ? void 0 : url.startsWith(assetPrefix))) {
+      if (assetPrefix && url?.startsWith(assetPrefix)) {
         req.url = url.slice(assetPrefix.length);
         assetMiddleware(req, res, (...args) => {
           req.url = url;
@@ -122,7 +122,7 @@ class RsbuildProdServer {
   }
   listen(options, listener) {
     const callback = () => {
-      listener == null ? void 0 : listener();
+      listener?.();
     };
     if (typeof options === "object") {
       this.app.listen(options, callback);
@@ -139,7 +139,6 @@ async function startProdServer(context, rsbuildConfig, {
   strictPort = false,
   getPortSilently
 } = {}) {
-  var _a, _b, _c;
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "production";
   }
@@ -151,11 +150,12 @@ async function startProdServer(context, rsbuildConfig, {
   const server = new RsbuildProdServer({
     pwd: context.rootPath,
     output: {
-      path: ((_b = (_a = rsbuildConfig.output) == null ? void 0 : _a.distPath) == null ? void 0 : _b.root) || import_shared.ROOT_DIST_DIR,
-      assetPrefix: (_c = rsbuildConfig.output) == null ? void 0 : _c.assetPrefix
+      path: rsbuildConfig.output?.distPath?.root || import_shared.ROOT_DIST_DIR,
+      assetPrefix: rsbuildConfig.output?.assetPrefix
     },
     serverConfig
   });
+  await context.hooks.onBeforeStartProdServerHook.call();
   const httpServer = await server.createHTTPServer();
   await server.onInit(httpServer);
   return new Promise((resolve) => {
@@ -164,14 +164,17 @@ async function startProdServer(context, rsbuildConfig, {
         host,
         port
       },
-      () => {
-        var _a2, _b2;
+      async () => {
+        const routes = (0, import_shared.formatRoutes)(
+          context.entry,
+          rsbuildConfig.output?.distPath?.html
+        );
+        await context.hooks.onAfterStartProdServerHook.call({
+          port,
+          routes
+        });
         const urls = (0, import_shared.getAddressUrls)(https ? "https" : "http", port);
         if (printURLs) {
-          const routes = (0, import_shared.formatRoutes)(
-            context.entry,
-            (_b2 = (_a2 = rsbuildConfig.output) == null ? void 0 : _a2.distPath) == null ? void 0 : _b2.html
-          );
           (0, import_shared.printServerURLs)(
             (0, import_shared.isFunction)(printURLs) ? printURLs(urls) : urls,
             routes

package/dist/server/proxy.js

@@ -25,7 +25,6 @@ module.exports = __toCommonJS(proxy_exports);
 var import_http_proxy_middleware = require("@rsbuild/shared/http-proxy-middleware");
 var import_shared = require("@rsbuild/shared");
 function formatProxyOptions(proxyOptions) {
-  var _a;
   const ret = [];
   if (Array.isArray(proxyOptions)) {
     ret.push(...proxyOptions);
@@ -48,7 +47,7 @@ function formatProxyOptions(proxyOptions) {
   }
   const handleError = (err) => import_shared.logger.error(err);
   for (const opts of ret) {
-    (_a = opts.onError) != null ? _a : opts.onError = handleError;
+    opts.onError ?? (opts.onError = handleError);
   }
   return ret;
 }

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import type { Context as BaseContext, RsbuildConfig, NormalizedConfig, DefaultRsbuildPluginAPI, RsbuildPlugin as BaseRsbuildPlugin } from '@rsbuild/shared';
 import type { Hooks } from './rspack-provider/core/initHooks';
-import type { RspackConfig, RspackCompiler, RspackMultiCompiler } from '@rsbuild/shared';
-export interface RsbuildPluginAPI extends DefaultRsbuildPluginAPI<RsbuildConfig, NormalizedConfig, RspackConfig, RspackCompiler | RspackMultiCompiler> {}
+import type { RspackConfig } from '@rsbuild/shared';
+export interface RsbuildPluginAPI extends DefaultRsbuildPluginAPI<RsbuildConfig, NormalizedConfig, RspackConfig> {}
 export type RsbuildPlugin<T = RsbuildPluginAPI> = BaseRsbuildPlugin<T>;
 /** The inner context. */
 export type Context = BaseContext & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -63,12 +63,10 @@
     "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
     "postcss": "8.4.31",
     "semver": "^7.5.4",
-    "ws": "^8.2.0",
-    "@rsbuild/shared": "0.1.1"
+    "@rsbuild/shared": "0.1.3"
   },
   "devDependencies": {
     "@types/node": "^16",
-    "@types/ws": "^8.2.0",
     "@types/semver": "^7.5.4",
     "typescript": "^5.3.0"
   },