@rsbuild/core 0.1.5 → 0.1.6

package/dist/cli/commands.d.ts

@@ -21,5 +21,5 @@ export declare function init({
 }: {
   cliOptions?: CommonOptions;
   isRestart?: boolean;
-}): Promise<import("@rsbuild/shared").RsbuildInstance<any> | undefined>;
+}): Promise<import("@rsbuild/shared").RsbuildInstance | undefined>;
 export declare function runCli(): void;

package/dist/cli/commands.js

@@ -81,7 +81,7 @@ async function init({
   }
 }
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.1.5");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.1.6");
   import_commander.program.command("dev").option("--open", "open the page in browser on startup").option(
     "--port <port>",
     "specify a port number for Rsbuild Server to listen"

package/dist/cli/prepare.js

@@ -34,7 +34,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"0.1.5"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.1.6"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/createRsbuild.d.ts

@@ -1,10 +1,10 @@
 import { type RsbuildInstance, type RsbuildProvider, type CreateRsbuildOptions } from '@rsbuild/shared';
 import type { RsbuildConfig } from './types';
-export declare function createRsbuild<P extends ({
-  rsbuildConfig
-}: {
-  rsbuildConfig: T;
-}) => RsbuildProvider, T extends RsbuildConfig>(options: CreateRsbuildOptions & {
-  rsbuildConfig: T;
-  provider?: P;
-}): Promise<RsbuildInstance<ReturnType<P>>>;
+export declare function createRsbuild(options: CreateRsbuildOptions & {
+  rsbuildConfig: RsbuildConfig;
+  provider?: ({
+    rsbuildConfig
+  }: {
+    rsbuildConfig: RsbuildConfig;
+  }) => RsbuildProvider;
+}): Promise<RsbuildInstance>;

package/dist/plugins/html.d.ts

@@ -1,4 +1,4 @@
-import type { HtmlConfig, NormalizedConfig, SharedRsbuildPluginAPI, NormalizedOutputConfig } from '@rsbuild/shared';
+import type { HtmlConfig, RsbuildPluginAPI, NormalizedConfig, NormalizedOutputConfig } from '@rsbuild/shared';
 import type { RsbuildPlugin } from '../types';
 export declare function getTitle(entryName: string, config: NormalizedConfig): string;
 export declare function getInject(entryName: string, config: NormalizedConfig): import("@rsbuild/shared").ScriptInject;
@@ -13,5 +13,5 @@ export declare function getMetaTags(entryName: string, config: {
   html: HtmlConfig;
   output: NormalizedOutputConfig;
 }, templateContent?: string): import("@rsbuild/shared").MetaOptions;
-export declare const applyInjectTags: (api: SharedRsbuildPluginAPI) => void;
+export declare const applyInjectTags: (api: RsbuildPluginAPI) => void;
 export declare const pluginHtml: () => RsbuildPlugin;

package/dist/plugins/index.js

@@ -53,7 +53,8 @@ const plugins = {
   networkPerformance: () => Promise.resolve().then(() => __toESM(require("./networkPerformance"))).then((m) => m.pluginNetworkPerformance()),
   preloadOrPrefetch: () => Promise.resolve().then(() => __toESM(require("./preloadOrPrefetch"))).then((m) => m.pluginPreloadOrPrefetch()),
   performance: () => Promise.resolve().then(() => __toESM(require("./performance"))).then((m) => m.pluginPerformance()),
-  define: () => Promise.resolve().then(() => __toESM(require("./define"))).then((m) => m.pluginDefine())
+  define: () => Promise.resolve().then(() => __toESM(require("./define"))).then((m) => m.pluginDefine()),
+  server: () => Promise.resolve().then(() => __toESM(require("./server"))).then((m) => m.pluginServer())
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/plugins/server.d.ts

@@ -0,0 +1,2 @@
+import type { RsbuildPlugin } from '../types';
+export declare const pluginServer: () => RsbuildPlugin;

package/dist/plugins/server.js

@@ -0,0 +1,56 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  pluginServer: () => pluginServer
+});
+module.exports = __toCommonJS(server_exports);
+var import_shared = require("@rsbuild/shared");
+const pluginServer = () => ({
+  name: "rsbuild:server",
+  setup(api) {
+    api.modifyRsbuildConfig((rsbuildConfig, { mergeRsbuildConfig }) => {
+      if ((0, import_shared.isProd)() && rsbuildConfig.server?.publicDir) {
+        const { name, copyOnBuild } = rsbuildConfig.server?.publicDir;
+        if (!copyOnBuild || !name) {
+          return;
+        }
+        const { copy } = rsbuildConfig.output || {};
+        const publicPattern = [
+          {
+            from: name,
+            to: "",
+            noErrorOnMissing: true
+          }
+        ];
+        return mergeRsbuildConfig(rsbuildConfig, {
+          output: {
+            copy: Array.isArray(copy) ? publicPattern : {
+              patterns: publicPattern
+            }
+          }
+        });
+      }
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pluginServer
+});

package/dist/rspack-provider/core/createContext.js

@@ -68,7 +68,7 @@ function createContextByConfig(options, bundlerType, sourceConfig = {}, outputCo
     entry: sourceConfig.entry || // TODO: remove sourceConfig.entries in v0.2.0
     // compat with previous config
     sourceConfig.entries || getDefaultEntry(rootPath),
-    version: "0.1.5",
+    version: "0.1.6",
     target,
     rootPath,
     distPath,

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

@@ -1,5 +1,4 @@
-import { type OnExitFn, type OnAfterBuildFn, type OnBeforeBuildFn, type OnDevCompileDoneFn, type ModifyRsbuildConfigFn, type OnAfterStartDevServerFn, type OnBeforeStartDevServerFn, type OnAfterStartProdServerFn, type OnBeforeStartProdServerFn, type OnAfterCreateCompilerFn, type OnBeforeCreateCompilerFn, type ModifyBundlerChainFn, type RspackConfig, type ModifyRspackConfigFn } from '@rsbuild/shared';
-import type { RsbuildConfig } from '../../types';
+import type { OnExitFn, OnAfterBuildFn, OnBeforeBuildFn, OnDevCompileDoneFn, ModifyBundlerChainFn, ModifyRspackConfigFn, ModifyWebpackChainFn, ModifyWebpackConfigFn, ModifyRsbuildConfigFn, OnAfterStartDevServerFn, OnBeforeStartDevServerFn, OnAfterStartProdServerFn, OnBeforeStartProdServerFn, OnAfterCreateCompilerFn, OnBeforeCreateCompilerFn } from '@rsbuild/shared';
 export declare function initHooks(): {
   /** parameters are not bundler-related */
   onExitHook: import("@rsbuild/shared").AsyncHook<OnExitFn>;
@@ -10,11 +9,13 @@ export declare function initHooks(): {
   onBeforeStartProdServerHook: import("@rsbuild/shared").AsyncHook<OnBeforeStartProdServerFn>;
   /** parameters are bundler-related */
   onAfterBuildHook: import("@rsbuild/shared").AsyncHook<OnAfterBuildFn>;
-  onBeforeBuildHook: import("@rsbuild/shared").AsyncHook<OnBeforeBuildFn<RspackConfig>>;
+  onBeforeBuildHook: import("@rsbuild/shared").AsyncHook<OnBeforeBuildFn>;
   modifyRspackConfigHook: import("@rsbuild/shared").AsyncHook<ModifyRspackConfigFn>;
-  modifyRsbuildConfigHook: import("@rsbuild/shared").AsyncHook<ModifyRsbuildConfigFn<RsbuildConfig>>;
-  onAfterCreateCompilerHook: import("@rsbuild/shared").AsyncHook<OnAfterCreateCompilerFn>;
-  onBeforeCreateCompilerHook: import("@rsbuild/shared").AsyncHook<OnBeforeCreateCompilerFn<RspackConfig>>;
   modifyBundlerChainHook: import("@rsbuild/shared").AsyncHook<ModifyBundlerChainFn>;
+  modifyWebpackChainHook: import("@rsbuild/shared").AsyncHook<ModifyWebpackChainFn>;
+  modifyWebpackConfigHook: import("@rsbuild/shared").AsyncHook<ModifyWebpackConfigFn>;
+  modifyRsbuildConfigHook: import("@rsbuild/shared").AsyncHook<ModifyRsbuildConfigFn>;
+  onAfterCreateCompilerHook: import("@rsbuild/shared").AsyncHook<OnAfterCreateCompilerFn>;
+  onBeforeCreateCompilerHook: import("@rsbuild/shared").AsyncHook<OnBeforeCreateCompilerFn>;
 };
 export type Hooks = ReturnType<typeof initHooks>;

package/dist/rspack-provider/core/initHooks.js

@@ -35,10 +35,12 @@ function initHooks() {
     onAfterBuildHook: (0, import_shared.createAsyncHook)(),
     onBeforeBuildHook: (0, import_shared.createAsyncHook)(),
     modifyRspackConfigHook: (0, import_shared.createAsyncHook)(),
+    modifyBundlerChainHook: (0, import_shared.createAsyncHook)(),
+    modifyWebpackChainHook: (0, import_shared.createAsyncHook)(),
+    modifyWebpackConfigHook: (0, import_shared.createAsyncHook)(),
     modifyRsbuildConfigHook: (0, import_shared.createAsyncHook)(),
     onAfterCreateCompilerHook: (0, import_shared.createAsyncHook)(),
-    onBeforeCreateCompilerHook: (0, import_shared.createAsyncHook)(),
-    modifyBundlerChainHook: (0, import_shared.createAsyncHook)()
+    onBeforeCreateCompilerHook: (0, import_shared.createAsyncHook)()
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,5 +1,5 @@
-import { type PluginStore } from '@rsbuild/shared';
-import type { Context, RsbuildPluginAPI } from '../../types';
+import { type PluginStore, type RsbuildPluginAPI } from '@rsbuild/shared';
+import type { Context } from '../../types';
 export declare function getPluginAPI({
   context,
   pluginStore

package/dist/rspack-provider/core/initPlugins.js

@@ -68,19 +68,17 @@ function getPluginAPI({
     onAfterBuild: hooks.onAfterBuildHook.tap,
     onBeforeBuild: hooks.onBeforeBuildHook.tap,
     onDevCompileDone: hooks.onDevCompileDoneHook.tap,
+    modifyBundlerChain: hooks.modifyBundlerChainHook.tap,
     modifyRspackConfig: hooks.modifyRspackConfigHook.tap,
+    modifyWebpackChain: hooks.modifyWebpackChainHook.tap,
+    modifyWebpackConfig: hooks.modifyWebpackConfigHook.tap,
     modifyRsbuildConfig: hooks.modifyRsbuildConfigHook.tap,
-    modifyBundlerChain: hooks.modifyBundlerChainHook.tap,
     onAfterCreateCompiler: hooks.onAfterCreateCompilerHook.tap,
-    onBeforeCreateCompiler: hooks.onBeforeCreateCompilerHook.tap,
     onAfterStartDevServer: hooks.onAfterStartDevServerHook.tap,
+    onBeforeCreateCompiler: hooks.onBeforeCreateCompilerHook.tap,
     onBeforeStartDevServer: hooks.onBeforeStartDevServerHook.tap,
     onAfterStartProdServer: hooks.onAfterStartProdServerHook.tap,
-    onBeforeStartProdServer: hooks.onBeforeStartProdServerHook.tap,
-    modifyWebpackChain: () => {
-    },
-    modifyWebpackConfig: () => {
-    }
+    onBeforeStartProdServer: hooks.onBeforeStartProdServerHook.tap
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,6 +1,7 @@
 export { getRspackVersion } from './shared';
 export { rspackProvider } from './provider';
-export type { RspackProvider } from './provider';
 export type { Rspack, RspackConfig } from '@rsbuild/shared';
 export { createPublicContext, createContextByConfig } from './core/createContext';
+export { initHooks, type Hooks } from './core/initHooks';
+export { withDefaultConfig } from './config';
 export { initRsbuildConfig } from './core/initConfigs';

package/dist/rspack-provider/index.js

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

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

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

package/dist/rspack-provider/shared.js

@@ -75,6 +75,7 @@ const applyDefaultPlugins = (plugins) => (0, import_shared3.awaitableGetter)([
   plugins.networkPerformance(),
   plugins.preloadOrPrefetch(),
   plugins.performance(),
+  plugins.server(),
   Promise.resolve().then(() => __toESM(require("./plugins/rspackProfile"))).then((m) => m.pluginRspackProfile())
 ]);
 const getRspackVersion = async () => {
@@ -88,12 +89,30 @@ const getRspackVersion = async () => {
   }
 };
 const rspackMinVersion = "0.3.6";
+const compareSemver = (version1, version2) => {
+  const parts1 = version1.split(".").map(Number);
+  const parts2 = version2.split(".").map(Number);
+  const len = Math.max(parts1.length, parts2.length);
+  for (let i = 0; i < len; i++) {
+    const item1 = parts1[i] ?? 0;
+    const item2 = parts2[i] ?? 0;
+    if (item1 > item2) {
+      return 1;
+    }
+    if (item1 < item2) {
+      return -1;
+    }
+  }
+  return 0;
+};
 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(rspackMinVersion, version) : true;
+  if (version && /^[\d\.]+$/.test(version)) {
+    return compareSemver(version, rspackMinVersion) >= 0;
+  }
+  return true;
 };
 const getCompiledPath = (packageName) => {
   const providerCompilerPath = (0, import_path.join)(__dirname, "../../compiled", packageName);

package/dist/server/devServer.js

@@ -113,6 +113,16 @@ class RsbuildDevServer {
     }
     devMiddleware.init(app);
     devMiddleware.middleware && this.middlewares.use(devMiddleware.middleware);
+    if (dev.publicDir && dev.publicDir.name) {
+      const { default: sirv } = await Promise.resolve().then(() => __toESM(require("../../compiled/sirv")));
+      const { name } = dev.publicDir;
+      const publicDir = (0, import_path.isAbsolute)(name) ? name : (0, import_path.join)(this.pwd, name);
+      const assetMiddleware = sirv(publicDir, {
+        etag: true,
+        dev: true
+      });
+      this.middlewares.use(assetMiddleware);
+    }
     const { distPath } = this.output;
     this.middlewares.use(
       (0, import_middlewares.getHtmlFallbackMiddleware)({

package/dist/types.d.ts

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

package/package.json

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