@rsbuild/core 0.0.21 → 0.0.22

package/dist/server/devServer.js

@@ -37,7 +37,7 @@ var import_https = require("https");
 var import_url = __toESM(require("url"));
 var import_shared = require("@rsbuild/shared");
 var import_dev_middleware = __toESM(require("./dev-middleware"));
-var import_connect = __toESM(require("connect"));
+var import_connect = __toESM(require("@rsbuild/shared/connect"));
 var import_proxy = require("./proxy");
 var import_middlewares = require("./middlewares");
 var import_path = require("path");
@@ -121,9 +121,8 @@ class RsbuildDevServer {
       })
     );
     if (dev.historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
+      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback")));
       const historyApiFallbackMiddleware = connectHistoryApiFallback(
-        // @ts-expect-error
         typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
       );
       this.middlewares.use(historyApiFallbackMiddleware);
@@ -157,7 +156,7 @@ class RsbuildDevServer {
     this.app.close();
   }
 }
-async function startDevServer(options, startDevCompile, {
+async function startDevServer(options, createDevMiddleware, {
   open,
   compiler,
   printURLs = true,
@@ -188,17 +187,8 @@ async function startDevServer(options, startDevCompile, {
     options.context.entry,
     (_c = (_b = rsbuildConfig.output) == null ? void 0 : _b.distPath) == null ? void 0 : _c.html
   );
-  if (printURLs) {
-    if ((0, import_shared.isFunction)(printURLs)) {
-      urls = printURLs(urls);
-      if (!Array.isArray(urls)) {
-        throw new Error("Please return an array in the `printURLs` function.");
-      }
-    }
-    (0, import_shared.printServerURLs)(urls, routes, logger);
-  }
   (0, import_shared.debug)("create dev server");
-  const devMiddleware = await startDevCompile(options, compiler);
+  const devMiddleware = await createDevMiddleware(options, compiler);
   const server = new RsbuildDevServer({
     pwd: options.context.rootPath,
     devMiddleware,
@@ -211,6 +201,15 @@ async function startDevServer(options, startDevCompile, {
   (0, import_shared.debug)("create dev server done");
   await options.context.hooks.onBeforeStartDevServerHook.call();
   const httpServer = await server.createHTTPServer();
+  if (printURLs) {
+    if ((0, import_shared.isFunction)(printURLs)) {
+      urls = printURLs(urls);
+      if (!Array.isArray(urls)) {
+        throw new Error("Please return an array in the `printURLs` function.");
+      }
+    }
+    (0, import_shared.printServerURLs)(urls, routes, logger);
+  }
   await server.onInit(httpServer);
   (0, import_shared.debug)("listen dev server");
   return new Promise((resolve) => {
@@ -233,7 +232,7 @@ async function startDevServer(options, startDevCompile, {
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: () => {
+            close: async () => {
               server.close();
             }
           }

package/dist/server/prodServer.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import type { ListenOptions } from 'net';
 import { Server } from 'http';
-import connect from 'connect';
+import connect from '@rsbuild/shared/connect';
 import { Context, RsbuildConfig, StartServerResult, PreviewServerOptions } from '@rsbuild/shared';
 type RsbuildProdServerOptions = {
   pwd: string;

package/dist/server/prodServer.js

@@ -33,7 +33,7 @@ __export(prodServer_exports, {
 });
 module.exports = __toCommonJS(prodServer_exports);
 var import_http = require("http");
-var import_connect = __toESM(require("connect"));
+var import_connect = __toESM(require("@rsbuild/shared/connect"));
 var import_path = require("path");
 var import_sirv = __toESM(require("sirv"));
 var import_shared = require("@rsbuild/shared");
@@ -130,7 +130,7 @@ async function startProdServer(context, rsbuildConfig, { printURLs = true } = {}
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: () => {
+            close: async () => {
               server.close();
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -21,9 +21,9 @@
       "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"
+    "./client/*": {
+      "types": "./dist/client/*.d.ts",
+      "default": "./dist/client/*.js"
     },
     "./cli": {
       "types": "./dist/cli/index.d.ts",
@@ -54,12 +54,11 @@
     "bin",
     "dist",
     "static",
+    "compiled",
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "0.3.11",
-    "connect": "3.7.0",
-    "connect-history-api-fallback": "^2.0.0",
+    "@rspack/core": "0.3.12",
     "commander": "^10.0.1",
     "core-js": "~3.32.2",
     "gzip-size": "^6.0.0",
@@ -67,17 +66,14 @@
     "http-compression": "1.0.6",
     "http-proxy-middleware": "^2.0.1",
     "jiti": "^1.20.0",
-    "open": "^8.4.0",
     "postcss": "8.4.31",
     "rslog": "^1.1.0",
     "semver": "^7.5.4",
     "sirv": "^2.0.3",
     "ws": "^8.2.0",
-    "@rsbuild/shared": "0.0.21"
+    "@rsbuild/shared": "0.0.22"
   },
   "devDependencies": {
-    "@types/connect": "3.4.35",
-    "@types/connect-history-api-fallback": "^1.3.5",
     "@types/node": "^16",
     "@types/ws": "^8.2.0",
     "@types/semver": "^7.5.4",

package/dist/plugins/rem.d.ts

@@ -1,2 +0,0 @@
-import { type DefaultRsbuildPlugin } from '@rsbuild/shared';
-export declare const pluginRem: () => DefaultRsbuildPlugin;

package/dist/plugins/rem.js

@@ -1,103 +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 rem_exports = {};
-__export(rem_exports, {
-  pluginRem: () => pluginRem
-});
-module.exports = __toCommonJS(rem_exports);
-var import_shared = require("@rsbuild/shared");
-var import_shared2 = require("@rsbuild/shared");
-const defaultOptions = {
-  enableRuntime: true,
-  rootFontSize: 50
-};
-const pluginRem = () => ({
-  name: "plugin-rem",
-  pre: ["plugin-css", "plugin-less", "plugin-sass", "plugin-stylus"],
-  setup(api) {
-    api.modifyBundlerChain(
-      async (chain, { CHAIN_ID, isServer, isWebWorker, HtmlPlugin }) => {
-        const config = api.getNormalizedConfig();
-        const {
-          output: { convertToRem }
-        } = config;
-        if (!convertToRem || isServer || isWebWorker) {
-          return;
-        }
-        const userOptions = {
-          ...defaultOptions,
-          ...typeof convertToRem === "boolean" ? {} : convertToRem
-        };
-        const { default: PxToRemPlugin } = await Promise.resolve().then(() => __toESM(require((0, import_shared.getSharedPkgCompiledPath)("postcss-pxtorem"))));
-        const applyRules = [
-          CHAIN_ID.RULE.CSS,
-          CHAIN_ID.RULE.LESS,
-          CHAIN_ID.RULE.SASS,
-          CHAIN_ID.RULE.STYLUS
-        ];
-        const getPxToRemPlugin = () => PxToRemPlugin({
-          rootValue: userOptions.rootFontSize,
-          unitPrecision: 5,
-          propList: ["*"],
-          ...userOptions.pxtorem ? (0, import_shared2.cloneDeep)(userOptions.pxtorem) : {}
-        });
-        applyRules.forEach((name) => {
-          chain.module.rules.has(name) && chain.module.rule(name).use(CHAIN_ID.USE.POSTCSS).tap((options = {}) => {
-            var _a;
-            return {
-              ...options,
-              postcssOptions: {
-                ...options.postcssOptions || {},
-                plugins: [
-                  ...((_a = options.postcssOptions) == null ? void 0 : _a.plugins) || [],
-                  getPxToRemPlugin()
-                ]
-              }
-            };
-          });
-        });
-        if (!userOptions.enableRuntime) {
-          return;
-        }
-        const entries = Object.keys(chain.entryPoints.entries() || {});
-        const distDir = (0, import_shared.getDistPath)(config.output, "js");
-        chain.plugin(CHAIN_ID.PLUGIN.AUTO_SET_ROOT_SIZE).use(import_shared.AutoSetRootFontSizePlugin, [
-          userOptions,
-          entries,
-          HtmlPlugin,
-          distDir
-        ]);
-      }
-    );
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  pluginRem
-});

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

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

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

@@ -1,52 +0,0 @@
-"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 fallback_exports = {};
-__export(fallback_exports, {
-  pluginFallback: () => pluginFallback
-});
-module.exports = __toCommonJS(fallback_exports);
-var import_path = require("path");
-var import_shared = require("@rsbuild/shared");
-const pluginFallback = () => ({
-  name: "plugin-fallback",
-  setup(api) {
-    api.modifyRspackConfig((config, { isProd }) => {
-      var _a;
-      const rsbuildConfig = api.getNormalizedConfig();
-      if (!rsbuildConfig.output.enableAssetFallback) {
-        return;
-      }
-      const distDir = (0, import_shared.getDistPath)(rsbuildConfig.output, "media");
-      const filename = (0, import_shared.getFilename)(rsbuildConfig.output, "media", isProd);
-      (0, import_shared.setConfig)(config, "output.assetModuleFilename", (0, import_path.join)(distDir, filename));
-      if (!config.module) {
-        return;
-      }
-      (0, import_shared.setConfig)(
-        config,
-        "module.rules",
-        (0, import_shared.resourceRuleFallback)((_a = config.module) == null ? void 0 : _a.rules)
-      );
-    });
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  pluginFallback
-});

package/dist/server/dev-middleware/hmr-client/createSocketUrl.js

@@ -1,68 +0,0 @@
-"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 createSocketUrl_exports = {};
-__export(createSocketUrl_exports, {
-  HMR_SOCK_PATH: () => HMR_SOCK_PATH,
-  createSocketUrl: () => createSocketUrl,
-  formatURL: () => formatURL
-});
-module.exports = __toCommonJS(createSocketUrl_exports);
-const HMR_SOCK_PATH = "/rsbuild-hmr";
-function createSocketUrl(resourceQuery) {
-  const searchParams = resourceQuery.substr(1).split("&");
-  const options = {};
-  for (const pair of searchParams) {
-    const ary = pair.split("=");
-    options[ary[0]] = decodeURIComponent(ary[1]);
-  }
-  const currentLocation = self.location;
-  return getSocketUrl(options, currentLocation);
-}
-function formatURL({
-  port,
-  protocol,
-  hostname,
-  pathname
-}) {
-  if (window.URL) {
-    const url = new URL("http://localhost");
-    url.port = port;
-    url.hostname = hostname;
-    url.protocol = protocol;
-    url.pathname = pathname;
-    return url.toString();
-  }
-  const colon = protocol.indexOf(":") === -1 ? ":" : "";
-  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
-}
-function getSocketUrl(urlParts, location) {
-  const { host, port, path, protocol } = urlParts;
-  return formatURL({
-    protocol: protocol || (location.protocol === "https:" ? "wss" : "ws"),
-    hostname: host || location.hostname,
-    port: port || location.port,
-    pathname: path || HMR_SOCK_PATH
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  HMR_SOCK_PATH,
-  createSocketUrl,
-  formatURL
-});

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

@@ -1,141 +0,0 @@
-"use strict";
-var import_format_stats = require("@rsbuild/shared/format-stats");
-var import_createSocketUrl = require("./createSocketUrl");
-const hadRuntimeError = false;
-const socketUrl = (0, import_createSocketUrl.createSocketUrl)(__resourceQuery);
-const connection = new WebSocket(socketUrl);
-connection.onopen = function() {
-  if (typeof console !== "undefined" && typeof console.info === "function") {
-    console.info("[HMR] connected.");
-  }
-};
-connection.onclose = function() {
-  if (typeof console !== "undefined" && typeof console.info === "function") {
-    console.info("[HMR] disconnected. Refresh the page if necessary.");
-  }
-};
-let isFirstCompilation = true;
-let mostRecentCompilationHash = null;
-let hasCompileErrors = false;
-function clearOutdatedErrors() {
-  if (typeof console !== "undefined" && typeof console.clear === "function") {
-    if (hasCompileErrors) {
-      console.clear();
-    }
-  }
-}
-function handleSuccess() {
-  clearOutdatedErrors();
-  const isHotUpdate = !isFirstCompilation;
-  isFirstCompilation = false;
-  hasCompileErrors = false;
-  if (isHotUpdate) {
-    tryApplyUpdates();
-  }
-}
-function handleWarnings(warnings) {
-  clearOutdatedErrors();
-  const isHotUpdate = !isFirstCompilation;
-  isFirstCompilation = false;
-  hasCompileErrors = false;
-  function printWarnings() {
-    const formatted = (0, import_format_stats.formatStatsMessages)({
-      warnings,
-      errors: []
-    });
-    if (typeof console !== "undefined" && typeof console.warn === "function") {
-      for (let i = 0; i < formatted.warnings.length; i++) {
-        if (i === 5) {
-          console.warn(
-            "There were more warnings in other files.\nYou can find a complete log in the terminal."
-          );
-          break;
-        }
-        console.warn(formatted.warnings[i]);
-      }
-    }
-  }
-  printWarnings();
-  if (isHotUpdate) {
-    tryApplyUpdates();
-  }
-}
-function handleErrors(errors) {
-  clearOutdatedErrors();
-  isFirstCompilation = false;
-  hasCompileErrors = true;
-  const formatted = (0, import_format_stats.formatStatsMessages)({
-    errors,
-    warnings: []
-  });
-  if (typeof console !== "undefined" && typeof console.error === "function") {
-    for (const error of formatted.errors) {
-      console.error(error);
-    }
-  }
-}
-function handleAvailableHash(hash) {
-  mostRecentCompilationHash = hash;
-}
-connection.onmessage = function(e) {
-  const message = JSON.parse(e.data);
-  switch (message.type) {
-    case "hash":
-      handleAvailableHash(message.data);
-      break;
-    case "still-ok":
-    case "ok":
-      handleSuccess();
-      break;
-    case "content-changed":
-      window.location.reload();
-      break;
-    case "warnings":
-      handleWarnings(message.data);
-      break;
-    case "errors":
-      handleErrors(message.data);
-      break;
-    default:
-  }
-};
-function isUpdateAvailable() {
-  return mostRecentCompilationHash !== __webpack_hash__;
-}
-function canApplyUpdates() {
-  return module.hot.status() === "idle";
-}
-function tryApplyUpdates() {
-  if (!module.hot) {
-    window.location.reload();
-    return;
-  }
-  if (!isUpdateAvailable() || !canApplyUpdates()) {
-    return;
-  }
-  function handleApplyUpdates(err, updatedModules) {
-    const wantsForcedReload = err || !updatedModules || hadRuntimeError;
-    if (wantsForcedReload) {
-      window.location.reload();
-      return;
-    }
-    if (isUpdateAvailable()) {
-      tryApplyUpdates();
-    }
-  }
-  const result = module.hot.check(
-    /* autoApply */
-    true,
-    handleApplyUpdates
-  );
-  if (result == null ? void 0 : result.then) {
-    result.then(
-      (updatedModules) => {
-        handleApplyUpdates(null, updatedModules);
-      },
-      (err) => {
-        handleApplyUpdates(err, null);
-      }
-    );
-  }
-}