michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: potentially unreliable cache

Browse source
This commit is contained in:
bholmesdev 2023-03-03 09:59:41 -05:00
parent 989dcd44fd
commit d6a03bfc99
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/integrations/markdoc/src/index.ts
View file

@ -1,5 +1,5 @@
import type { AstroIntegration, AstroConfig } from 'astro'; import type { AstroIntegration, AstroConfig } from 'astro';
import type { InlineConfig } from 'vite'; import { InlineConfig, normalizePath } from 'vite';
import type { Config } from '@markdoc/markdoc'; import type { Config } from '@markdoc/markdoc';
import Markdoc from '@markdoc/markdoc'; import Markdoc from '@markdoc/markdoc';
import { getAstroConfigPath, MarkdocError, parseFrontmatter } from './utils.js'; import { getAstroConfigPath, MarkdocError, parseFrontmatter } from './utils.js';
@ -7,14 +7,12 @@ import { fileURLToPath } from 'node:url';
import fs from 'node:fs'; import fs from 'node:fs';
export default function markdoc(markdocConfig: Config = {}): AstroIntegration { export default function markdoc(markdocConfig: Config = {}): AstroIntegration {
const entryBodyByFileIdCache = new Map<string, string>();
return { return {
name: '@astrojs/markdoc', name: '@astrojs/markdoc',
hooks: { hooks: {
'astro:config:setup': async ({ updateConfig, config, addContentEntryType }: any) => { 'astro:config:setup': async ({ updateConfig, config, addContentEntryType }: any) => {
function getEntryInfo({ fileUrl, contents }: { fileUrl: URL; contents: string }) { function getEntryInfo({ fileUrl, contents }: { fileUrl: URL; contents: string }) {
const parsed = parseFrontmatter(contents, fileURLToPath(fileUrl)); const parsed = parseFrontmatter(contents, fileURLToPath(fileUrl));
entryBodyByFileIdCache.set(fileUrl.pathname, parsed.content);
return { return {
data: parsed.data, data: parsed.data,
body: parsed.content, body: parsed.content,
@ -41,9 +39,7 @@ export default function markdoc(markdocConfig: Config = {}): AstroIntegration {
validateRenderProperties(markdocConfig, config); validateRenderProperties(markdocConfig, config);
const body = const body =
entryBodyByFileIdCache.get(id) ?? getEntryInfo({ fileUrl: new URL(normalizePath(id), 'file://'), contents: code }).body;
// It's possible for Vite to attempt to transform a file before `getEntryInfo()` has run
getEntryInfo({ fileUrl: new URL(id, 'file://'), contents: code }).body;
const ast = Markdoc.parse(body); const ast = Markdoc.parse(body);
const content = Markdoc.transform(ast, markdocConfig); const content = Markdoc.transform(ast, markdocConfig);