astro 2.5.7 → 2.6.1

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

@@ -1,16 +1,10 @@
 import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../../constants.js";
-import { addRollupInput } from "../add-rollup-input.js";
 const MIDDLEWARE_MODULE_ID = "@astro-middleware";
 function vitePluginMiddleware(opts, _internals) {
   return {
     name: "@astro/plugin-middleware",
-    options(options) {
-      if (opts.settings.config.experimental.middleware) {
-        return addRollupInput(options, [MIDDLEWARE_MODULE_ID]);
-      }
-    },
     async resolveId(id) {
-      if (id === MIDDLEWARE_MODULE_ID && opts.settings.config.experimental.middleware) {
+      if (id === MIDDLEWARE_MODULE_ID) {
         const middlewareId = await this.resolve(
           `${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
         );

package/dist/core/build/plugins/plugin-pages.d.ts

@@ -11,4 +11,5 @@ export declare const ASTRO_PAGE_EXTENSION_POST_PATTERN = "@_@";
  * @param path
  */
 export declare function getVirtualModulePageNameFromPath(path: string): string;
+export declare function getVirtualModulePageIdFromPath(path: string): string;
 export declare function pluginPages(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

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

@@ -1,4 +1,5 @@
 import { extname } from "node:path";
+import { routeIsRedirect } from "../../redirects/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { MIDDLEWARE_MODULE_ID } from "./plugin-middleware.js";
 import { RENDERERS_MODULE_ID } from "./plugin-renderers.js";
@@ -12,13 +13,20 @@ function getVirtualModulePageNameFromPath(path) {
     extension.replace(".", ASTRO_PAGE_EXTENSION_POST_PATTERN)
   )}`;
 }
+function getVirtualModulePageIdFromPath(path) {
+  const name = getVirtualModulePageNameFromPath(path);
+  return "\0" + name;
+}
 function vitePluginPages(opts, internals) {
   return {
     name: "@astro/plugin-build-pages",
     options(options) {
       if (opts.settings.config.output === "static") {
         const inputs = /* @__PURE__ */ new Set();
-        for (const path of Object.keys(opts.allPages)) {
+        for (const [path, pageData] of Object.entries(opts.allPages)) {
+          if (routeIsRedirect(pageData.route)) {
+            continue;
+          }
           inputs.add(getVirtualModulePageNameFromPath(path));
         }
         return addRollupInput(options, Array.from(inputs));
@@ -44,9 +52,10 @@ function vitePluginPages(opts, internals) {
             exports.push(`export { page }`);
             imports.push(`import { renderers } from "${RENDERERS_MODULE_ID}";`);
             exports.push(`export { renderers };`);
-            if (opts.settings.config.experimental.middleware) {
-              imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}";`);
-              exports.push(`export const middleware = _middleware;`);
+            const middlewareModule = await this.resolve(MIDDLEWARE_MODULE_ID);
+            if (middlewareModule) {
+              imports.push(`import * as middleware from "${middlewareModule.id}";`);
+              exports.push(`export { middleware };`);
             }
             return `${imports.join("\n")}${exports.join("\n")}`;
           }
@@ -71,6 +80,7 @@ export {
   ASTRO_PAGE_EXTENSION_POST_PATTERN,
   ASTRO_PAGE_MODULE_ID,
   ASTRO_PAGE_RESOLVED_MODULE_ID,
+  getVirtualModulePageIdFromPath,
   getVirtualModulePageNameFromPath,
   pluginPages
 };

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

@@ -1,14 +1,14 @@
 import glob from "fast-glob";
 import { fileURLToPath } from "url";
 import { runHookBuildSsr } from "../../../integrations/index.js";
-import { isHybridOutput } from "../../../prerender/utils.js";
+import { isServerLikeOutput } from "../../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { joinPaths, prependForwardSlash } from "../../path.js";
+import { routeIsRedirect } from "../../redirects/index.js";
 import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
 import { cssOrder, mergeInlineCss } from "../internal.js";
-import { MIDDLEWARE_MODULE_ID } from "./plugin-middleware.js";
 import { getVirtualModulePageNameFromPath } from "./plugin-pages.js";
 import { RENDERERS_MODULE_ID } from "./plugin-renderers.js";
 const SSR_VIRTUAL_MODULE_ID = "@astrojs-ssr-virtual-entry";
@@ -28,7 +28,6 @@ function vitePluginSSR(internals, adapter, options) {
       }
     },
     async load(id) {
-      var _a;
       if (id === RESOLVED_SSR_VIRTUAL_MODULE_ID) {
         const {
           settings: { config },
@@ -37,22 +36,20 @@ function vitePluginSSR(internals, adapter, options) {
         const imports = [];
         const contents = [];
         const exports = [];
-        let middleware;
-        if (((_a = config.experimental) == null ? void 0 : _a.middleware) === true) {
-          imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}"`);
-          middleware = "middleware: _middleware";
-        }
         let i = 0;
         const pageMap = [];
-        for (const path of Object.keys(allPages)) {
+        for (const [path, pageData] of Object.entries(allPages)) {
+          if (routeIsRedirect(pageData.route)) {
+            continue;
+          }
           const virtualModuleName = getVirtualModulePageNameFromPath(path);
           let module = await this.resolve(virtualModuleName);
           if (module) {
             const variable = `_page${i}`;
             imports.push(`const ${variable}  = () => import("${virtualModuleName}");`);
-            const pageData = internals.pagesByComponent.get(path);
-            if (pageData) {
-              pageMap.push(`[${JSON.stringify(pageData.component)}, ${variable}]`);
+            const pageData2 = internals.pagesByComponent.get(path);
+            if (pageData2) {
+              pageMap.push(`[${JSON.stringify(pageData2.component)}, ${variable}]`);
             }
             i++;
           }
@@ -66,7 +63,6 @@ import { _privateSetManifestDontUseThis } from 'astro:ssr-manifest';
 const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
 	pageMap,
 	renderers,
-	${middleware}
 });
 _privateSetManifestDontUseThis(_manifest);
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : "undefined"};
@@ -217,7 +213,7 @@ function buildManifest(opts, internals, staticFiles) {
   return ssrManifest;
 }
 function pluginSSR(options, internals) {
-  const ssr = options.settings.config.output === "server" || isHybridOutput(options.settings.config);
+  const ssr = isServerLikeOutput(options.settings.config);
   return {
     build: "ssr",
     hooks: {

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

@@ -14,7 +14,7 @@ import { emptyDir, removeEmptyDirs } from "../../core/fs/index.js";
 import { appendForwardSlash, prependForwardSlash } from "../../core/path.js";
 import { isModeServerWithNoAdapter } from "../../core/util.js";
 import { runHookBuildSetup } from "../../integrations/index.js";
-import { isHybridOutput } from "../../prerender/utils.js";
+import { isServerLikeOutput } from "../../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { info } from "../logger/core.js";
@@ -79,7 +79,6 @@ async function viteBuild(opts) {
 }
 async function staticBuild(opts, internals) {
   const { settings } = opts;
-  const hybridOutput = isHybridOutput(settings.config);
   switch (true) {
     case settings.config.output === "static": {
       settings.timer.start("Static generate");
@@ -88,7 +87,7 @@ async function staticBuild(opts, internals) {
       settings.timer.end("Static generate");
       return;
     }
-    case (settings.config.output === "server" || hybridOutput): {
+    case isServerLikeOutput(settings.config): {
       settings.timer.start("Server generate");
       await generatePages(opts, internals);
       await cleanStaticOutput(opts, internals);
@@ -104,7 +103,7 @@ ${bgMagenta(black(" finalizing server assets "))}
 async function ssrBuild(opts, internals, input, container) {
   var _a, _b, _c, _d, _e;
   const { settings, viteConfig } = opts;
-  const ssr = settings.config.output === "server" || isHybridOutput(settings.config);
+  const ssr = isServerLikeOutput(settings.config);
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir);
   const { lastVitePlugins, vitePlugins } = container.runBeforeHook("ssr", input);
   const viteBuildConfig = {
@@ -132,13 +131,13 @@ async function ssrBuild(opts, internals, input, container) {
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
           ...(_e = (_d = viteConfig.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output,
           entryFileNames(chunkInfo) {
-            var _a2, _b2;
+            var _a2;
             if ((_a2 = chunkInfo.facadeModuleId) == null ? void 0 : _a2.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {
               return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId);
             } else if (
               // checks if the path of the module we have middleware, e.g. middleware.js / middleware/index.js
-              ((_b2 = chunkInfo.facadeModuleId) == null ? void 0 : _b2.includes("middleware")) && // checks if the file actually export the `onRequest` function
-              chunkInfo.exports.includes("onRequest")
+              chunkInfo.moduleIds.find((m) => m.includes("middleware")) !== void 0 && // checks if the file actually export the `onRequest` function
+              chunkInfo.exports.includes("_middleware")
             ) {
               return "middleware.mjs";
             } else if (chunkInfo.facadeModuleId === SSR_VIRTUAL_MODULE_ID) {
@@ -175,7 +174,7 @@ async function clientBuild(opts, internals, input, container) {
   var _a, _b, _c;
   const { settings, viteConfig } = opts;
   const timer = performance.now();
-  const ssr = settings.config.output === "server" || isHybridOutput(settings.config);
+  const ssr = isServerLikeOutput(settings.config);
   const out = ssr ? opts.buildConfig.client : getOutDirWithinCwd(settings.config.outDir);
   if (!input.size) {
     if (ssr) {
@@ -229,7 +228,7 @@ async function runPostBuildHooks(container, ssrReturn, clientReturn) {
   const config = container.options.settings.config;
   const buildConfig = container.options.settings.config.build;
   for (const [fileName, mutation] of mutations) {
-    const root = config.output === "server" || isHybridOutput(config) ? mutation.build === "server" ? buildConfig.server : buildConfig.client : config.outDir;
+    const root = isServerLikeOutput(config) ? mutation.build === "server" ? buildConfig.server : buildConfig.client : config.outDir;
     const fileURL = new URL(fileName, root);
     await fs.promises.mkdir(new URL("./", fileURL), { recursive: true });
     await fs.promises.writeFile(fileURL, mutation.code, "utf-8");
@@ -241,7 +240,7 @@ async function cleanStaticOutput(opts, internals) {
     if (pageData.route.prerender)
       allStaticFiles.add(internals.pageToBundleMap.get(pageData.moduleSpecifier));
   }
-  const ssr = opts.settings.config.output === "server" || isHybridOutput(opts.settings.config);
+  const ssr = isServerLikeOutput(opts.settings.config);
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir);
   const files = await glob("**/*.mjs", {
     cwd: fileURLToPath(out)

package/dist/core/config/config.js

@@ -3,7 +3,6 @@ import * as colors from "kleur/colors";
 import path from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import { mergeConfig as mergeViteConfig } from "vite";
-import { isHybridMalconfigured } from "../../prerender/utils.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { arraify, isObject, isURL } from "../util.js";
 import { createRelativeSchema } from "./schema.js";
@@ -77,7 +76,7 @@ function resolveFlags(flags) {
     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,
-    experimentalMiddleware: typeof flags.experimentalMiddleware === "boolean" ? flags.experimentalMiddleware : void 0
+    experimentalRedirects: typeof flags.experimentalRedirects === "boolean" ? flags.experimentalRedirects : void 0
   };
 }
 function resolveRoot(cwd) {
@@ -105,9 +104,6 @@ function mergeCLIFlags(astroConfig, flags) {
   if (typeof flags.open === "boolean") {
     astroConfig.server.open = flags.open;
   }
-  if (typeof flags.experimentalMiddleware === "boolean") {
-    astroConfig.experimental.middleware = true;
-  }
   return astroConfig;
 }
 async function search(fsMod, root) {
@@ -152,11 +148,6 @@ async function openConfig(configOptions) {
     userConfig = config.value;
   }
   const astroConfig = await resolveConfig(userConfig, root, flags, configOptions.cmd);
-  if (isHybridMalconfigured(astroConfig)) {
-    throw new Error(
-      `The "output" config option must be set to "hybrid" and "experimental.hybridOutput" must be set to true to use the hybrid output mode. Falling back to "static" output mode.`
-    );
-  }
   return {
     astroConfig,
     userConfig,

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

@@ -46,6 +46,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         assets: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         assetsPrefix: z.ZodOptional<z.ZodString>;
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+        redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
     }, "strip", z.ZodTypeAny, {
         assetsPrefix?: string | undefined;
         server: URL;
@@ -53,6 +55,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         client: URL;
         assets: string;
         serverEntry: string;
+        redirects: boolean;
+        inlineStylesheets: "never" | "always" | "auto";
     }, {
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
@@ -60,6 +64,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         assets?: string | undefined;
         assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
+        redirects?: boolean | undefined;
+        inlineStylesheets?: "never" | "always" | "auto" | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         open: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -82,6 +88,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         host: string | boolean;
         port: number;
     }, unknown>;
+    redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
     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]>;
@@ -155,34 +162,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>>;
-        customClientDirectives: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
-        middleware: z.ZodDefault<z.ZodOptional<z.ZodOptional<z.ZodBoolean>>>;
-        hybridOutput: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
-        customClientDirectives: boolean;
-        inlineStylesheets: "never" | "always" | "auto";
-        middleware: boolean;
-        hybridOutput: boolean;
+        redirects: boolean;
     }, {
         assets?: boolean | undefined;
-        customClientDirectives?: boolean | undefined;
-        inlineStylesheets?: "never" | "always" | "auto" | undefined;
-        middleware?: boolean | undefined;
-        hybridOutput?: boolean | undefined;
+        redirects?: boolean | undefined;
     }>, {
         assets: boolean;
-        customClientDirectives: boolean;
-        inlineStylesheets: "never" | "always" | "auto";
-        middleware: boolean;
-        hybridOutput: boolean;
+        redirects: boolean;
     }, {
         assets?: boolean | undefined;
-        customClientDirectives?: boolean | undefined;
-        inlineStylesheets?: "never" | "always" | "auto" | undefined;
-        middleware?: boolean | undefined;
-        hybridOutput?: boolean | undefined;
+        redirects?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
 }, "strip", z.ZodTypeAny, {
@@ -211,6 +203,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         name: string;
         hooks: {};
     }[];
+    redirects: Record<string, string>;
     build: {
         assetsPrefix?: string | undefined;
         server: URL;
@@ -218,6 +211,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         client: URL;
         assets: string;
         serverEntry: string;
+        redirects: boolean;
+        inlineStylesheets: "never" | "always" | "auto";
     };
     image: {
         service: {
@@ -242,10 +237,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     vite: ViteUserConfig;
     experimental: {
         assets: boolean;
-        customClientDirectives: boolean;
-        inlineStylesheets: "never" | "always" | "auto";
-        middleware: boolean;
-        hybridOutput: boolean;
+        redirects: boolean;
     };
     legacy: {};
 }, {
@@ -266,6 +258,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         name: string;
     } | undefined;
     integrations?: unknown;
+    redirects?: Record<string, string> | undefined;
     build?: {
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
@@ -273,6 +266,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         assets?: string | undefined;
         assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
+        redirects?: boolean | undefined;
+        inlineStylesheets?: "never" | "always" | "auto" | undefined;
     } | undefined;
     image?: {
         service: {
@@ -297,10 +292,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     vite?: ViteUserConfig | undefined;
     experimental?: {
         assets?: boolean | undefined;
-        customClientDirectives?: boolean | undefined;
-        inlineStylesheets?: "never" | "always" | "auto" | undefined;
-        middleware?: boolean | undefined;
-        hybridOutput?: boolean | undefined;
+        redirects?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;
@@ -333,6 +325,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         name: string;
         hooks: {};
     }[], unknown>;
+    redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
     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]>;
@@ -406,34 +399,19 @@ 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>>;
-        customClientDirectives: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
-        middleware: z.ZodDefault<z.ZodOptional<z.ZodOptional<z.ZodBoolean>>>;
-        hybridOutput: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
-        customClientDirectives: boolean;
-        inlineStylesheets: "never" | "always" | "auto";
-        middleware: boolean;
-        hybridOutput: boolean;
+        redirects: boolean;
     }, {
         assets?: boolean | undefined;
-        customClientDirectives?: boolean | undefined;
-        inlineStylesheets?: "never" | "always" | "auto" | undefined;
-        middleware?: boolean | undefined;
-        hybridOutput?: boolean | undefined;
+        redirects?: boolean | undefined;
     }>, {
         assets: boolean;
-        customClientDirectives: boolean;
-        inlineStylesheets: "never" | "always" | "auto";
-        middleware: boolean;
-        hybridOutput: boolean;
+        redirects: boolean;
     }, {
         assets?: boolean | undefined;
-        customClientDirectives?: boolean | undefined;
-        inlineStylesheets?: "never" | "always" | "auto" | undefined;
-        middleware?: boolean | undefined;
-        hybridOutput?: boolean | undefined;
+        redirects?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
     root: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
@@ -449,6 +427,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         assets: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         assetsPrefix: z.ZodOptional<z.ZodString>;
         serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+        redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
     }, "strip", z.ZodTypeAny, {
         assetsPrefix?: string | undefined;
         server: URL;
@@ -456,6 +436,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client: URL;
         assets: string;
         serverEntry: string;
+        redirects: boolean;
+        inlineStylesheets: "never" | "always" | "auto";
     }, {
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
@@ -463,6 +445,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         assets?: string | undefined;
         assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
+        redirects?: boolean | undefined;
+        inlineStylesheets?: "never" | "always" | "auto" | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
@@ -516,6 +500,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         name: string;
         hooks: {};
     }[];
+    redirects: Record<string, string>;
     build: {
         assetsPrefix?: string | undefined;
         server: URL;
@@ -523,6 +508,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client: URL;
         assets: string;
         serverEntry: string;
+        redirects: boolean;
+        inlineStylesheets: "never" | "always" | "auto";
     };
     image: {
         service: {
@@ -547,10 +534,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite: ViteUserConfig;
     experimental: {
         assets: boolean;
-        customClientDirectives: boolean;
-        inlineStylesheets: "never" | "always" | "auto";
-        middleware: boolean;
-        hybridOutput: boolean;
+        redirects: boolean;
     };
     legacy: {};
 }, {
@@ -571,6 +555,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         name: string;
     } | undefined;
     integrations?: unknown;
+    redirects?: Record<string, string> | undefined;
     build?: {
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
@@ -578,6 +563,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         assets?: string | undefined;
         assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
+        redirects?: boolean | undefined;
+        inlineStylesheets?: "never" | "always" | "auto" | undefined;
     } | undefined;
     image?: {
         service: {
@@ -602,10 +589,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite?: ViteUserConfig | undefined;
     experimental?: {
         assets?: boolean | undefined;
-        customClientDirectives?: boolean | undefined;
-        inlineStylesheets?: "never" | "always" | "auto" | undefined;
-        middleware?: boolean | undefined;
-        hybridOutput?: boolean | undefined;
+        redirects?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>, {
@@ -635,6 +619,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         name: string;
         hooks: {};
     }[];
+    redirects: Record<string, string>;
     build: {
         assetsPrefix?: string | undefined;
         server: URL;
@@ -642,6 +627,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         client: URL;
         assets: string;
         serverEntry: string;
+        redirects: boolean;
+        inlineStylesheets: "never" | "always" | "auto";
     };
     image: {
         service: {
@@ -666,10 +653,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite: ViteUserConfig;
     experimental: {
         assets: boolean;
-        customClientDirectives: boolean;
-        inlineStylesheets: "never" | "always" | "auto";
-        middleware: boolean;
-        hybridOutput: boolean;
+        redirects: boolean;
     };
     legacy: {};
 }, {
@@ -690,6 +674,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         name: string;
     } | undefined;
     integrations?: unknown;
+    redirects?: Record<string, string> | undefined;
     build?: {
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
@@ -697,6 +682,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         assets?: string | undefined;
         assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
+        redirects?: boolean | undefined;
+        inlineStylesheets?: "never" | "always" | "auto" | undefined;
     } | undefined;
     image?: {
         service: {
@@ -721,10 +708,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     vite?: ViteUserConfig | undefined;
     experimental?: {
         assets?: boolean | undefined;
-        customClientDirectives?: boolean | undefined;
-        inlineStylesheets?: "never" | "always" | "auto" | undefined;
-        middleware?: boolean | undefined;
-        hybridOutput?: boolean | undefined;
+        redirects?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;

package/dist/core/config/schema.js

@@ -15,7 +15,9 @@ const ASTRO_CONFIG_DEFAULTS = {
     client: "./dist/client/",
     server: "./dist/server/",
     assets: "_astro",
-    serverEntry: "entry.mjs"
+    serverEntry: "entry.mjs",
+    redirects: true,
+    inlineStylesheets: "never"
   },
   compressHTML: false,
   server: {
@@ -31,12 +33,10 @@ const ASTRO_CONFIG_DEFAULTS = {
   },
   vite: {},
   legacy: {},
+  redirects: {},
   experimental: {
     assets: false,
-    hybridOutput: false,
-    customClientDirectives: false,
-    inlineStylesheets: "never",
-    middleware: false
+    redirects: false
   }
 };
 const AstroConfigSchema = z.object({
@@ -64,7 +64,9 @@ const AstroConfigSchema = z.object({
     server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(val)),
     assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
     assetsPrefix: z.string().optional(),
-    serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry)
+    serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
+    redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
+    inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)
   }).optional().default({}),
   server: z.preprocess(
     // preprocess
@@ -79,6 +81,7 @@ const AstroConfigSchema = z.object({
       headers: z.custom().optional()
     }).optional().default({})
   ),
+  redirects: z.record(z.string(), z.string()).default(ASTRO_CONFIG_DEFAULTS.redirects),
   image: z.object({
     service: z.object({
       entrypoint: z.union([
@@ -118,10 +121,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),
-    customClientDirectives: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.customClientDirecives),
-    inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.experimental.inlineStylesheets),
-    middleware: z.oboolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.middleware),
-    hybridOutput: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.hybridOutput)
+    redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.redirects)
   }).passthrough().refine(
     (d) => {
       const validKeys = Object.keys(ASTRO_CONFIG_DEFAULTS.experimental);
@@ -158,7 +158,9 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
       server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(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)
+      serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
+      redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
+      inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)
     }).optional().default({}),
     server: z.preprocess(
       // preprocess

package/dist/core/config/settings.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "url";
 import { getContentPaths } from "../../content/index.js";
 import jsxRenderer from "../../jsx/renderer.js";
-import { isHybridOutput } from "../../prerender/utils.js";
+import { isServerLikeOutput } from "../../prerender/utils.js";
 import { markdownContentEntryType } from "../../vite-plugin-markdown/content-entry-type.js";
 import { getDefaultClientDirectives } from "../client-directive/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
@@ -19,7 +19,7 @@ function createBaseSettings(config) {
     tsConfig: void 0,
     tsConfigPath: void 0,
     adapter: void 0,
-    injectedRoutes: config.experimental.assets && (config.output === "server" || isHybridOutput(config)) ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint" }] : [],
+    injectedRoutes: config.experimental.assets && isServerLikeOutput(config) ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint" }] : [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     contentEntryTypes: [markdownContentEntryType],
     dataEntryTypes: [