From 5c5ad61b438139256a3668ad65bbc31997507f9e Mon Sep 17 00:00:00 2001 From: hippotastic <6137925+hippotastic@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:50:48 +0100 Subject: [PATCH 1/4] Update `astro-expressive-code` dependency to `^0.33.1` --- .changeset/tricky-berries-retire.md | 9 ++++ packages/starlight/package.json | 2 +- pnpm-lock.yaml | 68 +++++++++++++++-------------- 3 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 .changeset/tricky-berries-retire.md diff --git a/.changeset/tricky-berries-retire.md b/.changeset/tricky-berries-retire.md new file mode 100644 index 00000000000..e604fe539db --- /dev/null +++ b/.changeset/tricky-berries-retire.md @@ -0,0 +1,9 @@ +--- +'@astrojs/starlight': minor +--- + +Updates `astro-expressive-code` dependency to `^0.33.1`. + +This unlocks support for [word wrap](https://expressive-code.com/key-features/word-wrap/) and [line numbers](https://expressive-code.com/plugins/line-numbers/), as well as updating the syntax highlighter to the latest Shiki release, which includes new and updated language grammars. + +See the [Expressive Code release notes](https://expressive-code.com/releases/) for more information on all contained changes. diff --git a/packages/starlight/package.json b/packages/starlight/package.json index 12f07912db3..ad847006d42 100644 --- a/packages/starlight/package.json +++ b/packages/starlight/package.json @@ -186,7 +186,7 @@ "@pagefind/default-ui": "^1.0.3", "@types/hast": "^3.0.3", "@types/mdast": "^4.0.3", - "astro-expressive-code": "^0.32.4", + "astro-expressive-code": "^0.33.1", "bcp-47": "^2.1.0", "hast-util-select": "^6.0.2", "hastscript": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ed6f8f0556..46c19dc4444 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,8 +145,8 @@ importers: specifier: ^4.0.3 version: 4.0.3 astro-expressive-code: - specifier: ^0.32.4 - version: 0.32.4(astro@4.3.5) + specifier: ^0.33.1 + version: 0.33.1(astro@4.3.5) bcp-47: specifier: ^2.1.0 version: 2.1.0 @@ -1117,8 +1117,8 @@ packages: requiresBuild: true optional: true - /@expressive-code/core@0.32.4: - resolution: {integrity: sha512-S0OwgZCy29OCcwFUBTLDrShUovIUWZcQn3EvSoKsGfzf/wTisK7XqZ1uH0Y7Mlof3Hf9uJMjOhJZvxTLtQUdSQ==} + /@expressive-code/core@0.33.1: + resolution: {integrity: sha512-UiA2nTmjTDtP/TZ8bvSMqeAiBI7UVpNg7gIGPCCZQPPKJORxCWU74+YTEUtAMKqCDAaei2SOB1eJxzkoE3MVeA==} dependencies: '@ctrl/tinycolor': 3.6.1 hast-util-to-html: 8.0.4 @@ -1127,24 +1127,24 @@ packages: postcss-nested: 6.0.1(postcss@8.4.33) dev: false - /@expressive-code/plugin-frames@0.32.4: - resolution: {integrity: sha512-XOQrLqlVEy5JbqsBhDcSJQinceQ5j/Z8cE0/27Lnlcj4oXRdiQNjMVtstC/xZUeWEbm+FI9ZZP4Z9yihol61Aw==} + /@expressive-code/plugin-frames@0.33.1: + resolution: {integrity: sha512-jQx2w1ZBZdo7JBGu31up2979elhFJ9s5pBlpXdbqJ93kLQVtWvzEQtz5wtphydSZ1fH9iYA0zy4ObrN86Iyw3g==} dependencies: - '@expressive-code/core': 0.32.4 + '@expressive-code/core': 0.33.1 hastscript: 7.2.0 dev: false - /@expressive-code/plugin-shiki@0.32.4: - resolution: {integrity: sha512-zZzTXFFTpG+fmBG6C+4KzIyh1nFPdn4gLJ8E9LhBVufmRkn3gZplkE99lulfillsKyUZTRw3+dC3xYZWEZKzPw==} + /@expressive-code/plugin-shiki@0.33.1: + resolution: {integrity: sha512-HdTn1WqyNijOnqppuwRulQ0T8J4Pcp6MKT6iuL7iTAhECTjLBd4W4PuhQq/jinx92SUe6i4EctpjjNpD8kKmBg==} dependencies: - '@expressive-code/core': 0.32.4 - shikiji: 0.8.7 + '@expressive-code/core': 0.33.1 + shiki: 1.1.6 dev: false - /@expressive-code/plugin-text-markers@0.32.4: - resolution: {integrity: sha512-lFlo3uwTp7vUmfXtLPn2aXs0CPFqdFvKiR3y8gtNzmBeYWPqVahF4RFUCN9ZpztCmXp5V8p2ADvNHzoNwCBwzA==} + /@expressive-code/plugin-text-markers@0.33.1: + resolution: {integrity: sha512-MdsLIwZMHjTvCxbKwcqjYUBypqWbUsEk/GF9wutfzlVZVCUyRmMGOqlqxqZ2SbJtvBnjLoKoc7993O+GT7u/NA==} dependencies: - '@expressive-code/core': 0.32.4 + '@expressive-code/core': 0.33.1 hastscript: 7.2.0 unist-util-visit-parents: 5.1.3 dev: false @@ -1469,6 +1469,10 @@ packages: requiresBuild: true optional: true + /@shikijs/core@1.1.6: + resolution: {integrity: sha512-kt9hhvrWTm0EPtRDIsoAZnSsFlIDBVBBI5CQewpA/NZCPin+MOKRXg+JiWc4y+8fZ/v0HzfDhu/UC+OTZGMt7A==} + dev: false + /@sideway/address@4.1.4: resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==} dependencies: @@ -1873,14 +1877,14 @@ packages: hasBin: true dev: false - /astro-expressive-code@0.32.4(astro@4.3.5): - resolution: {integrity: sha512-/Kq8wLMz0X2gbLWGmPryqEdFV/om/GROsoLtPFqLrLCRD5CpwxXAW185BIGZKf4iYsyJim1vvcpQm5Y9hV5B1g==} + /astro-expressive-code@0.33.1(astro@4.3.5): + resolution: {integrity: sha512-PCPKR/gWrZkRcaM2rLR8/+j+AzyaULNU659sklK21eeMoOkzZm3+4feQo6+sz7sMeToVKyUsJ33dwlXJ1vgk4w==} peerDependencies: astro: ^3.3.0 || ^4.0.0-beta dependencies: astro: 4.3.5(@types/node@18.16.19) hast-util-to-html: 8.0.4 - remark-expressive-code: 0.32.4 + remark-expressive-code: 0.33.1 dev: false /astro@4.3.5(@types/node@18.16.19): @@ -2924,13 +2928,13 @@ packages: resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} engines: {node: '>=6'} - /expressive-code@0.32.4: - resolution: {integrity: sha512-r+yUP2JV181tVR2EyYked7lT2W8bvL9o7xpdKU6q60FMU7Wh/DbGtH0jg+WmDxKK1C57iXF9chbBv+BsDPlUEQ==} + /expressive-code@0.33.1: + resolution: {integrity: sha512-kaGos1n00MLQJzyv4M5Qqu6MyUj7R4MiCelCsbStwBePjDDLN5bqZyr3cuS3j3Rgs+WT5OtgtgJQi4usuYREhQ==} dependencies: - '@expressive-code/core': 0.32.4 - '@expressive-code/plugin-frames': 0.32.4 - '@expressive-code/plugin-shiki': 0.32.4 - '@expressive-code/plugin-text-markers': 0.32.4 + '@expressive-code/core': 0.33.1 + '@expressive-code/plugin-frames': 0.33.1 + '@expressive-code/plugin-shiki': 0.33.1 + '@expressive-code/plugin-text-markers': 0.33.1 dev: false /extend-shallow@2.0.1: @@ -5694,10 +5698,10 @@ packages: - supports-color dev: false - /remark-expressive-code@0.32.4: - resolution: {integrity: sha512-khV7fVBpVDOyz9EXU+6MFwLj7BtY3DLVlNMMJYQcfp9ksLMxG/i83rIJbMUZCRof9bDBmFFlrF0VDvqJ0/MNeQ==} + /remark-expressive-code@0.33.1: + resolution: {integrity: sha512-T0qgsoxov65x8MAGvjBTPulwFRIj7zu5weUWk546KfYTPfca/povPqKo02JjF230mrB2hRZY0VXunSW9kvFDjg==} dependencies: - expressive-code: 0.32.4 + expressive-code: 0.33.1 hast-util-to-html: 8.0.4 unist-util-visit: 4.1.2 dev: false @@ -5963,15 +5967,15 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - /shikiji-core@0.9.19: - resolution: {integrity: sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==} - - /shikiji@0.8.7: - resolution: {integrity: sha512-j5usxwI0yHkDTHOuhuSJl9+wT5CNYeYO82dJMSJBlJ/NYT5SIebGcPoL6y9QOyH15wGrJC4LOP2nz5k8mUDGRQ==} + /shiki@1.1.6: + resolution: {integrity: sha512-j4pcpvaQWHb42cHeV+W6P+X/VcK7Y2ctvEham6zB8wsuRQroT6cEMIkiUmBU2Nqg2qnHZDH6ZyRdVldcy0l6xw==} dependencies: - hast-util-to-html: 9.0.0 + '@shikijs/core': 1.1.6 dev: false + /shikiji-core@0.9.19: + resolution: {integrity: sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==} + /shikiji@0.9.19: resolution: {integrity: sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==} dependencies: From bc0a570d473ce1bf82b230566b8d306756c10aa1 Mon Sep 17 00:00:00 2001 From: hippotastic <6137925+hippotastic@users.noreply.github.com> Date: Wed, 21 Feb 2024 15:35:48 +0100 Subject: [PATCH 2/4] Update to 0.33.2 to hopefully get more error details --- packages/starlight/package.json | 2 +- pnpm-lock.yaml | 50 ++++++++++++++++----------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/starlight/package.json b/packages/starlight/package.json index ad847006d42..78d89c8d8d6 100644 --- a/packages/starlight/package.json +++ b/packages/starlight/package.json @@ -186,7 +186,7 @@ "@pagefind/default-ui": "^1.0.3", "@types/hast": "^3.0.3", "@types/mdast": "^4.0.3", - "astro-expressive-code": "^0.33.1", + "astro-expressive-code": "^0.33.2", "bcp-47": "^2.1.0", "hast-util-select": "^6.0.2", "hastscript": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46c19dc4444..089fcb0cb69 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,8 +145,8 @@ importers: specifier: ^4.0.3 version: 4.0.3 astro-expressive-code: - specifier: ^0.33.1 - version: 0.33.1(astro@4.3.5) + specifier: ^0.33.2 + version: 0.33.2(astro@4.3.5) bcp-47: specifier: ^2.1.0 version: 2.1.0 @@ -1117,8 +1117,8 @@ packages: requiresBuild: true optional: true - /@expressive-code/core@0.33.1: - resolution: {integrity: sha512-UiA2nTmjTDtP/TZ8bvSMqeAiBI7UVpNg7gIGPCCZQPPKJORxCWU74+YTEUtAMKqCDAaei2SOB1eJxzkoE3MVeA==} + /@expressive-code/core@0.33.2: + resolution: {integrity: sha512-4PwGzv5wFvJr4Tb5xDP73Z1XA3ZeqGEAyFDMBFe9tfTAJ2ppkqlPDbhIDTqPRhUmNjmM8piuhZwg+fnqbTF7IQ==} dependencies: '@ctrl/tinycolor': 3.6.1 hast-util-to-html: 8.0.4 @@ -1127,24 +1127,24 @@ packages: postcss-nested: 6.0.1(postcss@8.4.33) dev: false - /@expressive-code/plugin-frames@0.33.1: - resolution: {integrity: sha512-jQx2w1ZBZdo7JBGu31up2979elhFJ9s5pBlpXdbqJ93kLQVtWvzEQtz5wtphydSZ1fH9iYA0zy4ObrN86Iyw3g==} + /@expressive-code/plugin-frames@0.33.2: + resolution: {integrity: sha512-g082mx4SUgh9s2HZ+x/gUK9IIszcjJsyZ0tDWwlrYrS5sFBlMLj1MnUywqTOAf6WJVWN3F1A9DqW9eNKYIwr9w==} dependencies: - '@expressive-code/core': 0.33.1 + '@expressive-code/core': 0.33.2 hastscript: 7.2.0 dev: false - /@expressive-code/plugin-shiki@0.33.1: - resolution: {integrity: sha512-HdTn1WqyNijOnqppuwRulQ0T8J4Pcp6MKT6iuL7iTAhECTjLBd4W4PuhQq/jinx92SUe6i4EctpjjNpD8kKmBg==} + /@expressive-code/plugin-shiki@0.33.2: + resolution: {integrity: sha512-NcbRAtr0VxrB+rTew/ZexQZuFKv+eufpV5FyL5xSc9ycbu5ntm5C7cW3kRshbC0vuTWgWLruNox/zzW1Y8BmDg==} dependencies: - '@expressive-code/core': 0.33.1 + '@expressive-code/core': 0.33.2 shiki: 1.1.6 dev: false - /@expressive-code/plugin-text-markers@0.33.1: - resolution: {integrity: sha512-MdsLIwZMHjTvCxbKwcqjYUBypqWbUsEk/GF9wutfzlVZVCUyRmMGOqlqxqZ2SbJtvBnjLoKoc7993O+GT7u/NA==} + /@expressive-code/plugin-text-markers@0.33.2: + resolution: {integrity: sha512-3p2k6Kp3tL/RMLOoPSJPcWyo5HSpJe8I4/hN+6laK6JIeplH1ElxvcEgl3RLPJohi+joRs0+Apst+Y+ETZvxpQ==} dependencies: - '@expressive-code/core': 0.33.1 + '@expressive-code/core': 0.33.2 hastscript: 7.2.0 unist-util-visit-parents: 5.1.3 dev: false @@ -1877,14 +1877,14 @@ packages: hasBin: true dev: false - /astro-expressive-code@0.33.1(astro@4.3.5): - resolution: {integrity: sha512-PCPKR/gWrZkRcaM2rLR8/+j+AzyaULNU659sklK21eeMoOkzZm3+4feQo6+sz7sMeToVKyUsJ33dwlXJ1vgk4w==} + /astro-expressive-code@0.33.2(astro@4.3.5): + resolution: {integrity: sha512-SV6NuJZnh+EXpx6PqLyMEv4QNA3qVL0Guaogu68mnXZNuz6m4OuVufiHDQgDcoF+KJGzLeGAjQ37uTXYxqlzXw==} peerDependencies: astro: ^3.3.0 || ^4.0.0-beta dependencies: astro: 4.3.5(@types/node@18.16.19) hast-util-to-html: 8.0.4 - remark-expressive-code: 0.33.1 + remark-expressive-code: 0.33.2 dev: false /astro@4.3.5(@types/node@18.16.19): @@ -2928,13 +2928,13 @@ packages: resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} engines: {node: '>=6'} - /expressive-code@0.33.1: - resolution: {integrity: sha512-kaGos1n00MLQJzyv4M5Qqu6MyUj7R4MiCelCsbStwBePjDDLN5bqZyr3cuS3j3Rgs+WT5OtgtgJQi4usuYREhQ==} + /expressive-code@0.33.2: + resolution: {integrity: sha512-uqTpc1XdgcBF8Sa43+yNPz8O4+HzBbhYAVu3g9RZgfiXFXznur6K/HdaHSq1puaENynouIlx6n1KMFcsgX31VQ==} dependencies: - '@expressive-code/core': 0.33.1 - '@expressive-code/plugin-frames': 0.33.1 - '@expressive-code/plugin-shiki': 0.33.1 - '@expressive-code/plugin-text-markers': 0.33.1 + '@expressive-code/core': 0.33.2 + '@expressive-code/plugin-frames': 0.33.2 + '@expressive-code/plugin-shiki': 0.33.2 + '@expressive-code/plugin-text-markers': 0.33.2 dev: false /extend-shallow@2.0.1: @@ -5698,10 +5698,10 @@ packages: - supports-color dev: false - /remark-expressive-code@0.33.1: - resolution: {integrity: sha512-T0qgsoxov65x8MAGvjBTPulwFRIj7zu5weUWk546KfYTPfca/povPqKo02JjF230mrB2hRZY0VXunSW9kvFDjg==} + /remark-expressive-code@0.33.2: + resolution: {integrity: sha512-hwde2sqPaxzFKm9EEi4V64OycoUzpmlHmUjxeaEFPqTdu3ju7wpJAdFstBwSagqRECn6iTSaL3SCXcGNGzRCGg==} dependencies: - expressive-code: 0.33.1 + expressive-code: 0.33.2 hast-util-to-html: 8.0.4 unist-util-visit: 4.1.2 dev: false From ca8201aafaa68b9a1a5bc2c1a76f999354ee4dc7 Mon Sep 17 00:00:00 2001 From: hippotastic <6137925+hippotastic@users.noreply.github.com> Date: Wed, 21 Feb 2024 15:42:14 +0100 Subject: [PATCH 3/4] Update changeset --- .changeset/tricky-berries-retire.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/tricky-berries-retire.md b/.changeset/tricky-berries-retire.md index e604fe539db..f752ec8056f 100644 --- a/.changeset/tricky-berries-retire.md +++ b/.changeset/tricky-berries-retire.md @@ -2,7 +2,7 @@ '@astrojs/starlight': minor --- -Updates `astro-expressive-code` dependency to `^0.33.1`. +Updates `astro-expressive-code` dependency to the latest minor release (0.33). This unlocks support for [word wrap](https://expressive-code.com/key-features/word-wrap/) and [line numbers](https://expressive-code.com/plugins/line-numbers/), as well as updating the syntax highlighter to the latest Shiki release, which includes new and updated language grammars. From fe8320345ac856ab385d593ca9c60743e19293f4 Mon Sep 17 00:00:00 2001 From: Hippo <6137925+hippotastic@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:55:40 +0100 Subject: [PATCH 4/4] Update .changeset/tricky-berries-retire.md Co-authored-by: Chris Swithinbank --- .changeset/tricky-berries-retire.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/tricky-berries-retire.md b/.changeset/tricky-berries-retire.md index f752ec8056f..80ab2b9e23a 100644 --- a/.changeset/tricky-berries-retire.md +++ b/.changeset/tricky-berries-retire.md @@ -6,4 +6,4 @@ Updates `astro-expressive-code` dependency to the latest minor release (0.33). This unlocks support for [word wrap](https://expressive-code.com/key-features/word-wrap/) and [line numbers](https://expressive-code.com/plugins/line-numbers/), as well as updating the syntax highlighter to the latest Shiki release, which includes new and updated language grammars. -See the [Expressive Code release notes](https://expressive-code.com/releases/) for more information on all contained changes. +See the [Expressive Code release notes](https://expressive-code.com/releases/) for more information including details of potentially breaking changes.