@astrojs/markdown-remark 2.1.2 → 2.1.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/markdown-remark:build: cache hit, replaying output 56144f20e07435ef
+@astrojs/markdown-remark:build: cache hit, replaying output 8b8e166000163d0b
 @astrojs/markdown-remark:build: 
-@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.1.2 build /home/runner/work/astro/astro/packages/markdown/remark
+@astrojs/markdown-remark:build: > @astrojs/markdown-remark@2.1.4 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,23 @@
 # @astrojs/markdown-remark
 
+## 2.1.4
+
+### Patch Changes
+
+- [#6824](https://github.com/withastro/astro/pull/6824) [`2511d58d5`](https://github.com/withastro/astro/commit/2511d58d586af080a78e5ef8a63020b3e17770db) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add support for using optimized and relative images in MDX files with `experimental.assets`
+
+- Updated dependencies [[`8539eb164`](https://github.com/withastro/astro/commit/8539eb1643864ae7e0f5a080915cd75535f7101b), [`a9c22994e`](https://github.com/withastro/astro/commit/a9c22994e41f92a586d8946988d29e3c62148778), [`948a6d7be`](https://github.com/withastro/astro/commit/948a6d7be0c76fd1dd8550270bd29821075f799c)]:
+  - astro@2.3.0
+
+## 2.1.3
+
+### Patch Changes
+
+- [#6744](https://github.com/withastro/astro/pull/6744) [`a1a4f45b5`](https://github.com/withastro/astro/commit/a1a4f45b51a80215fa7598da83bd0d9c5acd20d2) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix remote images in Markdown throwing errors when using `experimental.assets`
+
+- Updated dependencies [[`489dd8d69`](https://github.com/withastro/astro/commit/489dd8d69cdd9d7c243cf8bec96051a914984b9c), [`a1a4f45b5`](https://github.com/withastro/astro/commit/a1a4f45b51a80215fa7598da83bd0d9c5acd20d2), [`a1108e037`](https://github.com/withastro/astro/commit/a1108e037115cdb67d03505286c7d3a4fc2a1ff5), [`8b88e4cf1`](https://github.com/withastro/astro/commit/8b88e4cf15c8bea7942b3985380164e0edf7250b), [`d54cbe413`](https://github.com/withastro/astro/commit/d54cbe41349e55f8544212ad9320705f07325920), [`4c347ab51`](https://github.com/withastro/astro/commit/4c347ab51e46f2319d614f8577fe502e3dc816e2), [`ff0430786`](https://github.com/withastro/astro/commit/ff043078630e678348ae4f4757b3015b3b862c16), [`2f2e572e9`](https://github.com/withastro/astro/commit/2f2e572e937fd25451bbc78a05d55b7caa1ca3ec), [`7116c021a`](https://github.com/withastro/astro/commit/7116c021a39eac15a6e1264dfbd11bef0f5d618a)]:
+  - astro@2.2.0
+
 ## 2.1.2
 
 ### Patch Changes

package/dist/frontmatter-injection.d.ts

@@ -1,4 +1,4 @@
-import type { Data, VFile } from 'vfile';
+import type { VFile, VFileData as Data } from 'vfile';
 import type { MarkdownAstroData } from './types.js';
 export declare class InvalidAstroDataError extends TypeError {
 }

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import type { AstroMarkdownOptions, MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
+export { remarkCollectImages } from './remark-collect-images.js';
 export * from './types.js';
 export declare const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'drafts'>;
 /** Shared utility for rendering markdown */

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 toRemarkCollectImages from "./remark-collect-images.js";
+import { remarkCollectImages } from "./remark-collect-images.js";
 import remarkPrism from "./remark-prism.js";
 import scopedStyles from "./remark-scoped-styles.js";
 import remarkShiki from "./remark-shiki.js";
@@ -15,6 +15,7 @@ import { unified } from "unified";
 import { VFile } from "vfile";
 import { rehypeImages } from "./rehype-images.js";
 import { rehypeHeadingIds as rehypeHeadingIds2 } from "./rehype-collect-headings.js";
+import { remarkCollectImages as remarkCollectImages2 } from "./remark-collect-images.js";
 export * from "./types.js";
 const markdownConfigDefaults = {
   syntaxHighlight: "shiki",
@@ -69,7 +70,7 @@ async function renderMarkdown(content, opts) {
       parser.use([remarkPrism(scopedClassName)]);
     }
     if (opts.experimentalAssets) {
-      parser.use([toRemarkCollectImages()]);
+      parser.use([remarkCollectImages]);
     }
   }
   parser.use([
@@ -127,5 +128,6 @@ ${err.message}`;
 export {
   markdownConfigDefaults,
   rehypeHeadingIds2 as rehypeHeadingIds,
+  remarkCollectImages2 as remarkCollectImages,
   renderMarkdown
 };

package/dist/rehype-images.js

@@ -2,15 +2,13 @@ import { visit } from "unist-util-visit";
 function rehypeImages() {
   return () => function(tree, file) {
     visit(tree, (node) => {
-      var _a;
+      var _a, _b;
       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;
+        if ((_b = file.data.imagePaths) == null ? void 0 : _b.has(node.properties.src)) {
           node.properties["__ASTRO_IMAGE_"] = node.properties.src;
           delete node.properties.src;
         }
@@ -18,23 +16,6 @@ function rehypeImages() {
     });
   };
 }
-function isAliasedPath(path) {
-  return path.startsWith("~/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

@@ -1,2 +1,2 @@
-import type { VFile } from 'vfile';
-export default function toRemarkCollectImages(): () => (tree: any, vfile: VFile) => Promise<void>;
+import type { MarkdownVFile } from './types';
+export declare function remarkCollectImages(): (tree: any, vfile: MarkdownVFile) => void;

package/dist/remark-collect-images.js

@@ -1,15 +1,27 @@
 import { visit } from "unist-util-visit";
-function toRemarkCollectImages() {
-  return () => async function(tree, vfile) {
+function remarkCollectImages() {
+  return 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);
+    visit(tree, "image", (node) => {
+      if (shouldOptimizeImage(node.url))
+        imagePaths.add(node.url);
     });
-    vfile.data.imagePaths = Array.from(imagePaths);
+    vfile.data.imagePaths = imagePaths;
   };
 }
+function shouldOptimizeImage(src) {
+  return !isValidUrl(src) && !src.startsWith("/");
+}
+function isValidUrl(str) {
+  try {
+    new URL(str);
+    return true;
+  } catch {
+    return false;
+  }
+}
 export {
-  toRemarkCollectImages as default
+  remarkCollectImages
 };

package/dist/types.d.ts

@@ -61,10 +61,11 @@ export interface MarkdownMetadata {
 export interface MarkdownVFile extends VFile {
     data: {
         __astroHeadings?: MarkdownHeading[];
+        imagePaths?: Set<string>;
     };
 }
 export interface MarkdownRenderingResult {
     metadata: MarkdownMetadata;
-    vfile: VFile;
+    vfile: MarkdownVFile;
     code: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -17,7 +17,7 @@
     "./dist/internal.js": "./dist/internal.js"
   },
   "peerDependencies": {
-    "astro": "^2.1.5"
+    "astro": "^2.3.0"
   },
   "dependencies": {
     "@astrojs/prism": "^2.1.0",
@@ -42,10 +42,10 @@
     "@types/mdast": "^3.0.10",
     "@types/mocha": "^9.1.1",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.14",
     "chai": "^4.3.6",
     "mdast-util-mdx-expression": "^1.3.1",
-    "mocha": "^9.2.2"
+    "mocha": "^9.2.2",
+    "astro-scripts": "0.0.14"
   },
   "scripts": {
     "prepublish": "pnpm build",

package/src/frontmatter-injection.ts

@@ -1,4 +1,4 @@
-import type { Data, VFile } from 'vfile';
+import type { VFile, VFileData as Data } from 'vfile';
 import type { MarkdownAstroData } from './types.js';
 
 function isValidAstroData(obj: unknown): obj is MarkdownAstroData {

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 toRemarkCollectImages from './remark-collect-images.js';
+import { remarkCollectImages } from './remark-collect-images.js';
 import remarkPrism from './remark-prism.js';
 import scopedStyles from './remark-scoped-styles.js';
 import remarkShiki from './remark-shiki.js';
@@ -24,6 +24,7 @@ import { VFile } from 'vfile';
 import { rehypeImages } from './rehype-images.js';
 
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
+export { remarkCollectImages } from './remark-collect-images.js';
 export * from './types.js';
 
 export const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'drafts'> = {
@@ -96,7 +97,7 @@ export async function renderMarkdown(
 
 		if (opts.experimentalAssets) {
 			// Apply later in case user plugins resolve relative image paths
-			parser.use([toRemarkCollectImages()]);
+			parser.use([remarkCollectImages]);
 		}
 	}
 

package/src/rehype-images.ts

@@ -9,9 +9,7 @@ export function rehypeImages() {
 				if (node.tagName !== 'img') return;
 
 				if (node.properties?.src) {
-					if (file.dirname) {
-						if (!isRelativePath(node.properties.src) && !isAliasedPath(node.properties.src)) return;
-
+					if (file.data.imagePaths?.has(node.properties.src)) {
 						node.properties['__ASTRO_IMAGE_'] = node.properties.src;
 						delete node.properties.src;
 					}
@@ -19,24 +17,3 @@ export function rehypeImages() {
 			});
 		};
 }
-
-function isAliasedPath(path: string) {
-	return path.startsWith('~/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

@@ -1,17 +1,30 @@
 import type { Image } from 'mdast';
 import { visit } from 'unist-util-visit';
-import type { VFile } from 'vfile';
+import type { MarkdownVFile } from './types';
 
-export default function toRemarkCollectImages() {
-	return () =>
-		async function (tree: any, vfile: VFile) {
-			if (typeof vfile?.path !== 'string') return;
+export function remarkCollectImages() {
+	return function (tree: any, vfile: MarkdownVFile) {
+		if (typeof vfile?.path !== 'string') return;
 
-			const imagePaths = new Set<string>();
-			visit(tree, 'image', function raiseError(node: Image) {
-				imagePaths.add(node.url);
-			});
+		const imagePaths = new Set<string>();
+		visit(tree, 'image', (node: Image) => {
+			if (shouldOptimizeImage(node.url)) imagePaths.add(node.url);
+		});
 
-			vfile.data.imagePaths = Array.from(imagePaths);
-		};
+		vfile.data.imagePaths = imagePaths;
+	};
+}
+
+function shouldOptimizeImage(src: string) {
+	// Optimize anything that is NOT external or an absolute path to `public/`
+	return !isValidUrl(src) && !src.startsWith('/');
+}
+
+function isValidUrl(str: string): boolean {
+	try {
+		new URL(str);
+		return true;
+	} catch {
+		return false;
+	}
 }

package/src/types.ts

@@ -85,11 +85,12 @@ export interface MarkdownMetadata {
 export interface MarkdownVFile extends VFile {
 	data: {
 		__astroHeadings?: MarkdownHeading[];
+		imagePaths?: Set<string>;
 	};
 }
 
 export interface MarkdownRenderingResult {
 	metadata: MarkdownMetadata;
-	vfile: VFile;
+	vfile: MarkdownVFile;
 	code: string;
 }