@rsbuild/core 0.0.17 → 0.0.18

package/dist/server/https.js

@@ -0,0 +1,50 @@
+"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 https_exports = {};
+__export(https_exports, {
+  genHttpsOptions: () => genHttpsOptions
+});
+module.exports = __toCommonJS(https_exports);
+var import_shared = require("@rsbuild/shared");
+const genHttpsOptions = async (userOptions, pwd) => {
+  const httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
+  if (!httpsOptions.key || !httpsOptions.cert) {
+    let devcertPath;
+    try {
+      devcertPath = require.resolve("devcert", { paths: [pwd, __dirname] });
+    } catch (err) {
+      const command = import_shared.color.bold(import_shared.color.yellow(`npm add devcert@1.2.2 -D`));
+      import_shared.logger.error(
+        `You have enabled "dev.https" option, but the "devcert" package is not installed.`
+      );
+      import_shared.logger.error(
+        `Please run ${command} to install manually, otherwise the https can not work.`
+      );
+      throw new Error('[https] "devcert" is not found.');
+    }
+    const devcert = require(devcertPath);
+    const selfsign = await devcert.certificateFor(["localhost"]);
+    return selfsign;
+  }
+  return httpsOptions;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  genHttpsOptions
+});

package/dist/server/index.d.ts

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

package/dist/server/index.js

@@ -0,0 +1,31 @@
+"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, {
+  createDevServer: () => import_devServer.createDevServer,
+  startProdServer: () => import_prodServer.startProdServer
+});
+module.exports = __toCommonJS(server_exports);
+var import_devServer = require("./devServer");
+var import_prodServer = require("./prodServer");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createDevServer,
+  startProdServer
+});

package/dist/server/prodServer.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { ListenOptions } from 'net';
+import { Server } from 'http';
+import connect from 'connect';
+import { Context, RsbuildConfig, StartServerResult } from '@rsbuild/shared';
+type RsbuildProdServerOptions = {
+  pwd: string;
+  output: {
+    path: string;
+    assetPrefix?: string;
+  };
+};
+export declare class RsbuildProdServer {
+  private app;
+  private options;
+  middlewares: connect.Server;
+  constructor(options: RsbuildProdServerOptions);
+  onInit(app: Server): Promise<void>;
+  private applyDefaultMiddlewares;
+  createHTTPServer(): Promise<Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>;
+  listen(options?: number | ListenOptions | undefined, listener?: () => void): void;
+  close(): void;
+}
+export declare function startProdServer(context: Context, rsbuildConfig: RsbuildConfig): Promise<StartServerResult>;
+export {};

package/dist/server/prodServer.js

