MDX support #3706
Merged
MDX support #3706
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: bfb72ff The changes in this PR will be included in the next version bump. This PR includes changesets to release 10 packages
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
bot
added
pkg: astro
matthewp
reviewed
Jun 24, 2022
natemoo-re
force-pushed
the
feat/mdx
branch
2 times, most recently
from
55c45df
to
de0a31a
Compare
natemoo-re
commented
Jun 29, 2022
Comment on lines
+169
to
+171
| const rendererAliases = new Map([ | ||
| ['solid', 'solid-js'] | ||
| ]) |
There was a problem hiding this comment.
Unrelated bug caught by update to e2e tests. We should support both client:only="solid" and client:only="solid-js"
Comment on lines
+181
to
+183
| if (!importSource && jsxRenderers.has('astro') && id.includes('.mdx')) { | ||
| importSource = 'astro'; | ||
| } |
There was a problem hiding this comment.
Only default to astro/jsx-runtime if it's an .mdx component
Comment on lines
+942
to
+944
| export type HookParameters<Hook extends keyof AstroIntegration['hooks'], Fn = AstroIntegration['hooks'][Hook]> = Fn extends (...args: any) => any | ||
| ? Parameters<Fn>[0] | ||
| : never; |
There was a problem hiding this comment.
Small QoL thing but this exposes a type for Integration hook parameters
Comment on lines
143
to
149
| if (!Component.isAstroComponentFactory) { | ||
| const props: Record<string, any> = { ...(pageProps ?? {}), 'server:root': true }; | ||
| const html = await renderComponent(result, Component.name, Component, props, null); | ||
| return new Response(html.toString(), result.response); | ||
| } else { | ||
| return await renderPage(result, Component, pageProps, null); | ||
| } |
There was a problem hiding this comment.
Moved this logic into renderPage
tony-sull
requested changes
Jun 30, 2022
bholmesdev
reviewed
Jun 30, 2022
There was a problem hiding this comment.
Agreed to @tony-sull's comment on testing as well. Mostly nits, but super mdxcited to get this merged!
packages/astro/e2e/fixtures/solid-component/src/components/SolidComponent.jsx
Show resolved
Hide resolved
hippotastic
reviewed
Jun 30, 2022
tony-sull
approved these changes
Jun 30, 2022
Merged
SiriousHunter
pushed a commit
to SiriousHunter/astro
that referenced
this pull request
Feb 3, 2023
* feat: first pass at MDX support * fix: move built-in JSX renderer to come first * chore: remove jsx example * chore: update lockfile * chore: cleanup example * fix: missing deps * refactor: move component render logic to `renderPage` * chore: update HMR script * chore: update MDX example * refactor: prefer unshit * refactor: remove TODO comment * fix: remove duplicate identifier * refactor: cleanup mdx entrypoint * fix: better html handling * fix: add tsconfig to mdx package * chore: update lockfile * fix: do not sort plugins unless mdx is enabled * chore: update compiler * fix(hmr): maybe render head for non-Astro pages * fix: set initial pageExtensions * refactor: cleanup addPageExtension * refactor: remove addPageExtensions from types * refactor: expose HookParameters type * fix: only default to astro for MDX * test: pick up jsx support in test fixtures * refactor: simplify mdx entrypoint * test: add basic MDX tests * test(e2e): add mdx + framework tests * chore: update lockfile * test(e2e): fix preact mdx e2e test * fix(mdx): disable .md support * test(e2e): fix vue-component test missing mdx * test(e2e): fix solid component needing import * fix: allow `client:only="solid"` as an alias to `solid-js` * chore: move to with-mdx example * chore: update MDX readme * chore: update example readme * chore: bump astro version * chore: update lockfile * Update mod.d.ts * feat: support `export const components` in MDX pages * chore: update mdx example * fix: update jsx-runtime with better slot support * refactor: remove object style support * chore: cleanup package exports * chore: add todo comment * refactor: improve isPage function, move to utils * refactor: dry up manual HMR updates * chore: add dev tests for MDX * chore: prefer set to array * chore: add changesets * fix(hmr): flip public/private route Co-authored-by: Nate Moore <nate@astro.build>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
@astrojs/mdxintegration.mdxpagesTesting
.mdxfile added to each framework e2e testDocs
with-mdxexample includes README