diff options
| author |  Matthew Phillips <matthew@skypack.dev>
| 2022-08-02 08:08:28 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-08-02 08:08:28 -0400 |
| commit | e33fc9bc46ff0a30013deb6dc76e545e70cc3a3e (patch) | |
| tree | 6e7f2152b7d0f8a28e1ce43065f596773deecaad /packages/integrations/mdx | |
| parent | 10a8fa5dcd958605deb41f0f5fe8b2f2ee7229b5 (diff) | |
| download | astro-e33fc9bc46ff0a30013deb6dc76e545e70cc3a3e.tar.gz astro-e33fc9bc46ff0a30013deb6dc76e545e70cc3a3e.tar.zst astro-e33fc9bc46ff0a30013deb6dc76e545e70cc3a3e.zip | |
Load configs with Vite when loading with Proload fails (#4112)
* 4078 breaking test
* Use Vite for loading the config
* Try it
* Fallback to loading with Vite only when needed
* Remove console.error
* Remove extra console.log
* Add a changeset
* Use middlewareMode
Diffstat (limited to 'packages/integrations/mdx')
4 files changed, 14 insertions, 3 deletions
diff --git a/packages/integrations/mdx/src/index.ts b/packages/integrations/mdx/src/index.ts index 139e08515..81187cc60 100644 --- a/packages/integrations/mdx/src/index.ts +++ b/packages/integrations/mdx/src/index.ts @@ -52,7 +52,7 @@ export default function mdx(mdxOptions: MdxOptions = {}): AstroIntegration { // Workarounds tried: // - "import * as remarkShikiTwoslash" // - "import { default as remarkShikiTwoslash }" - (remarkShikiTwoslash as any).default, + (remarkShikiTwoslash as any).default ?? remarkShikiTwoslash, config.markdown.shikiConfig, ]); rehypePlugins.push([rehypeRaw, { passThrough: nodeTypes }]); diff --git a/packages/integrations/mdx/test/fixtures/mdx-page/astro.config.ts b/packages/integrations/mdx/test/fixtures/mdx-page/astro.config.ts new file mode 100644 index 000000000..f1d5e8bd7 --- /dev/null +++ b/packages/integrations/mdx/test/fixtures/mdx-page/astro.config.ts @@ -0,0 +1,5 @@ +import mdx from '@astrojs/mdx'; + +export default { + integrations: [mdx()] +} diff --git a/packages/integrations/mdx/test/fixtures/mdx-page/package.json b/packages/integrations/mdx/test/fixtures/mdx-page/package.json new file mode 100644 index 000000000..c8f3217b3 --- /dev/null +++ b/packages/integrations/mdx/test/fixtures/mdx-page/package.json @@ -0,0 +1,7 @@ +{ + "name": "@test/mdx-page", + "dependencies": { + "astro": "workspace:*", + "@astrojs/mdx": "workspace:*" + } +} diff --git a/packages/integrations/mdx/test/mdx-page.test.js b/packages/integrations/mdx/test/mdx-page.test.js index e375a9f17..487923d42 100644 --- a/packages/integrations/mdx/test/mdx-page.test.js +++ b/packages/integrations/mdx/test/mdx-page.test.js @@ -9,8 +9,7 @@ describe('MDX Page', () => { before(async () => { fixture = await loadFixture({ - root: new URL('./fixtures/mdx-page/', import.meta.url), - integrations: [mdx()], + root: new URL('./fixtures/mdx-page/', import.meta.url) }); }); |