Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Markdoc - Shiki #7187

Merged
merged 24 commits into from
May 24, 2023
Merged

Markdoc - Shiki #7187

merged 24 commits into from
May 24, 2023

Conversation

bholmesdev
Copy link
Contributor

@bholmesdev bholmesdev commented May 23, 2023

Changes

  • Add a shiki() extension to add syntax highlighting to Markdoc
  • Introduce a new extends property to the Markdoc config. This accepts an array of objects to be merged and applied before user-specified config. shiki() is the first dogfooding!

Testing

  • Add unit tests for the Shiki syntax highlighter

Docs

  • Update README with syntax highlighting section

@changeset-bot
Copy link

changeset-bot bot commented May 23, 2023

🦋 Changeset detected

Latest commit: 1cd3797

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions github-actions bot added pkg: astro Related to the core `astro` package (scope) pkg: integration Related to any renderer integration (scope) labels May 23, 2023
@bholmesdev bholmesdev force-pushed the feat/markdoc-syntax-highlighting branch from 3d4290c to acc02a2 Compare May 23, 2023 21:49
@github-actions github-actions bot added pkg: svelte Related to Svelte (scope) pkg: vue Related to Vue (scope) labels May 23, 2023
@bholmesdev bholmesdev marked this pull request as ready for review May 23, 2023 21:50
@bholmesdev bholmesdev requested a review from a team as a code owner May 23, 2023 21:51
@bholmesdev bholmesdev changed the base branch from fix/markdoc-asset-bleed to main May 23, 2023 21:51
@bholmesdev bholmesdev changed the title Feat/markdoc syntax highlighting Markdoc - Shiki May 23, 2023
@github-actions github-actions bot removed pkg: svelte Related to Svelte (scope) pkg: vue Related to Vue (scope) labels May 23, 2023
@bholmesdev bholmesdev force-pushed the feat/markdoc-syntax-highlighting branch from 0fa339a to acc02a2 Compare May 23, 2023 21:54
packages/integrations/markdoc/package.json Show resolved Hide resolved
packages/integrations/markdoc/src/extensions/shiki.ts Outdated Show resolved Hide resolved
packages/integrations/markdoc/src/extensions/shiki.ts Outdated Show resolved Hide resolved
packages/integrations/markdoc/src/extensions/shiki.ts Outdated Show resolved Hide resolved
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.

Docs look good, @bholmesdev! Just a smol suggestion to see what you think!

packages/integrations/markdoc/README.md Outdated Show resolved Hide resolved
Copy link
Member

@yanthomasdev yanthomasdev left a comment

Choose a reason for hiding this comment

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

Docs LGTM!

@bholmesdev bholmesdev merged commit 1efaef6 into main May 24, 2023
2 checks passed
@bholmesdev bholmesdev deleted the feat/markdoc-syntax-highlighting branch May 24, 2023 20:52
@astrobot-houston astrobot-houston mentioned this pull request May 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pkg: astro Related to the core `astro` package (scope) pkg: integration Related to any renderer integration (scope)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants