Skip to content

Commit

Permalink
Fix @astrojs/prism edgecase with pnpm (#6485)
Browse files Browse the repository at this point in the history
  • Loading branch information
bluwy authored Mar 9, 2023
1 parent a9a6ae2 commit d637d1e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .changeset/tall-taxis-exercise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix `@astrojs/prism` edgecase with strict package managers
15 changes: 11 additions & 4 deletions packages/astro/src/core/create-vite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ const ALWAYS_NOEXTERNAL = [
'@fontsource/*',
];

// These specifiers are usually dependencies written in CJS, but loaded through Vite's transform
// pipeline, which Vite doesn't support in development time. This hardcoded list temporarily
// fixes things until Vite can properly handle them, or when they support ESM.
const ONLY_DEV_EXTERNAL = [
// Imported by `<Code/>` which is processed by Vite
'shiki',
// Imported by `@astrojs/prism` which exposes `<Prism/>` that is processed by Vite
'prismjs/components/index.js',
];

/** Return a common starting point for all Vite actions */
export async function createVite(
commandConfig: vite.InlineConfig,
Expand Down Expand Up @@ -162,10 +172,7 @@ export async function createVite(
},
ssr: {
noExternal: [...ALWAYS_NOEXTERNAL, ...astroPkgsConfig.ssr.noExternal],
// shiki is imported by Code.astro, which is no-externalized (processed by Vite).
// However, shiki's deps are in CJS and trips up Vite's dev SSR transform, externalize
// shiki to load it with node instead.
external: [...(mode === 'dev' ? ['shiki'] : []), ...astroPkgsConfig.ssr.external],
external: [...(mode === 'dev' ? ONLY_DEV_EXTERNAL : []), ...astroPkgsConfig.ssr.external],
},
};

Expand Down

0 comments on commit d637d1e

Please sign in to comment.