Skip to content

revert: change to shiki behaviour #13307

Open
ematipico wants to merge 1 commit intov6from
revert/shiki-behaviour
Open

revert: change to shiki behaviour #13307
ematipico wants to merge 1 commit intov6from
revert/shiki-behaviour

Conversation

@ematipico
Copy link
Member

Description (required)

Reverts some changes on the upgrade guide. Plus, I added a limitation to the CSP. I know users asked for this, and we decided we want to support it, I added a paragraph about it

For Astro version: 6.0.0. See astro PR #15640.

@netlify
Copy link

netlify bot commented Feb 24, 2026

Deploy Preview for astro-docs-2 ready!

Name Link
🔨 Latest commit 74aa9f6
🔍 Latest deploy log https://app.netlify.com/projects/astro-docs-2/deploys/699f0a914da81d0007848070
😎 Deploy Preview https://deploy-preview-13307--astro-docs-2.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@astrobot-houston
Copy link
Contributor

astrobot-houston commented Feb 24, 2026

Lunaria Status Overview

🌕 This pull request will trigger status changes.

Learn more

By default, every PR changing files present in the Lunaria configuration's files property will be considered and trigger status changes accordingly.

You can change this by adding one of the keywords present in the ignoreKeywords property in your Lunaria configuration file in the PR's title (ignoring all files) or by including a tracker directive in the merged commit's description.

Tracked Files

File Note
en/guides/upgrade-to/v6.mdx Localization changed, will be marked as complete.
Warnings reference
Icon Description
🔄️ The source for this localization has been updated since the creation of this pull request, make sure all changes in the source have been applied.

@ematipico ematipico changed the title revert: change to shiki behaviour @ematipico revert: change to shiki behaviour Feb 24, 2026
@ematipico ematipico force-pushed the revert/shiki-behaviour branch from 0ef3222 to b957aaf Compare February 24, 2026 15:27
@sarah11918
Copy link
Member

Noting that this appears to have already been released, so this is NOT merge-on-release and can merge whenever we are happy with it!

@sarah11918 sarah11918 added improve or update documentation Enhance / update existing documentation (e.g. add example, improve description, update for changes) 6.0 labels Feb 25, 2026
@sarah11918 sarah11918 added this to the v6.0.0 docs milestone Feb 25, 2026
@ematipico ematipico force-pushed the revert/shiki-behaviour branch from b957aaf to 74aa9f6 Compare February 25, 2026 14:43
@sarah11918
Copy link
Member

Config reference PR: withastro/astro#15658 for the updated JSDoc

Copy link
Member

@sarah11918 sarah11918 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is fine! We've got the other PR for the config reference now!

@sarah11918 sarah11918 added the Merge Queue Approved and ready to be merged (wait for feature release if also labelled M-O-R)! label Feb 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.0 improve or update documentation Enhance / update existing documentation (e.g. add example, improve description, update for changes) Merge Queue Approved and ready to be merged (wait for feature release if also labelled M-O-R)!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants