From d5ea2dc0c36c7a877c4aa4b0e8cb7a34b70efaaa Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Feb 2025 11:31:38 +0800 Subject: [PATCH] fix: switch to sirv and disable cache (#737) --- packages/client/package.json | 3 +-- packages/client/rsbuild.config.ts | 3 ++- packages/sdk/package.json | 3 +-- packages/sdk/src/sdk/server/index.ts | 8 ++++++-- pnpm-lock.yaml | 18 ++++++------------ 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/packages/client/package.json b/packages/client/package.json index 815a68e5..02ff2d52 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -29,14 +29,13 @@ "@types/node": "^16", "@types/react": "^18.3.18", "@types/react-dom": "^18.3.5", - "@types/serve-static": "1.15.7", "antd": "5.19.1", "normalize.css": "8.0.1", "react": "18.3.1", "react-dom": "18.3.1", "react-error-boundary": "^4.1.2", "react-router-dom": "6.4.3", - "serve-static": "1.16.2", + "sirv": "2.0.4", "typescript": "^5.2.2" }, "publishConfig": { diff --git a/packages/client/rsbuild.config.ts b/packages/client/rsbuild.config.ts index 18477ade..348d14ca 100644 --- a/packages/client/rsbuild.config.ts +++ b/packages/client/rsbuild.config.ts @@ -4,7 +4,7 @@ import { pluginTypeCheck } from '@rsbuild/plugin-type-check'; import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill'; import type { Rspack, RsbuildConfig } from '@rsbuild/core'; import { pluginSass } from '@rsbuild/plugin-sass'; -import serve from 'serve-static'; +import serve from 'sirv'; import path from 'path'; import fs from 'fs'; @@ -196,6 +196,7 @@ export default defineConfig(({ env }) => { (middlewares) => { if (fs.existsSync(WebpackRsdoctorDirPath)) { const fn = serve(WebpackRsdoctorDirPath, { + dev: true, setHeaders(res) { res.setHeader('Content-Type', 'text/plain; charset=utf-8'); }, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8ca0007e..3e07b7fb 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -33,7 +33,7 @@ "json-cycle": "^1.5.0", "lodash": "^4.17.21", "open": "^8.4.2", - "serve-static": "1.16.2", + "sirv": "2.0.4", "socket.io": "4.8.1", "source-map": "^0.7.4", "tapable": "2.2.1" @@ -43,7 +43,6 @@ "@types/cors": "2.8.17", "@types/lodash": "^4.17.15", "@types/node": "^16", - "@types/serve-static": "1.15.7", "tslib": "2.8.1", "typescript": "^5.2.2" }, diff --git a/packages/sdk/src/sdk/server/index.ts b/packages/sdk/src/sdk/server/index.ts index 7929a135..522167c4 100644 --- a/packages/sdk/src/sdk/server/index.ts +++ b/packages/sdk/src/sdk/server/index.ts @@ -1,6 +1,6 @@ import { Common, SDK, Thirdparty, Client } from '@rsdoctor/types'; import { Server } from '@rsdoctor/utils/build'; -import serve from 'serve-static'; +import serve from 'sirv'; import { Bundle } from '@rsdoctor/utils/common'; import assert from 'assert'; import bodyParser from 'body-parser'; @@ -96,7 +96,11 @@ export class RsdoctorServer implements SDK.RsdoctorServerInstance { ? this._innerClientPath : require.resolve('@rsdoctor/client'); const clientDistPath = path.resolve(clientHtmlPath, '..'); - this.app.use(serve(clientDistPath)); + this.app.use( + serve(clientDistPath, { + dev: true, + }), + ); await this._router.setup(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 962dd66c..0357fba7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -540,9 +540,6 @@ importers: '@types/react-dom': specifier: ^18.3.5 version: 18.3.5(@types/react@18.3.18) - '@types/serve-static': - specifier: 1.15.7 - version: 1.15.7 antd: specifier: 5.19.1 version: 5.19.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -561,9 +558,9 @@ importers: react-router-dom: specifier: 6.4.3 version: 6.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - serve-static: - specifier: 1.16.2 - version: 1.16.2 + sirv: + specifier: 2.0.4 + version: 2.0.4 typescript: specifier: ^5.2.2 version: 5.7.3 @@ -938,9 +935,9 @@ importers: open: specifier: ^8.4.2 version: 8.4.2 - serve-static: - specifier: 1.16.2 - version: 1.16.2 + sirv: + specifier: 2.0.4 + version: 2.0.4 socket.io: specifier: 4.8.1 version: 4.8.1 @@ -963,9 +960,6 @@ importers: '@types/node': specifier: ^16 version: 16.18.123 - '@types/serve-static': - specifier: 1.15.7 - version: 1.15.7 tslib: specifier: 2.8.1 version: 2.8.1