astro 2.5.5 → 2.5.6

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

@@ -454,7 +454,7 @@ export declare const AstroErrorData: {
      * For unsupported formats such as SVGs and GIFs, you may be able to use an `img` tag directly:
      * ```astro
      * ---
-     * import rocket from '../assets/images/rocket.svg'
+     * import rocket from '../assets/images/rocket.svg';
      * ---
      *
      * <img src={rocket.src} width={rocket.width} height={rocket.height} alt="A rocketship in space." />
@@ -551,7 +551,7 @@ export declare const AstroErrorData: {
      * Making changes to the response, such as setting headers, cookies, and the status code cannot be done outside of page components.
      */
     readonly ResponseSentError: {
-        readonly title: "Unable to set response";
+        readonly title: "Unable to set response.";
         readonly code: 3030;
         readonly message: "The response has already been sent to the browser and cannot be altered.";
     };
@@ -570,7 +570,7 @@ export declare const AstroErrorData: {
      * ```
      */
     readonly MiddlewareNoDataOrNextCalled: {
-        readonly title: "The middleware didn't return a response or call `next`";
+        readonly title: "The middleware didn't return a response or call `next`.";
         readonly code: 3031;
         readonly message: "The middleware needs to either return a `Response` object or call the `next` function.";
     };
@@ -588,7 +588,7 @@ export declare const AstroErrorData: {
      * ```
      */
     readonly MiddlewareNotAResponse: {
-        readonly title: "The middleware returned something that is not a `Response` object";
+        readonly title: "The middleware returned something that is not a `Response` object.";
         readonly code: 3032;
         readonly message: "Any data returned from middleware must be a valid `Response` object.";
     };
@@ -608,11 +608,61 @@ export declare const AstroErrorData: {
      * ```
      */
     readonly LocalsNotAnObject: {
-        readonly title: "Value assigned to `locals` is not accepted";
+        readonly title: "Value assigned to `locals` is not accepted.";
         readonly code: 3033;
         readonly message: "`locals` can only be assigned to an object. Other values like numbers, strings, etc. are not accepted.";
         readonly hint: "If you tried to remove some information from the `locals` object, try to use `delete` or set the property to `undefined`.";
     };
+    /**
+     * @docs
+     * @see
+     * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+     * @description
+     * When using the default image services, `Image`'s and `getImage`'s `src` parameter must be either an imported image or an URL, it cannot be a filepath.
+     *
+     * ```astro
+     * ---
+     * import { Image } from "astro:assets";
+     * import myImage from "../my_image.png";
+     * ---
+     *
+     * <!-- GOOD: `src` is the full imported image. -->
+     * <Image src={myImage} alt="Cool image" />
+     *
+     * <!-- BAD: `src` is an image's `src` path instead of the full image. -->
+     * <Image src={myImage.src} alt="Cool image" />
+     * ```
+     */
+    readonly LocalImageUsedWrongly: {
+        readonly title: "ESM imported images must be passed as-is.";
+        readonly code: 3034;
+        readonly message: (imageFilePath: string) => string;
+    };
+    /**
+     * @docs
+     * @see
+     * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
+     * @description
+     * `Astro.glob()` can only be used in `.astro` files. You can use [`import.meta.glob()`](https://vitejs.dev/guide/features.html#glob-import) instead to acheive the same result.
+     */
+    readonly AstroGlobUsedOutside: {
+        readonly title: "Astro.glob() used outside of an Astro file.";
+        readonly code: 3035;
+        readonly message: (globStr: string) => string;
+        readonly hint: "See Vite's documentation on `import.meta.glob` for more information: https://vitejs.dev/guide/features.html#glob-import";
+    };
+    /**
+     * @docs
+     * @see
+     * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
+     * @description
+     * `Astro.glob()` did not return any matching files. There might be a typo in the glob pattern.
+     */
+    readonly AstroGlobNoMatch: {
+        readonly title: "Astro.glob() did not match any files.";
+        readonly code: 3036;
+        readonly message: (globStr: string) => string;
+    };
     /**
      * @docs
      * @see
@@ -858,7 +908,6 @@ export declare const AstroErrorData: {
     };
     /**
      * @docs
-     * @message A content collection schema should not contain `slug` since it is reserved for slug generation. Remove this from your `COLLECTION_NAME` collection schema.
      * @see
      * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
      * @description
@@ -867,7 +916,7 @@ export declare const AstroErrorData: {
     readonly ContentSchemaContainsSlugError: {
         readonly title: "Content Schema should not contain `slug`.";
         readonly code: 9003;
-        readonly message: (collection: string) => string;
+        readonly message: (collectionName: string) => string;
         readonly hint: "See https://docs.astro.build/en/guides/content-collections/ for more on the `slug` field.";
     };
     /**
@@ -879,7 +928,7 @@ export declare const AstroErrorData: {
     readonly CollectionDoesNotExistError: {
         readonly title: "Collection does not exist";
         readonly code: 9004;
-        readonly message: (collection: string) => string;
+        readonly message: (collectionName: string) => string;
         readonly hint: "See https://docs.astro.build/en/guides/content-collections/ for more on creating collections.";
     };
     /**

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

@@ -466,7 +466,7 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
    * For unsupported formats such as SVGs and GIFs, you may be able to use an `img` tag directly:
    * ```astro
    * ---
-   * import rocket from '../assets/images/rocket.svg'
+   * import rocket from '../assets/images/rocket.svg';
    * ---
    *
    * <img src={rocket.src} width={rocket.width} height={rocket.height} alt="A rocketship in space." />
@@ -565,7 +565,7 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
    * Making changes to the response, such as setting headers, cookies, and the status code cannot be done outside of page components.
    */
   ResponseSentError: {
-    title: "Unable to set response",
+    title: "Unable to set response.",
     code: 3030,
     message: "The response has already been sent to the browser and cannot be altered."
   },
@@ -584,7 +584,7 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
    * ```
    */
   MiddlewareNoDataOrNextCalled: {
-    title: "The middleware didn't return a response or call `next`",
+    title: "The middleware didn't return a response or call `next`.",
     code: 3031,
     message: "The middleware needs to either return a `Response` object or call the `next` function."
   },
@@ -602,7 +602,7 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
    * ```
    */
   MiddlewareNotAResponse: {
-    title: "The middleware returned something that is not a `Response` object",
+    title: "The middleware returned something that is not a `Response` object.",
     code: 3032,
     message: "Any data returned from middleware must be a valid `Response` object."
   },
@@ -622,11 +622,61 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
    * ```
    */
   LocalsNotAnObject: {
-    title: "Value assigned to `locals` is not accepted",
+    title: "Value assigned to `locals` is not accepted.",
     code: 3033,
     message: "`locals` can only be assigned to an object. Other values like numbers, strings, etc. are not accepted.",
     hint: "If you tried to remove some information from the `locals` object, try to use `delete` or set the property to `undefined`."
   },
+  /**
+   * @docs
+   * @see
+   * - [Assets (Experimental)](https://docs.astro.build/en/guides/assets/)
+   * @description
+   * When using the default image services, `Image`'s and `getImage`'s `src` parameter must be either an imported image or an URL, it cannot be a filepath.
+   *
+   * ```astro
+   * ---
+   * import { Image } from "astro:assets";
+   * import myImage from "../my_image.png";
+   * ---
+   *
+   * <!-- GOOD: `src` is the full imported image. -->
+   * <Image src={myImage} alt="Cool image" />
+   *
+   * <!-- BAD: `src` is an image's `src` path instead of the full image. -->
+   * <Image src={myImage.src} alt="Cool image" />
+   * ```
+   */
+  LocalImageUsedWrongly: {
+    title: "ESM imported images must be passed as-is.",
+    code: 3034,
+    message: (imageFilePath) => `\`Image\`'s and \`getImage\`'s \`src\` parameter must be an imported image or an URL, it cannot be a filepath. Received \`${imageFilePath}\`.`
+  },
+  /**
+   * @docs
+   * @see
+   * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
+   * @description
+   * `Astro.glob()` can only be used in `.astro` files. You can use [`import.meta.glob()`](https://vitejs.dev/guide/features.html#glob-import) instead to acheive the same result.
+   */
+  AstroGlobUsedOutside: {
+    title: "Astro.glob() used outside of an Astro file.",
+    code: 3035,
+    message: (globStr) => `\`Astro.glob(${globStr})\` can only be used in \`.astro\` files. \`import.meta.glob(${globStr})\` can be used instead to achieve a similar result.`,
+    hint: "See Vite's documentation on `import.meta.glob` for more information: https://vitejs.dev/guide/features.html#glob-import"
+  },
+  /**
+   * @docs
+   * @see
+   * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
+   * @description
+   * `Astro.glob()` did not return any matching files. There might be a typo in the glob pattern.
+   */
+  AstroGlobNoMatch: {
+    title: "Astro.glob() did not match any files.",
+    code: 3036,
+    message: (globStr) => `\`Astro.glob(${globStr})\` did not return any matching files. Check the pattern for typos.`
+  },
   // No headings here, that way Vite errors are merged with Astro ones in the docs, which makes more sense to users.
   // Vite Errors - 4xxx
   /**
@@ -890,7 +940,6 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
   },
   /**
    * @docs
-   * @message A content collection schema should not contain `slug` since it is reserved for slug generation. Remove this from your `COLLECTION_NAME` collection schema.
    * @see
    * - [The reserved entry `slug` field](https://docs.astro.build/en/guides/content-collections/)
    * @description
@@ -899,9 +948,7 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
   ContentSchemaContainsSlugError: {
     title: "Content Schema should not contain `slug`.",
     code: 9003,
-    message: (collection) => {
-      return `A content collection schema should not contain \`slug\` since it is reserved for slug generation. Remove this from your ${collection} collection schema.`;
-    },
+    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."
   },
   /**
@@ -913,9 +960,7 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
   CollectionDoesNotExistError: {
     title: "Collection does not exist",
     code: 9004,
-    message: (collection) => {
-      return `The collection **${collection}** does not exist. Ensure a collection directory with this name exists.`;
-    },
+    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."
   },
   /**

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.5.5";
+  const version = "2.5.6";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.5.5"}`
+        `v${"2.5.6"}`
       )} ${headline}`
     );
   }

package/dist/core/render/dev/index.js

@@ -1,4 +1,3 @@
-import { fileURLToPath } from "url";
 import { PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { createAPIContext } from "../../endpoint/index.js";
 import { enhanceViteSSRError } from "../../errors/dev/index.js";
@@ -22,7 +21,7 @@ async function preload({
 }) {
   const renderers = await loadRenderers(env.loader, env.settings);
   try {
-    const mod = await env.loader.import(fileURLToPath(filePath));
+    const mod = await env.loader.import(viteID(filePath));
     return [renderers, mod];
   } catch (error) {
     if (MarkdownError.is(error) || CSSError.is(error) || AggregateError.is(error)) {

package/dist/prerender/routing.d.ts

@@ -0,0 +1,13 @@
+import type { AstroSettings, RouteData } from '../@types/astro';
+import { type DevelopmentEnvironment } from '../core/render/dev/index.js';
+type GetSortedPreloadedMatchesParams = {
+    env: DevelopmentEnvironment;
+    matches: RouteData[];
+    settings: AstroSettings;
+};
+export declare function getSortedPreloadedMatches({ env, matches, settings, }: GetSortedPreloadedMatchesParams): Promise<{
+    readonly preloadedComponent: import("../core/render/dev/index.js").ComponentPreload;
+    readonly route: RouteData;
+    readonly filePath: URL;
+}[]>;
+export {};

package/dist/prerender/routing.js

@@ -0,0 +1,49 @@
+import { preload } from "../core/render/dev/index.js";
+import { getPrerenderStatus } from "./metadata.js";
+async function getSortedPreloadedMatches({
+  env,
+  matches,
+  settings
+}) {
+  return (await preloadAndSetPrerenderStatus({
+    env,
+    matches,
+    settings
+  })).sort((a, b) => prioritizePrerenderedMatchesComparator(a.route, b.route));
+}
+async function preloadAndSetPrerenderStatus({
+  env,
+  matches,
+  settings
+}) {
+  const preloaded = await Promise.all(
+    matches.map(async (route) => {
+      const filePath = new URL(`./${route.component}`, settings.config.root);
+      const preloadedComponent = await preload({ env, filePath });
+      const prerenderStatus = getPrerenderStatus({
+        filePath,
+        loader: env.loader
+      });
+      if (prerenderStatus !== void 0) {
+        route.prerender = prerenderStatus;
+      }
+      return { preloadedComponent, route, filePath };
+    })
+  );
+  return preloaded;
+}
+function prioritizePrerenderedMatchesComparator(a, b) {
+  if (areRegexesEqual(a.pattern, b.pattern)) {
+    if (a.prerender !== b.prerender) {
+      return a.prerender ? -1 : 1;
+    }
+    return a.component < b.component ? -1 : 1;
+  }
+  return 0;
+}
+function areRegexesEqual(regexp1, regexp2) {
+  return regexp1.source === regexp2.source && regexp1.global === regexp2.global;
+}
+export {
+  getSortedPreloadedMatches
+};

package/dist/runtime/server/astro-global.js

@@ -1,9 +1,19 @@
 import { ASTRO_VERSION } from "../../core/constants.js";
+import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 function createAstroGlobFn() {
   const globHandler = (importMetaGlobResult, globValue) => {
+    if (typeof importMetaGlobResult === "string") {
+      throw new AstroError({
+        ...AstroErrorData.AstroGlobUsedOutside,
+        message: AstroErrorData.AstroGlobUsedOutside.message(JSON.stringify(importMetaGlobResult))
+      });
+    }
     let allEntries = [...Object.values(importMetaGlobResult)];
     if (allEntries.length === 0) {
-      throw new Error(`Astro.glob(${JSON.stringify(globValue())}) - no matches found.`);
+      throw new AstroError({
+        ...AstroErrorData.AstroGlobNoMatch,
+        message: AstroErrorData.AstroGlobNoMatch.message(JSON.stringify(importMetaGlobResult))
+      });
     }
     return Promise.all(allEntries.map((fn) => fn()));
   };

package/dist/runtime/server/index.d.ts

@@ -1,7 +1,7 @@
 export { createComponent } from './astro-component.js';
 export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
-export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
+export { escapeHTML, HTMLBytes, HTMLString, isHTMLString, markHTMLString, unescapeHTML, } from './escape.js';
 export { renderJSX } from './jsx.js';
 export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderSlotToString, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, ComponentSlots, RenderInstruction, } from './render/index.js';

package/dist/runtime/server/index.js

@@ -1,7 +1,14 @@
 import { createComponent } from "./astro-component.js";
 import { createAstro } from "./astro-global.js";
 import { renderEndpoint } from "./endpoint.js";
-import { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from "./escape.js";
+import {
+  escapeHTML,
+  HTMLBytes,
+  HTMLString,
+  isHTMLString,
+  markHTMLString,
+  unescapeHTML
+} from "./escape.js";
 import { renderJSX } from "./jsx.js";
 import {
   addAttribute,
@@ -93,6 +100,7 @@ export {
   defineScriptVars,
   defineStyleVars,
   escapeHTML,
+  isHTMLString,
   markHTMLString,
   maybeRenderHead,
   mergeSlots,

package/dist/runtime/server/render/astro/instance.js

@@ -29,6 +29,9 @@ class AstroComponentInstance {
       value = await value;
     }
     if (isHeadAndContent(value)) {
+      if (this.result.extraHead.length === 0 && value.head) {
+        yield renderChild(value.head);
+      }
       yield* value.content;
     } else {
       yield* renderChild(value);

package/dist/runtime/server/scripts.js

@@ -1,5 +1,5 @@
 import islandScript from "./astro-island.prebuilt.js";
-const ISLAND_STYLES = `<style>astro-island,astro-slot{display:contents}</style>`;
+const ISLAND_STYLES = `<style>astro-island,astro-slot,astro-static-slot{display:contents}</style>`;
 function determineIfNeedsHydrationScript(result) {
   if (result._metadata.hasHydrationScript) {
     return false;

package/dist/vite-plugin-astro-server/route.js

@@ -9,7 +9,7 @@ import { preload, renderPage } from "../core/render/dev/index.js";
 import { getParamsAndProps, GetParamsAndPropsError } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
-import { getPrerenderStatus } from "../prerender/metadata.js";
+import { getSortedPreloadedMatches } from "../prerender/routing.js";
 import { isHybridOutput } from "../prerender/utils.js";
 import { log404 } from "./common.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
@@ -20,16 +20,8 @@ function getCustom404Route(manifest) {
 async function matchRoute(pathname, env, manifest) {
   const { logging, settings, routeCache } = env;
   const matches = matchAllRoutes(pathname, manifest);
-  for await (const maybeRoute of matches) {
-    const filePath = new URL(`./${maybeRoute.component}`, settings.config.root);
-    const preloadedComponent = await preload({ env, filePath });
-    const prerenderStatus = getPrerenderStatus({
-      filePath,
-      loader: env.loader
-    });
-    if (prerenderStatus !== void 0) {
-      maybeRoute.prerender = prerenderStatus;
-    }
+  const preloadedMatches = await getSortedPreloadedMatches({ env, matches, settings });
+  for await (const { preloadedComponent, route: maybeRoute, filePath } of preloadedMatches) {
     const [, mod] = preloadedComponent;
     const paramsAndPropsRes = await getParamsAndProps({
       mod,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -103,13 +103,13 @@
     "@astrojs/language-server": "^1.0.0",
     "@astrojs/markdown-remark": "^2.2.1",
     "@astrojs/telemetry": "^2.1.1",
-    "@astrojs/webapi": "^2.1.1",
-    "@babel/core": "^7.18.2",
+    "@astrojs/webapi": "^2.2.0",
+    "@babel/core": "^7.21.8",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
     "@babel/plugin-transform-react-jsx": "^7.17.12",
     "@babel/traverse": "^7.18.2",
-    "@babel/types": "^7.18.4",
+    "@babel/types": "^7.21.5",
     "@types/babel__core": "^7.1.19",
     "@types/yargs-parser": "^21.0.0",
     "acorn": "^8.8.2",