From 5ea4b00a984bc76d0d000f621ab72763a4c9a48b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 07:21:39 +0200 Subject: [PATCH] chore(deps): update dependency sirv to v3 (#18346) Co-authored-by: sapphi-red <49056869+sapphi-red@users.noreply.github.com> --- package.json | 2 +- packages/vite/package.json | 2 +- .../{sirv@2.0.4.patch => sirv@3.0.0.patch} | 29 ++++++++++++++----- playground/lib/package.json | 2 +- pnpm-lock.yaml | 22 +++++++------- 5 files changed, 35 insertions(+), 22 deletions(-) rename patches/{sirv@2.0.4.patch => sirv@3.0.0.patch} (74%) diff --git a/package.json b/package.json index c049340b0..2acf2870f 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "acorn@8.12.1": "patches/acorn@8.12.1.patch", "chokidar@3.6.0": "patches/chokidar@3.6.0.patch", "http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch", - "sirv@2.0.4": "patches/sirv@2.0.4.patch" + "sirv@3.0.0": "patches/sirv@3.0.0.patch" }, "peerDependencyRules": { "allowedVersions": { diff --git a/packages/vite/package.json b/packages/vite/package.json index b0d92e6cf..3895d988b 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -144,7 +144,7 @@ "rollup-plugin-license": "^3.5.3", "sass": "^1.79.4", "sass-embedded": "^1.79.4", - "sirv": "^2.0.4", + "sirv": "^3.0.0", "source-map-support": "^0.5.21", "strip-ansi": "^7.1.0", "strip-literal": "^2.1.0", diff --git a/patches/sirv@2.0.4.patch b/patches/sirv@3.0.0.patch similarity index 74% rename from patches/sirv@2.0.4.patch rename to patches/sirv@3.0.0.patch index d6cf2c64a..49de9e6b2 100644 --- a/patches/sirv@2.0.4.patch +++ b/patches/sirv@3.0.0.patch @@ -1,5 +1,5 @@ diff --git a/build.js b/build.js -index 0884d9ffaa24d0ae3ec020a6faff12b3125b2071..85b82c90346e829bbf723e913f282c80096df061 100644 +index 0c6ed8e2c0949c93978dd1a244baa9bf2448e9b8..08a9347cfdca06e6a97077ea4582c5b0922ecb2d 100644 --- a/build.js +++ b/build.js @@ -35,7 +35,7 @@ function viaCache(cache, uri, extns) { @@ -29,7 +29,7 @@ index 0884d9ffaa24d0ae3ec020a6faff12b3125b2071..85b82c90346e829bbf723e913f282c80 if (isEtag && req.headers['if-none-match'] === data.headers['ETag']) { diff --git a/build.mjs b/build.mjs -index c93bbe6bdfb7ad13ee20f0c44d80d6aacdd64087..3dc3e22f09abcae51aef7b75c34dc08b1f6e6abd 100644 +index 3ad14d45630a8627b93842a04a96465120d3f223..8451277c015b56a7d2cb99aaee3a318d9c0893dd 100644 --- a/build.mjs +++ b/build.mjs @@ -35,7 +35,7 @@ function viaCache(cache, uri, extns) { @@ -58,16 +58,29 @@ index c93bbe6bdfb7ad13ee20f0c44d80d6aacdd64087..3dc3e22f09abcae51aef7b75c34dc08b if (!data) return next ? next() : isNotFound(req, res); if (isEtag && req.headers['if-none-match'] === data.headers['ETag']) { -diff --git a/sirv.d.ts b/sirv.d.ts -index c05040fc6ec504a1828a7badd39f669981acd0ee..e9597e8b5bf24613a09565f0e13024ae3ca8fa5e 100644 ---- a/sirv.d.ts -+++ b/sirv.d.ts -@@ -19,6 +19,8 @@ declare module 'sirv' { +diff --git a/index.d.mts b/index.d.mts +index 8bfe364f1db2d1382c56a9b75a014579083cfa70..a8dfa1c473ff15c979bbfbc28c3630a12e222c3a 100644 +--- a/index.d.mts ++++ b/index.d.mts +@@ -24,6 +24,8 @@ export interface Options { + gzip?: boolean; + onNoMatch?: (req: IncomingMessage, res: ServerResponse) => void; + setHeaders?: (res: ServerResponse, pathname: string, stats: Stats) => void; ++ /** patched */ ++ shouldServe?: (absoluteFilePath: string) => void; + } + + export default function (dir?: string, opts?: Options): RequestHandler; +diff --git a/index.d.ts b/index.d.ts +index 96cc63e7ee1ccdd7266e9193252b799068ef2e3c..9e298d627002cd0b073073aa13528b7492541b5b 100644 +--- a/index.d.ts ++++ b/index.d.ts +@@ -25,6 +25,8 @@ declare namespace sirv { gzip?: boolean; onNoMatch?: (req: IncomingMessage, res: ServerResponse) => void; setHeaders?: (res: ServerResponse, pathname: string, stats: Stats) => void; + /** patched */ + shouldServe?: (absoluteFilePath: string) => void; } + } - export default function(dir?: string, opts?: Options): RequestHandler; diff --git a/playground/lib/package.json b/playground/lib/package.json index 5765873eb..9385ca58b 100644 --- a/playground/lib/package.json +++ b/playground/lib/package.json @@ -10,6 +10,6 @@ "preview": "vite preview" }, "devDependencies": { - "sirv": "^2.0.4" + "sirv": "^3.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bedcade32..a387e56fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,9 +17,9 @@ patchedDependencies: http-proxy@1.18.1: hash: qqiqxx62zlcu62nljjmhlvexni path: patches/http-proxy@1.18.1.patch - sirv@2.0.4: - hash: amdes53ifqfntejkflpaq5ifce - path: patches/sirv@2.0.4.patch + sirv@3.0.0: + hash: plxlsciwiebyhal5sm4vtpekka + path: patches/sirv@3.0.0.patch importers: @@ -395,8 +395,8 @@ importers: specifier: ^1.79.4 version: 1.79.4 sirv: - specifier: ^2.0.4 - version: 2.0.4(patch_hash=amdes53ifqfntejkflpaq5ifce) + specifier: ^3.0.0 + version: 3.0.0(patch_hash=plxlsciwiebyhal5sm4vtpekka) source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -823,8 +823,8 @@ importers: playground/lib: devDependencies: sirv: - specifier: ^2.0.4 - version: 2.0.4(patch_hash=amdes53ifqfntejkflpaq5ifce) + specifier: ^3.0.0 + version: 3.0.0(patch_hash=plxlsciwiebyhal5sm4vtpekka) playground/minify: dependencies: @@ -6579,9 +6579,9 @@ packages: resolution: {integrity: sha512-tgqwPUMDcNDhuf1Xf6KTUsyeqGdgKMhzaH4PAZZuzguOgTl5uuyeYe/8mWgAr6IBxB5V06uqEf6Dy37gIWDtDg==} hasBin: true - sirv@2.0.4: - resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==} - engines: {node: '>= 10'} + sirv@3.0.0: + resolution: {integrity: sha512-BPwJGUeDaDCHihkORDchNyyTvWFhcusy1XMmhEVTQTwGeybFbp8YEmB+njbPnth1FibULBSBVwCQni25XlCUDg==} + engines: {node: '>=18'} sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -12500,7 +12500,7 @@ snapshots: simple-git-hooks@2.11.1: {} - sirv@2.0.4(patch_hash=amdes53ifqfntejkflpaq5ifce): + sirv@3.0.0(patch_hash=plxlsciwiebyhal5sm4vtpekka): dependencies: '@polka/url': 1.0.0-next.24 mrmime: 2.0.0