chore: adapted to rspack 0.7 (#2352)

web-infra-dev · May 15, 2024 · 696cec3 · 696cec3
1 parent dfcf7bc
commit 696cec3
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 103 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@rsbuild/shared": "workspace:*",
-    "@rspack/core": "0.6.5",
+    "@rspack/core": "0.6.5-canary-2456d69-20240515093621",
     "@swc/helpers": "0.5.3",
     "core-js": "~3.36.0",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2",

diff --git a/packages/core/src/client/format.ts b/packages/core/src/client/format.ts
@@ -27,8 +27,7 @@ function formatMessage(stats: StatsError | string) {
   // Stats error object
   if (typeof stats === 'object') {
     const fileName = resolveFileName(stats);
-    const mainMessage =
-      typeof stats.formatted === 'string' ? stats.formatted : stats.message;
+    const mainMessage = stats.message;
     const details = stats.details ? `\nDetails: ${stats.details}\n` : '';
     const stack = stats.stack ? `\n${stats.stack}` : '';
 

diff --git a/packages/core/src/server/devServer.ts b/packages/core/src/server/devServer.ts
@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import {
   type CreateDevMiddlewareReturns,
   type CreateDevServerOptions,
+  type OutputFileSystem,
   ROOT_DIST_DIR,
   type RsbuildDevServer,
   type StartDevServerOptions,
@@ -66,7 +67,7 @@ export async function createDevServer<
     https,
   };
 
-  let outputFileSystem = fs;
+  let outputFileSystem: OutputFileSystem = fs;
 
   const startCompile: () => Promise<
     RsbuildDevMiddlewareOptions['compileMiddlewareAPI']
@@ -91,9 +92,10 @@ export async function createDevServer<
 
     compilerDevMiddleware.init();
 
-    outputFileSystem = isMultiCompiler(compiler)
-      ? compiler.compilers[0].outputFileSystem
-      : compiler.outputFileSystem;
+    outputFileSystem =
+      (isMultiCompiler(compiler)
+        ? compiler.compilers[0].outputFileSystem
+        : compiler.outputFileSystem) || fs;
 
     return {
       middleware: compilerDevMiddleware.middleware,

diff --git a/packages/core/src/server/getDevMiddlewares.ts b/packages/core/src/server/getDevMiddlewares.ts
@@ -1,10 +1,10 @@
-import type fs from 'node:fs';
 import { isAbsolute, join } from 'node:path';
 import url from 'node:url';
 import type {
   CompileMiddlewareAPI,
   DevConfig,
   Middlewares,
+  OutputFileSystem,
   RequestHandler,
   ServerAPIs,
   ServerConfig,
@@ -22,7 +22,7 @@ export type RsbuildDevMiddlewareOptions = {
   dev: DevConfig;
   server: ServerConfig;
   compileMiddlewareAPI?: CompileMiddlewareAPI;
-  outputFileSystem: typeof fs;
+  outputFileSystem: OutputFileSystem;
   output: {
     distPath: string;
   };

diff --git a/packages/core/src/server/middlewares.ts b/packages/core/src/server/middlewares.ts
@@ -1,9 +1,9 @@
-import type fs from 'node:fs';
 import path from 'node:path';
 import { parse } from 'node:url';
 import {
   type HtmlFallback,
   type RequestHandler as Middleware,
+  type OutputFileSystem,
   color,
   debug,
   isDebug,
@@ -81,12 +81,12 @@ export const getHtmlFallbackMiddleware: (params: {
   distPath: string;
   callback?: Middleware;
   htmlFallback?: HtmlFallback;
-  outputFileSystem: typeof fs;
+  outputFileSystem: OutputFileSystem;
 }) => Middleware = ({ htmlFallback, distPath, callback, outputFileSystem }) => {
   /**
    * support access page without suffix and support fallback in some edge cases
    */
-  return (req, res, next) => {
+  return async (req, res, next) => {
     if (
       // Only accept GET or HEAD
       (req.method !== 'GET' && req.method !== 'HEAD') ||
@@ -119,6 +119,14 @@ export const getHtmlFallbackMiddleware: (params: {
       return next();
     }
 
+    const isFileExists = async (filePath: string) => {
+      return new Promise((resolve) => {
+        outputFileSystem.stat(filePath, (_error, stats) => {
+          resolve(stats?.isFile());
+        });
+      });
+    };
+
     const rewrite = (newUrl: string, isFallback = false) => {
       if (isFallback && isDebug()) {
         debug(
@@ -143,7 +151,7 @@ export const getHtmlFallbackMiddleware: (params: {
       const newUrl = `${pathname}index.html`;
       const filePath = path.join(distPath, pathname, 'index.html');
 
-      if (outputFileSystem.existsSync(filePath)) {
+      if (await isFileExists(filePath)) {
         return rewrite(newUrl);
       }
     } else if (
@@ -153,13 +161,13 @@ export const getHtmlFallbackMiddleware: (params: {
       const newUrl = `${pathname}.html`;
       const filePath = path.join(distPath, `${pathname}.html`);
 
-      if (outputFileSystem.existsSync(filePath)) {
+      if (await isFileExists(filePath)) {
         return rewrite(newUrl);
       }
     }
 
     if (htmlFallback === 'index') {
-      if (outputFileSystem.existsSync(path.join(distPath, 'index.html'))) {
+      if (await isFileExists(path.join(distPath, 'index.html'))) {
         return rewrite('/index.html', true);
       }
     }

diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@rsbuild/shared": "workspace:*",
-    "@rspack/plugin-react-refresh": "0.6.5",
+    "@rspack/plugin-react-refresh": "0.6.5-canary-2456d69-20240515093621",
     "react-refresh": "^0.14.2"
   },
   "devDependencies": {

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -96,7 +96,7 @@
     "test:watch": "vitest dev --no-coverage"
   },
   "dependencies": {
-    "@rspack/core": "0.6.5",
+    "@rspack/core": "0.6.5-canary-2456d69-20240515093621",
     "caniuse-lite": "^1.0.30001617",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2",
     "postcss": "^8.4.38"

diff --git a/packages/shared/src/types/rspack.ts b/packages/shared/src/types/rspack.ts
@@ -16,6 +16,8 @@ export type RspackMultiCompiler = Rspack.MultiCompiler;
 /** T[] => T */
 type GetElementType<T extends any[]> = T extends (infer U)[] ? U : never;
 
+export type OutputFileSystem = Rspack.OutputFileSystem;
+
 export type RspackRule = GetElementType<
   NonNullable<NonNullable<RspackConfig['module']>['rules']>
 >;