chore: fix rebase problems

withastro · Jul 25, 2023 · e635660 · e635660
1 parent 5a31724
commit e635660
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 77 deletions.
diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts
@@ -9,7 +9,6 @@ import type * as rollup from 'rollup';
 import type { ErrorPayload as ViteErrorPayload } from 'vite';
 import type { ComponentConfig } from './config.js';
 import { MarkdocError, isComponentConfig, isValidUrl, prependForwardSlash } from './utils.js';
-// @ts-expect-error Cannot get the types here without `moduleResolution: 'nodenext'`
 import { emitESMImage } from 'astro/assets/utils';
 import { htmlTokenTransform } from './html/transform/html-token-transform.js';
 import type { MarkdocConfigResult } from './load-config.js';