From ccf8401255d987b1afc290fa79d813e5bb624eed Mon Sep 17 00:00:00 2001 From: sebastien Date: Thu, 18 Jun 2026 18:16:14 +0200 Subject: [PATCH 1/2] migrate to @11ty/gray-matter --- packages/docusaurus-utils/package.json | 2 +- .../src/__tests__/markdownUtils.test.ts | 8 ++++-- .../docusaurus-utils/src/markdownUtils.ts | 2 +- pnpm-lock.yaml | 28 +++++++++---------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json index e80ebf9152cf..b122c25f3c61 100644 --- a/packages/docusaurus-utils/package.json +++ b/packages/docusaurus-utils/package.json @@ -25,7 +25,7 @@ "file-loader": "^6.2.0", "fs-extra": "^11.2.0", "github-slugger": "^2.0.0", - "gray-matter": "^4.0.3", + "@11ty/gray-matter": "^1.0.0", "jiti": "^2.7.0", "js-yaml": "^4.1.0", "lodash": "^4.17.21", diff --git a/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts b/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts index a10c240e381e..7e1668cd415f 100644 --- a/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts +++ b/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts @@ -895,9 +895,11 @@ describe('parseMarkdownFile', () => { --- `), ).rejects.toThrowErrorMatchingInlineSnapshot(` - [YAMLException: incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line at line 2, column 7: - foo: f: a - ^] + [YAMLException: bad indentation of a mapping entry (2:7) + + 1 | + 2 | foo: f: a + -----------^] `); }); }); diff --git a/packages/docusaurus-utils/src/markdownUtils.ts b/packages/docusaurus-utils/src/markdownUtils.ts index 6767f3cabf69..d411f1ca28cd 100644 --- a/packages/docusaurus-utils/src/markdownUtils.ts +++ b/packages/docusaurus-utils/src/markdownUtils.ts @@ -6,7 +6,7 @@ */ import logger from '@docusaurus/logger'; -import matter from 'gray-matter'; +import matter from '@11ty/gray-matter'; import type { ParseFrontMatter, DefaultParseFrontMatter, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 37f7d8c386fd..61eaf4218d36 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1904,6 +1904,9 @@ importers: packages/docusaurus-utils: dependencies: + '@11ty/gray-matter': + specifier: ^1.0.0 + version: 1.0.0 '@docusaurus/logger': specifier: 3.10.1 version: link:../docusaurus-logger @@ -1925,9 +1928,6 @@ importers: github-slugger: specifier: ^2.0.0 version: 2.0.0 - gray-matter: - specifier: ^4.0.3 - version: 4.0.3 jiti: specifier: ^2.7.0 version: 2.7.0 @@ -2218,6 +2218,10 @@ importers: packages: + '@11ty/gray-matter@1.0.0': + resolution: {integrity: sha512-7mJJl+wf1AByoT0PknQiQfOPnVNT4fevGrUBVWO4HXsnYn1aQPyRyrELYrNUFleUBM++KzMKN6QaxHPk0t/6/g==} + engines: {node: '>=11'} + '@actions/core@3.0.1': resolution: {integrity: sha512-a6d/Nwahm9fliVGRhdhofo40HjHQasUPusmc7vBfyky+7Z+P2A1J68zyFVaNcEclc/Se+eO595oAr5nwEIoIUA==} @@ -8639,10 +8643,6 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - gray-matter@4.0.3: - resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} - engines: {node: '>=6.0'} - hachure-fill@0.5.2: resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==} @@ -13442,6 +13442,13 @@ packages: snapshots: + '@11ty/gray-matter@1.0.0': + dependencies: + js-yaml: 4.2.0 + kind-of: 6.0.3 + section-matter: 1.0.0 + strip-bom-string: 1.0.0 + '@actions/core@3.0.1': dependencies: '@actions/exec': 3.0.0 @@ -20630,13 +20637,6 @@ snapshots: graceful-fs@4.2.11: {} - gray-matter@4.0.3: - dependencies: - js-yaml: 3.14.2 - kind-of: 6.0.3 - section-matter: 1.0.0 - strip-bom-string: 1.0.0 - hachure-fill@0.5.2: {} handle-thing@2.0.1: {} From 35b65cfa0688de2ad23407691d9863472fcd027e Mon Sep 17 00:00:00 2001 From: sebastien Date: Thu, 18 Jun 2026 18:22:52 +0200 Subject: [PATCH 2/2] @11ty/gray-matter v2 --- packages/docusaurus-utils/package.json | 2 +- pnpm-lock.yaml | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json index b122c25f3c61..cb0c3ed35bf9 100644 --- a/packages/docusaurus-utils/package.json +++ b/packages/docusaurus-utils/package.json @@ -25,7 +25,7 @@ "file-loader": "^6.2.0", "fs-extra": "^11.2.0", "github-slugger": "^2.0.0", - "@11ty/gray-matter": "^1.0.0", + "@11ty/gray-matter": "^2.0.0", "jiti": "^2.7.0", "js-yaml": "^4.1.0", "lodash": "^4.17.21", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 61eaf4218d36..b603c1d6de65 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1905,8 +1905,8 @@ importers: packages/docusaurus-utils: dependencies: '@11ty/gray-matter': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.2 '@docusaurus/logger': specifier: 3.10.1 version: link:../docusaurus-logger @@ -2218,8 +2218,8 @@ importers: packages: - '@11ty/gray-matter@1.0.0': - resolution: {integrity: sha512-7mJJl+wf1AByoT0PknQiQfOPnVNT4fevGrUBVWO4HXsnYn1aQPyRyrELYrNUFleUBM++KzMKN6QaxHPk0t/6/g==} + '@11ty/gray-matter@2.0.2': + resolution: {integrity: sha512-+sbmr+BPzzi0z4lFvruKiGQ3D/d5zBssavhH9SzXmWkf7rStnB4gfeEMgz6k1Ac8bpN5NAFCH5GyR3xHk1BGPA==} engines: {node: '>=11'} '@actions/core@3.0.1': @@ -12232,10 +12232,6 @@ packages: resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==} 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'} @@ -13442,12 +13438,10 @@ packages: snapshots: - '@11ty/gray-matter@1.0.0': + '@11ty/gray-matter@2.0.2': dependencies: js-yaml: 4.2.0 - kind-of: 6.0.3 section-matter: 1.0.0 - strip-bom-string: 1.0.0 '@actions/core@3.0.1': dependencies: @@ -25300,8 +25294,6 @@ snapshots: dependencies: ansi-regex: 6.2.2 - strip-bom-string@1.0.0: {} - strip-bom@3.0.0: {} strip-bom@4.0.0: {}