astro 4.15.1 → 4.15.2

package/dist/@types/astro.d.ts

@@ -1546,7 +1546,7 @@ export interface AstroUserConfig {
              *
              * When `i18n.routing.fallback: "rewrite"` is configured, Astro will create pages that render the contents of the fallback page on the original, requested URL.
              *
-             * With the following configuration, if you have the file `src/pages/en/about.astro` but not `src/pages/fr/about.astro`, the `astro build` command will generate `dist/fr/about.html` with the same content as the `dist/en/index.html` page.
+             * With the following configuration, if you have the file `src/pages/en/about.astro` but not `src/pages/fr/about.astro`, the `astro build` command will generate `dist/fr/about.html` with the same content as the `dist/en/about.html` page.
              * Your site visitor will see the English version of the page at `https://example.com/fr/about/` and will not be redirected.
              *
              * ```js
@@ -1566,7 +1566,7 @@ export interface AstroUserConfig {
              * })
              * ```
              */
-            fallbackType: 'redirect' | 'rewrite';
+            fallbackType?: 'redirect' | 'rewrite';
             /**
              * @name i18n.routing.strategy
              * @type {"pathname"}

package/dist/content/content-layer.js

@@ -1,6 +1,4 @@
 import { promises as fs, existsSync } from "node:fs";
-import { isAbsolute } from "node:path";
-import { fileURLToPath } from "node:url";
 import * as fastq from "fastq";
 import xxhash from "xxhash-wasm";
 import { AstroUserError } from "../core/errors/errors.js";
@@ -13,8 +11,7 @@ import {
 import {
   getEntryConfigByExtMap,
   getEntryDataAndImages,
-  globalContentConfigObserver,
-  posixRelative
+  globalContentConfigObserver
 } from "./utils.js";
 class ContentLayer {
   #logger;
@@ -140,7 +137,7 @@ class ContentLayer {
         }
         const collectionWithResolvedSchema = { ...collection, schema };
         const parseData = async ({ id, data, filePath = "" }) => {
-          const { imageImports, data: parsedData } = await getEntryDataAndImages(
+          const { data: parsedData } = await getEntryDataAndImages(
             {
               id,
               collection: name,
@@ -153,13 +150,6 @@ class ContentLayer {
             collectionWithResolvedSchema,
             false
           );
-          if (imageImports?.length) {
-            this.#store.addAssetImports(
-              imageImports,
-              // This path may already be relative, if we're re-parsing an existing entry
-              isAbsolute(filePath) ? posixRelative(fileURLToPath(this.#settings.config.root), filePath) : filePath
-            );
-          }
           return parsedData;
         };
         const context = await this.#getLoaderContext({

package/dist/content/data-store.d.ts

@@ -30,6 +30,7 @@ export interface DataEntry<TData extends Record<string, unknown> = Record<string
      * If an entry is a deferred, its rendering phase is delegated to a virtual module during the runtime phase when calling `renderEntry`.
      */
     deferredRender?: boolean;
+    assetImports?: Array<string>;
 }
 /**
  * A read-only data store for content collections. This is used to retrieve data from the content layer at runtime.

package/dist/content/loaders/glob.js

@@ -61,13 +61,9 @@ function glob(globOptions) {
           if (existingEntry.deferredRender) {
             store.addModuleImport(existingEntry.filePath);
           }
-          if (existingEntry.rendered?.metadata?.imagePaths?.length) {
-            store.addAssetImports(
-              existingEntry.rendered.metadata.imagePaths,
-              existingEntry.filePath
-            );
+          if (existingEntry.assetImports?.length) {
+            store.addAssetImports(existingEntry.assetImports, existingEntry.filePath);
           }
-          await parseData(existingEntry);
           return;
         }
         const filePath = fileURLToPath(fileUrl);
@@ -101,11 +97,9 @@ function glob(globOptions) {
             body,
             filePath: relativePath,
             digest,
-            rendered
+            rendered,
+            assetImports: rendered?.metadata?.imagePaths
           });
-          if (rendered?.metadata?.imagePaths?.length) {
-            store.addAssetImports(rendered.metadata.imagePaths, relativePath);
-          }
         } else if ("contentModuleTypes" in entryType) {
           store.set({
             id,

package/dist/content/mutable-data-store.d.ts

@@ -10,8 +10,8 @@ export declare class MutableDataStore extends DataStore {
     delete(collectionName: string, key: string): void;
     clear(collectionName: string): void;
     clearAll(): void;
-    addAssetImport(assetImport: string, filePath: string): void;
-    addAssetImports(assets: Array<string>, filePath: string): void;
+    addAssetImport(assetImport: string, filePath?: string): void;
+    addAssetImports(assets: Array<string>, filePath?: string): void;
     addModuleImport(fileName: string): void;
     writeAssetImports(filePath: PathLike): Promise<void>;
     writeModuleImports(filePath: PathLike): Promise<void>;

package/dist/content/mutable-data-store.js

@@ -1,7 +1,9 @@
 import { promises as fs, existsSync } from "node:fs";
 import * as devalue from "devalue";
+import { Traverse } from "neotraverse/modern";
 import { imageSrcToImportId, importIdToSymbolName } from "../assets/utils/resolveImports.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { IMAGE_IMPORT_PREFIX } from "./consts.js";
 import { DataStore } from "./data-store.js";
 import { contentModuleToId } from "./utils.js";
 const SAVE_DEBOUNCE_MS = 500;
@@ -157,7 +159,7 @@ ${lines.join(",\n")}]);
       entries: () => this.entries(collectionName),
       values: () => this.values(collectionName),
       keys: () => this.keys(collectionName),
-      set: ({ id: key, data, body, filePath, deferredRender, digest, rendered }) => {
+      set: ({ id: key, data, body, filePath, deferredRender, digest, rendered, assetImports }) => {
         if (!key) {
           throw new Error(`ID must be a non-empty string`);
         }
@@ -168,6 +170,13 @@ ${lines.join(",\n")}]);
             return false;
           }
         }
+        const foundAssets = new Set(assetImports);
+        new Traverse(data).forEach((_, val) => {
+          if (typeof val === "string" && val.startsWith(IMAGE_IMPORT_PREFIX)) {
+            const src = val.replace(IMAGE_IMPORT_PREFIX, "");
+            foundAssets.add(src);
+          }
+        });
         const entry = {
           id,
           data
@@ -181,6 +190,10 @@ ${lines.join(",\n")}]);
           }
           entry.filePath = filePath;
         }
+        if (foundAssets.size) {
+          entry.assetImports = Array.from(foundAssets);
+          this.addAssetImports(entry.assetImports, filePath);
+        }
         if (digest) {
           entry.digest = digest;
         }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.15.1";
+const ASTRO_VERSION = "4.15.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.15.1";
+  const currentVersion = "4.15.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/errors-data.d.ts

@@ -26,23 +26,6 @@ export declare const UnknownCompilerError: {
     title: string;
     hint: string;
 };
-/**
- * @docs
- * @see
- * - [Enabling SSR in Your Project](https://docs.astro.build/en/guides/server-side-rendering/)
- * - [Astro.redirect](https://docs.astro.build/en/reference/api-reference/#astroredirect)
- * @description
- * The `Astro.redirect` function is only available when [Server-side rendering](/en/guides/server-side-rendering/) is enabled.
- *
- * To redirect on a static website, the [meta refresh attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta) can be used. Certain hosts also provide config-based redirects (ex: [Netlify redirects](https://docs.netlify.com/routing/redirects/)).
- * @deprecated Deprecated since version 2.6.
- */
-export declare const StaticRedirectNotAvailable: {
-    name: string;
-    title: string;
-    message: string;
-    hint: string;
-};
 /**
  * @docs
  * @see
@@ -260,20 +243,6 @@ export declare const InvalidGetStaticPathsReturn: {
     message: (returnType: any) => string;
     hint: string;
 };
-/**
- * @docs
- * @deprecated Deprecated since Astro 4.0. The RSS helper no longer exists with an error fallback.
- * @see
- * - [RSS Guide](https://docs.astro.build/en/guides/rss/)
- * @description
- * `getStaticPaths` no longer expose an helper for generating a RSS feed. We recommend migrating to the [@astrojs/rss](https://docs.astro.build/en/guides/rss/#setting-up-astrojsrss)integration instead.
- */
-export declare const GetStaticPathsRemovedRSSHelper: {
-    name: string;
-    title: string;
-    message: string;
-    hint: string;
-};
 /**
  * @docs
  * @see
@@ -650,24 +619,6 @@ export declare const NoImageMetadata: {
     message: (imagePath: string | undefined) => string;
     hint: string;
 };
-/**
- * @docs
- * @deprecated This error is no longer Markdown specific and as such, as been replaced by `ImageNotFound`
- * @message
- * Could not find requested image `IMAGE_PATH` at `FULL_IMAGE_PATH`.
- * @see
- * - [Images](https://docs.astro.build/en/guides/images/)
- * @description
- * Astro could not find an image you included in your Markdown content. Usually, this is simply caused by a typo in the path.
- *
- * Images in Markdown are relative to the current file. To refer to an image that is located in the same folder as the `.md` file, the path should start with `./`
- */
-export declare const MarkdownImageNotFound: {
-    name: string;
-    title: string;
-    message: (imagePath: string, fullImagePath: string | undefined) => string;
-    hint: string;
-};
 /**
  * @docs
  * @see
@@ -1020,17 +971,6 @@ export declare const MissingMiddlewareForInternationalization: {
     title: string;
     message: string;
 };
-/**
- * @deprecated
- * @docs
- * @description
- * The user tried to rewrite using a route that doesn't exist, or it emitted a runtime error during its rendering phase.
- */
-export declare const RewriteEncounteredAnError: {
-    name: string;
-    title: string;
-    message: (route: string, stack?: string) => string;
-};
 /**
  * @docs
  * @description
@@ -1387,19 +1327,6 @@ export declare const ContentSchemaContainsSlugError: {
     message: (collectionName: string) => string;
     hint: string;
 };
-/**
- * @docs
- * @message A collection queried via `getCollection()` does not exist.
- * @deprecated Collections that do not exist no longer result in an error. A warning is given instead.
- * @description
- * When querying a collection, ensure a collection directory with the requested name exists under `src/content/`.
- */
-export declare const CollectionDoesNotExistError: {
-    name: string;
-    title: string;
-    message: (collectionName: string) => string;
-    hint: string;
-};
 /**
  * @docs
  * @see

package/dist/core/errors/errors-data.js

@@ -3,12 +3,6 @@ const UnknownCompilerError = {
   title: "Unknown compiler error.",
   hint: "This is almost always a problem with the Astro compiler, not your code. Please open an issue at https://astro.build/issues/compiler."
 };
-const StaticRedirectNotAvailable = {
-  name: "StaticRedirectNotAvailable",
-  title: "`Astro.redirect` is not available in static mode.",
-  message: "Redirects are only available when using `output: 'server'` or `output: 'hybrid'`. Update your Astro config if you need SSR features.",
-  hint: "See https://docs.astro.build/en/guides/server-side-rendering/ for more information on how to enable SSR."
-};
 const ClientAddressNotAvailable = {
   name: "ClientAddressNotAvailable",
   title: "`Astro.clientAddress` is not available in current adapter.",
@@ -83,12 +77,6 @@ const InvalidGetStaticPathsReturn = {
   message: (returnType) => `Invalid type returned by \`getStaticPaths\`. Expected an \`array\`, got \`${returnType}\``,
   hint: "See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
 };
-const GetStaticPathsRemovedRSSHelper = {
-  name: "GetStaticPathsRemovedRSSHelper",
-  title: "getStaticPaths RSS helper is not available anymore.",
-  message: "The RSS helper has been removed from `getStaticPaths`. Try the new @astrojs/rss package instead.",
-  hint: "See https://docs.astro.build/en/guides/rss/ for more information."
-};
 const GetStaticPathsExpectedParams = {
   name: "GetStaticPathsExpectedParams",
   title: "Missing params property on `getStaticPaths` route.",
@@ -233,12 +221,6 @@ const NoImageMetadata = {
   message: (imagePath) => `Could not process image metadata${imagePath ? ` for \`${imagePath}\`` : ""}.`,
   hint: "This is often caused by a corrupted or malformed image. Re-exporting the image from your image editor may fix this issue."
 };
-const MarkdownImageNotFound = {
-  name: "MarkdownImageNotFound",
-  title: "Image not found.",
-  message: (imagePath, fullImagePath) => `Could not find requested image \`${imagePath}\`${fullImagePath ? ` at \`${fullImagePath}\`.` : "."}`,
-  hint: "This is often caused by a typo in the image path. Please make sure the file exists, and is spelled correctly."
-};
 const CouldNotTransformImage = {
   name: "CouldNotTransformImage",
   title: "Could not transform image.",
@@ -362,11 +344,6 @@ const MissingMiddlewareForInternationalization = {
   title: "Enabled manual internationalization routing without having a middleware.",
   message: "Your configuration setting `i18n.routing: 'manual'` requires you to provide your own i18n `middleware` file."
 };
-const RewriteEncounteredAnError = {
-  name: "RewriteEncounteredAnError",
-  title: "Astro couldn't find the route to rewrite, or if was found but it emitted an error during the rendering phase.",
-  message: (route, stack) => `The route ${route} that you tried to render doesn't exist, or it emitted an error during the rendering phase. ${stack ? stack : ""}.`
-};
 const CantRenderPage = {
   name: "CantRenderPage",
   title: "Astro can't render the route.",
@@ -516,12 +493,6 @@ const ContentSchemaContainsSlugError = {
   message: (collectionName) => `A content collection schema should not contain \`slug\` since it is reserved for slug generation. Remove this from your ${collectionName} collection schema.`,
   hint: "See https://docs.astro.build/en/guides/content-collections/ for more on the `slug` field."
 };
-const CollectionDoesNotExistError = {
-  name: "CollectionDoesNotExistError",
-  title: "Collection does not exist",
-  message: (collectionName) => `The collection **${collectionName}** does not exist. Ensure a collection directory with this name exists.`,
-  hint: "See https://docs.astro.build/en/guides/content-collections/ for more on creating collections."
-};
 const MixedContentDataCollectionError = {
   name: "MixedContentDataCollectionError",
   title: "Content and data cannot be in same collection.",
@@ -595,7 +566,6 @@ export {
   CSSSyntaxError,
   CantRenderPage,
   ClientAddressNotAvailable,
-  CollectionDoesNotExistError,
   ConfigLegacyKey,
   ConfigNotFound,
   ContentCollectionTypeMismatchError,
@@ -616,7 +586,6 @@ export {
   GetEntryDeprecationError,
   GetStaticPathsExpectedParams,
   GetStaticPathsInvalidRouteParam,
-  GetStaticPathsRemovedRSSHelper,
   GetStaticPathsRequired,
   ImageMissingAlt,
   ImageNotFound,
@@ -636,7 +605,6 @@ export {
   LocalImageUsedWrongly,
   LocalsNotAnObject,
   MarkdownFrontmatterParseError,
-  MarkdownImageNotFound,
   MdxIntegrationMissingError,
   MiddlewareCantBeLoaded,
   MiddlewareNoDataOrNextCalled,
@@ -663,12 +631,10 @@ export {
   RedirectWithNoLocation,
   ReservedSlotName,
   ResponseSentError,
-  RewriteEncounteredAnError,
   RewriteWithBodyUsed,
   RouteNotFound,
   ServerOnlyModule,
   StaticClientAddressNotAvailable,
-  StaticRedirectNotAvailable,
   UnhandledRejection,
   UnknownCLIError,
   UnknownCSSError,

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.15.1";
+  const version = "4.15.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -270,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.15.1"}`
+        `v${"4.15.2"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.15.1",
+  "version": "4.15.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -111,7 +111,7 @@
     "@astrojs/compiler": "^2.10.3",
     "@babel/core": "^7.25.2",
     "@babel/plugin-transform-react-jsx": "^7.25.2",
-    "@babel/types": "^7.25.4",
+    "@babel/types": "^7.25.6",
     "@oslojs/encoding": "^0.4.1",
     "@rollup/pluginutils": "^5.1.0",
     "@types/babel__core": "^7.20.5",
@@ -156,11 +156,11 @@
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
     "semver": "^7.6.3",
-    "shiki": "^1.14.1",
+    "shiki": "^1.16.1",
     "string-width": "^7.2.0",
     "strip-ansi": "^7.1.0",
     "tinyexec": "^0.3.0",
-    "tsconfck": "^3.1.1",
+    "tsconfck": "^3.1.3",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
     "vite": "^5.4.2",
@@ -172,8 +172,8 @@
     "zod-to-json-schema": "^3.23.2",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/telemetry": "3.1.0",
-    "@astrojs/markdown-remark": "5.2.0"
+    "@astrojs/markdown-remark": "5.2.0",
+    "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -187,7 +187,7 @@
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
     "@types/debug": "^4.1.12",
-    "@types/diff": "^5.2.1",
+    "@types/diff": "^5.2.2",
     "@types/dlv": "^1.1.4",
     "@types/dom-view-transitions": "^1.0.5",
     "@types/hast": "^3.0.4",
@@ -199,7 +199,7 @@
     "@types/semver": "^7.5.8",
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0",
-    "eol": "^0.9.1",
+    "eol": "^0.10.0",
     "execa": "^8.0.1",
     "expect-type": "^0.20.0",
     "mdast-util-mdx": "^3.0.0",
@@ -211,7 +211,7 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.21.1",
+    "rollup": "^4.21.2",
     "sass": "^1.77.8",
     "undici": "^6.19.8",
     "unified": "^11.0.5",