Fix build

withastro · Oct 12, 2023 · 151ac57 · 151ac57
1 parent 653080d
commit 151ac57
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/packages/astro/components/Code.astro b/packages/astro/components/Code.astro
@@ -8,7 +8,7 @@ import type {
 	ThemeRegistrationRaw,
 } from 'shikiji';
 import { visit } from 'unist-util-visit';
-import { getCachedHighlighter, replaceCssVariables } from './shiki.js';
+import { getCachedHighlighter, replaceCssVariables } from '../dist/core/shiki.js';
 
 interface Props {
 	/** The code to highlight. Required. */

diff --git a/packages/astro/src/core/errors/dev/vite.ts b/packages/astro/src/core/errors/dev/vite.ts
@@ -8,7 +8,7 @@ import { AstroError, type ErrorWithMetadata } from '../errors.js';
 import { createSafeError } from '../utils.js';
 import type { SSRLoadedRenderer } from './../../../@types/astro.js';
 import { getDocsForError, renderErrorMarkdown } from './utils.js';
-import { replaceCssVariables } from '../../../../components/shiki.js';
+import { replaceCssVariables } from '../../shiki.js';
 
 export function enhanceViteSSRError({
 	error,

diff --git a/packages/astro/components/shiki.js → packages/astro/src/core/shiki.ts b/packages/astro/components/shiki.js → packages/astro/src/core/shiki.ts
@@ -1,7 +1,8 @@
-import { getHighlighter } from 'shikiji';
+import { type Highlighter, getHighlighter } from 'shikiji';
 
-/** @type {Record<string, string>} */
-const ASTRO_COLOR_REPLACEMENTS = {
+type HighlighterOptions = NonNullable<Parameters<typeof getHighlighter>[0]>;
+
+const ASTRO_COLOR_REPLACEMENTS: Record<string, string> = {
 	'#000001': 'var(--astro-code-color-text)',
 	'#000002': 'var(--astro-code-color-background)',
 	'#000004': 'var(--astro-code-token-constant)',
@@ -24,18 +25,12 @@ const cachedHighlighters = new Map();
 
 /**
  * shiki -> shikiji compat as we need to manually replace it
- * @param {string} str
  */
-export function replaceCssVariables(str) {
+export function replaceCssVariables(str: string) {
 	return str.replace(COLOR_REPLACEMENT_REGEX, (match) => ASTRO_COLOR_REPLACEMENTS[match] || match);
 }
 
-/**
- *
- * @param {NonNullable<Parameters<typeof getHighlighter>[0]>} opts
- * @returns {Promise<import('shikiji').Highlighter>}
- */
-export function getCachedHighlighter(opts) {
+export function getCachedHighlighter(opts: HighlighterOptions): Promise<Highlighter> {
 	// Always sort keys before stringifying to make sure objects match regardless of parameter ordering
 	const key = JSON.stringify(opts, Object.keys(opts).sort());