astro 3.1.1 → 3.1.2

package/dist/vite-plugin-config-alias/index.js

@@ -37,7 +37,8 @@ function configAliasVitePlugin({
     return null;
   const plugin = {
     name: "astro:tsconfig-alias",
-    enforce: "pre",
+    // use post to only resolve ids that all other plugins before it can't
+    enforce: "post",
     configResolved(config) {
       patchCreateResolver(config, plugin);
     },
@@ -56,7 +57,7 @@ function configAliasVitePlugin({
   };
   return plugin;
 }
-function patchCreateResolver(config, prePlugin) {
+function patchCreateResolver(config, postPlugin) {
   const _createResolver = config.createResolver;
   config.createResolver = function(...args1) {
     const resolver = _createResolver.apply(config, args1);
@@ -75,14 +76,16 @@ function patchCreateResolver(config, prePlugin) {
         isEntry: false,
         ssr
       };
-      const resolved = await prePlugin.resolveId.apply(fakePluginContext, [
+      const result = await resolver.apply(_createResolver, args2);
+      if (result)
+        return result;
+      const resolved = await postPlugin.resolveId.apply(fakePluginContext, [
         id,
         importer,
         fakeResolveIdOpts
       ]);
       if (resolved)
         return resolved;
-      return resolver.apply(_createResolver, args2);
     };
   };
 }

package/dist/vite-plugin-markdown/index.js

@@ -8,7 +8,8 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.js";
-import { isMarkdownFile, rootRelativePath } from "../core/util.js";
+import { isMarkdownFile } from "../core/util.js";
+import { shorthash } from "../runtime/server/shorthash.js";
 import { escapeViteEnvReferences, getFileInfo } from "../vite-plugin-utils/index.js";
 function safeMatter(source, id) {
   try {
@@ -71,7 +72,8 @@ function markdown({ settings, logger }) {
         for (const imagePath of rawImagePaths.values()) {
           imagePaths.push({
             raw: imagePath,
-            resolved: (await this.resolve(imagePath, id))?.id ?? path.join(path.dirname(id), imagePath)
+            resolved: (await this.resolve(imagePath, id))?.id ?? path.join(path.dirname(id), imagePath),
+            safeName: shorthash(imagePath)
           });
         }
         const { layout } = frontmatter;
@@ -89,36 +91,26 @@ function markdown({ settings, logger }) {
 
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 				import { getImage } from "astro:assets";
+				${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`)}
 
-				export const images = {
-					${imagePaths.map(
-          (entry) => `'${entry.raw}': await getImageSafely((await import("${entry.raw}")).default, "${entry.raw}", "${rootRelativePath(settings.config.root, entry.resolved)}")`
-        )}
-				}
-
-				async function getImageSafely(imageSrc, imagePath, resolvedImagePath) {
-					if (!imageSrc) {
-						throw new AstroError({
-							...AstroErrorData.MarkdownImageNotFound,
-							message: AstroErrorData.MarkdownImageNotFound.message(
-								imagePath,
-								resolvedImagePath
-							),
-							location: { file: "${id}" },
-						});
+				const images = async function() {
+					return {
+						${imagePaths.map((entry) => `"${entry.raw}": await getImage({src: Astro__${entry.safeName}})`).join("\n")}
 					}
-
-					return await getImage({src: imageSrc})
 				}
 
-				function updateImageReferences(html) {
-					return html.replaceAll(
-						/__ASTRO_IMAGE_="([^"]+)"/gm,
-						(full, imagePath) => spreadAttributes({src: images[imagePath].src, ...images[imagePath].attributes})
-					);
+				async function updateImageReferences(html) {
+					return images().then((images) => {
+						return html.replaceAll(/__ASTRO_IMAGE_="([^"]+)"/gm, (full, imagePath) =>
+							spreadAttributes({
+								src: images[imagePath].src,
+								...images[imagePath].attributes,
+							})
+						);
+					});
 				}
 
-				const html = updateImageReferences(${JSON.stringify(html)});
+				const html = await updateImageReferences(${JSON.stringify(html)});
 
 				export const frontmatter = ${JSON.stringify(frontmatter)};
 				export const file = ${JSON.stringify(fileId)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -161,7 +161,7 @@
     "zod": "3.21.1",
     "@astrojs/internal-helpers": "0.2.0",
     "@astrojs/markdown-remark": "3.2.0",
-    "@astrojs/telemetry": "3.0.1"
+    "@astrojs/telemetry": "3.0.2"
   },
   "optionalDependencies": {
     "sharp": "^0.32.5"