astro 5.6.1 → 5.7.0

package/dist/config/entrypoint.js

@@ -2,6 +2,7 @@ import { defineConfig, getViteConfig } from "./index.js";
 import { envField } from "../env/config.js";
 import { mergeConfig } from "../core/config/merge.js";
 import { validateConfig } from "../core/config/validate.js";
+import { fontProviders, defineAstroFontProvider } from "../assets/fonts/providers/index.js";
 function sharpImageService(config = {}) {
   return {
     entrypoint: "astro/assets/services/sharp",
@@ -15,8 +16,10 @@ function passthroughImageService() {
   };
 }
 export {
+  defineAstroFontProvider,
   defineConfig,
   envField,
+  fontProviders,
   getViteConfig,
   mergeConfig,
   passthroughImageService,

package/dist/config/index.d.ts

@@ -1,10 +1,11 @@
 import type { UserConfig as ViteUserConfig, UserConfigFn as ViteUserConfigFn } from 'vite';
+import type { FontFamily } from '../assets/fonts/types.js';
 import type { AstroInlineConfig, AstroUserConfig, Locales, SessionDriverName } from '../types/public/config.js';
 /**
  * See the full Astro Configuration API Documentation
  * https://astro.build/config
  */
-export declare function defineConfig<const TLocales extends Locales = never, const TDriver extends SessionDriverName = never>(config: AstroUserConfig<TLocales, TDriver>): AstroUserConfig<TLocales, TDriver>;
+export declare function defineConfig<const TLocales extends Locales = never, const TDriver extends SessionDriverName = never, const TFontFamilies extends FontFamily[] = never>(config: AstroUserConfig<TLocales, TDriver, TFontFamilies>): AstroUserConfig<TLocales, TDriver, TFontFamilies>;
 /**
  * Use Astro to generate a fully resolved Vite config
  */

package/dist/content/content-layer.js

@@ -153,7 +153,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.6.1") {
+    if (previousAstroVersion && previousAstroVersion !== "5.7.0") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -161,8 +161,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.6.1") {
-      await this.#store.metaStore().set("astro-version", "5.6.1");
+    if ("5.7.0") {
+      await this.#store.metaStore().set("astro-version", "5.7.0");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);
@@ -202,7 +202,8 @@ ${contentConfig.error.message}`);
             },
             collectionWithResolvedSchema,
             false,
-            !!this.#settings.config.experimental.svg
+            // FUTURE: Remove in this in v6
+            id.endsWith(".svg")
           );
           return parsedData;
         };

package/dist/content/runtime-assets.js

@@ -7,6 +7,7 @@ function createImage(pluginContext, shouldEmitFile, entryFilePath, experimentalS
       const metadata = await emitESMImage(
         resolvedFilePath,
         pluginContext.meta.watchMode,
+        // FUTURE: Remove in this in v6
         experimentalSvgEnabled,
         shouldEmitFile ? pluginContext.emitFile : void 0
       );

package/dist/content/utils.d.ts

@@ -106,8 +106,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     }, {
         load: (args_0: {
             collection: string;
@@ -122,8 +122,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     }>]>;
     /** deprecated */
     _legacy: z.ZodOptional<z.ZodBoolean>;
@@ -143,8 +143,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     };
     schema?: any;
     _legacy?: boolean | undefined;
@@ -164,8 +164,8 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
         name: string;
-        render?: ((args_0: any) => unknown) | undefined;
         schema?: any;
+        render?: ((args_0: any) => unknown) | undefined;
     };
     schema?: any;
     _legacy?: boolean | undefined;
@@ -244,8 +244,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         }, {
             load: (args_0: {
                 collection: string;
@@ -260,8 +260,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         }>]>;
         /** deprecated */
         _legacy: z.ZodOptional<z.ZodBoolean>;
@@ -281,8 +281,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;
@@ -302,8 +302,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;
@@ -331,8 +331,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;
@@ -360,8 +360,8 @@ declare const contentConfigParser: z.ZodObject<{
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
             name: string;
-            render?: ((args_0: any) => unknown) | undefined;
             schema?: any;
+            render?: ((args_0: any) => unknown) | undefined;
         };
         schema?: any;
         _legacy?: boolean | undefined;

package/dist/content/vite-plugin-content-imports.js

@@ -171,7 +171,8 @@ async function getContentEntryModule(params) {
     { id, collection, _internal, unvalidatedData },
     collectionConfig,
     params.shouldEmitFile,
-    !!params.config.experimental.svg,
+    // FUTURE: Remove in this in v6
+    id.endsWith(".svg"),
     pluginContext
   ) : unvalidatedData;
   const contentEntryModule = {
@@ -197,7 +198,8 @@ async function getDataEntryModule(params) {
     { id, collection, _internal, unvalidatedData },
     collectionConfig,
     params.shouldEmitFile,
-    !!params.config.experimental.svg,
+    // FUTURE: Remove in this in v6
+    id.endsWith(".svg"),
     pluginContext
   ) : unvalidatedData;
   const dataEntryModule = {

package/dist/core/build/generate.js

@@ -18,7 +18,7 @@ import {
 } from "../../core/path.js";
 import { toFallbackType, toRoutingStrategy } from "../../i18n/utils.js";
 import { runHookBuildGenerated } from "../../integrations/hooks.js";
-import { getOutputDirectory } from "../../prerender/utils.js";
+import { getServerOutputDirectory } from "../../prerender/utils.js";
 import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { NOOP_MIDDLEWARE_FN } from "../middleware/noop-middleware.js";
@@ -41,7 +41,7 @@ async function generatePages(options, internals) {
   if (ssr) {
     manifest = await BuildPipeline.retrieveManifest(options.settings, internals);
   } else {
-    const baseDirectory = getOutputDirectory(options.settings);
+    const baseDirectory = getServerOutputDirectory(options.settings);
     const renderersEntryUrl = new URL("renderers.mjs", baseDirectory);
     const renderers = await import(renderersEntryUrl.toString());
     const middleware = internals.middlewareEntryPoint ? await import(internals.middlewareEntryPoint.toString()).then((mod) => mod.onRequest) : NOOP_MIDDLEWARE_FN;

package/dist/core/build/pipeline.js

@@ -1,4 +1,4 @@
-import { getOutputDirectory } from "../../prerender/utils.js";
+import { getServerOutputDirectory } from "../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { routeIsFallback, routeIsRedirect } from "../redirects/helpers.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
@@ -81,7 +81,7 @@ class BuildPipeline extends Pipeline {
    * @param staticBuildOptions
    */
   static async retrieveManifest(settings, internals) {
-    const baseDirectory = getOutputDirectory(settings);
+    const baseDirectory = getServerOutputDirectory(settings);
     const manifestEntryUrl = new URL(
       `${internals.manifestFileName}?time=${Date.now()}`,
       baseDirectory

package/dist/core/build/plugins/plugin-prerender.js

@@ -41,9 +41,6 @@ function getNonPrerenderOnlyChunks(bundle, internals) {
       }
       nonPrerenderOnlyEntryChunks.add(chunk);
     }
-    if (chunk.type === "chunk" && chunk.isDynamicEntry) {
-      nonPrerenderOnlyEntryChunks.add(chunk);
-    }
   }
   const nonPrerenderOnlyChunks = new Set(nonPrerenderOnlyEntryChunks);
   for (const chunk of nonPrerenderOnlyChunks) {

package/dist/core/build/static-build.js

@@ -9,7 +9,7 @@ import { createBuildInternals } from "../../core/build/internal.js";
 import { emptyDir, removeEmptyDirs } from "../../core/fs/index.js";
 import { appendForwardSlash, prependForwardSlash } from "../../core/path.js";
 import { runHookBuildSetup } from "../../integrations/hooks.js";
-import { getOutputDirectory } from "../../prerender/utils.js";
+import { getServerOutputDirectory } from "../../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { routeIsRedirect } from "../redirects/index.js";
 import { getOutDirWithinCwd } from "./common.js";
@@ -95,7 +95,7 @@ async function staticBuild(opts, internals, ssrOutputChunkNames) {
 async function ssrBuild(opts, internals, input, container) {
   const { allPages, settings, viteConfig } = opts;
   const ssr = settings.buildOutput === "server";
-  const out = getOutputDirectory(settings);
+  const out = getServerOutputDirectory(settings);
   const routes = Object.values(allPages).flatMap((pageData) => pageData.route);
   const { lastVitePlugins, vitePlugins } = await container.runBeforeHook("server", input);
   const viteBuildConfig = {