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

Fix/markdoc assets (#7706)

Browse source
This commit is contained in:
Erika 2023-07-18 18:03:46 +02:00 committed by GitHub
parent a77741d25e
commit 4f6b5ae2ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.changeset/smart-hairs-lick.md Normal file
View file

@ -0,0 +1,6 @@
---
'@astrojs/markdoc': patch
'astro': patch
---
Fix Markdoc integration not being able to import `emitESMImage` from Astro

1
packages/astro/package.json
View file

@ -52,6 +52,7 @@
"./components": "./components/index.ts", "./components": "./components/index.ts",
"./components/*": "./components/*", "./components/*": "./components/*",
"./assets": "./dist/assets/index.js", "./assets": "./dist/assets/index.js",
"./assets/utils": "./dist/assets/utils/index.js",
"./assets/image-endpoint": "./dist/assets/image-endpoint.js", "./assets/image-endpoint": "./dist/assets/image-endpoint.js",
"./assets/services/sharp": "./dist/assets/services/sharp.js", "./assets/services/sharp": "./dist/assets/services/sharp.js",
"./assets/services/squoosh": "./dist/assets/services/squoosh.js", "./assets/services/squoosh": "./dist/assets/services/squoosh.js",

1
packages/astro/src/assets/utils/index.ts Normal file
View file

@ -0,0 +1 @@
export { emitESMImage } from './emitAsset.js';

6
packages/integrations/markdoc/src/content-entry-type.ts
View file

@ -6,9 +6,9 @@ import fs from 'node:fs';
import { fileURLToPath } from 'node:url'; import { fileURLToPath } from 'node:url';
import type { ErrorPayload as ViteErrorPayload } from 'vite'; import type { ErrorPayload as ViteErrorPayload } from 'vite';
import type { ComponentConfig } from './config.js'; import type { ComponentConfig } from './config.js';
import { isComponentConfig, isValidUrl, MarkdocError, prependForwardSlash } from './utils.js'; import { MarkdocError, isComponentConfig, isValidUrl, prependForwardSlash } from './utils.js';
// @ts-expect-error Cannot find module 'astro/assets' or its corresponding type declarations. // @ts-expect-error Cannot get the types here without `moduleResolution: 'nodenext'`
import { emitESMImage } from 'astro/assets'; import { emitESMImage } from 'astro/assets/utils';
import path from 'node:path'; import path from 'node:path';
import type * as rollup from 'rollup'; import type * as rollup from 'rollup';
import type { MarkdocConfigResult } from './load-config.js'; import type { MarkdocConfigResult } from './load-config.js';