diff --git a/docs/package.json b/docs/package.json index 8793c95da..10f3c27a8 100644 --- a/docs/package.json +++ b/docs/package.json @@ -30,7 +30,9 @@ "zod": "^4.6.6" }, "patchedDependencies": { - "http-cache-semantics@4.3.0": "patches/http-cache-semantics@4.3.0.patch" + "http-cache-semantics@4.3.0": "patches/http-cache-semantics@4.3.0.patch", + "picomatch@4.0.7": "patches/picomatch@4.0.7.patch", + "picomatch@2.3.2": "patches/picomatch@2.3.2.patch" } } } diff --git a/docs/patches/picomatch@2.3.2.patch b/docs/patches/picomatch@2.3.2.patch new file mode 100644 index 000000000..9405b29f5 --- /dev/null +++ b/docs/patches/picomatch@2.3.2.patch @@ -0,0 +1,87 @@ +diff --git a/lib/parse.js b/lib/parse.js +index caa2b86aa5a567df33cef4bda3c7a97794f439f8..b5e0a33480897aef82fe9c6dfb6e8ee2b56afd63 100644 +--- a/lib/parse.js ++++ b/lib/parse.js +@@ -280,7 +280,36 @@ const repeatedExtglobRecursion = pattern => { + return depth; + }; + +-const analyzeRepeatedExtglob = (body, options) => { ++// A branch built only from single-character matchers and `*` wildcards, with no ++// slash: literal characters, `?`, and plain bracket classes that cannot match `/`. ++const ABSORBING_BRANCH_REGEX = /^(?:[^\\/()[\]{}|!@+*?"']|\?|\[[^\]\\/!^]+\]|\*(?!\*))+$/; ++ ++// A bracket range such as `[+-0]` can still match `/`, so check the compiled class. ++const bracketMatchesSlash = tok => { ++ try { ++ return new RegExp(`^(?:${tok.output || tok.value})$`).test('/'); ++ } catch (err) { ++ return true; ++ } ++}; ++ ++const isAbsorbingBranch = (body, bodyTokens) => { ++ return ABSORBING_BRANCH_REGEX.test(body) && ++ body.replace(/\[[^\]]*\]/g, '').includes('*') && ++ !bodyTokens.some(tok => tok.type === 'bracket' && bracketMatchesSlash(tok)); ++}; ++ ++// Wildcard tokens in an extglob body, not counting a `*` that opens a nested `*(...)`. ++const hasWildcardToken = bodyTokens => { ++ return bodyTokens.some((tok, i) => { ++ if (tok.type !== 'star' && tok.type !== 'globstar') return false; ++ if (tok.value === '') return false; ++ const next = bodyTokens[i + 1]; ++ return !(next && next.type === 'paren' && next.extglob === true && next.value === '('); ++ }); ++}; ++ ++const analyzeRepeatedExtglob = (body, options, bodyTokens = []) => { + if (options.maxExtglobRecursion === false) { + return { risky: false }; + } +@@ -292,6 +321,24 @@ const analyzeRepeatedExtglob = (body, options) => { + + const branches = splitTopLevel(body).map(branch => branch.trim()); + ++ // A single branch holding a wildcard, such as `+(*a)` or `+(a*)b`, nests an ++ // unbounded quantifier and backtracks exponentially (GHSA-fc5q-39xc-vjpf). ++ if (branches.length === 1 && hasWildcardToken(bodyTokens)) { ++ // For a branch P made of single-character matchers and `*`, P repeated ++ // matches exactly what P matches: the first `*` absorbs every later repeat. ++ // So `+(P)` is `(P)` and `*(P)` is `(P)?`, with no nested quantifier. ++ if (isAbsorbingBranch(body, bodyTokens)) { ++ return { risky: false, collapse: true }; ++ } ++ ++ // A literal slash fixes where each repeat starts, since `*` cannot cross ++ // it outside bash mode, so the repeat cannot backtrack. ++ const hasSlash = bodyTokens.some(tok => tok.type === 'slash'); ++ if (options.bash === true || !hasSlash) { ++ return { risky: true }; ++ } ++ } ++ + if (branches.length > 1) { + if ( + branches.some(branch => branch === '') || +@@ -510,7 +557,7 @@ const parse = (input, options) => { + const extglobClose = token => { + const literal = input.slice(token.startIndex, state.index + 1); + const body = input.slice(token.startIndex + 2, state.index); +- const analysis = analyzeRepeatedExtglob(body, opts); ++ const analysis = analyzeRepeatedExtglob(body, opts, tokens.slice(token.tokensIndex + 2)); + + if ((token.type === 'plus' || token.type === 'star') && analysis.risky) { + const safeOutput = analysis.safeOutput +@@ -536,6 +583,10 @@ const parse = (input, options) => { + return; + } + ++ if (analysis.collapse === true && (token.type === 'plus' || token.type === 'star')) { ++ token.close = token.type === 'plus' ? ')' : ')?'; ++ } ++ + let output = token.close + (opts.capture ? ')' : ''); + let rest; + diff --git a/docs/patches/picomatch@4.0.7.patch b/docs/patches/picomatch@4.0.7.patch new file mode 100644 index 000000000..c5fab983c --- /dev/null +++ b/docs/patches/picomatch@4.0.7.patch @@ -0,0 +1,87 @@ +diff --git a/lib/parse.js b/lib/parse.js +index 29207512c60183b4bb9bf5112be3b9b5f4a9a9fd..296afb16b857e181315a800630978fea9f139929 100644 +--- a/lib/parse.js ++++ b/lib/parse.js +@@ -284,7 +284,36 @@ const repeatedExtglobRecursion = pattern => { + return depth; + }; + +-const analyzeRepeatedExtglob = (body, options) => { ++// A branch built only from single-character matchers and `*` wildcards, with no ++// slash: literal characters, `?`, and plain bracket classes that cannot match `/`. ++const ABSORBING_BRANCH_REGEX = /^(?:[^\\/()[\]{}|!@+*?"']|\?|\[[^\]\\/!^]+\]|\*(?!\*))+$/; ++ ++// A bracket range such as `[+-0]` can still match `/`, so check the compiled class. ++const bracketMatchesSlash = tok => { ++ try { ++ return new RegExp(`^(?:${tok.output || tok.value})$`).test('/'); ++ } catch (err) { ++ return true; ++ } ++}; ++ ++const isAbsorbingBranch = (body, bodyTokens) => { ++ return ABSORBING_BRANCH_REGEX.test(body) && ++ body.replace(/\[[^\]]*\]/g, '').includes('*') && ++ !bodyTokens.some(tok => tok.type === 'bracket' && bracketMatchesSlash(tok)); ++}; ++ ++// Wildcard tokens in an extglob body, not counting a `*` that opens a nested `*(...)`. ++const hasWildcardToken = bodyTokens => { ++ return bodyTokens.some((tok, i) => { ++ if (tok.type !== 'star' && tok.type !== 'globstar') return false; ++ if (tok.value === '') return false; ++ const next = bodyTokens[i + 1]; ++ return !(next && next.type === 'paren' && next.extglob === true && next.value === '('); ++ }); ++}; ++ ++const analyzeRepeatedExtglob = (body, options, bodyTokens = []) => { + if (options.maxExtglobRecursion === false) { + return { risky: false }; + } +@@ -296,6 +325,24 @@ const analyzeRepeatedExtglob = (body, options) => { + + const branches = splitTopLevel(body).map(branch => branch.trim()); + ++ // A single branch holding a wildcard, such as `+(*a)` or `+(a*)b`, nests an ++ // unbounded quantifier and backtracks exponentially (GHSA-fc5q-39xc-vjpf). ++ if (branches.length === 1 && hasWildcardToken(bodyTokens)) { ++ // For a branch P made of single-character matchers and `*`, P repeated ++ // matches exactly what P matches: the first `*` absorbs every later repeat. ++ // So `+(P)` is `(P)` and `*(P)` is `(P)?`, with no nested quantifier. ++ if (isAbsorbingBranch(body, bodyTokens)) { ++ return { risky: false, collapse: true }; ++ } ++ ++ // A literal slash fixes where each repeat starts, since `*` cannot cross ++ // it outside bash mode, so the repeat cannot backtrack. ++ const hasSlash = bodyTokens.some(tok => tok.type === 'slash'); ++ if (options.bash === true || !hasSlash) { ++ return { risky: true }; ++ } ++ } ++ + if (branches.length > 1) { + if ( + branches.some(branch => branch === '') || +@@ -539,7 +586,7 @@ const parse = (input, options) => { + const extglobClose = token => { + const literal = input.slice(token.startIndex, state.index + 1); + const body = input.slice(token.startIndex + 2, state.index); +- const analysis = analyzeRepeatedExtglob(body, opts); ++ const analysis = analyzeRepeatedExtglob(body, opts, tokens.slice(token.tokensIndex + 2)); + + if ((token.type === 'plus' || token.type === 'star') && analysis.risky) { + const safeOutput = analysis.safeOutput +@@ -565,6 +612,10 @@ const parse = (input, options) => { + return; + } + ++ if (analysis.collapse === true && (token.type === 'plus' || token.type === 'star')) { ++ token.close = token.type === 'plus' ? ')' : ')?'; ++ } ++ + let output = token.close + (opts.capture ? ')' : ''); + let rest; + diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 21d45e43e..543c8f5c3 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -22,6 +22,12 @@ patchedDependencies: http-cache-semantics@4.3.0: hash: 97e6a6643e115456a2b6a536977aa7f471d5a5397a27b9d4732415c35054eded path: patches/http-cache-semantics@4.3.0.patch + picomatch@2.3.2: + hash: c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784 + path: patches/picomatch@2.3.2.patch + picomatch@4.0.7: + hash: e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4 + path: patches/picomatch@4.0.7.patch importers: @@ -65,24 +71,28 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] '@astrojs/compiler-binding-linux-arm64-musl@0.5.2': resolution: {integrity: sha512-GRGyby3AZWw5d6JQzidyxPyvGgHWsSusrpgKyFVpDTKctABF7L3Pd5V1cRJbV36/rcu+Eh292/wL7pF7MkmGkQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] '@astrojs/compiler-binding-linux-x64-gnu@0.5.2': resolution: {integrity: sha512-9XAqGTMQAtIslMsjK3xdyY6OI9d59OZqcLBB6pvD/DcoR0daYswfrKx2azdDERDY4AqAnWPC7odVM1BmxYv3Vw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] '@astrojs/compiler-binding-linux-x64-musl@0.5.2': resolution: {integrity: sha512-jOViewGeTh9bSfS8vK72ECxoy2yvmA+Pd/ZcEvBI5c7+7IcfHwZ5qA4L9fRYuOhSrAifvQ2dV4vm1XAtloaWBw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] '@astrojs/compiler-binding-wasm32-wasi@0.5.2': resolution: {integrity: sha512-Z7p64doar1uvR5C9Xs6j1CV9lGlPVQX7OQ2aAtZ/xKC5aGS6GB13nyc2UfQXTQLvZrvVwsyaflTQy6ziY5Bekw==} @@ -209,41 +219,49 @@ packages: resolution: {integrity: sha512-aeH365GHaqv01wRSiHaGUlpL28U8e9UnV9LxjIF6BOyTj71/M5bop4HKomcis4VxFZjd68fDqNyU22yFkF/h7A==} cpu: [arm64] os: [linux] + libc: [glibc] '@bruits/satteri-linux-arm64-gnu@0.9.5': resolution: {integrity: sha512-u51id17uJwNEMK9nBlICsq6U31c+XVqQueVBkwRIzZG+gMpS8TOJctt5h5Wz33Z8xnMdTd+adtACVz0yHgGuOA==} cpu: [arm64] os: [linux] + libc: [glibc] '@bruits/satteri-linux-arm64-musl@0.11.7': resolution: {integrity: sha512-72WlBhuwOHm+2Nv4Qf1WzfS75PHOLz81sYkDJnmj0Rm2C4Xax5faSiTDt7vWo1IcK6rDlkuRDNnWIw8uIKWuVQ==} cpu: [arm64] os: [linux] + libc: [musl] '@bruits/satteri-linux-arm64-musl@0.9.5': resolution: {integrity: sha512-v39HxiwGC5Rqm01HksP6+5Y+xKLPlsuVFgIgpEAo+SiQ22c+mJVhS3u7Z6ePAKdhL5NJoK1xq70kLz3L13AhpQ==} cpu: [arm64] os: [linux] + libc: [musl] '@bruits/satteri-linux-x64-gnu@0.11.7': resolution: {integrity: sha512-gDp4v1jjckeNCetLtrMUfDV4CKGYL6fayDPdoaQq09nkDCSrclxEFK7kAmRuHhoalgsao4bZMFqQr3HQtN2NEQ==} cpu: [x64] os: [linux] + libc: [glibc] '@bruits/satteri-linux-x64-gnu@0.9.5': resolution: {integrity: sha512-F3uO8uFp3pAP5ZGXttwvh57GS7s0lL953tnNdyI2gRyP4kOOkp6pyGojNJzCjkDvWI2Cvb9iNrKok3aqQPauAw==} cpu: [x64] os: [linux] + libc: [glibc] '@bruits/satteri-linux-x64-musl@0.11.7': resolution: {integrity: sha512-zqzSpQLA6V3J/TO2Vjuc1VRQPIQQdoSYmzKKFL+3GwGlbXiFQP2ZUDSLw9xlm0tTKXkCM9ANr4jMiDASZ+JGUw==} cpu: [x64] os: [linux] + libc: [musl] '@bruits/satteri-linux-x64-musl@0.9.5': resolution: {integrity: sha512-bicEqglLlz++mWyADaZoP0JY20s4vDfLjaPYgQqC+NI4zZLTOOg1T4GB8aqtc822Pqji8SQBmSrTb7CrP8i08Q==} cpu: [x64] os: [linux] + libc: [musl] '@bruits/satteri-wasm32-wasi@0.11.7': resolution: {integrity: sha512-L46f6rtlaBR4fsTWGCTFcXtbtka2GyM3l9TsmE0FgTxjXGq+sndYg5X3hzlhWDkNvJpRtCHCmgTRJ5+cIi4o3A==} @@ -527,89 +545,105 @@ packages: resolution: {integrity: sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A==} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-arm@1.3.4': resolution: {integrity: sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw==} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-ppc64@1.3.4': resolution: {integrity: sha512-Le6boB8Tai0Nis+gIxIpKx68UDVVIqdR8Tin5Yf1z2LJJQLDJvCDRqRu+jC2qCoD+eIomonmOwB4smBRxfVpYQ==} cpu: [ppc64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-riscv64@1.3.4': resolution: {integrity: sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q==} cpu: [riscv64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-s390x@1.3.4': resolution: {integrity: sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ==} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-x64@1.3.4': resolution: {integrity: sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw==} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linuxmusl-arm64@1.3.4': resolution: {integrity: sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA==} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-libvips-linuxmusl-x64@1.3.4': resolution: {integrity: sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg==} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-linux-arm64@0.35.5': resolution: {integrity: sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ==} engines: {node: '>=20.9.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-linux-arm@0.35.5': resolution: {integrity: sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ==} engines: {node: '>=20.9.0'} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-linux-ppc64@0.35.5': resolution: {integrity: sha512-QVxAAq8evVRI9ia2vqgwrmWucn5Dfv+JdWzj75pD8omHLPSP7f8p20O8jxzjCcuCEQEOtYOZUmX1hkiZ0kdevA==} engines: {node: '>=20.9.0'} cpu: [ppc64] os: [linux] + libc: [glibc] '@img/sharp-linux-riscv64@0.35.5': resolution: {integrity: sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ==} engines: {node: '>=20.9.0'} cpu: [riscv64] os: [linux] + libc: [glibc] '@img/sharp-linux-s390x@0.35.5': resolution: {integrity: sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA==} engines: {node: '>=20.9.0'} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-linux-x64@0.35.5': resolution: {integrity: sha512-SxFtLTeJInhAA9Q836kux2vZNeOBQEx658qvbboZScr0wIARym3IcGmW7KpVD5sbVg0Ojy+udFQdayYIZyoNog==} engines: {node: '>=20.9.0'} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-linuxmusl-arm64@0.35.5': resolution: {integrity: sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg==} engines: {node: '>=20.9.0'} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-linuxmusl-x64@0.35.5': resolution: {integrity: sha512-4KOphqB035HrVdqLZfCgMzzERrQkkzOwRhl4OAkRO1YCldbaFjySXMaK534Mo0V+LndnlJk+sbUyLeU0ULyD1A==} engines: {node: '>=20.9.0'} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-wasm32@0.35.5': resolution: {integrity: sha512-Ptsga1su4tQx+LLF1ECS9U6nz5kmrXKo6XVbtR48Ke3ZRxxgaWBu7IDtEe1quo8hiupwm6WFqxVlXaSf7IINGQ==} @@ -799,72 +833,84 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-arm64-gnu@1.3.2': resolution: {integrity: sha512-0wloJFYqV844gv6boiERbHpErxbxHbmlgnMX5VxP1Ux+DLBqGrUOn0cIpBmCZEcTITes3QUelxya4u8c9ziQvQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-arm64-musl@1.2.19': resolution: {integrity: sha512-K1SmQp3FFichn8oqrNIwvFoZ5wcvjC7goBzpaMNvLf9FZc+QB/QvLmnpJZgAAGHiD980tP8FZZnXk2K94rvlxg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] '@rolldown/binding-linux-arm64-musl@1.3.2': resolution: {integrity: sha512-Kys8wgFQy8H8vua0MNpC0akMBFoNO8455RHk2yycBM0iayMIAtVAL6xmV9TWAkehFgrrlImTL2fZdX5LXfYtAA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] '@rolldown/binding-linux-ppc64-gnu@1.2.19': resolution: {integrity: sha512-I0xwD57jP/3A7+5UPZin2w8Y7XHEmEM5zqpYZOcQ45MlNW6tUJUziymV3yRr7rL4vwyfEcRsRksC4a7Kc08p5Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-ppc64-gnu@1.3.2': resolution: {integrity: sha512-L8eej7+/StRxUHHOPsOVl7Fzx/3tumuGB4hGQZKT73xRI16KZhaSJr0gi3C3WBjNRxeJRKKps2UD4lQukP+oBw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-s390x-gnu@1.2.19': resolution: {integrity: sha512-BrtEHT24SNXj9HiXqy+s/kXiSiQGt6EKCPUlRirAoIioVxKGnbXBUEkbZASAei7iZJB0/Ynm+0JP00Ipx7AnSw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] + libc: [glibc] '@rolldown/binding-linux-s390x-gnu@1.3.2': resolution: {integrity: sha512-MV5CEb/nV8neQOj7l6945q1vy62HXtWO8zPDvfySPusoUzdBoLoJ/DfXXwaYThGTXZCniF+5bCf253WTPPK7Yw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] + libc: [glibc] '@rolldown/binding-linux-x64-gnu@1.2.19': resolution: {integrity: sha512-rm75/9DkHKeU2WnA8w4X94WGYgLlDCFCfkQC+4bguVJmC/jvDRv2B+2wLOYhyE0fVuv7//Ckk39OoOufyCu76Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-x64-gnu@1.3.2': resolution: {integrity: sha512-3qssvvVvkwQookZ1/1avlKWc5orAR85vgKdzDd5noZS8nnHiI/ejOAEt0xfNYvtBBF7/DZmP8dANWkRBJVOBCA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-x64-musl@1.2.19': resolution: {integrity: sha512-irh/4+iYFM4GAzpluDErgjz89bj6NDtqqMAG/6O1LG38Ed3NpyebzCpcVNkFW8uhy+/3/BocUvnXDR33CXWe9A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] '@rolldown/binding-linux-x64-musl@1.3.2': resolution: {integrity: sha512-rJqoFTm/bCZFKKgaT4NzWn/TuJkFDToZ/rzYFnYVBL28jH1nIfg6snx2mDri30nal9H+wcYfKpoPR9jrMQgQQg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] '@rolldown/binding-openharmony-arm64@1.2.19': resolution: {integrity: sha512-+KWTWNoPt+CfSq94CiceWu3yPE+QzkaG+phPyz9G60tmZLwfQkcA4AeksafzvJAw4pvg1mcd5a1TkUqVv0s4JA==} @@ -1483,24 +1529,28 @@ packages: engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] lightningcss-linux-arm64-musl@1.33.0: resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [musl] lightningcss-linux-x64-gnu@1.33.0: resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [glibc] lightningcss-linux-x64-musl@1.33.0: resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [musl] lightningcss-win32-arm64-msvc@1.33.0: resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==} @@ -2292,7 +2342,7 @@ snapshots: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 js-yaml: 4.3.2 - picomatch: 4.0.7 + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) retext-smartypants: 6.2.0 shiki: 4.4.3 smol-toml: 1.9.1 @@ -2302,7 +2352,7 @@ snapshots: dependencies: '@types/hast': 3.0.5 '@types/mdast': 4.0.4 - picomatch: 4.0.7 + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) retext-smartypants: 6.2.0 shiki: 4.5.0 smol-toml: 1.9.1 @@ -3135,7 +3185,7 @@ snapshots: anymatch@3.1.3: dependencies: normalize-path: 3.0.0 - picomatch: 2.3.2 + picomatch: 2.3.2(patch_hash=c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784) arg@5.0.2: {} @@ -3189,7 +3239,7 @@ snapshots: p-queue: 10.0.0 package-manager-detector: 1.9.0 piccolore: 0.1.3 - picomatch: 4.0.7 + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) rolldown: 1.3.2 shiki: 4.5.0 smol-toml: 1.9.1 @@ -3468,9 +3518,9 @@ snapshots: dependencies: fast-string-width: 3.0.2 - fdir@6.5.0(picomatch@4.0.7): + fdir@6.5.0(picomatch@4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4)): optionalDependencies: - picomatch: 4.0.7 + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) flattie@1.1.1: {} @@ -4346,9 +4396,9 @@ snapshots: picocolors@1.1.1: {} - picomatch@2.3.2: {} + picomatch@2.3.2(patch_hash=c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784): {} - picomatch@4.0.7: {} + picomatch@4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4): {} postcss-nested@8.0.1(postcss@8.5.33): dependencies: @@ -4733,8 +4783,8 @@ snapshots: tinyglobby@0.2.17: dependencies: - fdir: 6.5.0(picomatch@4.0.7) - picomatch: 4.0.7 + fdir: 6.5.0(picomatch@4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4)) + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) tinyps@0.5.1: {} @@ -4855,7 +4905,7 @@ snapshots: vite@8.3.8(@types/node@25.0.3)(esbuild@0.28.2)(yaml@2.9.1): dependencies: lightningcss: 1.33.0 - picomatch: 4.0.7 + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) postcss: 8.5.33 rolldown: 1.2.19 tinyglobby: 0.2.17 diff --git a/docs/tests/dependency-security.test.cjs b/docs/tests/dependency-security.test.cjs index 2a1d1461a..41731c70a 100644 --- a/docs/tests/dependency-security.test.cjs +++ b/docs/tests/dependency-security.test.cjs @@ -157,3 +157,37 @@ test('stale-if-error retains matching Vary variants and valid HEAD reuse', () => assert.equal(cache.revalidatedPolicy({ ...same, method }, { status: 503, headers: {} }).policy, cache); } }); + +// GHSA-fc5q-39xc-vjpf: single-branch repeated extglobs nest an unbounded quantifier. +const { spawnSync } = require('node:child_process'); +const unstorageRequire = createRequire(astroRequire.resolve('unstorage')); +const picomatchCopies = { + '4.0.7 (astro, @astrojs/internal-helpers)': astroRequire.resolve('picomatch'), + '2.3.2 (astro > unstorage > anymatch)': createRequire(unstorageRequire.resolve('anymatch')).resolve('picomatch'), +}; +const picomatchRedos = require.resolve('./fixtures/picomatch-redos.cjs'); + +for (const [name, picomatchPath] of Object.entries(picomatchCopies)) { + test(`GHSA-fc5q-39xc-vjpf: picomatch ${name} rejects crafted input without backtracking`, () => { + const result = spawnSync(process.execPath, [picomatchRedos, picomatchPath], { encoding: 'utf8', timeout: 10_000 }); + assert.equal(result.error, undefined); + assert.equal(result.stderr, ''); + assert.equal(result.status, 0); + }); + + test(`picomatch ${name} keeps extglob matching`, () => { + const picomatch = require(picomatchPath); + assert.equal(picomatch.makeRe('+(*a)').source, '^(?:(?=.)(?:[^/]*?a))$'); + assert.equal(picomatch.isMatch('xaa', '+(*a)'), true); + assert.equal(picomatch.isMatch('ab', '+(*a)'), false); + assert.equal(picomatch.isMatch('a/a', '+(*a)'), false); + assert.equal(picomatch.isMatch('abab', '+(a*b)'), true); + assert.equal(picomatch.isMatch('x.jsy.js', '+(*.js)'), true); + assert.equal(picomatch.isMatch('x.jsy.ts', '+(*.js)'), false); + assert.equal(picomatch.isMatch('abab', '+(a|b)'), true); + assert.equal(picomatch.isMatch('src/a/src/b/', '+(src/*/)'), true); + assert.equal(picomatch.isMatch('foo.ts', '!(*.d).ts'), true); + assert.equal(picomatch.isMatch('foo.d.ts', '!(*.d).ts'), false); + assert.equal(picomatch.isMatch('src/a/b.md', 'src/**/*.@(md|mdx)'), true); + }); +} diff --git a/docs/tests/fixtures/picomatch-redos.cjs b/docs/tests/fixtures/picomatch-redos.cjs new file mode 100644 index 000000000..5bfa39e21 --- /dev/null +++ b/docs/tests/fixtures/picomatch-redos.cjs @@ -0,0 +1,12 @@ +/* global require, process */ +// GHSA-fc5q-39xc-vjpf: single-branch repeated extglobs nest an unbounded +// quantifier. Runs in a child process because a backtracking regex blocks +// its own event loop. Usage: node picomatch-redos.cjs +const picomatch = require(process.argv[2]); +const globs = ['+(*)', '+(*a)', '*(*a)', '+(a*)b', '+(*[a])', '+(@(*a))']; +const inputs = ['a'.repeat(50000) + '!', 'a'.repeat(50000) + '/']; +for (const glob of globs) { + for (const input of inputs) { + picomatch(glob)(input); + } +} diff --git a/package.json b/package.json index e0b8de95e..948be4ad6 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "pnpm": "10.27.0" }, "dependencies": { - "@vercel/client": "^18.2.5", + "@vercel/client": "^18.12.3", "fastest-levenshtein": "^1.0.16", "ignore": "^7.0.5", "marked": "^17.0.1", @@ -145,7 +145,9 @@ "glob@>=9": "^14.0.2" }, "patchedDependencies": { - "braces@3.0.3": "patches/braces@3.0.3.patch" + "braces@3.0.3": "patches/braces@3.0.3.patch", + "picomatch@4.0.7": "patches/picomatch@4.0.7.patch", + "picomatch@2.3.2": "patches/picomatch@2.3.2.patch" } } } diff --git a/patches/README.md b/patches/README.md index 757d7b022..e8cf645c5 100644 --- a/patches/README.md +++ b/patches/README.md @@ -18,6 +18,22 @@ the URL, host, method, and `Vary` variant to match the cached request. Normally responses retain their stale fallback behavior. Run `pnpm --dir docs test`; the docs build runs these tests too. +`picomatch@4.0.7.patch` and `picomatch@2.3.2.patch` mitigate +[GHSA-fc5q-39xc-vjpf](https://github.com/advisories/GHSA-fc5q-39xc-vjpf). Both +versions compile a repeated extglob with one wildcard branch, such as `+(*a)`, +to a nested quantifier that backtracks exponentially. The patch backports the +open upstream fix (micromatch/picomatch#267 and #268 for 2.x). A branch made only +of literals, `?`, `*`, and bracket classes that cannot match `/` absorbs its own +repetition, so `+(P)` compiles as `(P)` and `*(P)` as `(P)?`, with the same +matches. Unlike upstream, the patch checks each compiled bracket class, because +a range such as `[+-0]` includes `/`. Other single-branch wildcard bodies are +literalized, like the existing risky-extglob guard. A branch with a literal `/` +keeps its repetition, because the slash fixes where each repeat starts. In root they +cover the CLI globbing (`micromatch`), `typescript-eslint`, and build-time +watcher paths. Docs keeps identical copies under `../docs/patches/` for Astro. Run +`pnpm test src/__tests__/dependency-security.test.ts` and `pnpm --dir docs test`. + Keep the patches until upstream releases pass these regressions without them. Version-based scanners can still report locally patched dependencies, especially -`braces`, which has no upstream fixed release. Neither advisory is suppressed. +`braces` and `picomatch`, which have no upstream fixed release. No advisory is +suppressed. diff --git a/patches/picomatch@2.3.2.patch b/patches/picomatch@2.3.2.patch new file mode 100644 index 000000000..9405b29f5 --- /dev/null +++ b/patches/picomatch@2.3.2.patch @@ -0,0 +1,87 @@ +diff --git a/lib/parse.js b/lib/parse.js +index caa2b86aa5a567df33cef4bda3c7a97794f439f8..b5e0a33480897aef82fe9c6dfb6e8ee2b56afd63 100644 +--- a/lib/parse.js ++++ b/lib/parse.js +@@ -280,7 +280,36 @@ const repeatedExtglobRecursion = pattern => { + return depth; + }; + +-const analyzeRepeatedExtglob = (body, options) => { ++// A branch built only from single-character matchers and `*` wildcards, with no ++// slash: literal characters, `?`, and plain bracket classes that cannot match `/`. ++const ABSORBING_BRANCH_REGEX = /^(?:[^\\/()[\]{}|!@+*?"']|\?|\[[^\]\\/!^]+\]|\*(?!\*))+$/; ++ ++// A bracket range such as `[+-0]` can still match `/`, so check the compiled class. ++const bracketMatchesSlash = tok => { ++ try { ++ return new RegExp(`^(?:${tok.output || tok.value})$`).test('/'); ++ } catch (err) { ++ return true; ++ } ++}; ++ ++const isAbsorbingBranch = (body, bodyTokens) => { ++ return ABSORBING_BRANCH_REGEX.test(body) && ++ body.replace(/\[[^\]]*\]/g, '').includes('*') && ++ !bodyTokens.some(tok => tok.type === 'bracket' && bracketMatchesSlash(tok)); ++}; ++ ++// Wildcard tokens in an extglob body, not counting a `*` that opens a nested `*(...)`. ++const hasWildcardToken = bodyTokens => { ++ return bodyTokens.some((tok, i) => { ++ if (tok.type !== 'star' && tok.type !== 'globstar') return false; ++ if (tok.value === '') return false; ++ const next = bodyTokens[i + 1]; ++ return !(next && next.type === 'paren' && next.extglob === true && next.value === '('); ++ }); ++}; ++ ++const analyzeRepeatedExtglob = (body, options, bodyTokens = []) => { + if (options.maxExtglobRecursion === false) { + return { risky: false }; + } +@@ -292,6 +321,24 @@ const analyzeRepeatedExtglob = (body, options) => { + + const branches = splitTopLevel(body).map(branch => branch.trim()); + ++ // A single branch holding a wildcard, such as `+(*a)` or `+(a*)b`, nests an ++ // unbounded quantifier and backtracks exponentially (GHSA-fc5q-39xc-vjpf). ++ if (branches.length === 1 && hasWildcardToken(bodyTokens)) { ++ // For a branch P made of single-character matchers and `*`, P repeated ++ // matches exactly what P matches: the first `*` absorbs every later repeat. ++ // So `+(P)` is `(P)` and `*(P)` is `(P)?`, with no nested quantifier. ++ if (isAbsorbingBranch(body, bodyTokens)) { ++ return { risky: false, collapse: true }; ++ } ++ ++ // A literal slash fixes where each repeat starts, since `*` cannot cross ++ // it outside bash mode, so the repeat cannot backtrack. ++ const hasSlash = bodyTokens.some(tok => tok.type === 'slash'); ++ if (options.bash === true || !hasSlash) { ++ return { risky: true }; ++ } ++ } ++ + if (branches.length > 1) { + if ( + branches.some(branch => branch === '') || +@@ -510,7 +557,7 @@ const parse = (input, options) => { + const extglobClose = token => { + const literal = input.slice(token.startIndex, state.index + 1); + const body = input.slice(token.startIndex + 2, state.index); +- const analysis = analyzeRepeatedExtglob(body, opts); ++ const analysis = analyzeRepeatedExtglob(body, opts, tokens.slice(token.tokensIndex + 2)); + + if ((token.type === 'plus' || token.type === 'star') && analysis.risky) { + const safeOutput = analysis.safeOutput +@@ -536,6 +583,10 @@ const parse = (input, options) => { + return; + } + ++ if (analysis.collapse === true && (token.type === 'plus' || token.type === 'star')) { ++ token.close = token.type === 'plus' ? ')' : ')?'; ++ } ++ + let output = token.close + (opts.capture ? ')' : ''); + let rest; + diff --git a/patches/picomatch@4.0.7.patch b/patches/picomatch@4.0.7.patch new file mode 100644 index 000000000..c5fab983c --- /dev/null +++ b/patches/picomatch@4.0.7.patch @@ -0,0 +1,87 @@ +diff --git a/lib/parse.js b/lib/parse.js +index 29207512c60183b4bb9bf5112be3b9b5f4a9a9fd..296afb16b857e181315a800630978fea9f139929 100644 +--- a/lib/parse.js ++++ b/lib/parse.js +@@ -284,7 +284,36 @@ const repeatedExtglobRecursion = pattern => { + return depth; + }; + +-const analyzeRepeatedExtglob = (body, options) => { ++// A branch built only from single-character matchers and `*` wildcards, with no ++// slash: literal characters, `?`, and plain bracket classes that cannot match `/`. ++const ABSORBING_BRANCH_REGEX = /^(?:[^\\/()[\]{}|!@+*?"']|\?|\[[^\]\\/!^]+\]|\*(?!\*))+$/; ++ ++// A bracket range such as `[+-0]` can still match `/`, so check the compiled class. ++const bracketMatchesSlash = tok => { ++ try { ++ return new RegExp(`^(?:${tok.output || tok.value})$`).test('/'); ++ } catch (err) { ++ return true; ++ } ++}; ++ ++const isAbsorbingBranch = (body, bodyTokens) => { ++ return ABSORBING_BRANCH_REGEX.test(body) && ++ body.replace(/\[[^\]]*\]/g, '').includes('*') && ++ !bodyTokens.some(tok => tok.type === 'bracket' && bracketMatchesSlash(tok)); ++}; ++ ++// Wildcard tokens in an extglob body, not counting a `*` that opens a nested `*(...)`. ++const hasWildcardToken = bodyTokens => { ++ return bodyTokens.some((tok, i) => { ++ if (tok.type !== 'star' && tok.type !== 'globstar') return false; ++ if (tok.value === '') return false; ++ const next = bodyTokens[i + 1]; ++ return !(next && next.type === 'paren' && next.extglob === true && next.value === '('); ++ }); ++}; ++ ++const analyzeRepeatedExtglob = (body, options, bodyTokens = []) => { + if (options.maxExtglobRecursion === false) { + return { risky: false }; + } +@@ -296,6 +325,24 @@ const analyzeRepeatedExtglob = (body, options) => { + + const branches = splitTopLevel(body).map(branch => branch.trim()); + ++ // A single branch holding a wildcard, such as `+(*a)` or `+(a*)b`, nests an ++ // unbounded quantifier and backtracks exponentially (GHSA-fc5q-39xc-vjpf). ++ if (branches.length === 1 && hasWildcardToken(bodyTokens)) { ++ // For a branch P made of single-character matchers and `*`, P repeated ++ // matches exactly what P matches: the first `*` absorbs every later repeat. ++ // So `+(P)` is `(P)` and `*(P)` is `(P)?`, with no nested quantifier. ++ if (isAbsorbingBranch(body, bodyTokens)) { ++ return { risky: false, collapse: true }; ++ } ++ ++ // A literal slash fixes where each repeat starts, since `*` cannot cross ++ // it outside bash mode, so the repeat cannot backtrack. ++ const hasSlash = bodyTokens.some(tok => tok.type === 'slash'); ++ if (options.bash === true || !hasSlash) { ++ return { risky: true }; ++ } ++ } ++ + if (branches.length > 1) { + if ( + branches.some(branch => branch === '') || +@@ -539,7 +586,7 @@ const parse = (input, options) => { + const extglobClose = token => { + const literal = input.slice(token.startIndex, state.index + 1); + const body = input.slice(token.startIndex + 2, state.index); +- const analysis = analyzeRepeatedExtglob(body, opts); ++ const analysis = analyzeRepeatedExtglob(body, opts, tokens.slice(token.tokensIndex + 2)); + + if ((token.type === 'plus' || token.type === 'star') && analysis.risky) { + const safeOutput = analysis.safeOutput +@@ -565,6 +612,10 @@ const parse = (input, options) => { + return; + } + ++ if (analysis.collapse === true && (token.type === 'plus' || token.type === 'star')) { ++ token.close = token.type === 'plus' ? ')' : ')?'; ++ } ++ + let output = token.close + (opts.capture ? ')' : ''); + let rest; + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c9a81403d..b02b0dee5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -45,14 +45,20 @@ patchedDependencies: braces@3.0.3: hash: 1da2e5cc2a0608f1dbb4033e149ade9c1fe19309a53c48032a0e4a06039d9b03 path: patches/braces@3.0.3.patch + picomatch@2.3.2: + hash: c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784 + path: patches/picomatch@2.3.2.patch + picomatch@4.0.7: + hash: e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4 + path: patches/picomatch@4.0.7.patch importers: .: dependencies: '@vercel/client': - specifier: ^18.2.5 - version: 18.2.5(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0)) + specifier: ^18.12.3 + version: 18.12.3(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0)) fastest-levenshtein: specifier: ^1.0.16 version: 1.0.16 @@ -453,9 +459,6 @@ packages: resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==} engines: {node: '>=6.9.0'} - '@bytecodealliance/preview2-shim@0.17.6': - resolution: {integrity: sha512-n3cM88gTen5980UOBAD6xDcNNL3ocTK8keab21bpx1ONdA+ARj7uD1qoFxOWCyKlkpSi195FH+GeAut7Oc6zZw==} - '@esbuild/aix-ppc64@0.28.1': resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==} engines: {node: '>=18'} @@ -718,8 +721,8 @@ packages: '@kwsites/promise-deferred@1.1.1': resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==} - '@next/env@15.1.6': - resolution: {integrity: sha512-d9AFQVPEYNr+aqokIiPLNK/MTyt3DWa/dpKveiAaVccUadFbhFEvY6FXYX2LJO2Hv7PHnLBu2oWwB4uBuHjr/w==} + '@next/env@16.0.10': + resolution: {integrity: sha512-8tuaQkyDVgeONQ1MeT9Mkk8pQmZapMKFh5B+OrFUlG3rVmYTXcXlBetBgTurKXGaIZvkoqRT9JL5K3phXcgang==} '@nodable/entities@3.1.0': resolution: {integrity: sha512-LsS/DjHr+uDM647Gru/cA8+J3a3HfhttwCKLyuoyN7yXTFCxKBtSgMQBvrW9yNPa2/zDRUNuGPaH5QUFoa4arQ==} @@ -855,48 +858,56 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-arm64-musl@0.152.0': resolution: {integrity: sha512-om7iDMUroI74A/lfRRWY9/Ev3VWrVsrUZ4tyvyh8raBey/sdcfyAD7tYWc+iykAiotnmftyKTpUKFr1QnaBrAQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] '@oxc-parser/binding-linux-ppc64-gnu@0.152.0': resolution: {integrity: sha512-Lf1OL2lMTqwDMFC6jnRb30B+WYHKV0XT+bPHcFM6xHtNVwxpobiTzUIvKH6a0LWpvfwyru8Yu6zCGHqqFHH+gg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-riscv64-gnu@0.152.0': resolution: {integrity: sha512-BYWSMQK+YJ9ZILStPcmmiSVq8KEG9Qdq/c4BHPC3rUEq/fEDCVjUIwdj5ZzjgZ9P9is9PKu0tcAXzq1ZXg4urQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-riscv64-musl@0.152.0': resolution: {integrity: sha512-d2LqHNNNqdH185sRK5dPKWZu201JrNu9/CRFuVEuT+ht7n/QaVblEMWT9MALQPrDWYvhG10P+NSKJFquDWZ09w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] + libc: [musl] '@oxc-parser/binding-linux-s390x-gnu@0.152.0': resolution: {integrity: sha512-8gBeHt5rA/8+pKhHl+zLggfa3L/V/L2at96p7ty6pBE7id6lFO19nFUc15u2PcjC4OYeYK465MKy1fhhbpFIGw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-x64-gnu@0.152.0': resolution: {integrity: sha512-ltgrSF6L+yPTVsIdaAyqKq3zTqzj/1VlNbxWZuxAe8flR3sWdyNsKvdXukoO8/ucJbLickhmieRBge+o/e8Ugw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-x64-musl@0.152.0': resolution: {integrity: sha512-LcMp6BvrBnewSfdkLHoSqidhoAq4syKOTBV5TYHWd+2VnGkfD/nPRRVIzTBt/Lkbt7pfOFDGtkiTntFS0p6sQQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] '@oxc-parser/binding-openharmony-arm64@0.152.0': resolution: {integrity: sha512-jbhoMCslVxzRCRNQ8TSHxjYdSKRvk8O6ciLVDkahJvmyHDzBqba/bMQHM6ULKj/rgHNNbSzlIiakdx8SEfkJzA==} @@ -925,10 +936,6 @@ packages: '@oxc-project/types@0.152.0': resolution: {integrity: sha512-oM/5rLBm2tPkg0iBgkH/FOeR3PCDpY19GTgAZjMFM8h9WI9VW7cLgzp6nwtarYKmovavIQZ+Fe/RKX/8C8O/Rw==} - '@renovatebot/pep440@4.2.1': - resolution: {integrity: sha512-2FK1hF93Fuf1laSdfiEmJvSJPVIDHEUTz68D3Fi9s0IZrrpaEcj6pTFBTbYvsgC5du4ogrtf5re7yMMvrKNgkw==} - engines: {node: ^20.9.0 || ^22.11.0 || ^24, pnpm: ^10.0.0} - '@rollup/rollup-android-arm-eabi@4.61.1': resolution: {integrity: sha512-JnBB8MdXj45cajvTuO5FmPlvFVJRQgvrz1uSEl3NwqFnReAPGwb8EanbGi4z2nRaqLzjJSv5/JmycoTKlRZxHA==} cpu: [arm] @@ -963,66 +970,79 @@ packages: resolution: {integrity: sha512-Q8CBCCQtDFrYtXoeUXSrnFXKOnyUhx6bz+SkL6A0E7V8kAiCJ5pamq1WtbfpVGhR5TSpXY6ak3avmDc5fHTyJA==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.61.1': resolution: {integrity: sha512-nwnhk1581l0FBVellGcVCAT0Oi06onEA3WB53sf01VO3I0UPBkMH9sXONYME2K0ovXcNayJfNtHfm6mpJElatQ==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.61.1': resolution: {integrity: sha512-x5Xr49hwt3hdW75UOZm3395YwwzPyauktslv29KpWL/T+vVAzoT3azLcTWv0eMciBNrx+DYjH4paehHoLpPvpg==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.61.1': resolution: {integrity: sha512-unMS3H73DpaoPyyEVPjGKleM/s0mkmsauTENpw4INQY8y4+IuLNjkueQ5QCtC0D3N38Y38yhAU8OoZ20S2Tm6w==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-loong64-gnu@4.61.1': resolution: {integrity: sha512-zNZzGRnAhwjFEYmvphJRV5XaQGjs62cCmeYYHUT//NbvEnHauw+I85nGG+SiVg5ld4GX8D1IbKIX+ozITQnhMQ==} cpu: [loong64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-loong64-musl@4.61.1': resolution: {integrity: sha512-LdpWGL8X209B2SIvWjqlc8VZgM6PKfontSerGepuldQmHYrAOtnMCXeJkxXGbC+PPZVOuu5czJo7fNV6aeW8rQ==} cpu: [loong64] os: [linux] + libc: [musl] '@rollup/rollup-linux-ppc64-gnu@4.61.1': resolution: {integrity: sha512-EC5kTtNaNGOmbMGqar8dvJy6y/hg99GAwjfBz++pxZhQATXGcRjd6c5en5wcbru0vkRmiMGsQKdMJOOf6sza4g==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-ppc64-musl@4.61.1': resolution: {integrity: sha512-8hiwp6D4acEcNK78I4rP0/XtS1sknWIAMJBPdR4l6zUtyTm5KiTDr5bXmWt4foY7nAN7AThDHgkLIEZOWKbzWw==} cpu: [ppc64] os: [linux] + libc: [musl] '@rollup/rollup-linux-riscv64-gnu@4.61.1': resolution: {integrity: sha512-10dh/h/BqA7DuMPWSxkR8uks18FRwnwOEqr5zOTEl+NOwP/OMzKX8OFR/Of9xxDA7D5qef1Nzar5WDD2kCCr1g==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-musl@4.61.1': resolution: {integrity: sha512-YKJ5lg35DP17gcAOggnihe+APw9HLyj1Xn7gsmGumBJAUDa6NGXNixJzmkWLhcK9TOuuyQjdamzvJefkO7qHZQ==} cpu: [riscv64] os: [linux] + libc: [musl] '@rollup/rollup-linux-s390x-gnu@4.61.1': resolution: {integrity: sha512-Mlil5G2Jj6a7B3LWGctg+XPL9vdXYuzCtNXfxOQ0nPjc2m6ueUktocPGH9bnAM0bNRKb/bAWTujUU7IJQdQA+g==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.61.1': resolution: {integrity: sha512-bVWIOIk6pV01p4CdUbPP7CJ/434z+OooYjDuFcR+44N35YvKUC66G8MGnvcWx5mWKW3g61J+t74l3Kj15Kwn2Q==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-musl@4.61.1': resolution: {integrity: sha512-qy5pBvZbqNFheBz61R1rzsezjm0J7O2oNGoWtGoY89SZYLUfxAJTBAqDChqAIdB4rCiIbi9nF7yZ83GnNiLwSw==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-openbsd-x64@4.61.1': resolution: {integrity: sha512-E83TXjI4zm0+5f2qO+UOudaCYIhYwpJ5jq6YCZNIZ+6CbfhKrkAGezeiASBL9ElxAxFsRS9ZhESv8mfnj6TKeg==} @@ -1409,6 +1429,9 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} + '@types/md5@2.3.6': + resolution: {integrity: sha512-WD69gNXtRBnpknfZcb4TRQ0XJQbUPZcai/Qdhmka3sxUR3Et8NrXoeAoknG/LghYHTf4ve795rInVYHBTQdNVA==} + '@types/minipass@3.3.5': resolution: {integrity: sha512-M2BLHQdEmDmH671h0GIlOQQJrgezd1vNqq7PVj1VOsHZ2uQQb4iPiQIl0SlMdhxZPUsLIfEklmeEHXg8DJRewA==} deprecated: This is a stub types definition. minipass provides its own type definitions, so you do not need this installed. @@ -1515,18 +1538,18 @@ packages: resolution: {integrity: sha512-IrDKrw7pCRUR94zeuCSUWQ+w8JEf5ZX5jl/e6AHGSLi1/zIr0lgutfn/7JpfCey+urpgQEdrZVYzCaVVKiTwhQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vercel/build-utils@14.0.1': - resolution: {integrity: sha512-EGOVxPX5T6yYfITMZACezM0rDHByCXEJ7X42jGytl5bAYi/DSJR0S3PpRPOiqYOh46ml9LmRJyZeq5V13HeGDg==} + '@vercel/build-utils@15.4.2': + resolution: {integrity: sha512-QIxBmJy1g0Mu5bFylKWYxl6EjhlFDuXxWxm7Q6Cuk54jdR2o96OCy9MwAgs8nkAa0ay2KuJ+GhbL7p4ZW6sFKA==} - '@vercel/client@18.2.5': - resolution: {integrity: sha512-T1Qgj0U9IfFgXMgR3K+bihYZAh9wDyFdgo8pyt00rCrrtBo820WPsrSYH0xz/qMwOUanOAOk3dhsEnG6spCIFg==} + '@vercel/client@18.12.3': + resolution: {integrity: sha512-eqIr5E0F2DkVZKpZR1DVNznwlYPZn8HSGOfbdgKfhahhjTUaeu19TgAziN1MeVlR2x7Vq60Q5my7pejG/wNdLw==} engines: {node: '>= 20'} '@vercel/error-utils@2.2.1': resolution: {integrity: sha512-9DhP8jP7raLML4hGsBemxX5fXuQnu5xxMV+HjGygGbzEmVK/+KyJ3QP2Cw7PdF0uXdb9N0Qa4c3tRGH34ZX6vw==} - '@vercel/microfrontends@1.2.2': - resolution: {integrity: sha512-QzcR5wVsz654XlCGT/HnxjgSkQMpeaEuj7bI1EeukwL/2D3kFkL5J68LMqA68HHSbbLvx32o7n5scSoB7a+3IQ==} + '@vercel/microfrontends@2.4.0': + resolution: {integrity: sha512-dpUzyjpLtE40gB+vxU3AWy5Dlkx/O91joVc/Q7PTYTtHVmw7ZkKgbR0QFEQJC0kw6SXOb35q46QN1BVwVRL5DQ==} hasBin: true peerDependencies: '@sveltejs/kit': '>=1' @@ -1552,11 +1575,8 @@ packages: vite: optional: true - '@vercel/python-analysis@0.13.1': - resolution: {integrity: sha512-ec4tii9I7i6eHfvsvG/eaNaKh0TxmxBsc904V7yjwZImeyFTEVvDSLQ/+510FB+wBG6gCvpyqBH5aAKP9llqsw==} - - '@vercel/routing-utils@6.4.1': - resolution: {integrity: sha512-d/DqMAbxV8ymZdPzVbmihFj9oK3IvskucNbRN18ik53JLFtMlfu8v1SuVTt+iRhnYXaeA/y4NYLcyOnkkNmq/Q==} + '@vercel/routing-utils@6.6.1': + resolution: {integrity: sha512-rIVybdiezAVE4KZVjXRrKHUEoUNW1RzNTkcUR/0v1rsOnxn2EqNjleNP7HFoPlr0vfWvXUUtUKPTM7AFxIcJnw==} '@vitest/expect@4.1.12': resolution: {integrity: sha512-vFlTt+YEu9WBpNjdGayNmlMVzrWPi1+sv853/7t2FU7hpO5gAFBKHzQmkCq5Xjpr+evegF2994LQT3hF3mRlqQ==} @@ -1825,6 +1845,9 @@ packages: resolution: {integrity: sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==} engines: {node: '>=10'} + charenc@0.0.2: + resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==} + chokidar@3.6.0: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} @@ -1895,9 +1918,9 @@ packages: convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - cookie@0.7.2: - resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==} - engines: {node: '>= 0.6'} + cookie@1.0.2: + resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} + engines: {node: '>=18'} core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -1906,6 +1929,9 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} + crypt@0.0.2: + resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==} + debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} engines: {node: '>=6.0'} @@ -2156,10 +2182,6 @@ packages: fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} - fs-extra@11.1.1: - resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==} - engines: {node: '>=14.14'} - fs-extra@8.0.1: resolution: {integrity: sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==} engines: {node: '>=6 <7 || >=8'} @@ -2312,6 +2334,9 @@ packages: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} + is-buffer@1.1.6: + resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} + is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} @@ -2404,9 +2429,6 @@ packages: jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} - jsonfile@6.2.1: - resolution: {integrity: sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==} - jwa@2.0.1: resolution: {integrity: sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==} @@ -2462,6 +2484,9 @@ packages: resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} engines: {node: '>= 0.4'} + md5@2.3.0: + resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==} + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -2803,10 +2828,6 @@ packages: sleep-promise@8.0.1: resolution: {integrity: sha512-nfwyX+G1dsx2R1DMMKWLpNxuHMOCL7JIRBUw0fl7Z4nZ1YZK0apZuGY8MDexn0HDZzgbERgj/CrNtsYpo/B7eA==} - smol-toml@1.9.0: - resolution: {integrity: sha512-hpd+HLON7HdZXqYchMM/+LaTTbdK0AU3NngIJ4KVyWbY9bfQqdL9cD+4yf6dUoU2Ap4VsU0JkQi6FxAI1B2mXQ==} - engines: {node: '>= 18'} - source-map-js@1.2.2: resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==} engines: {node: '>=0.10.0'} @@ -2981,10 +3002,6 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - universalify@2.0.1: - resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} - engines: {node: '>= 10.0.0'} - unplugin@1.0.1: resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} @@ -3177,9 +3194,6 @@ packages: resolution: {integrity: sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==} engines: {node: '>=12.20'} - zod@3.22.4: - resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} - snapshots: '@aws-crypto/crc32@5.2.0': @@ -3668,8 +3682,6 @@ snapshots: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@bytecodealliance/preview2-shim@0.17.6': {} - '@esbuild/aix-ppc64@0.28.1': optional: true @@ -3875,7 +3887,7 @@ snapshots: '@kwsites/promise-deferred@1.1.1': {} - '@next/env@15.1.6': {} + '@next/env@16.0.10': {} '@nodable/entities@3.1.0': {} @@ -4031,8 +4043,6 @@ snapshots: '@oxc-project/types@0.152.0': {} - '@renovatebot/pep440@4.2.1': {} - '@rollup/rollup-android-arm-eabi@4.61.1': optional: true @@ -4584,6 +4594,8 @@ snapshots: '@types/json-schema@7.0.15': {} + '@types/md5@2.3.6': {} + '@types/minipass@3.3.5': dependencies: minipass: 7.1.3 @@ -4731,18 +4743,17 @@ snapshots: '@typescript-eslint/types': 8.50.1 eslint-visitor-keys: 4.2.1 - '@vercel/build-utils@14.0.1': + '@vercel/build-utils@15.4.2': dependencies: - '@vercel/python-analysis': 0.13.1 cjs-module-lexer: 1.2.3 es-module-lexer: 1.5.0 - '@vercel/client@18.2.5(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0))': + '@vercel/client@18.12.3(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0))': dependencies: - '@vercel/build-utils': 14.0.1 + '@vercel/build-utils': 15.4.2 '@vercel/error-utils': 2.2.1 - '@vercel/microfrontends': 1.2.2(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0)) - '@vercel/routing-utils': 6.4.1 + '@vercel/microfrontends': 2.4.0(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0)) + '@vercel/routing-utils': 6.6.1 async-retry: 1.2.3 async-sema: 3.0.0 fs-extra: 8.0.1 @@ -4764,33 +4775,26 @@ snapshots: '@vercel/error-utils@2.2.1': {} - '@vercel/microfrontends@1.2.2(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0))': + '@vercel/microfrontends@2.4.0(vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0))': dependencies: - '@next/env': 15.1.6 + '@next/env': 16.0.10 + '@types/md5': 2.3.6 ajv: 8.20.0 commander: 12.1.0 - cookie: 0.7.2 + cookie: 1.0.2 fast-glob: 3.3.3 http-proxy: 1.18.1 jsonc-parser: 3.3.1 + md5: 2.3.0 nanoid: 3.3.19 path-to-regexp: 6.3.0 + semver: 7.7.3 optionalDependencies: vite: 7.3.7(@types/node@24.13.2)(tsx@4.21.0) transitivePeerDependencies: - debug - '@vercel/python-analysis@0.13.1': - dependencies: - '@bytecodealliance/preview2-shim': 0.17.6 - '@renovatebot/pep440': 4.2.1 - fs-extra: 11.1.1 - js-yaml: 4.3.2 - minimatch: 11.0.9 - smol-toml: 1.9.0 - zod: 3.22.4 - - '@vercel/routing-utils@6.4.1': + '@vercel/routing-utils@6.6.1': dependencies: path-to-regexp: 6.3.0 path-to-regexp-updated: path-to-regexp@6.3.0 @@ -4885,7 +4889,7 @@ snapshots: anymatch@3.1.3: dependencies: normalize-path: 3.0.0 - picomatch: 2.3.2 + picomatch: 2.3.2(patch_hash=c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784) anynum@1.0.1: {} @@ -5041,6 +5045,8 @@ snapshots: ansi-styles: 4.3.0 supports-color: 7.2.0 + charenc@0.0.2: {} + chokidar@3.6.0: dependencies: anymatch: 3.1.3 @@ -5101,7 +5107,7 @@ snapshots: convert-source-map@2.0.0: {} - cookie@0.7.2: {} + cookie@1.0.2: {} core-util-is@1.0.3: {} @@ -5111,6 +5117,8 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 + crypt@0.0.2: {} + debug@4.4.3: dependencies: ms: 2.1.3 @@ -5340,9 +5348,9 @@ snapshots: dependencies: reusify: 1.1.0 - fdir@6.5.0(picomatch@4.0.7): + fdir@6.5.0(picomatch@4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4)): optionalDependencies: - picomatch: 4.0.7 + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) file-entry-cache@8.0.0: dependencies: @@ -5407,12 +5415,6 @@ snapshots: fs-constants@1.0.0: {} - fs-extra@11.1.1: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.2.1 - universalify: 2.0.1 - fs-extra@8.0.1: dependencies: graceful-fs: 4.2.11 @@ -5593,6 +5595,8 @@ snapshots: dependencies: binary-extensions: 2.3.0 + is-buffer@1.1.6: {} + is-callable@1.2.7: {} is-ci@2.0.0: @@ -5659,12 +5663,6 @@ snapshots: optionalDependencies: graceful-fs: 4.2.11 - jsonfile@6.2.1: - dependencies: - universalify: 2.0.1 - optionalDependencies: - graceful-fs: 4.2.11 - jwa@2.0.1: dependencies: buffer-equal-constant-time: 1.0.1 @@ -5718,12 +5716,18 @@ snapshots: math-intrinsics@1.1.0: {} + md5@2.3.0: + dependencies: + charenc: 0.0.2 + crypt: 0.0.2 + is-buffer: 1.1.6 + merge2@1.4.1: {} micromatch@4.0.8: dependencies: braces: 3.0.3(patch_hash=1da2e5cc2a0608f1dbb4033e149ade9c1fe19309a53c48032a0e4a06039d9b03) - picomatch: 2.3.2 + picomatch: 2.3.2(patch_hash=c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784) mime-db@1.52.0: {} @@ -5881,9 +5885,9 @@ snapshots: picocolors@1.1.1: {} - picomatch@2.3.2: {} + picomatch@2.3.2(patch_hash=c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784): {} - picomatch@4.0.7: {} + picomatch@4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4): {} portable-executable-signature@2.0.6: {} @@ -5947,7 +5951,7 @@ snapshots: readdirp@3.6.0: dependencies: - picomatch: 2.3.2 + picomatch: 2.3.2(patch_hash=c183c92455b30f6253012a28ee01efc6344060768e13cc3519e83b86ac73a784) require-from-string@2.0.2: {} @@ -6058,8 +6062,6 @@ snapshots: sleep-promise@8.0.1: {} - smol-toml@1.9.0: {} - source-map-js@1.2.2: {} source-map-support@0.5.21: @@ -6207,8 +6209,8 @@ snapshots: tinyglobby@0.2.17: dependencies: - fdir: 6.5.0(picomatch@4.0.7) - picomatch: 4.0.7 + fdir: 6.5.0(picomatch@4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4)) + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) tinyrainbow@3.1.1: {} @@ -6269,8 +6271,6 @@ snapshots: universalify@0.1.2: {} - universalify@2.0.1: {} - unplugin@1.0.1: dependencies: acorn: 8.15.0 @@ -6299,8 +6299,8 @@ snapshots: vite@7.3.7(@types/node@24.13.2)(tsx@4.21.0): dependencies: esbuild: 0.28.1 - fdir: 6.5.0(picomatch@4.0.7) - picomatch: 4.0.7 + fdir: 6.5.0(picomatch@4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4)) + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) postcss: 8.5.24 rollup: 4.61.1 tinyglobby: 0.2.17 @@ -6323,7 +6323,7 @@ snapshots: magic-string: 0.30.21 obug: 2.2.1 pathe: 2.0.3 - picomatch: 4.0.7 + picomatch: 4.0.7(patch_hash=e10f889f737d1a1a04446d3866b3fe472b92bbb9c546530286bf226af1a3b8e4) std-env: 4.2.0 tinybench: 2.9.0 tinyexec: 1.3.1 @@ -6411,5 +6411,3 @@ snapshots: yocto-queue@0.1.0: {} yocto-queue@1.2.2: {} - - zod@3.22.4: {} diff --git a/src/__tests__/dependency-security.test.ts b/src/__tests__/dependency-security.test.ts index 4b097d08d..c2e819158 100644 --- a/src/__tests__/dependency-security.test.ts +++ b/src/__tests__/dependency-security.test.ts @@ -1,4 +1,6 @@ +import { spawnSync } from 'node:child_process'; import { createRequire } from 'node:module'; +import { resolve } from 'node:path'; import { describe, expect, test } from 'vitest'; const projectRequire = createRequire(__filename); @@ -14,6 +16,15 @@ const pluginRequire = createRequire( ); const unpluginRequire = createRequire(pluginRequire.resolve('unplugin')); const chokidarRequire = createRequire(unpluginRequire.resolve('chokidar')); +const anymatchRequire = createRequire(chokidarRequire.resolve('anymatch')); +const typescriptEstreeRequire = createRequire( + createRequire(projectRequire.resolve('typescript-eslint')).resolve( + '@typescript-eslint/typescript-estree', + ), +); +const tinyglobbyRequire = createRequire( + typescriptEstreeRequire.resolve('tinyglobby'), +); describe('GHSA-vfj7-8cjw-p6xm dependency patch', () => { test('protects both runtime globbing and build-time file watching', () => { @@ -57,3 +68,52 @@ describe('GHSA-vfj7-8cjw-p6xm dependency patch', () => { expect(braces.expand('\\{'.repeat(200))).toEqual(['{'.repeat(200)]); }); }); + +const picomatchRedos = resolve(__dirname, 'fixtures/picomatch-redos.cjs'); + +describe('GHSA-fc5q-39xc-vjpf dependency patch', () => { + const picomatchCopies = { + '4.0.7 (typescript-eslint > tinyglobby)': + tinyglobbyRequire.resolve('picomatch'), + '2.3.2 (@sentry/esbuild-plugin > ... > anymatch)': + anymatchRequire.resolve('picomatch'), + '2.3.2 (@vercel/client > ... > micromatch)': + micromatchRequire.resolve('picomatch'), + }; + + test.each(Object.entries(picomatchCopies))( + 'picomatch %s rejects crafted input without backtracking', + (_name, picomatchPath) => { + const result = spawnSync( + process.execPath, + [picomatchRedos, picomatchPath], + { + encoding: 'utf8', + timeout: 10_000, + }, + ); + expect(result.error).toBeUndefined(); + expect(result.stderr).toBe(''); + expect(result.status).toBe(0); + }, + ); + + test.each(Object.entries(picomatchCopies))( + 'picomatch %s keeps extglob matching', + (_name, picomatchPath) => { + const picomatch = projectRequire(picomatchPath); + expect(picomatch.makeRe('+(*a)').source).toBe('^(?:(?=.)(?:[^/]*?a))$'); + expect(picomatch.isMatch('xaa', '+(*a)')).toBe(true); + expect(picomatch.isMatch('ab', '+(*a)')).toBe(false); + expect(picomatch.isMatch('a/a', '+(*a)')).toBe(false); + expect(picomatch.isMatch('abab', '+(a*b)')).toBe(true); + expect(picomatch.isMatch('x.jsy.js', '+(*.js)')).toBe(true); + expect(picomatch.isMatch('x.jsy.ts', '+(*.js)')).toBe(false); + expect(picomatch.isMatch('abab', '+(a|b)')).toBe(true); + expect(picomatch.isMatch('src/a/src/b/', '+(src/*/)')).toBe(true); + expect(picomatch.isMatch('foo.ts', '!(*.d).ts')).toBe(true); + expect(picomatch.isMatch('foo.d.ts', '!(*.d).ts')).toBe(false); + expect(picomatch.isMatch('src/a/b.ts', 'src/**/*.@(ts|js)')).toBe(true); + }, + ); +}); diff --git a/src/__tests__/fixtures/picomatch-redos.cjs b/src/__tests__/fixtures/picomatch-redos.cjs new file mode 100644 index 000000000..5bfa39e21 --- /dev/null +++ b/src/__tests__/fixtures/picomatch-redos.cjs @@ -0,0 +1,12 @@ +/* global require, process */ +// GHSA-fc5q-39xc-vjpf: single-branch repeated extglobs nest an unbounded +// quantifier. Runs in a child process because a backtracking regex blocks +// its own event loop. Usage: node picomatch-redos.cjs +const picomatch = require(process.argv[2]); +const globs = ['+(*)', '+(*a)', '*(*a)', '+(a*)b', '+(*[a])', '+(@(*a))']; +const inputs = ['a'.repeat(50000) + '!', 'a'.repeat(50000) + '/']; +for (const glob of globs) { + for (const input of inputs) { + picomatch(glob)(input); + } +}