astro 2.8.5 → 2.9.1

package/dist/core/build/generate.js

@@ -20,15 +20,11 @@ import {
 import { runHookBuildGenerated } from "../../integrations/index.js";
 import { isServerLikeOutput } from "../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-import { callEndpoint, throwIfRedirectNotAllowed } from "../endpoint/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { debug, info } from "../logger/core.js";
-import {
-  getRedirectLocationOrThrow,
-  RedirectSinglePageBuiltModule,
-  routeIsRedirect
-} from "../redirects/index.js";
-import { createEnvironment, createRenderContext, tryRenderPage } from "../render/index.js";
+import { RedirectSinglePageBuiltModule, getRedirectLocationOrThrow } from "../redirects/index.js";
+import { isEndpointResult } from "../render/core.js";
+import { createEnvironment, createRenderContext, tryRenderRoute } from "../render/index.js";
 import { callGetStaticPaths } from "../render/route-cache.js";
 import {
   createAssetLink,
@@ -165,9 +161,6 @@ async function generateImage(opts, transform, path) {
   info(opts.logging, null, `  ${green("\u25B6")} ${path} ${dim(statsText)} ${dim(timeIncrease)}`);
 }
 async function generatePage(opts, internals, pageData, ssrEntry, builtPaths, manifest) {
-  if (routeIsRedirect(pageData.route) && !opts.settings.config.experimental.redirects) {
-    throw new Error(`To use redirects first set experimental.redirects to \`true\``);
-  }
   let timeStart = performance.now();
   const pageInfo = getPageDataByComponent(internals, pageData.route.component);
   const linkIds = [];
@@ -399,34 +392,26 @@ async function generatePath(pathname, opts, gopts, manifest, onRequest) {
   });
   let body;
   let encoding;
-  if (pageData.route.type === "endpoint") {
-    const endpointHandler = mod;
-    const result = await callEndpoint(
-      endpointHandler,
-      env,
-      renderContext,
-      onRequest
-    );
-    if (result.type === "response") {
-      throwIfRedirectNotAllowed(result.response, opts.settings.config);
-      if (!result.response.body)
+  let response;
+  try {
+    response = await tryRenderRoute(pageData.route.type, renderContext, env, mod, onRequest);
+  } catch (err) {
+    if (!AstroError.is(err) && !err.id && typeof err === "object") {
+      err.id = pageData.component;
+    }
+    throw err;
+  }
+  if (isEndpointResult(response, pageData.route.type)) {
+    if (response.type === "response") {
+      if (!response.response.body)
         return;
-      const ab = await result.response.arrayBuffer();
+      const ab = await response.response.arrayBuffer();
       body = new Uint8Array(ab);
     } else {
-      body = result.body;
-      encoding = result.encoding;
+      body = response.body;
+      encoding = response.encoding;
     }
   } else {
-    let response;
-    try {
-      response = await tryRenderPage(renderContext, env, mod, onRequest);
-    } catch (err) {
-      if (!AstroError.is(err) && !err.id && typeof err === "object") {
-        err.id = pageData.component;
-      }
-      throw err;
-    }
     if (response.status >= 300 && response.status < 400) {
       if (!opts.settings.config.build.redirects) {
         return;

package/dist/core/build/graph.js

@@ -21,7 +21,7 @@ function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PUR
     if (seen.has(imp)) {
       continue;
     }
-    yield* walkParentInfos(imp, ctx, until, ++depth, order, seen, id);
+    yield* walkParentInfos(imp, ctx, until, depth + 1, order, seen, id);
   }
 }
 function moduleIsTopLevelPage(info) {

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

@@ -1,3 +1,4 @@
+import { walk } from "estree-walker";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import { prependForwardSlash } from "../../../core/path.js";
 import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "../graph.js";
@@ -9,12 +10,91 @@ function isPropagatedAsset(id) {
     return false;
   }
 }
+async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
+  var _a, _b;
+  if (!childInfo || !parentInfo.ast || !childExportNames)
+    return "no";
+  if (childExportNames === "dynamic" || ((_a = parentInfo.dynamicallyImportedIds) == null ? void 0 : _a.includes(childInfo.id))) {
+    return "dynamic";
+  }
+  const imports = [];
+  const exports = [];
+  walk(parentInfo.ast, {
+    enter(node) {
+      if (node.type === "ImportDeclaration") {
+        imports.push(node);
+      } else if (node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration") {
+        exports.push(node);
+      }
+    }
+  });
+  const importNames = [];
+  const exportNames = [];
+  for (const node of imports) {
+    const resolved = await this.resolve(node.source.value, parentInfo.id);
+    if (!resolved || resolved.id !== childInfo.id)
+      continue;
+    for (const specifier of node.specifiers) {
+      if (specifier.type === "ImportNamespaceSpecifier")
+        continue;
+      const name = specifier.type === "ImportDefaultSpecifier" ? "default" : specifier.imported.name;
+      if (childExportNames.includes(name)) {
+        importNames.push(specifier.local.name);
+      }
+    }
+  }
+  for (const node of exports) {
+    if (node.type === "ExportDefaultDeclaration") {
+      if (node.declaration.type === "Identifier" && importNames.includes(node.declaration.name)) {
+        exportNames.push("default");
+      }
+    } else {
+      if (node.source) {
+        const resolved = await this.resolve(node.source.value, parentInfo.id);
+        if (!resolved || resolved.id !== childInfo.id)
+          continue;
+        for (const specifier of node.specifiers) {
+          if (childExportNames.includes(specifier.local.name)) {
+            importNames.push(specifier.local.name);
+            exportNames.push(specifier.exported.name);
+          }
+        }
+      }
+      if (node.declaration) {
+        if (node.declaration.type !== "VariableDeclaration")
+          continue;
+        for (const declarator of node.declaration.declarations) {
+          if (((_b = declarator.init) == null ? void 0 : _b.type) !== "Identifier")
+            continue;
+          if (declarator.id.type !== "Identifier")
+            continue;
+          if (importNames.includes(declarator.init.name)) {
+            exportNames.push(declarator.id.name);
+          }
+        }
+      }
+      for (const specifier of node.specifiers) {
+        if (importNames.includes(specifier.local.name)) {
+          exportNames.push(specifier.exported.name);
+        }
+      }
+    }
+  }
+  if (!importNames.length)
+    return "no";
+  if (parentInfo.id.endsWith(".astro")) {
+    exportNames.push("default");
+  } else if (parentInfo.id.endsWith(".mdx")) {
+    exportNames.push("Content");
+  }
+  return exportNames;
+}
 function vitePluginAnalyzer(internals) {
   function hoistedScriptScanner() {
     const uniqueHoistedIds = /* @__PURE__ */ new Map();
     const pageScripts = /* @__PURE__ */ new Map();
     return {
-      scan(scripts, from) {
+      async scan(scripts, from) {
         var _a;
         const hoistedScripts = /* @__PURE__ */ new Set();
         for (let i = 0; i < scripts.length; i++) {
@@ -22,9 +102,27 @@ function vitePluginAnalyzer(internals) {
           hoistedScripts.add(hid);
         }
         if (hoistedScripts.size) {
-          for (const [parentInfo] of walkParentInfos(from, this, function until(importer) {
+          const depthsToChildren = /* @__PURE__ */ new Map();
+          const depthsToExportNames = /* @__PURE__ */ new Map();
+          depthsToExportNames.set(0, ["default"]);
+          for (const [parentInfo, depth] of walkParentInfos(from, this, function until(importer) {
             return isPropagatedAsset(importer);
           })) {
+            depthsToChildren.set(depth, parentInfo);
+            if (depth > 0) {
+              const childInfo = depthsToChildren.get(depth - 1);
+              const childExportNames = depthsToExportNames.get(depth - 1);
+              const doesImport = await doesParentImportChild.call(
+                this,
+                parentInfo,
+                childInfo,
+                childExportNames
+              );
+              if (doesImport === "no") {
+                continue;
+              }
+              depthsToExportNames.set(depth, doesImport);
+            }
             if (isPropagatedAsset(parentInfo.id)) {
               for (const [nestedParentInfo] of walkParentInfos(from, this)) {
                 if (moduleIsTopLevelPage(nestedParentInfo)) {
@@ -114,7 +212,7 @@ function vitePluginAnalyzer(internals) {
             internals.discoveredHydratedComponents.set(rid, [c.exportName]);
           }
         }
-        hoistScanner.scan.call(this, astro.scripts, id);
+        await hoistScanner.scan.call(this, astro.scripts, id);
         if (astro.clientOnlyComponents.length) {
           const clientOnlys = [];
           for (const c of astro.clientOnlyComponents) {

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

@@ -1,6 +1,6 @@
 import * as crypto from "node:crypto";
 import * as npath from "node:path";
-import { isBuildableCSSRequest } from "../../render/dev/util.js";
+import { isBuildableCSSRequest } from "../../../vite-plugin-astro-server/util.js";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import * as assetName from "../css-asset-name.js";
 import { moduleIsTopLevelPage, walkParentInfos } from "../graph.js";

package/dist/core/build/types.d.ts

@@ -1,4 +1,4 @@
-import type { default as vite, InlineConfig } from 'vite';
+import type { InlineConfig, default as vite } from 'vite';
 import type { AstroConfig, AstroSettings, ComponentInstance, ManifestData, MiddlewareHandler, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 import type { RouteCache } from '../render/route-cache';

package/dist/core/compile/compile.js

@@ -24,6 +24,8 @@ async function compile({
       astroGlobalArgs: JSON.stringify(astroConfig.site),
       scopedStyleStrategy: astroConfig.scopedStyleStrategy,
       resultScopedSlot: true,
+      experimentalTransitions: astroConfig.experimental.viewTransitions,
+      transitionsAnimationURL: "astro/components/viewtransitions.css",
       preprocessStyle: createStylePreprocessor({
         filename,
         viteConfig,

package/dist/core/config/config.js

@@ -1,7 +1,7 @@
 import * as colors from "kleur/colors";
 import fs from "node:fs";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { mergeConfig } from "./merge.js";
 import { createRelativeSchema } from "./schema.js";
@@ -18,7 +18,6 @@ const LEGACY_ASTRO_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "devOptions"
 ]);
 async function validateConfig(userConfig, root, cmd) {
-  const fileProtocolRoot = pathToFileURL(root + path.sep);
   if (userConfig.hasOwnProperty("renderers")) {
     console.error('Astro "renderers" are now "integrations"!');
     console.error("Update your configuration and install new dependencies:");
@@ -60,7 +59,7 @@ async function validateConfig(userConfig, root, cmd) {
       message: AstroErrorData.ConfigLegacyKey.message(legacyConfigKey)
     });
   }
-  const AstroConfigRelativeSchema = createRelativeSchema(cmd, fileProtocolRoot);
+  const AstroConfigRelativeSchema = createRelativeSchema(cmd, root);
   const result = await AstroConfigRelativeSchema.parseAsync(userConfig);
   return result;
 }
@@ -74,8 +73,7 @@ function resolveFlags(flags) {
     config: typeof flags.config === "string" ? flags.config : void 0,
     host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
     drafts: typeof flags.drafts === "boolean" ? flags.drafts : void 0,
-    experimentalAssets: typeof flags.experimentalAssets === "boolean" ? flags.experimentalAssets : void 0,
-    experimentalRedirects: typeof flags.experimentalRedirects === "boolean" ? flags.experimentalRedirects : void 0
+    experimentalAssets: typeof flags.experimentalAssets === "boolean" ? flags.experimentalAssets : void 0
   };
 }
 function resolveRoot(cwd) {

package/dist/core/config/schema.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { RehypePlugin, RemarkPlugin, RemarkRehype } from '@astrojs/markdown-remark';
 import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
 import type { ViteUserConfig } from '../../@types/astro';
@@ -94,7 +95,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
         port: number;
         open: boolean;
     }, unknown>;
-    redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
+    redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodObject<{
+        status: z.ZodUnion<[z.ZodLiteral<300>, z.ZodLiteral<301>, z.ZodLiteral<302>, z.ZodLiteral<303>, z.ZodLiteral<304>, z.ZodLiteral<307>, z.ZodLiteral<308>]>;
+        destination: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }, {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>]>>>;
     image: z.ZodDefault<z.ZodObject<{
         service: z.ZodObject<{
             entrypoint: z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodLiteral<"astro/assets/services/squoosh">, z.ZodString]>;
@@ -168,19 +178,19 @@ export declare const AstroConfigSchema: z.ZodObject<{
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
     experimental: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodObject<{
         assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        viewTransitions: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
-        redirects: boolean;
+        viewTransitions: boolean;
     }, {
         assets?: boolean | undefined;
-        redirects?: boolean | undefined;
+        viewTransitions?: boolean | undefined;
     }>, {
         assets: boolean;
-        redirects: boolean;
+        viewTransitions: boolean;
     }, {
         assets?: boolean | undefined;
-        redirects?: boolean | undefined;
+        viewTransitions?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
 }, "strip", z.ZodTypeAny, {
@@ -196,7 +206,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         port: number;
         open: boolean;
     };
-    redirects: Record<string, string>;
+    redirects: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>;
     root: URL;
     srcDir: URL;
     publicDir: URL;
@@ -245,13 +258,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
     vite: ViteUserConfig;
     experimental: {
         assets: boolean;
-        redirects: boolean;
+        viewTransitions: boolean;
     };
     legacy: {};
 }, {
     output?: "server" | "static" | "hybrid" | undefined;
     server?: unknown;
-    redirects?: Record<string, string> | undefined;
+    redirects?: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }> | undefined;
     root?: string | undefined;
     srcDir?: string | undefined;
     publicDir?: string | undefined;
@@ -302,13 +318,22 @@ export declare const AstroConfigSchema: z.ZodObject<{
     vite?: ViteUserConfig | undefined;
     experimental?: {
         assets?: boolean | undefined;
-        redirects?: boolean | undefined;
+        viewTransitions?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;
-export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL): z.ZodEffects<z.ZodObject<{
+export declare function createRelativeSchema(cmd: string, fileProtocolRoot: string): z.ZodEffects<z.ZodObject<{
     output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">, z.ZodLiteral<"hybrid">]>>>;
-    redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
+    redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodObject<{
+        status: z.ZodUnion<[z.ZodLiteral<300>, z.ZodLiteral<301>, z.ZodLiteral<302>, z.ZodLiteral<303>, z.ZodLiteral<304>, z.ZodLiteral<307>, z.ZodLiteral<308>]>;
+        destination: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }, {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>]>>>;
     site: z.ZodOptional<z.ZodString>;
     base: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
@@ -409,31 +434,31 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
     experimental: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodObject<{
         assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        viewTransitions: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
-        redirects: boolean;
+        viewTransitions: boolean;
     }, {
         assets?: boolean | undefined;
-        redirects?: boolean | undefined;
+        viewTransitions?: boolean | undefined;
     }>, {
         assets: boolean;
-        redirects: boolean;
+        viewTransitions: boolean;
     }, {
         assets?: boolean | undefined;
-        redirects?: boolean | undefined;
+        viewTransitions?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
-    root: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
-    srcDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
+    root: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
+    srcDir: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
     compressHTML: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    publicDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
-    outDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
-    cacheDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
+    publicDir: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
+    outDir: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
+    cacheDir: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
     build: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         format: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"directory">]>>>;
-        client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-        server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+        client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, import("url").URL, string | undefined>;
+        server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, import("url").URL, string | undefined>;
         assets: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         assetsPrefix: z.ZodOptional<z.ZodString>;
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
@@ -444,8 +469,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     }, "strip", z.ZodTypeAny, {
         assetsPrefix?: string | undefined;
         format: "file" | "directory";
-        client: URL;
-        server: URL;
+        client: import("url").URL;
+        server: import("url").URL;
         assets: string;
         serverEntry: string;
         redirects: boolean;
@@ -503,12 +528,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         open: boolean;
         streaming: boolean;
     };
-    redirects: Record<string, string>;
-    root: URL;
-    srcDir: URL;
-    publicDir: URL;
-    outDir: URL;
-    cacheDir: URL;
+    redirects: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>;
+    root: import("url").URL;
+    srcDir: import("url").URL;
+    publicDir: import("url").URL;
+    outDir: import("url").URL;
+    cacheDir: import("url").URL;
     compressHTML: boolean;
     base: string;
     trailingSlash: "ignore" | "always" | "never";
@@ -520,8 +548,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     build: {
         assetsPrefix?: string | undefined;
         format: "file" | "directory";
-        client: URL;
-        server: URL;
+        client: import("url").URL;
+        server: import("url").URL;
         assets: string;
         serverEntry: string;
         redirects: boolean;
@@ -552,13 +580,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite: ViteUserConfig;
     experimental: {
         assets: boolean;
-        redirects: boolean;
+        viewTransitions: boolean;
     };
     legacy: {};
 }, {
     output?: "server" | "static" | "hybrid" | undefined;
     server?: unknown;
-    redirects?: Record<string, string> | undefined;
+    redirects?: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }> | undefined;
     root?: string | undefined;
     srcDir?: string | undefined;
     publicDir?: string | undefined;
@@ -609,7 +640,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite?: ViteUserConfig | undefined;
     experimental?: {
         assets?: boolean | undefined;
-        redirects?: boolean | undefined;
+        viewTransitions?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>, {
@@ -626,12 +657,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         open: boolean;
         streaming: boolean;
     };
-    redirects: Record<string, string>;
-    root: URL;
-    srcDir: URL;
-    publicDir: URL;
-    outDir: URL;
-    cacheDir: URL;
+    redirects: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>;
+    root: import("url").URL;
+    srcDir: import("url").URL;
+    publicDir: import("url").URL;
+    outDir: import("url").URL;
+    cacheDir: import("url").URL;
     compressHTML: boolean;
     base: string;
     trailingSlash: "ignore" | "always" | "never";
@@ -643,8 +677,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     build: {
         assetsPrefix?: string | undefined;
         format: "file" | "directory";
-        client: URL;
-        server: URL;
+        client: import("url").URL;
+        server: import("url").URL;
         assets: string;
         serverEntry: string;
         redirects: boolean;
@@ -675,13 +709,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite: ViteUserConfig;
     experimental: {
         assets: boolean;
-        redirects: boolean;
+        viewTransitions: boolean;
     };
     legacy: {};
 }, {
     output?: "server" | "static" | "hybrid" | undefined;
     server?: unknown;
-    redirects?: Record<string, string> | undefined;
+    redirects?: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }> | undefined;
     root?: string | undefined;
     srcDir?: string | undefined;
     publicDir?: string | undefined;
@@ -732,7 +769,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite?: ViteUserConfig | undefined;
     experimental?: {
         assets?: boolean | undefined;
-        redirects?: boolean | undefined;
+        viewTransitions?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;

package/dist/core/config/schema.js

@@ -1,4 +1,6 @@
 import { markdownConfigDefaults } from "@astrojs/markdown-remark";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
 import { BUNDLED_THEMES } from "shiki";
 import { z } from "zod";
 import { appendForwardSlash, prependForwardSlash, trimSlashes } from "../path.js";
@@ -37,7 +39,7 @@ const ASTRO_CONFIG_DEFAULTS = {
   redirects: {},
   experimental: {
     assets: false,
-    redirects: false
+    viewTransitions: false
   }
 };
 const AstroConfigSchema = z.object({
@@ -84,7 +86,24 @@ const AstroConfigSchema = z.object({
       headers: z.custom().optional()
     }).optional().default({})
   ),
-  redirects: z.record(z.string(), z.string()).default(ASTRO_CONFIG_DEFAULTS.redirects),
+  redirects: z.record(
+    z.string(),
+    z.union([
+      z.string(),
+      z.object({
+        status: z.union([
+          z.literal(300),
+          z.literal(301),
+          z.literal(302),
+          z.literal(303),
+          z.literal(304),
+          z.literal(307),
+          z.literal(308)
+        ]),
+        destination: z.string()
+      })
+    ])
+  ).default(ASTRO_CONFIG_DEFAULTS.redirects),
   image: z.object({
     service: z.object({
       entrypoint: z.union([
@@ -124,7 +143,7 @@ const AstroConfigSchema = z.object({
   vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.vite),
   experimental: z.object({
     assets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.assets),
-    redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.redirects)
+    viewTransitions: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.viewTransitions)
   }).passthrough().refine(
     (d) => {
       const validKeys = Object.keys(ASTRO_CONFIG_DEFAULTS.experimental);
@@ -149,16 +168,16 @@ See https://docs.astro.build/en/reference/configuration-reference/#experimental-
 });
 function createRelativeSchema(cmd, fileProtocolRoot) {
   const AstroConfigRelativeSchema = AstroConfigSchema.extend({
-    root: z.string().default(ASTRO_CONFIG_DEFAULTS.root).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
-    srcDir: z.string().default(ASTRO_CONFIG_DEFAULTS.srcDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
+    root: z.string().default(ASTRO_CONFIG_DEFAULTS.root).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
+    srcDir: z.string().default(ASTRO_CONFIG_DEFAULTS.srcDir).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
     compressHTML: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.compressHTML),
-    publicDir: z.string().default(ASTRO_CONFIG_DEFAULTS.publicDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
-    outDir: z.string().default(ASTRO_CONFIG_DEFAULTS.outDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
-    cacheDir: z.string().default(ASTRO_CONFIG_DEFAULTS.cacheDir).transform((val) => new URL(appendForwardSlash(val), fileProtocolRoot)),
+    publicDir: z.string().default(ASTRO_CONFIG_DEFAULTS.publicDir).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
+    outDir: z.string().default(ASTRO_CONFIG_DEFAULTS.outDir).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
+    cacheDir: z.string().default(ASTRO_CONFIG_DEFAULTS.cacheDir).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
     build: z.object({
       format: z.union([z.literal("file"), z.literal("directory")]).optional().default(ASTRO_CONFIG_DEFAULTS.build.format),
-      client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => new URL(val, fileProtocolRoot)),
-      server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(val, fileProtocolRoot)),
+      client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
+      server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
       assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
       assetsPrefix: z.string().optional(),
       serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
@@ -209,6 +228,13 @@ A future version of Astro will stop using the site pathname when producing <link
   });
   return AstroConfigRelativeSchema;
 }
+function resolveDirAsUrl(dir, root) {
+  let resolvedDir = path.resolve(root, dir);
+  if (!resolvedDir.endsWith(path.sep)) {
+    resolvedDir += path.sep;
+  }
+  return pathToFileURL(resolvedDir);
+}
 export {
   AstroConfigSchema,
   createRelativeSchema

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.8.5";
+const ASTRO_VERSION = "2.9.1";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",