694918a56b
* feat(assets): Add Vite plugin
* feat(images): Set up Image component
* fix(types): Attempt to fix type generation
* Revert "fix(types): Attempt to fix type generation"
This reverts commit 063aa276e2
.
* fix(image): Fix image types causing build to fail
* feat(image): Implement client side part
* feat(services): Allow arbitrary transforms parameters
* fix(image): Fix paths and types
* config(types): Update config types to provide completions for available services
* feat(image): Add serving in dev
* feat(image): Improve type error messages
* refactor(image): Move sharp's parseParams to baseService
* refactor(image): Skip work in dev for remote servies
* feat(image): Add support for remote images
* feat(image): Add squoosh service
* chore: update export map
* refactor(image): Abstract attributes handling by services
* config(vercel): Remove test image service
* feat(image): Support for relative images in Markdown (WIP)
* feat(images): Add support for relative images in Markdown
* feat(image): Update with RFC feedback
* fix(image): Fix alt error on getImage
* feat(image): Add support for assets validation through content collections
* feat(image): Remove validateTransform
* feat(image): Move to assets folder
* fix(image): Fix package exports
* feat(image): Add static imports references to virtual moduel
* fix(image): Fix images from content collections not working when embedded
* chore: lockfile
* fix(markdown): Fix type
* fix(images): Flag enhanced images behing an experimental flag
* config(example): Update images example conifg
* fix(image): Fix types
* fix(image): Fix asset type for strict, allow arbritary input and output formats
* chore: fix example check
* feat(image): Emit assets for ESM imported images
* Add initial core image tests (#6381)
* feat(images): Make frontmatter extraction more generic than images for future
* feat(image): Add support for building
* fix(image): Fix types
* fix(images): Fix compatibility with image integration
* feat(images): Cuter generation stats
* fix(images): Globals are unsafe, it turns out
* fix(images): Only generate images if flag is enabled
* fix(images): Only create `addStaticImage` in build
* feat(images): Add SSR endpoint
* fix(images): Only inject route in SSR
* Add tests for SSR
* Remove console.log
* Updated lockfile
* rename to satisfy the link gods
* skip build tests for now
* fix(images): Fix WASM files not being copied in dev
* feat(images): Add quality presets
* fix build tests running
* Remove console.log
* Add tests for getImage
* Test local services
* Test the content collections API
* Add tests for quality
* Skipping content collections test
* feat(image): Add support for `~/assets` alias
* test(image): Add tests for aliases in dev
* Fix windows + content collections
* test(image): Add tests for aliased images and images in Markdown
* Fix markdown images being built
* Should be posix join
* Use the optimized image
* fix test
* Fixes windows smoke
* fix(image): Nits
* feat(images): Add automatic update for `env.d.ts` when experimental images are enabled
* fix(images): Revert env.d.ts change if the user opted-out of the experimental image support
* chore: remove bad image example project
* feat(image): Rename `experimental.images` to `experimental.assets`
* fix(images): Remove unused code in MDX integration
* chore: Remove unrelated change
* fix(images): Remove export from astro/components
* Fix, esm import on Win
* test(images): Add test for format
* fix(images): Add `client-image.d.ts` to export map
* chore: changeset
* fix(images): Adjust with feedback, no more automatic refine, asset() -> image()
* fix(images): Fix types
* fix(images): Remove unnecessary spread
* fix(images): Better types for parseUrl and transform
* fix(images): Fix types
* fix(images): Adjust from feedback
* fix(images): Pass width and height through getHTMLAttributes even if they're not added by the uesr
* fix(images): Recusirsively extract frontmatter assets
* fix(images): Use a reduce instead
* feat(images): Add support for data: URIs
* chore: changeset
* docs(images): Misc docs fixes
* Update .changeset/gold-rocks-cry.md
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update .changeset/gold-rocks-cry.md
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* Update packages/astro/src/@types/astro.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/services/service.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/services/service.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/services/service.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/types.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/types.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---------
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: Matthew Phillips <matthew@matthewphillips.info>
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
84 lines
1.9 KiB
TypeScript
84 lines
1.9 KiB
TypeScript
import type { Options as AcornOpts } from 'acorn';
|
|
import { parse } from 'acorn';
|
|
import type { AstroConfig, SSRError } from 'astro';
|
|
import matter from 'gray-matter';
|
|
import type { MdxjsEsm } from 'mdast-util-mdx';
|
|
|
|
function appendForwardSlash(path: string) {
|
|
return path.endsWith('/') ? path : path + '/';
|
|
}
|
|
|
|
interface FileInfo {
|
|
fileId: string;
|
|
fileUrl: string;
|
|
}
|
|
|
|
/** @see 'vite-plugin-utils' for source */
|
|
export function getFileInfo(id: string, config: AstroConfig): FileInfo {
|
|
const sitePathname = appendForwardSlash(
|
|
config.site ? new URL(config.base, config.site).pathname : config.base
|
|
);
|
|
|
|
// Try to grab the file's actual URL
|
|
let url: URL | undefined = undefined;
|
|
try {
|
|
url = new URL(`file://${id}`);
|
|
} catch {}
|
|
|
|
const fileId = id.split('?')[0];
|
|
let fileUrl: string;
|
|
const isPage = fileId.includes('/pages/');
|
|
if (isPage) {
|
|
fileUrl = fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(\/index)?\.mdx$/, '');
|
|
} else if (url && url.pathname.startsWith(config.root.pathname)) {
|
|
fileUrl = url.pathname.slice(config.root.pathname.length);
|
|
} else {
|
|
fileUrl = fileId;
|
|
}
|
|
|
|
if (fileUrl && config.trailingSlash === 'always') {
|
|
fileUrl = appendForwardSlash(fileUrl);
|
|
}
|
|
return { fileId, fileUrl };
|
|
}
|
|
|
|
/**
|
|
* Match YAML exception handling from Astro core errors
|
|
* @see 'astro/src/core/errors.ts'
|
|
*/
|
|
export function parseFrontmatter(code: string, id: string) {
|
|
try {
|
|
return matter(code);
|
|
} catch (e: any) {
|
|
if (e.name === 'YAMLException') {
|
|
const err: SSRError = e;
|
|
err.id = id;
|
|
err.loc = { file: e.id, line: e.mark.line + 1, column: e.mark.column };
|
|
err.message = e.reason;
|
|
throw err;
|
|
} else {
|
|
throw e;
|
|
}
|
|
}
|
|
}
|
|
|
|
export function jsToTreeNode(
|
|
jsString: string,
|
|
acornOpts: AcornOpts = {
|
|
ecmaVersion: 'latest',
|
|
sourceType: 'module',
|
|
}
|
|
): MdxjsEsm {
|
|
return {
|
|
type: 'mdxjsEsm',
|
|
value: '',
|
|
data: {
|
|
estree: {
|
|
body: [],
|
|
...parse(jsString, acornOpts),
|
|
type: 'Program',
|
|
sourceType: 'module',
|
|
},
|
|
},
|
|
};
|
|
}
|