diff --git a/.changeset/11ty-gray-matter.md b/.changeset/11ty-gray-matter.md new file mode 100644 index 0000000000000..64a7032e93232 --- /dev/null +++ b/.changeset/11ty-gray-matter.md @@ -0,0 +1,6 @@ +--- +"@refinedev/cli": patch +"@refinedev/devtools-server": patch +--- + +chore(deps): replace the unmaintained `gray-matter` (last release 2019) with the maintained `@11ty/gray-matter` fork, which also pulls in a patched `js-yaml` (#7510) diff --git a/packages/cli/package.json b/packages/cli/package.json index 86fc8533bad5b..a0f6a087db365 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -52,7 +52,7 @@ "figlet": "^1.5.2", "fs-extra": "^10.1.0", "globby": "^11.1.0", - "gray-matter": "^4.0.3", + "@11ty/gray-matter": "^3.0.0", "handlebars": "^4.7.7", "inquirer": "^8.2.5", "inquirer-autocomplete-prompt": "^2.0.0", diff --git a/packages/cli/src/utils/announcement/index.tsx b/packages/cli/src/utils/announcement/index.tsx index 0bbeb9477a585..03750398d74b1 100644 --- a/packages/cli/src/utils/announcement/index.tsx +++ b/packages/cli/src/utils/announcement/index.tsx @@ -1,6 +1,6 @@ -import React from "react"; -import matter from "gray-matter"; +import matter from "@11ty/gray-matter"; import boxen from "boxen"; +import React from "react"; import type { Announcement } from "../../definitions/announcement"; import { markedTerminalRenderer } from "@utils/marked-terminal-renderer"; diff --git a/packages/devtools-server/package.json b/packages/devtools-server/package.json index fd1b1ebe9b885..3c3db2e543e04 100644 --- a/packages/devtools-server/package.json +++ b/packages/devtools-server/package.json @@ -57,7 +57,7 @@ "express": "^4.21.0", "fs-extra": "^10.1.0", "globby": "^11.1.0", - "gray-matter": "^4.0.3", + "@11ty/gray-matter": "^3.0.0", "http-proxy-middleware": "^3.0.0", "jscodeshift": "^17.3.0", "lodash": "^4.17.21", diff --git a/packages/devtools-server/src/feed/get-feed.ts b/packages/devtools-server/src/feed/get-feed.ts index 01bcf05e301ef..f1e0b7fec26b9 100644 --- a/packages/devtools-server/src/feed/get-feed.ts +++ b/packages/devtools-server/src/feed/get-feed.ts @@ -1,6 +1,6 @@ -import fetch from "node-fetch"; -import matter from "gray-matter"; +import matter from "@11ty/gray-matter"; import { marked } from "marked"; +import fetch from "node-fetch"; import sanitizeHtml from "sanitize-html"; import type { Feed, FeedSection } from "@refinedev/devtools-shared"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cda431f5f65bd..242efc4177058 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11419,6 +11419,9 @@ importers: packages/cli: dependencies: + '@11ty/gray-matter': + specifier: ^3.0.0 + version: 3.0.0 '@npmcli/package-json': specifier: ^5.2.0 version: 5.2.0 @@ -11473,9 +11476,6 @@ importers: globby: specifier: ^11.1.0 version: 11.1.0 - gray-matter: - specifier: ^4.0.3 - version: 4.0.3 handlebars: specifier: ^4.7.7 version: 4.7.8 @@ -11956,6 +11956,9 @@ importers: packages/devtools-server: dependencies: + '@11ty/gray-matter': + specifier: ^3.0.0 + version: 3.0.0 '@refinedev/devtools-shared': specifier: 2.0.2 version: link:../devtools-shared @@ -11995,9 +11998,6 @@ importers: globby: specifier: ^11.1.0 version: 11.1.0 - gray-matter: - specifier: ^4.0.3 - version: 4.0.3 http-proxy-middleware: specifier: ^3.0.0 version: 3.0.0 @@ -14066,6 +14066,10 @@ packages: graphql: optional: true + '@11ty/gray-matter@3.0.0': + resolution: {integrity: sha512-mi6KB36DZCpCfCb9XP3NtDDNXe1N0jKtuFj9mTCZNy5H7vTabODyMgFmmOiGIGJKt+i8mJqEb/REtK+JTEzlpQ==} + engines: {node: '>=11'} + '@aashutoshrathi/word-wrap@1.2.6': resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} engines: {node: '>=0.10.0'} @@ -21415,6 +21419,9 @@ packages: argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} + argparse@3.0.3: + resolution: {integrity: sha512-Sn98ftV3KfsO8xfLPHG6oT8y+b0yvbrLgZjgPDXsharNY15tTAjqIsIju4S32nl6/iEUNNE4v+yL2Zhm8ooP3w==} + args@5.0.3: resolution: {integrity: sha512-h6k/zfFgusnv3i5TU08KQkVKuCPBtL/PWQbWkHUxvJrZ2nAyeaUupneemcrgn1xmqxPQsPIzwkUhOpoqPDRZuA==} engines: {node: '>= 6.0.0'} @@ -24862,10 +24869,6 @@ packages: resolution: {integrity: sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - gray-matter@4.0.3: - resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} - engines: {node: '>=6.0'} - groqd@0.15.11: resolution: {integrity: sha512-i1JBi6CnRAVbsld9pThccvEg0jEq+xDiZE1OAkbTTt6bakpic5nv3QASvdgA+nWAoaX754q1ACvntgB7Pf83VQ==} engines: {node: '>= 14'} @@ -26168,6 +26171,10 @@ packages: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true + js-yaml@5.5.0: + resolution: {integrity: sha512-paNr4LFIFPjeeSmwNYdrb8FafLLG/Cr2Af3GjbsHJ5CxIjH4r0c2emlmRdAtpPAieP1gRVzk6buBbVP5gBMGAg==} + hasBin: true + jsbn@0.1.1: resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} @@ -31262,10 +31269,6 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} - strip-bom-string@1.0.0: - resolution: {integrity: sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==} - engines: {node: '>=0.10.0'} - strip-bom@3.0.0: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} @@ -33181,6 +33184,11 @@ snapshots: optionalDependencies: graphql: 16.9.0 + '@11ty/gray-matter@3.0.0': + dependencies: + js-yaml: 5.5.0 + section-matter: 1.0.0 + '@aashutoshrathi/word-wrap@1.2.6': {} '@ably/msgpack-js@0.4.0': @@ -44178,6 +44186,8 @@ snapshots: argparse@2.0.1: {} + argparse@3.0.3: {} + args@5.0.3: dependencies: camelcase: 5.0.0 @@ -48680,13 +48690,6 @@ snapshots: graphql@16.9.0: {} - gray-matter@4.0.3: - dependencies: - js-yaml: 3.14.1 - kind-of: 6.0.3 - section-matter: 1.0.0 - strip-bom-string: 1.0.0 - groqd@0.15.11: dependencies: zod: 3.22.4 @@ -50375,6 +50378,10 @@ snapshots: dependencies: argparse: 2.0.1 + js-yaml@5.5.0: + dependencies: + argparse: 3.0.3 + jsbn@0.1.1: {} jsbn@1.1.0: {} @@ -57028,8 +57035,6 @@ snapshots: dependencies: ansi-regex: 6.0.1 - strip-bom-string@1.0.0: {} - strip-bom@3.0.0: {} strip-bom@4.0.0: {}