@astrojs/markdown-remark 2.0.1 → 2.1.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/markdown-remark:build: cache hit, replaying output a66e40aa1dc7052c
+@astrojs/markdown-remark:build: cache hit, replaying output 16e4e4cd9a08743c
 @astrojs/markdown-remark:build: 
-@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.0.1 build /home/runner/work/astro/astro/packages/markdown/remark
+@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.1.1 build /home/runner/work/astro/astro/packages/markdown/remark
 @astrojs/markdown-remark:build: > astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json
 @astrojs/markdown-remark:build: 

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @astrojs/markdown-remark
 
+## 2.1.1
+
+### Patch Changes
+
+- [#6559](https://github.com/withastro/astro/pull/6559) [`90e5f87d0`](https://github.com/withastro/astro/commit/90e5f87d03215a833bb6ac91f9548670a25ce659) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Vendor `image-size` to fix CJS-related issues
+
+- [#6555](https://github.com/withastro/astro/pull/6555) [`f5fddafc2`](https://github.com/withastro/astro/commit/f5fddafc248bb1ef57b7349bfecc25539ae2b5ea) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add a `validateOptions` hook to the Image Service API in order to set default options and validate the passed options
+
+- Updated dependencies [[`04dddd783`](https://github.com/withastro/astro/commit/04dddd783da3235aa9ed523d2856adf86b792b5f), [`ea9b3dd72`](https://github.com/withastro/astro/commit/ea9b3dd72b98b3f5a542ca24a275f673faa6c7c5), [`bf024cb34`](https://github.com/withastro/astro/commit/bf024cb3429c5929d98378108230bc946a376b17), [`22955b895`](https://github.com/withastro/astro/commit/22955b895ce4343e282355db64b3a5c1415f3944), [`f413446a8`](https://github.com/withastro/astro/commit/f413446a859e497395b3612e44d1540cc6b9dad7), [`90e5f87d0`](https://github.com/withastro/astro/commit/90e5f87d03215a833bb6ac91f9548670a25ce659), [`388190102`](https://github.com/withastro/astro/commit/3881901028cbb586f5a4de1b4953e2d6730458ab), [`035c0c4df`](https://github.com/withastro/astro/commit/035c0c4df2a623bcc2f2a1cb9e490df35fa29adc), [`f112c12b1`](https://github.com/withastro/astro/commit/f112c12b15dfbb278d66699f54809674dd1bded0), [`689884251`](https://github.com/withastro/astro/commit/68988425119255382f94c983796574050006f003), [`fa132e35c`](https://github.com/withastro/astro/commit/fa132e35c23f2cfe368fd0a7239584a2bc5c4f12), [`f5fddafc2`](https://github.com/withastro/astro/commit/f5fddafc248bb1ef57b7349bfecc25539ae2b5ea), [`283734525`](https://github.com/withastro/astro/commit/28373452503bc6ca88221ffd39a5590e015e4d71), [`66858f1f2`](https://github.com/withastro/astro/commit/66858f1f238a0edf6ded2b0f693bc738785d5aa3), [`6c465e958`](https://github.com/withastro/astro/commit/6c465e958e088ff55e5b895e67c64c0dfd4277a6)]:
+  - astro@2.1.4
+
+## 2.1.0
+
+### Minor Changes
+
+- [#6344](https://github.com/withastro/astro/pull/6344) [`694918a56`](https://github.com/withastro/astro/commit/694918a56b01104831296be0c25456135a63c784) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add a new experimental flag (`experimental.assets`) to enable our new core Assets story.
+
+  This unlocks a few features:
+
+  - A new built-in image component and JavaScript API to transform and optimize images.
+  - Relative images with automatic optimization in Markdown.
+  - Support for validating assets using content collections.
+  - and more!
+
+  See [Assets (Experimental)](https://docs.astro.build/en/guides/assets/) on our docs site for more information on how to use this feature!
+
+- [#6213](https://github.com/withastro/astro/pull/6213) [`afbbc4d5b`](https://github.com/withastro/astro/commit/afbbc4d5bfafc1779bac00b41c2a1cb1c90f2808) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Updated compilation settings to disable downlevelling for Node 14
+
+### Patch Changes
+
+- Updated dependencies [[`fec583909`](https://github.com/withastro/astro/commit/fec583909ab62829dc0c1600e2387979365f2b94), [`b087b83fe`](https://github.com/withastro/astro/commit/b087b83fe266c431fe34a07d5c2293cc4ab011c6), [`694918a56`](https://github.com/withastro/astro/commit/694918a56b01104831296be0c25456135a63c784), [`a20610609`](https://github.com/withastro/astro/commit/a20610609863ae3b48afe96819b8f11ae4f414d5), [`a4a74ab70`](https://github.com/withastro/astro/commit/a4a74ab70cd2aa0d812a1f6b202c4e240a8913bf), [`75921b3cd`](https://github.com/withastro/astro/commit/75921b3cd916d439f6392c487c21532fde35ed13), [`afbbc4d5b`](https://github.com/withastro/astro/commit/afbbc4d5bfafc1779bac00b41c2a1cb1c90f2808)]:
+  - astro@2.1.0
+  - @astrojs/prism@2.1.0
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/index.js

@@ -1,7 +1,7 @@
 import { toRemarkInitializeAstroData } from "./frontmatter-injection.js";
 import { loadPlugins } from "./load-plugins.js";
 import { rehypeHeadingIds } from "./rehype-collect-headings.js";
-import toRemarkContentRelImageError from "./remark-content-rel-image-error.js";
+import toRemarkCollectImages from "./remark-collect-images.js";
 import remarkPrism from "./remark-prism.js";
 import scopedStyles from "./remark-scoped-styles.js";
 import remarkShiki from "./remark-shiki.js";
@@ -13,6 +13,7 @@ import markdownToHtml from "remark-rehype";
 import remarkSmartypants from "remark-smartypants";
 import { unified } from "unified";
 import { VFile } from "vfile";
+import { rehypeImages } from "./rehype-images.js";
 import { rehypeHeadingIds as rehypeHeadingIds2 } from "./rehype-collect-headings.js";
 export * from "./types.js";
 const markdownConfigDefaults = {
@@ -28,6 +29,7 @@ const markdownConfigDefaults = {
   gfm: true,
   smartypants: true
 };
+const isPerformanceBenchmark = Boolean(process.env.ASTRO_PERFORMANCE_BENCHMARK);
 async function renderMarkdown(content, opts) {
   var _a;
   let {
@@ -39,32 +41,37 @@ async function renderMarkdown(content, opts) {
     remarkRehype = markdownConfigDefaults.remarkRehype,
     gfm = markdownConfigDefaults.gfm,
     smartypants = markdownConfigDefaults.smartypants,
-    contentDir,
     frontmatter: userFrontmatter = {}
   } = opts;
   const input = new VFile({ value: content, path: fileURL });
   const scopedClassName = (_a = opts.$) == null ? void 0 : _a.scopedClassName;
   let parser = unified().use(markdown).use(toRemarkInitializeAstroData({ userFrontmatter })).use([]);
-  if (gfm) {
-    parser.use(remarkGfm);
-  }
-  if (smartypants) {
-    parser.use(remarkSmartypants);
+  if (!isPerformanceBenchmark && gfm) {
+    if (gfm) {
+      parser.use(remarkGfm);
+    }
+    if (smartypants) {
+      parser.use(remarkSmartypants);
+    }
   }
   const loadedRemarkPlugins = await Promise.all(loadPlugins(remarkPlugins));
   const loadedRehypePlugins = await Promise.all(loadPlugins(rehypePlugins));
   loadedRemarkPlugins.forEach(([plugin, pluginOpts]) => {
     parser.use([[plugin, pluginOpts]]);
   });
-  if (scopedClassName) {
-    parser.use([scopedStyles(scopedClassName)]);
-  }
-  if (syntaxHighlight === "shiki") {
-    parser.use([await remarkShiki(shikiConfig, scopedClassName)]);
-  } else if (syntaxHighlight === "prism") {
-    parser.use([remarkPrism(scopedClassName)]);
+  if (!isPerformanceBenchmark) {
+    if (scopedClassName) {
+      parser.use([scopedStyles(scopedClassName)]);
+    }
+    if (syntaxHighlight === "shiki") {
+      parser.use([await remarkShiki(shikiConfig, scopedClassName)]);
+    } else if (syntaxHighlight === "prism") {
+      parser.use([remarkPrism(scopedClassName)]);
+    }
+    if (opts.experimentalAssets) {
+      parser.use([toRemarkCollectImages(opts.resolveImage)]);
+    }
   }
-  parser.use([toRemarkContentRelImageError({ contentDir })]);
   parser.use([
     [
       markdownToHtml,
@@ -78,7 +85,13 @@ async function renderMarkdown(content, opts) {
   loadedRehypePlugins.forEach(([plugin, pluginOpts]) => {
     parser.use([[plugin, pluginOpts]]);
   });
-  parser.use([rehypeHeadingIds, rehypeRaw]).use(rehypeStringify, { allowDangerousHtml: true });
+  if (opts.experimentalAssets) {
+    parser.use(rehypeImages(await opts.imageService, opts.assetsDir, opts.getImageMetadata));
+  }
+  if (!isPerformanceBenchmark) {
+    parser.use([rehypeHeadingIds]);
+  }
+  parser.use([rehypeRaw]).use(rehypeStringify, { allowDangerousHtml: true });
   let vfile;
   try {
     vfile = await parser.process(input);

package/dist/load-plugins.d.ts

@@ -1,2 +1,2 @@
-import * as unified from 'unified';
+import type * as unified from 'unified';
 export declare function loadPlugins(items: (string | [string, any] | unified.Plugin<any[], any> | [unified.Plugin<any[], any>, any])[]): Promise<[unified.Plugin, any?]>[];

package/dist/rehype-images.d.ts

@@ -0,0 +1,2 @@
+import type { MarkdownVFile } from './types.js';
+export declare function rehypeImages(imageService: any, assetsDir: URL | undefined, getImageMetadata: any): () => (tree: any, file: MarkdownVFile) => void;

package/dist/rehype-images.js

@@ -0,0 +1,71 @@
+import { join as pathJoin } from "node:path";
+import { fileURLToPath } from "node:url";
+import { visit } from "unist-util-visit";
+import { pathToFileURL } from "url";
+function rehypeImages(imageService, assetsDir, getImageMetadata) {
+  return () => function(tree, file) {
+    visit(tree, (node) => {
+      var _a;
+      if (!assetsDir)
+        return;
+      if (node.type !== "element")
+        return;
+      if (node.tagName !== "img")
+        return;
+      if ((_a = node.properties) == null ? void 0 : _a.src) {
+        if (file.dirname) {
+          if (!isRelativePath(node.properties.src) && !isAliasedPath(node.properties.src))
+            return;
+          let fileURL;
+          if (isAliasedPath(node.properties.src)) {
+            fileURL = new URL(stripAliasPath(node.properties.src), assetsDir);
+          } else {
+            fileURL = pathToFileURL(pathJoin(file.dirname, node.properties.src));
+          }
+          const fileData = getImageMetadata(fileURLToPath(fileURL));
+          fileURL.searchParams.append("origWidth", fileData.width.toString());
+          fileURL.searchParams.append("origHeight", fileData.height.toString());
+          fileURL.searchParams.append("origFormat", fileData.type.toString());
+          let options = {
+            src: {
+              src: fileURL,
+              width: fileData.width,
+              height: fileData.height,
+              format: fileData.type
+            },
+            alt: node.properties.alt
+          };
+          const validatedOptions = imageService.validateOptions ? imageService.validateOptions(options) : options;
+          const imageURL = imageService.getURL(validatedOptions);
+          node.properties = Object.assign(node.properties, {
+            src: imageURL,
+            ...imageService.getHTMLAttributes !== void 0 ? imageService.getHTMLAttributes(validatedOptions) : {}
+          });
+        }
+      }
+    });
+  };
+}
+function isAliasedPath(path) {
+  return path.startsWith("~/assets");
+}
+function stripAliasPath(path) {
+  return path.replace("~/assets/", "");
+}
+function isRelativePath(path) {
+  return startsWithDotDotSlash(path) || startsWithDotSlash(path);
+}
+function startsWithDotDotSlash(path) {
+  const c1 = path[0];
+  const c2 = path[1];
+  const c3 = path[2];
+  return c1 === "." && c2 === "." && c3 === "/";
+}
+function startsWithDotSlash(path) {
+  const c1 = path[0];
+  const c2 = path[1];
+  return c1 === "." && c2 === "/";
+}
+export {
+  rehypeImages
+};

package/dist/remark-collect-images.d.ts

@@ -0,0 +1,4 @@
+import type { VFile } from 'vfile';
+type OptionalResolveImage = ((path: string) => Promise<string>) | undefined;
+export default function toRemarkCollectImages(resolveImage: OptionalResolveImage): () => (tree: any, vfile: VFile) => Promise<void>;
+export {};

package/dist/remark-collect-images.js

@@ -0,0 +1,28 @@
+import { visit } from "unist-util-visit";
+function toRemarkCollectImages(resolveImage) {
+  return () => async function(tree, vfile) {
+    if (typeof (vfile == null ? void 0 : vfile.path) !== "string")
+      return;
+    const imagePaths = /* @__PURE__ */ new Set();
+    visit(tree, "image", function raiseError(node) {
+      imagePaths.add(node.url);
+    });
+    if (imagePaths.size === 0) {
+      vfile.data.imagePaths = [];
+      return;
+    } else if (resolveImage) {
+      const mapping = /* @__PURE__ */ new Map();
+      for (const path of Array.from(imagePaths)) {
+        const id = await resolveImage(path);
+        mapping.set(path, id);
+      }
+      visit(tree, "image", function raiseError(node) {
+        node.url = mapping.get(node.url);
+      });
+    }
+    vfile.data.imagePaths = Array.from(imagePaths);
+  };
+}
+export {
+  toRemarkCollectImages as default
+};

package/dist/remark-prism.d.ts

@@ -1,3 +1,3 @@
-declare type MaybeString = string | null | undefined;
+type MaybeString = string | null | undefined;
 declare function plugin(className: MaybeString): () => (tree: any) => void;
 export default plugin;

package/dist/types.d.ts

@@ -5,14 +5,14 @@ import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
 import type * as unified from 'unified';
 import type { VFile } from 'vfile';
 export type { Node } from 'unist';
-export declare type MarkdownAstroData = {
+export type MarkdownAstroData = {
     frontmatter: Record<string, any>;
 };
-export declare type RemarkPlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, mdast.Root>;
-export declare type RemarkPlugins = (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
-export declare type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, hast.Root>;
-export declare type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
-export declare type RemarkRehype = Omit<RemarkRehypeOptions, 'handlers' | 'unknownHandler'> & {
+export type RemarkPlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, mdast.Root>;
+export type RemarkPlugins = (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
+export type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, hast.Root>;
+export type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
+export type RemarkRehype = Omit<RemarkRehypeOptions, 'handlers' | 'unknownHandler'> & {
     handlers?: typeof Handlers;
     handler?: typeof Handler;
 };
@@ -31,6 +31,12 @@ export interface AstroMarkdownOptions {
     gfm?: boolean;
     smartypants?: boolean;
 }
+export interface ImageMetadata {
+    src: string;
+    width: number;
+    height: number;
+    type: string;
+}
 export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     /** @internal */
     fileURL?: URL;
@@ -38,10 +44,13 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     $?: {
         scopedClassName: string | null;
     };
-    /** Used to prevent relative image imports from `src/content/` */
-    contentDir: URL;
     /** Used for frontmatter injection plugins */
     frontmatter?: Record<string, any>;
+    experimentalAssets?: boolean;
+    imageService?: any;
+    assetsDir?: URL;
+    resolveImage?: (path: string) => Promise<string>;
+    getImageMetadata?: any;
 }
 export interface MarkdownHeading {
     depth: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -17,10 +17,10 @@
     "./dist/internal.js": "./dist/internal.js"
   },
   "peerDependencies": {
-    "astro": "^2.0.2"
+    "astro": "^2.1.4"
   },
   "dependencies": {
-    "@astrojs/prism": "^2.0.0",
+    "@astrojs/prism": "^2.1.0",
     "github-slugger": "^1.4.0",
     "import-meta-resolve": "^2.1.0",
     "rehype-raw": "^6.1.1",
@@ -42,7 +42,7 @@
     "@types/mdast": "^3.0.10",
     "@types/mocha": "^9.1.1",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.10",
+    "astro-scripts": "0.0.14",
     "chai": "^4.3.6",
     "mdast-util-mdx-expression": "^1.3.1",
     "mocha": "^9.2.2"

package/src/index.ts

@@ -8,7 +8,7 @@ import type {
 import { toRemarkInitializeAstroData } from './frontmatter-injection.js';
 import { loadPlugins } from './load-plugins.js';
 import { rehypeHeadingIds } from './rehype-collect-headings.js';
-import toRemarkContentRelImageError from './remark-content-rel-image-error.js';
+import toRemarkCollectImages from './remark-collect-images.js';
 import remarkPrism from './remark-prism.js';
 import scopedStyles from './remark-scoped-styles.js';
 import remarkShiki from './remark-shiki.js';
@@ -21,6 +21,7 @@ import markdownToHtml from 'remark-rehype';
 import remarkSmartypants from 'remark-smartypants';
 import { unified } from 'unified';
 import { VFile } from 'vfile';
+import { rehypeImages } from './rehype-images.js';
 
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
 export * from './types.js';
@@ -39,6 +40,9 @@ export const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'draft
 	smartypants: true,
 };
 
+// Skip nonessential plugins during performance benchmark runs
+const isPerformanceBenchmark = Boolean(process.env.ASTRO_PERFORMANCE_BENCHMARK);
+
 /** Shared utility for rendering markdown */
 export async function renderMarkdown(
 	content: string,
@@ -53,7 +57,6 @@ export async function renderMarkdown(
 		remarkRehype = markdownConfigDefaults.remarkRehype,
 		gfm = markdownConfigDefaults.gfm,
 		smartypants = markdownConfigDefaults.smartypants,
-		contentDir,
 		frontmatter: userFrontmatter = {},
 	} = opts;
 	const input = new VFile({ value: content, path: fileURL });
@@ -64,12 +67,13 @@ export async function renderMarkdown(
 		.use(toRemarkInitializeAstroData({ userFrontmatter }))
 		.use([]);
 
-	if (gfm) {
-		parser.use(remarkGfm);
-	}
-
-	if (smartypants) {
-		parser.use(remarkSmartypants);
+	if (!isPerformanceBenchmark && gfm) {
+		if (gfm) {
+			parser.use(remarkGfm);
+		}
+		if (smartypants) {
+			parser.use(remarkSmartypants);
+		}
 	}
 
 	const loadedRemarkPlugins = await Promise.all(loadPlugins(remarkPlugins));
@@ -79,18 +83,22 @@ export async function renderMarkdown(
 		parser.use([[plugin, pluginOpts]]);
 	});
 
-	if (scopedClassName) {
-		parser.use([scopedStyles(scopedClassName)]);
-	}
+	if (!isPerformanceBenchmark) {
+		if (scopedClassName) {
+			parser.use([scopedStyles(scopedClassName)]);
+		}
 
-	if (syntaxHighlight === 'shiki') {
-		parser.use([await remarkShiki(shikiConfig, scopedClassName)]);
-	} else if (syntaxHighlight === 'prism') {
-		parser.use([remarkPrism(scopedClassName)]);
-	}
+		if (syntaxHighlight === 'shiki') {
+			parser.use([await remarkShiki(shikiConfig, scopedClassName)]);
+		} else if (syntaxHighlight === 'prism') {
+			parser.use([remarkPrism(scopedClassName)]);
+		}
 
-	// Apply later in case user plugins resolve relative image paths
-	parser.use([toRemarkContentRelImageError({ contentDir })]);
+		if (opts.experimentalAssets) {
+			// Apply later in case user plugins resolve relative image paths
+			parser.use([toRemarkCollectImages(opts.resolveImage)]);
+		}
+	}
 
 	parser.use([
 		[
@@ -107,7 +115,14 @@ export async function renderMarkdown(
 		parser.use([[plugin, pluginOpts]]);
 	});
 
-	parser.use([rehypeHeadingIds, rehypeRaw]).use(rehypeStringify, { allowDangerousHtml: true });
+	if (opts.experimentalAssets) {
+		parser.use(rehypeImages(await opts.imageService, opts.assetsDir, opts.getImageMetadata));
+	}
+	if (!isPerformanceBenchmark) {
+		parser.use([rehypeHeadingIds]);
+	}
+
+	parser.use([rehypeRaw]).use(rehypeStringify, { allowDangerousHtml: true });
 
 	let vfile: MarkdownVFile;
 	try {
@@ -144,7 +159,7 @@ function prefixError(err: any, prefix: string) {
 	const wrappedError = new Error(`${prefix}${err ? `: ${err}` : ''}`);
 	try {
 		wrappedError.stack = err.stack;
-		// @ts-ignore
+		// @ts-expect-error
 		wrappedError.cause = err;
 	} catch (error) {
 		// It's ok if we could not set the stack or cause - the message is the most important part

package/src/load-plugins.ts

@@ -1,6 +1,6 @@
 import { resolve as importMetaResolve } from 'import-meta-resolve';
 import path from 'path';
-import * as unified from 'unified';
+import type * as unified from 'unified';
 import { pathToFileURL } from 'url';
 
 const cwdUrlStr = pathToFileURL(path.join(process.cwd(), 'package.json')).toString();

package/src/rehype-collect-headings.ts

@@ -1,7 +1,8 @@
-import { type Expression, type Super } from 'estree';
+import type { Expression, Super } from 'estree';
 import Slugger from 'github-slugger';
-import { type MdxTextExpression } from 'mdast-util-mdx-expression';
-import { visit, type Node } from 'unist-util-visit';
+import type { MdxTextExpression } from 'mdast-util-mdx-expression';
+import type { Node } from 'unist';
+import { visit } from 'unist-util-visit';
 
 import { InvalidAstroDataError, safelyGetAstroData } from './frontmatter-injection.js';
 import type { MarkdownAstroData, MarkdownHeading, MarkdownVFile, RehypePlugin } from './types.js';

package/src/rehype-images.ts

@@ -0,0 +1,81 @@
+import { join as pathJoin } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { visit } from 'unist-util-visit';
+import { pathToFileURL } from 'url';
+import type { ImageMetadata, MarkdownVFile } from './types.js';
+
+export function rehypeImages(imageService: any, assetsDir: URL | undefined, getImageMetadata: any) {
+	return () =>
+		function (tree: any, file: MarkdownVFile) {
+			visit(tree, (node) => {
+				if (!assetsDir) return;
+				if (node.type !== 'element') return;
+				if (node.tagName !== 'img') return;
+
+				if (node.properties?.src) {
+					if (file.dirname) {
+						if (!isRelativePath(node.properties.src) && !isAliasedPath(node.properties.src)) return;
+
+						let fileURL: URL;
+						if (isAliasedPath(node.properties.src)) {
+							fileURL = new URL(stripAliasPath(node.properties.src), assetsDir);
+						} else {
+							fileURL = pathToFileURL(pathJoin(file.dirname, node.properties.src));
+						}
+
+						const fileData = getImageMetadata!(fileURLToPath(fileURL)) as ImageMetadata;
+						fileURL.searchParams.append('origWidth', fileData.width.toString());
+						fileURL.searchParams.append('origHeight', fileData.height.toString());
+						fileURL.searchParams.append('origFormat', fileData.type.toString());
+
+						let options = {
+							src: {
+								src: fileURL,
+								width: fileData.width,
+								height: fileData.height,
+								format: fileData.type,
+							},
+							alt: node.properties.alt,
+						};
+
+						const validatedOptions = imageService.validateOptions
+							? imageService.validateOptions(options)
+							: options;
+
+						const imageURL = imageService.getURL(validatedOptions);
+						node.properties = Object.assign(node.properties, {
+							src: imageURL,
+							...(imageService.getHTMLAttributes !== undefined
+								? imageService.getHTMLAttributes(validatedOptions)
+								: {}),
+						});
+					}
+				}
+			});
+		};
+}
+
+function isAliasedPath(path: string) {
+	return path.startsWith('~/assets');
+}
+
+function stripAliasPath(path: string) {
+	return path.replace('~/assets/', '');
+}
+
+function isRelativePath(path: string) {
+	return startsWithDotDotSlash(path) || startsWithDotSlash(path);
+}
+
+function startsWithDotDotSlash(path: string) {
+	const c1 = path[0];
+	const c2 = path[1];
+	const c3 = path[2];
+	return c1 === '.' && c2 === '.' && c3 === '/';
+}
+
+function startsWithDotSlash(path: string) {
+	const c1 = path[0];
+	const c2 = path[1];
+	return c1 === '.' && c2 === '/';
+}

package/src/remark-collect-images.ts

@@ -0,0 +1,32 @@
+import type { Image } from 'mdast';
+import { visit } from 'unist-util-visit';
+import type { VFile } from 'vfile';
+
+type OptionalResolveImage = ((path: string) => Promise<string>) | undefined;
+
+export default function toRemarkCollectImages(resolveImage: OptionalResolveImage) {
+	return () =>
+		async function (tree: any, vfile: VFile) {
+			if (typeof vfile?.path !== 'string') return;
+
+			const imagePaths = new Set<string>();
+			visit(tree, 'image', function raiseError(node: Image) {
+				imagePaths.add(node.url);
+			});
+			if (imagePaths.size === 0) {
+				vfile.data.imagePaths = [];
+				return;
+			} else if (resolveImage) {
+				const mapping = new Map<string, string>();
+				for (const path of Array.from(imagePaths)) {
+					const id = await resolveImage(path);
+					mapping.set(path, id);
+				}
+				visit(tree, 'image', function raiseError(node: Image) {
+					node.url = mapping.get(node.url)!;
+				});
+			}
+
+			vfile.data.imagePaths = Array.from(imagePaths);
+		};
+}

package/src/types.ts

@@ -51,6 +51,13 @@ export interface AstroMarkdownOptions {
 	smartypants?: boolean;
 }
 
+export interface ImageMetadata {
+	src: string;
+	width: number;
+	height: number;
+	type: string;
+}
+
 export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
 	/** @internal */
 	fileURL?: URL;
@@ -58,10 +65,13 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
 	$?: {
 		scopedClassName: string | null;
 	};
-	/** Used to prevent relative image imports from `src/content/` */
-	contentDir: URL;
 	/** Used for frontmatter injection plugins */
 	frontmatter?: Record<string, any>;
+	experimentalAssets?: boolean;
+	imageService?: any;
+	assetsDir?: URL;
+	resolveImage?: (path: string) => Promise<string>;
+	getImageMetadata?: any;
 }
 
 export interface MarkdownHeading {

package/tsconfig.json

@@ -3,8 +3,8 @@
   "include": ["src"],
   "compilerOptions": {
     "allowJs": true,
-    "target": "ES2020",
-    "module": "ES2020",
+    "target": "ES2021",
+    "module": "ES2022",
     "outDir": "./dist"
   }
 }

package/dist/remark-content-rel-image-error.d.ts

@@ -1,8 +0,0 @@
-import type { VFile } from 'vfile';
-/**
- * `src/content/` does not support relative image paths.
- * This plugin throws an error if any are found
- */
-export default function toRemarkContentRelImageError({ contentDir }: {
-    contentDir: URL;
-}): () => (tree: any, vfile: VFile) => void;

package/dist/remark-content-rel-image-error.js

@@ -1,41 +0,0 @@
-import { visit } from "unist-util-visit";
-import { pathToFileURL } from "url";
-function toRemarkContentRelImageError({ contentDir }) {
-  return function remarkContentRelImageError() {
-    return (tree, vfile) => {
-      if (typeof (vfile == null ? void 0 : vfile.path) !== "string")
-        return;
-      const isContentFile = pathToFileURL(vfile.path).href.startsWith(contentDir.href);
-      if (!isContentFile)
-        return;
-      const relImagePaths = /* @__PURE__ */ new Set();
-      visit(tree, "image", function raiseError(node) {
-        if (isRelativePath(node.url)) {
-          relImagePaths.add(node.url);
-        }
-      });
-      if (relImagePaths.size === 0)
-        return;
-      const errorMessage = `Relative image paths are not supported in the content/ directory. Place local images in the public/ directory and use absolute paths (see https://docs.astro.build/en/guides/images/#in-markdown-files)
-` + [...relImagePaths].map((path) => JSON.stringify(path)).join(",\n");
-      throw errorMessage;
-    };
-  };
-}
-function isRelativePath(path) {
-  return startsWithDotDotSlash(path) || startsWithDotSlash(path);
-}
-function startsWithDotDotSlash(path) {
-  const c1 = path[0];
-  const c2 = path[1];
-  const c3 = path[2];
-  return c1 === "." && c2 === "." && c3 === "/";
-}
-function startsWithDotSlash(path) {
-  const c1 = path[0];
-  const c2 = path[1];
-  return c1 === "." && c2 === "/";
-}
-export {
-  toRemarkContentRelImageError as default
-};

package/src/remark-content-rel-image-error.ts

@@ -1,53 +0,0 @@
-import type { Image } from 'mdast';
-import { visit } from 'unist-util-visit';
-import { pathToFileURL } from 'url';
-import type { VFile } from 'vfile';
-
-/**
- * `src/content/` does not support relative image paths.
- * This plugin throws an error if any are found
- */
-export default function toRemarkContentRelImageError({ contentDir }: { contentDir: URL }) {
-	return function remarkContentRelImageError() {
-		return (tree: any, vfile: VFile) => {
-			if (typeof vfile?.path !== 'string') return;
-
-			const isContentFile = pathToFileURL(vfile.path).href.startsWith(contentDir.href);
-			if (!isContentFile) return;
-
-			const relImagePaths = new Set<string>();
-			visit(tree, 'image', function raiseError(node: Image) {
-				if (isRelativePath(node.url)) {
-					relImagePaths.add(node.url);
-				}
-			});
-			if (relImagePaths.size === 0) return;
-
-			const errorMessage =
-				`Relative image paths are not supported in the content/ directory. Place local images in the public/ directory and use absolute paths (see https://docs.astro.build/en/guides/images/#in-markdown-files)\n` +
-				[...relImagePaths].map((path) => JSON.stringify(path)).join(',\n');
-
-			// Throw raw string to use `astro:markdown` default formatting
-			throw errorMessage;
-		};
-	};
-}
-
-// Following utils taken from `packages/astro/src/core/path.ts`:
-
-function isRelativePath(path: string) {
-	return startsWithDotDotSlash(path) || startsWithDotSlash(path);
-}
-
-function startsWithDotDotSlash(path: string) {
-	const c1 = path[0];
-	const c2 = path[1];
-	const c3 = path[2];
-	return c1 === '.' && c2 === '.' && c3 === '/';
-}
-
-function startsWithDotSlash(path: string) {
-	const c1 = path[0];
-	const c2 = path[1];
-	return c1 === '.' && c2 === '/';
-}