@@ -0,0 +1,133 @@
+"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)
+    __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 __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 prodServer_exports = {};
+__export(prodServer_exports, {
+  RsbuildProdServer: () => RsbuildProdServer,
+  startProdServer: () => startProdServer
+});
+module.exports = __toCommonJS(prodServer_exports);
+var import_http = require("http");
+var import_connect = __toESM(require("connect"));
+var import_path = require("path");
+var import_sirv = __toESM(require("sirv"));
+var import_shared = require("@rsbuild/shared");
+class RsbuildProdServer {
+  constructor(options) {
+    this.middlewares = (0, import_connect.default)();
+    this.options = options;
+  }
+  // Complete the preparation of services
+  async onInit(app) {
+    this.app = app;
+    await this.applyDefaultMiddlewares();
+  }
+  async applyDefaultMiddlewares() {
+    const {
+      output: { path, assetPrefix },
+      pwd
+    } = this.options;
+    const assetMiddleware = (0, import_sirv.default)((0, import_path.join)(pwd, path), {
+      etag: true,
+      dev: true,
+      ignores: false
+    });
+    this.middlewares.use((req, res, next) => {
+      const url = req.url;
+      if (assetPrefix && (url == null ? void 0 : url.startsWith(assetPrefix))) {
+        req.url = url.slice(assetPrefix.length);
+        assetMiddleware(req, res, (...args) => {
+          req.url = url;
+          next(...args);
+        });
+      } else {
+        assetMiddleware(req, res, next);
+      }
+    });
+  }
+  async createHTTPServer() {
+    return (0, import_http.createServer)(this.middlewares);
+  }
+  listen(options, listener) {
+    const callback = () => {
+      listener == null ? void 0 : listener();
+    };
+    if (typeof options === "object") {
+      this.app.listen(options, callback);
+    } else {
+      this.app.listen(options || 8080, callback);
+    }
+  }
+  close() {
+    this.app.close();
+  }
+}
+async function startProdServer(context, rsbuildConfig) {
+  var _a, _b, _c, _d;
+  if (!process.env.NODE_ENV) {
+    process.env.NODE_ENV = "production";
+  }
+  const port = await (0, import_shared.getPort)(((_a = rsbuildConfig.dev) == null ? void 0 : _a.port) || import_shared.DEFAULT_PORT);
+  const server = new RsbuildProdServer({
+    pwd: context.rootPath,
+    output: {
+      path: ((_c = (_b = rsbuildConfig.output) == null ? void 0 : _b.distPath) == null ? void 0 : _c.root) || import_shared.ROOT_DIST_DIR,
+      assetPrefix: (_d = rsbuildConfig.output) == null ? void 0 : _d.assetPrefix
+    }
+  });
+  const httpServer = await server.createHTTPServer();
+  await server.onInit(httpServer);
+  return new Promise((resolve) => {
+    server.listen(
+      {
+        host: import_shared.DEFAULT_DEV_HOST,
+        port
+      },
+      () => {
+        const urls = (0, import_shared.getAddressUrls)("http", port);
+        (0, import_shared.printServerURLs)(urls);
+        resolve({
+          port,
+          urls: urls.map((item) => item.url),
+          server: {
+            middlewares: server.middlewares,
+            close: () => {
+              server.close();
+            }
+            // TODO: decouple with Modern.js server
+          }
+        });
+      }
+    );
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RsbuildProdServer,
+  startProdServer
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -17,6 +17,14 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./server": {
+      "types": "./dist/server/index.d.ts",
+      "default": "./dist/server/index.js"
+    },
+    "./hmr-client": {
+      "types": "./dist/server/dev-middleware/hmr-client/index.d.ts",
+      "default": "./dist/server/dev-middleware/hmr-client/index.js"
+    },
     "./cli": {
       "types": "./dist/cli/index.d.ts",
       "default": "./dist/cli/index.js"
@@ -32,6 +40,9 @@
     "./rspack-provider": {
       "types": "./dist/rspack-provider/index.d.ts",
       "default": "./dist/rspack-provider/index.js"
+    },
+    "./types": {
+      "types": "./types.d.ts"
     }
   },
   "main": "./dist/index.js",
@@ -41,6 +52,12 @@
       "cli": [
         "./dist/cli/index.d.ts"
       ],
+      "server": [
+        "./dist/server/index.d.ts"
+      ],
+      "hmr-client": [
+        "./dist/server/dev-middleware/hmr-client/index.d.ts"
+      ],
       "plugins/*": [
         "./dist/plugins/*.d.ts"
       ],
@@ -58,27 +75,36 @@
   "files": [
     "bin",
     "dist",
-    "static"
+    "static",
+    "types.d.ts"
   ],
   "dependencies": {
-    "@modern-js/server": "0.0.0-next-20231103131234",
     "@rspack/core": "0.3.11",
+    "connect": "3.7.0",
+    "connect-history-api-fallback": "^2.0.0",
     "commander": "^10.0.1",
     "core-js": "~3.32.2",
     "filesize": "^8.0.7",
     "gzip-size": "^6.0.0",
     "html-webpack-plugin": "5.5.3",
+    "http-compression": "1.0.6",
     "jiti": "^1.20.0",
     "lodash": "^4.17.21",
     "open": "^8.4.0",
-    "pkg-up": "^3.1.0",
     "postcss": "8.4.31",
+    "rslog": "^1.1.0",
     "semver": "^7.5.4",
-    "@rsbuild/shared": "0.0.17"
+    "sirv": "^2.0.3",
+    "strip-ansi": "^6.0.1",
+    "ws": "^8.2.0",
+    "@rsbuild/shared": "0.0.18"
   },
   "devDependencies": {
+    "@types/connect": "3.4.35",
+    "@types/connect-history-api-fallback": "^1.3.5",
     "@types/lodash": "^4.14.200",
     "@types/node": "^16",
+    "@types/ws": "^8.2.0",
     "@types/semver": "^7.5.4",
     "typescript": "^5.2.2"
   },

package/types.d.ts

@@ -0,0 +1,130 @@
+/**
+ * Image assets
+ */
+declare module '*.bmp' {
+  const src: string;
+  export default src;
+}
+declare module '*.bmp?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.bmp?inline' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif?inline' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg?inline' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg?inline' {
+  const src: string;
+  export default src;
+}
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+declare module '*.png?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.png?inline' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico?inline' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp?inline' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg?url' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg?inline' {
+  const src: string;
+  export default src;
+}
+
+/**
+ * CSS Modules
+ */
+type CSSModuleClasses = {
+  readonly [key: string]: string;
+};
+declare module '*.module.css' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.scss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sass' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.less' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.styl' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.stylus' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}

package/dist/plugins/assetsRetry.d.ts

@@ -1,2 +0,0 @@
-import { DefaultRsbuildPlugin } from '@rsbuild/shared';
-export declare function pluginAssetsRetry(): DefaultRsbuildPlugin;

package/dist/plugins/assetsRetry.js

@@ -1,66 +0,0 @@
-"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)
-    __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 __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 assetsRetry_exports = {};
-__export(assetsRetry_exports, {
-  pluginAssetsRetry: () => pluginAssetsRetry
-});
-module.exports = __toCommonJS(assetsRetry_exports);
-var import_shared = require("@rsbuild/shared");
-function pluginAssetsRetry() {
-  return {
-    name: "plugin-assets-retry",
-    setup(api) {
-      api.modifyBundlerChain(
-        async (chain, { CHAIN_ID, target, HtmlPlugin }) => {
-          const config = api.getNormalizedConfig();
-          if (!config.output.assetsRetry || (0, import_shared.isHtmlDisabled)(config, target)) {
-            return;
-          }
-          const { AssetsRetryPlugin } = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared")));
-          const distDir = (0, import_shared.getDistPath)(config.output, "js");
-          const { assetsRetry = {} } = config.output;
-          if (assetsRetry.crossOrigin === void 0) {
-            assetsRetry.crossOrigin = config.html.crossorigin;
-          }
-          chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin, [
-            {
-              ...assetsRetry,
-              distDir,
-              HtmlPlugin
-            }
-          ]);
-        }
-      );
-    }
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  pluginAssetsRetry
-});