astro 6.0.0-alpha.1 → 6.0.0-alpha.2

package/dist/actions/vite-plugin-actions.js

@@ -35,22 +35,29 @@ function vitePluginActions({
   return {
     name: VIRTUAL_MODULE_ID,
     enforce: "pre",
-    async resolveId(id) {
-      if (id === VIRTUAL_MODULE_ID) {
-        return RESOLVED_VIRTUAL_MODULE_ID;
-      }
-      if (id === OPTIONS_VIRTUAL_MODULE_ID) {
-        return RESOLVED_OPTIONS_VIRTUAL_MODULE_ID;
-      }
-      if (id === ACTIONS_ENTRYPOINT_VIRTUAL_MODULE_ID) {
-        const resolvedModule = await this.resolve(
-          `${decodeURI(new URL("actions", settings.config.srcDir).pathname)}`
-        );
-        if (!resolvedModule) {
-          return RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID;
+    resolveId: {
+      filter: {
+        id: new RegExp(
+          `^(${VIRTUAL_MODULE_ID}|${OPTIONS_VIRTUAL_MODULE_ID}|${ACTIONS_ENTRYPOINT_VIRTUAL_MODULE_ID})$`
+        )
+      },
+      async handler(id) {
+        if (id === VIRTUAL_MODULE_ID) {
+          return RESOLVED_VIRTUAL_MODULE_ID;
+        }
+        if (id === OPTIONS_VIRTUAL_MODULE_ID) {
+          return RESOLVED_OPTIONS_VIRTUAL_MODULE_ID;
+        }
+        if (id === ACTIONS_ENTRYPOINT_VIRTUAL_MODULE_ID) {
+          const resolvedModule = await this.resolve(
+            `${decodeURI(new URL("actions", settings.config.srcDir).pathname)}`
+          );
+          if (!resolvedModule) {
+            return RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID;
+          }
+          resolvedActionsId = resolvedModule.id;
+          return ACTIONS_RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID;
         }
-        resolvedActionsId = resolvedModule.id;
-        return ACTIONS_RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID;
       }
     },
     async configureServer(server) {
@@ -64,31 +71,38 @@ function vitePluginActions({
       server.watcher.on("add", watcherCallback);
       server.watcher.on("change", watcherCallback);
     },
-    async load(id) {
-      if (id === RESOLVED_VIRTUAL_MODULE_ID) {
-        if (this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.client) {
+    load: {
+      filter: {
+        id: new RegExp(
+          `^(${RESOLVED_VIRTUAL_MODULE_ID}|${RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID}|${ACTIONS_RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID}|${RESOLVED_OPTIONS_VIRTUAL_MODULE_ID})$`
+        )
+      },
+      async handler(id) {
+        if (id === RESOLVED_VIRTUAL_MODULE_ID) {
+          if (this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.client) {
+            return {
+              code: `export * from 'astro/actions/runtime/entrypoints/client.js';`
+            };
+          }
           return {
-            code: `export * from 'astro/actions/runtime/entrypoints/client.js';`
+            code: `export * from 'astro/actions/runtime/entrypoints/server.js';`
           };
         }
-        return {
-          code: `export * from 'astro/actions/runtime/entrypoints/server.js';`
-        };
-      }
-      if (id === RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID) {
-        return { code: "export const server = {}" };
-      }
-      if (id === ACTIONS_RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID) {
-        return { code: `export { server } from ${JSON.stringify(resolvedActionsId)};` };
-      }
-      if (id === RESOLVED_OPTIONS_VIRTUAL_MODULE_ID) {
-        return {
-          code: `
+        if (id === RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID) {
+          return { code: "export const server = {}" };
+        }
+        if (id === ACTIONS_RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID) {
+          return { code: `export { server } from ${JSON.stringify(resolvedActionsId)};` };
+        }
+        if (id === RESOLVED_OPTIONS_VIRTUAL_MODULE_ID) {
+          return {
+            code: `
 						export const shouldAppendTrailingSlash = ${JSON.stringify(
-            shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format)
-          )};
+              shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format)
+            )};
 					`
-        };
+          };
+        }
       }
     }
   };

package/dist/assets/consts.d.ts

@@ -1,4 +1,5 @@
 export declare const VIRTUAL_MODULE_ID = "astro:assets";
+export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
 export declare const VIRTUAL_SERVICE_ID = "virtual:image-service";
 export declare const VALID_INPUT_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg", "avif"];
 /**

package/dist/assets/consts.js

@@ -1,4 +1,5 @@
 const VIRTUAL_MODULE_ID = "astro:assets";
+const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 const VIRTUAL_SERVICE_ID = "virtual:image-service";
 const VALID_INPUT_FORMATS = [
   "jpeg",
@@ -34,6 +35,7 @@ const DEFAULT_HASH_PROPS = [
 export {
   DEFAULT_HASH_PROPS,
   DEFAULT_OUTPUT_FORMAT,
+  RESOLVED_VIRTUAL_MODULE_ID,
   VALID_INPUT_FORMATS,
   VALID_OUTPUT_FORMATS,
   VALID_SUPPORTED_FORMATS,

package/dist/assets/fonts/vite-plugin-fonts.js

@@ -228,13 +228,19 @@ function fontsPlugin({ settings, sync, logger }) {
         }
       });
     },
-    resolveId(id) {
-      if (id === VIRTUAL_MODULE_ID) {
+    resolveId: {
+      filter: {
+        id: new RegExp(`^(${VIRTUAL_MODULE_ID})$`)
+      },
+      handler() {
         return RESOLVED_VIRTUAL_MODULE_ID;
       }
     },
-    load(id) {
-      if (id === RESOLVED_VIRTUAL_MODULE_ID) {
+    load: {
+      filter: {
+        id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID})$`)
+      },
+      handler() {
         return {
           code: `
 						export const internalConsumableMap = new Map(${JSON.stringify(Array.from(internalConsumableMap?.entries() ?? []))});

package/dist/assets/services/noop.js

@@ -1,11 +1,16 @@
-import { baseService } from "./service.js";
+import { isESMImportedImage } from "../utils/imageKind.js";
+import { baseService, verifyOptions } from "./service.js";
 const noopService = {
   ...baseService,
   propertiesToHash: ["src"],
-  async validateOptions(options, imageConfig) {
-    const newOptions = await (baseService.validateOptions?.(options, imageConfig) ?? options);
-    delete newOptions.format;
-    return newOptions;
+  async validateOptions(options) {
+    if (isESMImportedImage(options.src) && options.src.format === "svg") {
+      options.format = "svg";
+    } else {
+      delete options.format;
+    }
+    verifyOptions(options);
+    return options;
   },
   async transform(inputBuffer, transformOptions) {
     return {

package/dist/assets/services/service.d.ts

@@ -80,6 +80,7 @@ export type BaseServiceTransform = {
     fit?: ImageFit;
     position?: string;
 };
+export declare function verifyOptions(options: ImageTransform): void;
 /**
  * Basic local service using the included `_image` endpoint.
  * This service intentionally does not implement `transform`.
@@ -95,7 +96,6 @@ export type BaseServiceTransform = {
  * ```
  *
  * This service adhere to the included services limitations:
- * - Remote images are passed as is.
  * - Only a limited amount of formats are supported.
  * - For remote images, `width` and `height` are always required.
  *

package/dist/assets/services/service.js

@@ -17,61 +17,64 @@ function parseQuality(quality) {
   return result;
 }
 const sortNumeric = (a, b) => a - b;
-const baseService = {
-  propertiesToHash: DEFAULT_HASH_PROPS,
-  validateOptions(options) {
-    if (!options.src || !isRemoteImage(options.src) && !isESMImportedImage(options.src)) {
+function verifyOptions(options) {
+  if (!options.src || !isRemoteImage(options.src) && !isESMImportedImage(options.src)) {
+    throw new AstroError({
+      ...AstroErrorData.ExpectedImage,
+      message: AstroErrorData.ExpectedImage.message(
+        JSON.stringify(options.src),
+        typeof options.src,
+        JSON.stringify(options, (_, v) => v === void 0 ? null : v)
+      )
+    });
+  }
+  if (!isESMImportedImage(options.src)) {
+    if (options.src.startsWith("/@fs/") || !isRemotePath(options.src) && !options.src.startsWith("/")) {
+      throw new AstroError({
+        ...AstroErrorData.LocalImageUsedWrongly,
+        message: AstroErrorData.LocalImageUsedWrongly.message(options.src)
+      });
+    }
+    let missingDimension;
+    if (!options.width && !options.height) {
+      missingDimension = "both";
+    } else if (!options.width && options.height) {
+      missingDimension = "width";
+    } else if (options.width && !options.height) {
+      missingDimension = "height";
+    }
+    if (missingDimension) {
       throw new AstroError({
-        ...AstroErrorData.ExpectedImage,
-        message: AstroErrorData.ExpectedImage.message(
-          JSON.stringify(options.src),
-          typeof options.src,
-          JSON.stringify(options, (_, v) => v === void 0 ? null : v)
+        ...AstroErrorData.MissingImageDimension,
+        message: AstroErrorData.MissingImageDimension.message(missingDimension, options.src)
+      });
+    }
+  } else {
+    if (!VALID_SUPPORTED_FORMATS.includes(options.src.format)) {
+      throw new AstroError({
+        ...AstroErrorData.UnsupportedImageFormat,
+        message: AstroErrorData.UnsupportedImageFormat.message(
+          options.src.format,
+          options.src.src,
+          VALID_SUPPORTED_FORMATS
         )
       });
     }
-    if (!isESMImportedImage(options.src)) {
-      if (options.src.startsWith("/@fs/") || !isRemotePath(options.src) && !options.src.startsWith("/")) {
-        throw new AstroError({
-          ...AstroErrorData.LocalImageUsedWrongly,
-          message: AstroErrorData.LocalImageUsedWrongly.message(options.src)
-        });
-      }
-      let missingDimension;
-      if (!options.width && !options.height) {
-        missingDimension = "both";
-      } else if (!options.width && options.height) {
-        missingDimension = "width";
-      } else if (options.width && !options.height) {
-        missingDimension = "height";
-      }
-      if (missingDimension) {
-        throw new AstroError({
-          ...AstroErrorData.MissingImageDimension,
-          message: AstroErrorData.MissingImageDimension.message(missingDimension, options.src)
-        });
-      }
-    } else {
-      if (!VALID_SUPPORTED_FORMATS.includes(options.src.format)) {
-        throw new AstroError({
-          ...AstroErrorData.UnsupportedImageFormat,
-          message: AstroErrorData.UnsupportedImageFormat.message(
-            options.src.format,
-            options.src.src,
-            VALID_SUPPORTED_FORMATS
-          )
-        });
-      }
-      if (options.widths && options.densities) {
-        throw new AstroError(AstroErrorData.IncompatibleDescriptorOptions);
-      }
-      if (options.src.format === "svg") {
-        options.format = "svg";
-      }
-      if (options.src.format === "svg" && options.format !== "svg" || options.src.format !== "svg" && options.format === "svg") {
-        throw new AstroError(AstroErrorData.UnsupportedImageConversion);
-      }
+    if (options.widths && options.densities) {
+      throw new AstroError(AstroErrorData.IncompatibleDescriptorOptions);
+    }
+    if (options.src.format === "svg" && options.format !== "svg" || options.src.format !== "svg" && options.format === "svg") {
+      throw new AstroError(AstroErrorData.UnsupportedImageConversion);
+    }
+  }
+}
+const baseService = {
+  propertiesToHash: DEFAULT_HASH_PROPS,
+  validateOptions(options) {
+    if (isESMImportedImage(options.src) && options.src.format === "svg") {
+      options.format = "svg";
     }
+    verifyOptions(options);
     if (!options.format) {
       options.format = DEFAULT_OUTPUT_FORMAT;
     }
@@ -234,5 +237,6 @@ function getTargetDimensions(options) {
 export {
   baseService,
   isLocalService,
-  parseQuality
+  parseQuality,
+  verifyOptions
 };

package/dist/assets/types.d.ts

@@ -72,7 +72,7 @@ export type ImageTransform = {
     fit?: ImageFit | undefined;
     position?: string | undefined;
     [key: string]: any;
-};
+} & Astro.CustomImageProps;
 export interface GetImageResult {
     rawOptions: ImageTransform;
     options: ImageTransform;
@@ -201,7 +201,7 @@ type ImageSharedProps<T> = T & {
     layout?: never;
     fit?: never;
     position?: never;
-});
+}) & Astro.CustomImageProps;
 export type LocalImageProps<T> = ImageSharedProps<T> & {
     /**
      * A reference to a local image imported through an ESM import.

package/dist/assets/utils/index.d.ts

@@ -4,8 +4,8 @@
  *
  * If some functions don't need to be exposed, just import the file that contains the functions.
  */
+export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from '@astrojs/internal-helpers/remote';
 export { isESMImportedImage, isRemoteImage, resolveSrc } from './imageKind.js';
 export { imageMetadata } from './metadata.js';
 export { getOrigQueryParams } from './queryParams.js';
-export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from './remotePattern.js';
 export { inferRemoteSize } from './remoteProbe.js';

package/dist/assets/utils/index.js

@@ -1,6 +1,3 @@
-import { isESMImportedImage, isRemoteImage, resolveSrc } from "./imageKind.js";
-import { imageMetadata } from "./metadata.js";
-import { getOrigQueryParams } from "./queryParams.js";
 import {
   isRemoteAllowed,
   matchHostname,
@@ -8,7 +5,10 @@ import {
   matchPattern,
   matchPort,
   matchProtocol
-} from "./remotePattern.js";
+} from "@astrojs/internal-helpers/remote";
+import { isESMImportedImage, isRemoteImage, resolveSrc } from "./imageKind.js";
+import { imageMetadata } from "./metadata.js";
+import { getOrigQueryParams } from "./queryParams.js";
 import { inferRemoteSize } from "./remoteProbe.js";
 export {
   getOrigQueryParams,

package/dist/assets/vite-plugin-assets.js

@@ -9,7 +9,13 @@ import {
   removeQueryString
 } from "../core/path.js";
 import { normalizePath } from "../core/viteUtils.js";
-import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
+import { isAstroServerEnvironment } from "../environments.js";
+import {
+  RESOLVED_VIRTUAL_MODULE_ID,
+  VALID_INPUT_FORMATS,
+  VIRTUAL_MODULE_ID,
+  VIRTUAL_SERVICE_ID
+} from "./consts.js";
 import { fontsPlugin } from "./fonts/vite-plugin-fonts.js";
 import { getAssetsPrefix } from "./utils/getAssetsPrefix.js";
 import { isESMImportedImage } from "./utils/index.js";
@@ -17,8 +23,6 @@ import { emitImageMetadata, hashTransform, propsToFilename } from "./utils/node.
 import { getProxyCode } from "./utils/proxy.js";
 import { makeSvgComponent } from "./utils/svg.js";
 import { createPlaceholderURL, stringifyPlaceholderURL } from "./utils/url.js";
-import { isAstroServerEnvironment } from "../environments.js";
-const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
 const assetRegex = new RegExp(`\\.(${VALID_INPUT_FORMATS.join("|")})`, "i");
 const assetRegexEnds = new RegExp(`\\.(${VALID_INPUT_FORMATS.join("|")})$`, "i");
 const addStaticImageFactory = (settings) => {
@@ -85,19 +89,27 @@ function assets({ fs, settings, sync, logger }) {
       config(_, env) {
         isBuild = env.command === "build";
       },
-      async resolveId(id, _importer) {
-        if (id === VIRTUAL_SERVICE_ID) {
-          if (isAstroServerEnvironment(this.environment)) {
-            return await this.resolve(settings.config.image.service.entrypoint);
+      resolveId: {
+        filter: {
+          id: new RegExp(`^(${VIRTUAL_SERVICE_ID}|${VIRTUAL_MODULE_ID})$`)
+        },
+        async handler(id) {
+          if (id === VIRTUAL_SERVICE_ID) {
+            if (isAstroServerEnvironment(this.environment)) {
+              return await this.resolve(settings.config.image.service.entrypoint);
+            }
+            return await this.resolve("astro/assets/services/noop");
+          }
+          if (id === VIRTUAL_MODULE_ID) {
+            return RESOLVED_VIRTUAL_MODULE_ID;
           }
-          return await this.resolve("astro/assets/services/noop");
-        }
-        if (id === VIRTUAL_MODULE_ID) {
-          return resolvedVirtualModuleId;
         }
       },
-      load(id) {
-        if (id === resolvedVirtualModuleId) {
+      load: {
+        filter: {
+          id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID})$`)
+        },
+        handler() {
           return {
             code: `
 							export { getConfiguredImageService, isLocalService } from "astro/assets";
@@ -179,8 +191,11 @@ function assets({ fs, settings, sync, logger }) {
       configResolved(viteConfig) {
         resolvedConfig = viteConfig;
       },
-      async load(id) {
-        if (assetRegex.test(id)) {
+      load: {
+        filter: {
+          id: assetRegex
+        },
+        async handler(id) {
           if (!globalThis.astroAsset.referencedImages)
             globalThis.astroAsset.referencedImages = /* @__PURE__ */ new Set();
           if (id !== removeQueryString(id)) {

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.0.0-alpha.1";
+  version = "6.0.0-alpha.2";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/container/vite-plugin-container.js

@@ -1,10 +1,13 @@
-const virtualModuleId = "astro:container";
+const VIRTUAL_MODULE_ID = "astro:container";
 function astroContainer() {
   return {
-    name: "astro:container",
+    name: VIRTUAL_MODULE_ID,
     enforce: "pre",
-    resolveId(id) {
-      if (id === virtualModuleId) {
+    resolveId: {
+      filter: {
+        id: new RegExp(`^(${VIRTUAL_MODULE_ID})$`)
+      },
+      handler() {
         return this.resolve("astro/virtual-modules/container.js");
       }
     }

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.0-alpha.1") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-alpha.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.0-alpha.1") {
-      await this.#store.metaStore().set("astro-version", "6.0.0-alpha.1");
+    if ("6.0.0-alpha.2") {
+      await this.#store.metaStore().set("astro-version", "6.0.0-alpha.2");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/types-generator.js

@@ -451,7 +451,16 @@ async function generateJSONSchema(fsMod, collectionConfig, collectionKey, collec
     });
   }
   try {
-    const schema = z.toJSONSchema(zodSchemaForJson);
+    const schema = z.toJSONSchema(zodSchemaForJson, {
+      unrepresentable: "any",
+      override: (ctx) => {
+        const def = ctx.zodSchema._zod.def;
+        if (def.type === "date") {
+          ctx.jsonSchema.type = "string";
+          ctx.jsonSchema.format = "date-time";
+        }
+      }
+    });
     const schemaStr = JSON.stringify(schema, null, 2);
     const schemaJsonPath = new URL(
       `./${collectionKey.replace(/"/g, "")}.schema.json`,

package/dist/content/utils.js

@@ -112,8 +112,15 @@ async function getEntryData(entry, collectionConfig, shouldEmitFile, pluginConte
       schema = schema({
         image: () => z.string().transform((val) => {
           let normalizedPath = val;
-          if (val && !val.startsWith("./") && !val.startsWith("../") && !val.startsWith("/") && !val.startsWith("~") && !val.startsWith("@") && !val.includes("://")) {
-            normalizedPath = `./${val}`;
+          const isUrl = val.includes("://");
+          const isAbsolute = val.startsWith("/");
+          const isRelative = val.startsWith(".");
+          if (val && !isUrl && !isAbsolute && !isRelative) {
+            const entryDir = path.dirname(entry._internal.filePath);
+            const resolvedPath = path.resolve(entryDir, val);
+            if (fsMod.existsSync(resolvedPath)) {
+              normalizedPath = `./${val}`;
+            }
           }
           return `${IMAGE_IMPORT_PREFIX}${normalizedPath}`;
         })