astro 4.6.2 → 4.6.4

package/dist/vite-plugin-markdown/images.d.ts

@@ -1,6 +1,5 @@
 export type MarkdownImagePath = {
     raw: string;
-    resolved: string;
     safeName: string;
 };
 export declare function getMarkdownCodeForImages(imagePaths: MarkdownImagePath[], html: string): string;

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

@@ -1,10 +1,7 @@
 function getMarkdownCodeForImages(imagePaths, html) {
   return `
 			import { getImage } from "astro:assets";
-			${imagePaths.map((entry) => {
-    const prefix = entry.raw.includes("/") ? "" : "./";
-    return `import Astro__${entry.safeName} from ${JSON.stringify(prefix + entry.raw)};`;
-  }).join("\n")}
+			${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
 
 			const images = async function(html) {
 					const imageSources = {};

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

@@ -1,5 +1,4 @@
 import fs from "node:fs";
-import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import {
   InvalidAstroDataError,
@@ -29,6 +28,14 @@ function markdown({ settings, logger }) {
     buildEnd() {
       processor = void 0;
     },
+    async resolveId(source, importer, options) {
+      if (importer?.endsWith(".md") && source[0] !== "/") {
+        let resolved = await this.resolve(source, importer, options);
+        if (!resolved)
+          resolved = await this.resolve("./" + source, importer, options);
+        return resolved;
+      }
+    },
     // Why not the "transform" hook instead of "load" + readFile?
     // A: Vite transforms all "import.meta.env" references to their values before
     // passing to the transform hook. This lets us get the truly raw value
@@ -60,7 +67,6 @@ 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),
             safeName: shorthash(imagePath)
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.6.2",
+  "version": "4.6.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -103,65 +103,65 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.7.1",
-    "@babel/core": "^7.24.3",
-    "@babel/generator": "^7.23.3",
-    "@babel/parser": "^7.23.3",
-    "@babel/plugin-transform-react-jsx": "^7.22.5",
-    "@babel/traverse": "^7.23.3",
-    "@babel/types": "^7.23.3",
-    "@types/babel__core": "^7.20.4",
-    "@types/cookie": "^0.5.4",
-    "acorn": "^8.11.2",
+    "@babel/core": "^7.24.4",
+    "@babel/generator": "^7.24.4",
+    "@babel/parser": "^7.24.4",
+    "@babel/plugin-transform-react-jsx": "^7.23.4",
+    "@babel/traverse": "^7.24.1",
+    "@babel/types": "^7.24.0",
+    "@types/babel__core": "^7.20.5",
+    "@types/cookie": "^0.6.0",
+    "acorn": "^8.11.3",
     "aria-query": "^5.3.0",
     "axobject-query": "^4.0.0",
     "boxen": "^7.1.1",
-    "chokidar": "^3.5.3",
+    "chokidar": "^3.6.0",
     "ci-info": "^4.0.0",
-    "clsx": "^2.0.0",
+    "clsx": "^2.1.0",
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.6.0",
     "cssesc": "^3.0.0",
     "debug": "^4.3.4",
-    "deterministic-object-hash": "^2.0.1",
-    "devalue": "^4.3.2",
-    "diff": "^5.1.0",
+    "deterministic-object-hash": "^2.0.2",
+    "devalue": "^5.0.0",
+    "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.3",
-    "es-module-lexer": "^1.4.1",
-    "esbuild": "^0.19.6",
+    "es-module-lexer": "^1.5.0",
+    "esbuild": "^0.20.2",
     "estree-walker": "^3.0.3",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "flattie": "^1.1.0",
+    "flattie": "^1.1.1",
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
     "html-escaper": "^3.0.3",
     "http-cache-semantics": "^4.1.1",
     "js-yaml": "^4.1.0",
-    "kleur": "^4.1.4",
-    "magic-string": "^0.30.3",
-    "mime": "^3.0.0",
-    "ora": "^7.0.1",
+    "kleur": "^4.1.5",
+    "magic-string": "^0.30.10",
+    "mrmime": "^2.0.0",
+    "ora": "^8.0.1",
     "p-limit": "^5.0.0",
     "p-queue": "^8.0.1",
-    "path-to-regexp": "^6.2.1",
-    "preferred-pm": "^3.1.2",
+    "path-to-regexp": "^6.2.2",
+    "preferred-pm": "^3.1.3",
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
-    "resolve": "^1.22.4",
-    "semver": "^7.5.4",
-    "shiki": "^1.1.2",
-    "string-width": "^7.0.0",
+    "resolve": "^1.22.8",
+    "semver": "^7.6.0",
+    "shiki": "^1.3.0",
+    "string-width": "^7.1.0",
     "strip-ansi": "^7.1.0",
-    "tsconfck": "^3.0.0",
+    "tsconfck": "^3.0.3",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.1.4",
+    "vite": "^5.2.10",
     "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
-    "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.22.4",
+    "zod": "^3.23.0",
+    "zod-to-json-schema": "^3.22.5",
     "@astrojs/internal-helpers": "0.4.0",
     "@astrojs/markdown-remark": "5.1.0",
     "@astrojs/telemetry": "3.1.0"
@@ -170,43 +170,40 @@
     "sharp": "^0.32.6"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.5.8",
-    "@playwright/test": "1.40.0",
+    "@astrojs/check": "^0.5.10",
+    "@playwright/test": "^1.43.1",
     "@types/aria-query": "^5.0.4",
-    "@types/babel__generator": "^7.6.7",
-    "@types/babel__traverse": "^7.20.4",
-    "@types/chai": "^4.3.10",
+    "@types/babel__generator": "^7.6.8",
+    "@types/babel__traverse": "^7.20.5",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/connect": "^3.4.38",
     "@types/cssesc": "^3.0.2",
     "@types/debug": "^4.1.12",
-    "@types/diff": "^5.0.8",
+    "@types/diff": "^5.2.0",
     "@types/dlv": "^1.1.4",
     "@types/dom-view-transitions": "^1.0.4",
-    "@types/hast": "^3.0.3",
+    "@types/hast": "^3.0.4",
     "@types/html-escaper": "^3.0.2",
     "@types/http-cache-semantics": "^4.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/mime": "^3.0.4",
-    "@types/mocha": "^10.0.4",
-    "@types/probe-image-size": "^7.2.3",
-    "@types/prompts": "^2.4.8",
-    "@types/resolve": "^1.20.5",
-    "@types/semver": "^7.5.2",
+    "@types/probe-image-size": "^7.2.4",
+    "@types/prompts": "^2.4.9",
+    "@types/resolve": "^1.20.6",
+    "@types/semver": "^7.5.8",
     "@types/send": "^0.17.4",
     "@types/unist": "^3.0.2",
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0-rc.12",
     "eol": "^0.9.1",
-    "memfs": "^4.6.0",
-    "node-mocks-http": "^1.13.0",
+    "memfs": "^4.8.2",
+    "node-mocks-http": "^1.14.1",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.5.0",
-    "sass": "^1.69.5",
+    "rollup": "^4.16.1",
+    "sass": "^1.75.0",
     "srcset-parse": "^1.1.0",
     "unified": "^11.0.4",
     "astro-scripts": "0.0.14"