From 5dbc31972f4a7b8c124feb87068f2d96061f7988 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sun, 1 Nov 2026 15:09:19 +0000 Subject: [PATCH] Pin minimatch 11.0.3 and satori 0.33.5 Replace the vulnerable minimatch 3.1.5 and 10.2.5 copies with a callable facade over 11.0.3 so ESLint's v3 default-export callers keep working. Point @vercel/og at 1.0.3, which ships satori 0.33.5, instead of bumping vinext past the React 19.2 peer range. Co-authored-by: Chris Williams --- overrides/minimatch/index.cjs | 16 +++ overrides/minimatch/index.d.ts | 14 +++ overrides/minimatch/index.mjs | 14 +++ overrides/minimatch/package.json | 24 +++++ package-lock.json | 174 ++++++++++++++----------------- package.json | 4 + 6 files changed, 151 insertions(+), 95 deletions(-) create mode 100644 overrides/minimatch/index.cjs create mode 100644 overrides/minimatch/index.d.ts create mode 100644 overrides/minimatch/index.mjs create mode 100644 overrides/minimatch/package.json diff --git a/overrides/minimatch/index.cjs b/overrides/minimatch/index.cjs new file mode 100644 index 0000000..acc6733 --- /dev/null +++ b/overrides/minimatch/index.cjs @@ -0,0 +1,16 @@ +"use strict"; + +// CJS entry: ESLint loads minimatch with require(), and the v3 callers need a function export. +/* eslint-disable @typescript-eslint/no-require-imports */ +const real = require("minimatch-11"); + +function minimatch(path, pattern, options) { + return real.minimatch(path, pattern, options); +} + +Object.assign(minimatch, real, { + minimatch: real.minimatch, + Minimatch: real.Minimatch, +}); + +module.exports = minimatch; diff --git a/overrides/minimatch/index.d.ts b/overrides/minimatch/index.d.ts new file mode 100644 index 0000000..10617f1 --- /dev/null +++ b/overrides/minimatch/index.d.ts @@ -0,0 +1,14 @@ +export { + GLOBSTAR, + Minimatch, + braceExpand, + defaults, + escape, + filter, + match, + minimatch, + sep, + unescape, +} from "minimatch-11"; + +export { minimatch as default } from "minimatch-11"; diff --git a/overrides/minimatch/index.mjs b/overrides/minimatch/index.mjs new file mode 100644 index 0000000..10617f1 --- /dev/null +++ b/overrides/minimatch/index.mjs @@ -0,0 +1,14 @@ +export { + GLOBSTAR, + Minimatch, + braceExpand, + defaults, + escape, + filter, + match, + minimatch, + sep, + unescape, +} from "minimatch-11"; + +export { minimatch as default } from "minimatch-11"; diff --git a/overrides/minimatch/package.json b/overrides/minimatch/package.json new file mode 100644 index 0000000..2c5e7b7 --- /dev/null +++ b/overrides/minimatch/package.json @@ -0,0 +1,24 @@ +{ + "name": "minimatch", + "version": "11.0.3", + "private": true, + "description": "Callable CommonJS facade for minimatch 11. ESLint 9 plugins still invoke the v3 default export.", + "main": "./index.cjs", + "types": "./index.d.ts", + "exports": { + ".": { + "import": { + "types": "./index.d.ts", + "default": "./index.mjs" + }, + "require": { + "types": "./index.d.ts", + "default": "./index.cjs" + } + }, + "./package.json": "./package.json" + }, + "dependencies": { + "minimatch-11": "npm:minimatch@11.0.3" + } +} diff --git a/package-lock.json b/package-lock.json index 7f01d62..cce9ddf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "eslint-plugin-react": "7.37.5", "eslint-plugin-react-hooks": "7.1.1", "globals": "16.4.0", + "minimatch": "file:./overrides/minimatch", "react-server-dom-webpack": "19.2.8", "tailwindcss": "4.2.1", "typescript": "5.9.3", @@ -1681,6 +1682,13 @@ "url": "https://opencollective.com/libvips" } }, + "node_modules/@isaacs/nonrecursive-glob-match": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@isaacs/nonrecursive-glob-match/-/nonrecursive-glob-match-1.0.3.tgz", + "integrity": "sha512-SI7kyKHq4XXDRozw+r9GlRZkia1ZkFrpLW98r2IC2Bpr8YkFGE3fvjzmxCG0x78A++69HmDNrDvSMYBZmHGpKA==", + "dev": true, + "license": "BlueOak-1.0.0" + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", @@ -1844,9 +1852,9 @@ "license": "MIT" }, "node_modules/@resvg/resvg-wasm": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@resvg/resvg-wasm/-/resvg-wasm-2.4.0.tgz", - "integrity": "sha512-C7c51Nn4yTxXFKvgh2txJFNweaVcfUPQxwEUFw4aWsCmfiBDJsTSwviIF8EcwjQ6k8bPyMWCl1vw4BdxE569Cg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@resvg/resvg-wasm/-/resvg-wasm-2.4.1.tgz", + "integrity": "sha512-yi6R0HyHtsoWTRA06Col4WoDs7SvlXU3DLMNP2bdAgs7HK18dTEVl1weXgxRzi8gwLteGUbIg29zulxIB3GSdg==", "dev": true, "license": "MPL-2.0", "engines": { @@ -1963,9 +1971,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1983,9 +1988,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -2003,9 +2005,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -2023,9 +2022,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -2043,9 +2039,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -2063,9 +2056,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -2761,45 +2751,6 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", - "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "18 || 20 || >=22" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", - "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", - "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "brace-expansion": "^5.0.5" - }, - "engines": { - "node": "18 || 20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", @@ -2899,17 +2850,20 @@ } }, "node_modules/@vercel/og": { - "version": "0.8.6", - "resolved": "https://registry.npmjs.org/@vercel/og/-/og-0.8.6.tgz", - "integrity": "sha512-hBcWIOppZV14bi+eAmCZj8Elj8hVSUZJTpf1lgGBhVD85pervzQ1poM/qYfFUlPraYSZYP+ASg6To5BwYmUSGQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@vercel/og/-/og-1.0.3.tgz", + "integrity": "sha512-/iYJ34PDu4lty1TXdL86qHEw8viveHTllG1PWLuJX8tSFfqKL7kyVJeUORJmQ250bHB0h+alcalXUlza3c/NSA==", "dev": true, "license": "MPL-2.0", "dependencies": { - "@resvg/resvg-wasm": "2.4.0", - "satori": "0.16.0" + "@resvg/resvg-wasm": "2.4.1", + "satori": "0.33.5" }, "engines": { - "node": ">=16" + "node": ">=22" + }, + "optionalDependencies": { + "sharp": "^0.35.3" } }, "node_modules/@vinext/types": { @@ -3505,11 +3459,14 @@ } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } }, "node_modules/base64-js": { "version": "0.0.8", @@ -3542,14 +3499,16 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.21", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", - "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" } }, "node_modules/braces": { @@ -3754,13 +3713,6 @@ "license": "MIT", "peer": true }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -3822,9 +3774,9 @@ } }, "node_modules/css-gradient-parser": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/css-gradient-parser/-/css-gradient-parser-0.0.16.tgz", - "integrity": "sha512-3O5QdqgFRUbXvK1x5INf1YkBz1UKSWqrd63vWsum8MNHDBYD5urm3QtxZbKU259OrEXNM26lP/MPY3d1IGkBgA==", + "version": "0.0.17", + "resolved": "https://registry.npmjs.org/css-gradient-parser/-/css-gradient-parser-0.0.17.tgz", + "integrity": "sha512-w2Xy9UMMwlKtou0vlRnXvWglPAceXCTtcmVSo8ZBUvqCV5aXEFP/PC6d+I464810I9FT++UACwTD5511bmGPUg==", "dev": true, "license": "MIT", "engines": { @@ -4942,6 +4894,13 @@ "dev": true, "license": "ISC" }, + "node_modules/harfbuzzjs": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/harfbuzzjs/-/harfbuzzjs-0.10.0.tgz", + "integrity": "sha512-SN8LVwCOzvTq3OPNd0+EAghgXugItz56wst567D1vs7LnnKGWprhi3EG58aVOBwhN8HEbQxL4I9NDWkcXUutRw==", + "dev": true, + "license": "MIT" + }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", @@ -6157,16 +6116,25 @@ } }, "node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", + "resolved": "overrides/minimatch", + "link": true + }, + "node_modules/minimatch-11": { + "name": "minimatch", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.3.tgz", + "integrity": "sha512-iny/40PEGkNJQ5/Pv6z3nm6FbRAby32GeZRjCUJk2WnNDbgPSTcdI+DDvLqsgBdD4cD5sMtMheqPPnehCCa8Nw==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^1.1.7" + "@isaacs/nonrecursive-glob-match": "^1.0.3", + "brace-expansion": "^5.0.12" }, "engines": { - "node": "*" + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/ms": { @@ -6867,19 +6835,21 @@ } }, "node_modules/satori": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/satori/-/satori-0.16.0.tgz", - "integrity": "sha512-ZvHN3ygzZ8FuxjSNB+mKBiF/NIoqHzlBGbD0MJiT+MvSsFOvotnWOhdTjxKzhHRT2wPC1QbhLzx2q/Y83VhfYQ==", + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/satori/-/satori-0.33.5.tgz", + "integrity": "sha512-PNW6ktrQ8SM6kk7u4aOuTkkUewkzyTOrj+QeEzXSsnNMAdff4ire9CAqIz8+4C3rCiBtK8QTELv52AZEd1PbRw==", "dev": true, "license": "MPL-2.0", "dependencies": { "@shuding/opentype.js": "1.4.0-beta.0", "css-background-parser": "^0.1.0", "css-box-shadow": "1.0.0-3", - "css-gradient-parser": "^0.0.16", + "css-gradient-parser": "^0.0.17", "css-to-react-native": "^3.0.0", "emoji-regex-xs": "^2.0.1", "escape-html": "^1.0.3", + "fflate": "0.7.3", + "harfbuzzjs": "0.10.0", "linebreak": "^1.1.0", "parse-css-color": "^0.2.1", "postcss-value-parser": "^4.2.0", @@ -6889,6 +6859,13 @@ "node": ">=16" } }, + "node_modules/satori/node_modules/fflate": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.3.tgz", + "integrity": "sha512-0Zz1jOzJWERhyhsimS54VTqOteCNwRtIlh8isdL0AXLo0g7xNTfTL7oWrkmCnPhZGocKIkWHBistBrrpoNH3aw==", + "dev": true, + "license": "MIT" + }, "node_modules/scheduler": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz", @@ -8700,6 +8677,13 @@ "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } + }, + "overrides/minimatch": { + "version": "11.0.3", + "dev": true, + "dependencies": { + "minimatch-11": "npm:minimatch@11.0.3" + } } } } diff --git a/package.json b/package.json index 6c15450..8aff88f 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "eslint-plugin-react": "7.37.5", "eslint-plugin-react-hooks": "7.1.1", "globals": "16.4.0", + "minimatch": "file:./overrides/minimatch", "react-server-dom-webpack": "19.2.8", "tailwindcss": "4.2.1", "typescript": "5.9.3", @@ -84,8 +85,11 @@ "wrangler": "4.121.0" }, "overrides": { + "@vercel/og": "1.0.3", "fast-uri": "3.1.9", "js-yaml": "4.3.2", + "minimatch": "$minimatch", + "satori": "0.33.5", "sharp": "0.35.5", "undici": "7.30.1" },