@rsbuild/core 0.3.6 → 0.3.8

package/dist/server/middlewares.js

@@ -30,13 +30,14 @@ var middlewares_exports = {};
 __export(middlewares_exports, {
   faviconFallbackMiddleware: () => faviconFallbackMiddleware,
   getHtmlFallbackMiddleware: () => getHtmlFallbackMiddleware,
+  getRequestLoggerMiddleware: () => getRequestLoggerMiddleware,
   notFoundMiddleware: () => notFoundMiddleware
 });
 module.exports = __toCommonJS(middlewares_exports);
 var import_shared = require("@rsbuild/shared");
-var import_url = require("url");
-var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
+var import_node_url = require("node:url");
+var import_node_path = __toESM(require("node:path"));
+var import_node_fs = __toESM(require("node:fs"));
 const faviconFallbackMiddleware = (req, res, next) => {
   if (req.url === "/favicon.ico") {
     res.statusCode = 204;
@@ -45,6 +46,42 @@ const faviconFallbackMiddleware = (req, res, next) => {
     next();
   }
 };
+const getStatusCodeColor = (status) => {
+  if (status >= 500) {
+    return import_shared.color.red;
+  }
+  if (status >= 400) {
+    return import_shared.color.yellow;
+  }
+  if (status >= 300) {
+    return import_shared.color.cyan;
+  }
+  if (status >= 200) {
+    return import_shared.color.green;
+  }
+  return (res) => res;
+};
+const getRequestLoggerMiddleware = async () => {
+  const { default: onFinished } = await Promise.resolve().then(() => __toESM(require("../../compiled/on-finished")));
+  return (req, res, next) => {
+    const _startAt = process.hrtime();
+    const logRequest = () => {
+      const method = req.method;
+      const url = req.originalUrl || req.url;
+      const status = Number(res.statusCode);
+      const statusColor = getStatusCodeColor(status);
+      const endAt = process.hrtime();
+      const totalTime = (endAt[0] - _startAt[0]) * 1e3 + (endAt[1] - _startAt[1]) * 1e-6;
+      (0, import_shared.debug)(
+        `${statusColor(status)} ${method} ${import_shared.color.gray(url)} ${import_shared.color.gray(
+          `${totalTime.toFixed(3)} ms`
+        )}`
+      );
+    };
+    onFinished(res, logRequest);
+    next();
+  };
+};
 const notFoundMiddleware = (_req, res, _next) => {
   res.statusCode = 404;
   res.end();
@@ -63,20 +100,26 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback }) => {
     const { url } = req;
     let pathname = url;
     try {
-      pathname = (0, import_url.parse)(url, false, true).pathname;
+      pathname = (0, import_node_url.parse)(url, false, true).pathname;
     } catch (err) {
       import_shared.logger.error(
         new Error(`Invalid URL: ${import_shared.color.yellow(url)}`, { cause: err })
       );
       return next();
     }
-    let outputFileSystem = import_fs.default;
+    let outputFileSystem = import_node_fs.default;
     if (res.locals.webpack) {
       const { devMiddleware } = res.locals.webpack;
       outputFileSystem = devMiddleware.outputFileSystem;
     }
-    const rewrite = (newUrl) => {
-      (0, import_shared.debug)?.(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
+    const rewrite = (newUrl, isFallback = false) => {
+      if (isFallback && (0, import_shared.isDebug)()) {
+        (0, import_shared.debug)(
+          `${req.method} ${import_shared.color.gray(
+            `${req.url} ${import_shared.color.yellow("fallback")} to ${newUrl}`
+          )}`
+        );
+      }
       req.url = newUrl;
       if (callback) {
         return callback(req, res, (...args) => {
@@ -87,7 +130,7 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback }) => {
     };
     if (pathname.endsWith("/")) {
       const newUrl = `${pathname}index.html`;
-      const filePath = import_path.default.join(distPath, pathname, "index.html");
+      const filePath = import_node_path.default.join(distPath, pathname, "index.html");
       if (outputFileSystem.existsSync(filePath)) {
         return rewrite(newUrl);
       }
@@ -96,14 +139,14 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback }) => {
       !pathname.endsWith(".html")
     ) {
       const newUrl = `${pathname}.html`;
-      const filePath = import_path.default.join(distPath, `${pathname}.html`);
+      const filePath = import_node_path.default.join(distPath, `${pathname}.html`);
       if (outputFileSystem.existsSync(filePath)) {
         return rewrite(newUrl);
       }
     }
     if (htmlFallback === "index") {
-      if (outputFileSystem.existsSync(import_path.default.join(distPath, "index.html"))) {
-        return rewrite("/index.html");
+      if (outputFileSystem.existsSync(import_node_path.default.join(distPath, "index.html"))) {
+        return rewrite("/index.html", true);
       }
     }
     next();
@@ -113,5 +156,6 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback }) => {
 0 && (module.exports = {
   faviconFallbackMiddleware,
   getHtmlFallbackMiddleware,
+  getRequestLoggerMiddleware,
   notFoundMiddleware
 });

package/dist/server/prodServer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { Server } from 'http';
+import type { Server } from 'node:http';
 import connect from '@rsbuild/shared/connect';
 import { type ServerConfig, type RsbuildConfig, type StartServerResult, type PreviewServerOptions } from '@rsbuild/shared';
 import type { InternalContext } from '../types';

package/dist/server/prodServer.js

@@ -38,7 +38,7 @@ __export(prodServer_exports, {
 });
 module.exports = __toCommonJS(prodServer_exports);
 var import_connect = __toESM(require("@rsbuild/shared/connect"));
-var import_path = require("path");
+var import_node_path = require("node:path");
 var import_sirv = __toESM(require("../../compiled/sirv"));
 var import_shared = require("@rsbuild/shared");
 var import_helper = require("./helper");
@@ -58,6 +58,9 @@ class RsbuildProdServer {
   }
   async applyDefaultMiddlewares() {
     const { headers, proxy, historyApiFallback, compress } = this.options.serverConfig;
+    if ((0, import_shared.isDebug)()) {
+      this.middlewares.use(await (0, import_middlewares.getRequestLoggerMiddleware)());
+    }
     if (compress) {
       const { default: compression } = await Promise.resolve().then(() => __toESM(require("../../compiled/http-compression")));
       this.middlewares.use((req, res, next) => {
@@ -100,7 +103,7 @@ class RsbuildProdServer {
       serverConfig: { htmlFallback },
       pwd
     } = this.options;
-    const assetMiddleware = (0, import_sirv.default)((0, import_path.join)(pwd, path), {
+    const assetMiddleware = (0, import_sirv.default)((0, import_node_path.join)(pwd, path), {
       etag: true,
       dev: true,
       ignores: ["favicon.ico"],

package/dist/server/restart.js

@@ -32,7 +32,7 @@ __export(restart_exports, {
   restartDevServer: () => restartDevServer
 });
 module.exports = __toCommonJS(restart_exports);
-var import_path = __toESM(require("path"));
+var import_node_path = __toESM(require("node:path"));
 var import_shared = require("@rsbuild/shared");
 var import_commands = require("../cli/commands");
 let cleaners = [];
@@ -46,7 +46,7 @@ const clearConsole = () => {
 };
 const restartDevServer = async ({ filePath }) => {
   clearConsole();
-  const filename = import_path.default.basename(filePath);
+  const filename = import_node_path.default.basename(filePath);
   import_shared.logger.info(`Restart because ${import_shared.color.yellow(filename)} is changed.
 `);
   for (const cleaner of cleaners) {

package/dist/server/socketServer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import type { IncomingMessage } from 'http';
-import type { Socket } from 'net';
+import type { IncomingMessage } from 'node:http';
+import type { Socket } from 'node:net';
 import ws from '../../compiled/ws';
 import { type Stats, type DevMiddlewaresConfig } from '@rsbuild/shared';
 export declare class SocketServer {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -52,12 +52,12 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "0.5.0",
+    "@rspack/core": "0.5.2",
     "@swc/helpers": "0.5.3",
     "core-js": "~3.32.2",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
     "postcss": "^8.4.33",
-    "@rsbuild/shared": "0.3.6"
+    "@rsbuild/shared": "0.3.8"
   },
   "devDependencies": {
     "@types/node": "16.x",

package/types.d.ts

@@ -17,6 +17,14 @@ declare module '*.jpeg' {
   const src: string;
   export default src;
 }
+declare module '*.pjpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjp' {
+  const src: string;
+  export default src;
+}
 declare module '*.png' {
   const src: string;
   export default src;
@@ -41,10 +49,18 @@ declare module '*.avif' {
   const src: string;
   export default src;
 }
+declare module '*.tif' {
+  const src: string;
+  export default src;
+}
 declare module '*.tiff' {
   const src: string;
   export default src;
 }
+declare module '*.jfif' {
+  const src: string;
+  export default src;
+}
 
 /**
  * Font assets
@@ -109,6 +125,14 @@ declare module '*.mov' {
   const src: string;
   export default src;
 }
+declare module '*.m4a' {
+  const src: string;
+  export default src;
+}
+declare module '*.opus' {
+  const src: string;
+  export default src;
+}
 
 /**
  * Configuration files