astro 4.0.2 → 4.0.4

package/astro-jsx.d.ts

@@ -36,6 +36,7 @@ declare namespace astroHTML.JSX {
 		AstroDefineVarsAttribute;
 	type AstroStyleAttributes = import('./dist/@types/astro.js').AstroStyleAttributes &
 		AstroDefineVarsAttribute;
+	type AstroSlotAttributes = import('./dist/@types/astro.js').AstroSlotAttributes;
 
 	// This is an unfortunate use of `any`, but unfortunately we can't make a type that works for every framework
 	// without importing every single framework's types (which comes with its own set of problems).
@@ -1415,7 +1416,7 @@ declare namespace astroHTML.JSX {
 		ruby: HTMLAttributes;
 		s: HTMLAttributes;
 		samp: HTMLAttributes;
-		slot: SlotHTMLAttributes;
+		slot: SlotHTMLAttributes & AstroSlotAttributes;
 		script: ScriptHTMLAttributes & AstroScriptAttributes;
 		section: HTMLAttributes;
 		select: SelectHTMLAttributes;

package/dist/@types/astro.d.ts

@@ -73,6 +73,9 @@ export interface AstroStyleAttributes {
 export interface AstroScriptAttributes {
     'is:inline'?: boolean;
 }
+export interface AstroSlotAttributes {
+    'is:inline'?: boolean;
+}
 export interface AstroComponentMetadata {
     displayName: string;
     hydrate?: 'load' | 'idle' | 'visible' | 'media' | 'only';

package/dist/cli/add/index.js

@@ -5,6 +5,7 @@ import { bold, cyan, dim, green, magenta, red, yellow } from "kleur/colors";
 import fsMod, { existsSync, promises as fs } from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import maxSatisfying from "semver/ranges/max-satisfying.js";
 import ora from "ora";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
@@ -507,9 +508,7 @@ async function getInstallIntegrationsCommand({
   logger.debug("add", `package manager: ${JSON.stringify(pm)}`);
   if (!pm)
     return null;
-  let dependencies = integrations.map((i) => [[i.packageName, null], ...i.dependencies]).flat(1).filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i).map(
-    ([name, version]) => version === null ? name : `${name}@${version.split(/\s*\|\|\s*/).pop()}`
-  ).sort();
+  const dependencies = await convertIntegrationsToInstallSpecifiers(integrations);
   switch (pm.name) {
     case "npm":
       return { pm: "npm", command: "install", flags: [], dependencies };
@@ -523,6 +522,26 @@ async function getInstallIntegrationsCommand({
       return null;
   }
 }
+async function convertIntegrationsToInstallSpecifiers(integrations) {
+  const ranges = {};
+  for (let { packageName, dependencies } of integrations) {
+    ranges[packageName] = "*";
+    for (const [name, range] of dependencies) {
+      ranges[name] = range;
+    }
+  }
+  return Promise.all(
+    Object.entries(ranges).map(([name, range]) => resolveRangeToInstallSpecifier(name, range))
+  );
+}
+async function resolveRangeToInstallSpecifier(name, range) {
+  const versions = await fetchPackageVersions(name);
+  if (versions instanceof Error)
+    return name;
+  const stableVersions = versions.filter((v) => !v.includes("-"));
+  const maxStable = maxSatisfying(stableVersions, range);
+  return `${name}@^${maxStable}`;
+}
 const INHERITED_FLAGS = /* @__PURE__ */ new Set([
   "P",
   "save-prod",
@@ -614,6 +633,19 @@ async function fetchPackageJson(scope, name, tag) {
     return new Error(`Failed to fetch ${registry}/${packageName}/${tag} - GET ${res.status}`);
   }
 }
+async function fetchPackageVersions(packageName) {
+  const registry = await getRegistry();
+  const res = await fetch(`${registry}/${packageName}`, {
+    headers: { accept: "application/vnd.npm.install-v1+json" }
+  });
+  if (res.status >= 200 && res.status < 300) {
+    return await res.json().then((data) => Object.keys(data.versions));
+  } else if (res.status === 404) {
+    return new Error();
+  } else {
+    return new Error(`Failed to fetch ${registry}/${packageName} - GET ${res.status}`);
+  }
+}
 async function validateIntegrations(integrations) {
   const spinner = ora("Resolving packages...").start();
   try {

package/dist/core/build/buildPipeline.js

@@ -4,7 +4,10 @@ import { Pipeline } from "../pipeline.js";
 import { routeIsFallback, routeIsRedirect } from "../redirects/helpers.js";
 import { createEnvironment } from "../render/index.js";
 import { createAssetLink } from "../render/ssr-element.js";
-import { ASTRO_PAGE_RESOLVED_MODULE_ID } from "./plugins/plugin-pages.js";
+import {
+  ASTRO_PAGE_RESOLVED_MODULE_ID,
+  getVirtualModulePageNameFromPath
+} from "./plugins/plugin-pages.js";
 import { RESOLVED_SPLIT_MODULE_ID } from "./plugins/plugin-ssr.js";
 import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
 import { i18nHasFallback } from "./util.js";
@@ -131,7 +134,11 @@ class BuildPipeline extends Pipeline {
       if (routeIsRedirect(pageData.route)) {
         pages.set(pageData, path);
       } else if (routeIsFallback(pageData.route) && (i18nHasFallback(this.getConfig()) || routeIsFallback(pageData.route) && pageData.route.route === "/")) {
-        pages.set(pageData, path);
+        const moduleSpecifier = getVirtualModulePageNameFromPath(path);
+        const filePath = this.#internals.entrySpecifierToBundleMap.get(moduleSpecifier);
+        if (filePath) {
+          pages.set(pageData, filePath);
+        }
       }
     }
     return pages;

package/dist/core/build/generate.js

@@ -223,11 +223,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
   };
   for (const route of eachRouteInRouteData(pageData)) {
     const icon = route.type === "page" || route.type === "redirect" || route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
-    if (isRelativePath(route.component)) {
-      logger.info(null, `${icon} ${route.route}`);
-    } else {
-      logger.info(null, `${icon} ${route.component}`);
-    }
+    logger.info(null, `${icon} ${getPrettyRouteName(route)}`);
     const paths = await getPathsForRoute(route, pageModule, pipeline, builtPaths);
     let timeStart = performance.now();
     let prevTimeEnd = timeStart;
@@ -453,6 +449,15 @@ async function generatePath(pathname, pipeline, gopts, route) {
   await fs.promises.mkdir(outFolder, { recursive: true });
   await fs.promises.writeFile(outFile, body);
 }
+function getPrettyRouteName(route) {
+  if (isRelativePath(route.component)) {
+    return route.route;
+  } else if (route.component.includes("node_modules/")) {
+    return route.component.match(/.*node_modules\/(.+)/)?.[1] ?? route.component;
+  } else {
+    return route.component;
+  }
+}
 function createBuildManifest(settings, internals, renderers) {
   let i18nManifest = void 0;
   if (settings.config.i18n) {

package/dist/core/build/index.js

@@ -132,8 +132,8 @@ class AstroBuilder {
       teardownCompiler: this.teardownCompiler,
       viteConfig
     };
-    const { internals } = await viteBuild(opts);
-    await staticBuild(opts, internals);
+    const { internals, ssrOutputChunkNames } = await viteBuild(opts);
+    await staticBuild(opts, internals, ssrOutputChunkNames);
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
       if (!assets[k])

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

@@ -1,4 +1,4 @@
-import type { Plugin as VitePlugin } from 'vite';
+import type { Plugin as VitePlugin, Rollup } from 'vite';
 import type { BuildInternals } from './internal.js';
 import type { StaticBuildOptions, ViteBuildReturn } from './types.js';
 type RollupOutputArray = Extract<ViteBuildReturn, Array<any>>;
@@ -34,7 +34,7 @@ export declare function createPluginContainer(options: StaticBuildOptions, inter
         vitePlugins: (VitePlugin<any> | VitePlugin<any>[])[];
         lastVitePlugins: (VitePlugin<any> | VitePlugin<any>[])[];
     }>;
-    runPostHook(ssrReturn: ViteBuildReturn, clientReturn: ViteBuildReturn | null): Promise<Map<string, {
+    runPostHook(ssrOutputs: Rollup.RollupOutput[], clientOutputs: Rollup.RollupOutput[]): Promise<Map<string, {
         targets: BuildTarget[];
         code: string;
     }>>;

package/dist/core/build/plugin.js

@@ -33,20 +33,8 @@ function createPluginContainer(options, internals) {
         lastVitePlugins
       };
     },
-    async runPostHook(ssrReturn, clientReturn) {
+    async runPostHook(ssrOutputs, clientOutputs) {
       const mutations = /* @__PURE__ */ new Map();
-      const ssrOutputs = [];
-      const clientOutputs = [];
-      if (Array.isArray(ssrReturn)) {
-        ssrOutputs.push(...ssrReturn);
-      } else if ("output" in ssrReturn) {
-        ssrOutputs.push(ssrReturn);
-      }
-      if (Array.isArray(clientReturn)) {
-        clientOutputs.push(...clientReturn);
-      } else if (clientReturn && "output" in clientReturn) {
-        clientOutputs.push(clientReturn);
-      }
       const mutate = (chunk, targets, newCode) => {
         chunk.code = newCode;
         mutations.set(chunk.fileName, {

package/dist/core/build/static-build.d.ts

@@ -3,8 +3,9 @@ import { type BuildInternals } from '../../core/build/internal.js';
 import type { StaticBuildOptions } from './types.js';
 export declare function viteBuild(opts: StaticBuildOptions): Promise<{
     internals: BuildInternals;
+    ssrOutputChunkNames: string[];
 }>;
-export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals): Promise<void>;
+export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[]): Promise<void>;
 export declare function copyFiles(fromFolder: URL, toFolder: URL, includeDotfiles?: boolean): Promise<void>;
 /**
  * This function takes the virtual module name of any page entrypoint and

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

@@ -30,7 +30,7 @@ import { ASTRO_PAGE_RESOLVED_MODULE_ID } from "./plugins/plugin-pages.js";
 import { RESOLVED_RENDERERS_MODULE_ID } from "./plugins/plugin-renderers.js";
 import { RESOLVED_SPLIT_MODULE_ID, RESOLVED_SSR_VIRTUAL_MODULE_ID } from "./plugins/plugin-ssr.js";
 import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
-import { encodeName, getTimeStat } from "./util.js";
+import { encodeName, getTimeStat, viteBuildReturnToRollupOutputs } from "./util.js";
 async function viteBuild(opts) {
   const { allPages, settings } = opts;
   if (isModeServerWithNoAdapter(opts.settings)) {
@@ -70,28 +70,38 @@ async function viteBuild(opts) {
     clientInput.add(PAGE_SCRIPT_ID);
   }
   const clientOutput = await clientBuild(opts, internals, clientInput, container);
-  await runPostBuildHooks(container, ssrOutput, clientOutput);
+  const ssrOutputs = viteBuildReturnToRollupOutputs(ssrOutput);
+  const clientOutputs = viteBuildReturnToRollupOutputs(clientOutput ?? []);
+  await runPostBuildHooks(container, ssrOutputs, clientOutputs);
   settings.timer.end("Client build");
   internals.ssrEntryChunk = void 0;
   if (opts.teardownCompiler) {
     teardown();
   }
-  return { internals };
+  const ssrOutputChunkNames = [];
+  for (const output of ssrOutputs) {
+    for (const chunk of output.output) {
+      if (chunk.type === "chunk") {
+        ssrOutputChunkNames.push(chunk.fileName);
+      }
+    }
+  }
+  return { internals, ssrOutputChunkNames };
 }
-async function staticBuild(opts, internals) {
+async function staticBuild(opts, internals, ssrOutputChunkNames) {
   const { settings } = opts;
   switch (true) {
     case settings.config.output === "static": {
       settings.timer.start("Static generate");
       await generatePages(opts, internals);
-      await cleanServerOutput(opts);
+      await cleanServerOutput(opts, ssrOutputChunkNames);
       settings.timer.end("Static generate");
       return;
     }
     case isServerLikeOutput(settings.config): {
       settings.timer.start("Server generate");
       await generatePages(opts, internals);
-      await cleanStaticOutput(opts, internals);
+      await cleanStaticOutput(opts, internals, ssrOutputChunkNames);
       opts.logger.info(null, `
 ${bgMagenta(black(" finalizing server assets "))}
 `);
@@ -254,8 +264,8 @@ ${bgGreen(black(" building client (vite) "))}`);
   const buildResult = await vite.build(viteBuildConfig);
   return buildResult;
 }
-async function runPostBuildHooks(container, ssrReturn, clientReturn) {
-  const mutations = await container.runPostHook(ssrReturn, clientReturn);
+async function runPostBuildHooks(container, ssrOutputs, clientOutputs) {
+  const mutations = await container.runPostHook(ssrOutputs, clientOutputs);
   const config = container.options.settings.config;
   const build = container.options.settings.config.build;
   for (const [fileName, mutation] of mutations) {
@@ -266,7 +276,7 @@ async function runPostBuildHooks(container, ssrReturn, clientReturn) {
     await fs.promises.writeFile(fileURL, mutation.code, "utf-8");
   }
 }
-async function cleanStaticOutput(opts, internals) {
+async function cleanStaticOutput(opts, internals, ssrOutputChunkNames) {
   const allStaticFiles = /* @__PURE__ */ new Set();
   for (const pageData of eachPageData(internals)) {
     if (pageData.route.prerender) {
@@ -278,9 +288,7 @@ async function cleanStaticOutput(opts, internals) {
   }
   const ssr = isServerLikeOutput(opts.settings.config);
   const out = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
-  const files = await glob("**/*.mjs", {
-    cwd: fileURLToPath(out)
-  });
+  const files = ssrOutputChunkNames.filter((f) => f.endsWith(".mjs"));
   if (files.length) {
     await eslexer.init;
     await Promise.all(
@@ -306,13 +314,9 @@ export const ${e.n} = noop;`;
     removeEmptyDirs(out);
   }
 }
-async function cleanServerOutput(opts) {
+async function cleanServerOutput(opts, ssrOutputChunkNames) {
   const out = getOutDirWithinCwd(opts.settings.config.outDir);
-  const files = await glob("**/*.mjs", {
-    cwd: fileURLToPath(out),
-    // Important! Also cleanup dotfiles like `node_modules/.pnpm/**`
-    dot: true
-  });
+  const files = ssrOutputChunkNames.filter((f) => f.endsWith(".mjs"));
   if (files.length) {
     await Promise.all(
       files.map(async (filename) => {

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

@@ -1,4 +1,6 @@
+import type { Rollup } from 'vite';
 import type { AstroConfig } from '../../@types/astro.js';
+import type { ViteBuildReturn } from './types.js';
 export declare function getTimeStat(timeStart: number, timeEnd: number): string;
 /**
  * Given the Astro configuration, it tells if a slash should be appended or not
@@ -6,3 +8,4 @@ export declare function getTimeStat(timeStart: number, timeEnd: number): string;
 export declare function shouldAppendForwardSlash(trailingSlash: AstroConfig['trailingSlash'], buildFormat: AstroConfig['build']['format']): boolean;
 export declare function i18nHasFallback(config: AstroConfig): boolean;
 export declare function encodeName(name: string): string;
+export declare function viteBuildReturnToRollupOutputs(viteBuildReturn: ViteBuildReturn): Rollup.RollupOutput[];

package/dist/core/build/util.js

@@ -35,9 +35,19 @@ function encodeName(name) {
   }
   return name;
 }
+function viteBuildReturnToRollupOutputs(viteBuildReturn) {
+  const result = [];
+  if (Array.isArray(viteBuildReturn)) {
+    result.push(...viteBuildReturn);
+  } else if ("output" in viteBuildReturn) {
+    result.push(viteBuildReturn);
+  }
+  return result;
+}
 export {
   encodeName,
   getTimeStat,
   i18nHasFallback,
-  shouldAppendForwardSlash
+  shouldAppendForwardSlash,
+  viteBuildReturnToRollupOutputs
 };

package/dist/core/compile/compile.d.ts

@@ -1,9 +1,11 @@
 import type { TransformResult } from '@astrojs/compiler';
 import type { ResolvedConfig } from 'vite';
 import type { AstroConfig } from '../../@types/astro.js';
+import type { AstroPreferences } from '../../preferences/index.js';
 export interface CompileProps {
     astroConfig: AstroConfig;
     viteConfig: ResolvedConfig;
+    preferences: AstroPreferences;
     filename: string;
     source: string;
 }
@@ -11,4 +13,4 @@ export interface CompileResult extends TransformResult {
     cssDeps: Set<string>;
     source: string;
 }
-export declare function compile({ astroConfig, viteConfig, filename, source, }: CompileProps): Promise<CompileResult>;
+export declare function compile({ astroConfig, viteConfig, preferences, filename, source, }: CompileProps): Promise<CompileResult>;

package/dist/core/compile/compile.js

@@ -8,6 +8,7 @@ import { createStylePreprocessor } from "./style.js";
 async function compile({
   astroConfig,
   viteConfig,
+  preferences,
   filename,
   source
 }) {
@@ -25,7 +26,7 @@ async function compile({
       scopedStyleStrategy: astroConfig.scopedStyleStrategy,
       resultScopedSlot: true,
       transitionsAnimationURL: "astro/components/viewtransitions.css",
-      annotateSourceFile: viteConfig.command === "serve" && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
+      annotateSourceFile: viteConfig.command === "serve" && astroConfig.devToolbar && astroConfig.devToolbar.enabled && await preferences.get("devToolbar.enabled"),
       preprocessStyle: createStylePreprocessor({
         filename,
         viteConfig,

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

@@ -57,12 +57,12 @@ export declare const AstroConfigSchema: z.ZodObject<{
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
     }, "strip", z.ZodTypeAny, {
+        redirects: boolean;
         format: "file" | "directory";
         client: URL;
         server: URL;
         assets: string;
         serverEntry: string;
-        redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
         assetsPrefix?: string | undefined;
     }, {
@@ -308,12 +308,12 @@ export declare const AstroConfigSchema: z.ZodObject<{
     legacy: z.ZodDefault<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
 }, "strip", z.ZodTypeAny, {
     build: {
+        redirects: boolean;
         format: "file" | "directory";
         client: URL;
         server: URL;
         assets: string;
         serverEntry: string;
-        redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
         assetsPrefix?: string | undefined;
     };
@@ -332,6 +332,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         smartypants: boolean;
     };
     vite: ViteUserConfig;
+    redirects: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>;
     output: "server" | "static" | "hybrid";
     server: {
         host: string | boolean;
@@ -339,10 +343,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
         open: boolean;
         headers?: OutgoingHttpHeaders | undefined;
     };
-    redirects: Record<string, string | {
-        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
-        destination: string;
-    }>;
     root: URL;
     srcDir: URL;
     publicDir: URL;
@@ -539,7 +539,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants?: boolean | undefined;
     }>>;
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
-    output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">, z.ZodLiteral<"hybrid">]>>>;
     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;
@@ -550,6 +549,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
         destination: string;
     }>]>>>;
+    output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">, z.ZodLiteral<"hybrid">]>>>;
     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">]>>>;
@@ -748,12 +748,12 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
     }, "strip", z.ZodTypeAny, {
+        redirects: boolean;
         format: "file" | "directory";
         client: import("url").URL;
         server: import("url").URL;
         assets: string;
         serverEntry: string;
-        redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
         assetsPrefix?: string | undefined;
     }, {
@@ -793,12 +793,12 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     }, unknown>;
 }, "strip", z.ZodTypeAny, {
     build: {
+        redirects: boolean;
         format: "file" | "directory";
         client: import("url").URL;
         server: import("url").URL;
         assets: string;
         serverEntry: string;
-        redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
         assetsPrefix?: string | undefined;
     };
@@ -817,6 +817,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants: boolean;
     };
     vite: ViteUserConfig;
+    redirects: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>;
     output: "server" | "static" | "hybrid";
     server: {
         host: string | boolean;
@@ -825,10 +829,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
     };
-    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;
@@ -902,11 +902,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants?: boolean | undefined;
     } | undefined;
     vite?: ViteUserConfig | undefined;
-    output?: "server" | "static" | "hybrid" | undefined;
     redirects?: Record<string, string | {
         status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
         destination: string;
     }> | undefined;
+    output?: "server" | "static" | "hybrid" | undefined;
     site?: string | undefined;
     base?: string | undefined;
     trailingSlash?: "ignore" | "always" | "never" | undefined;
@@ -973,12 +973,12 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     server?: unknown;
 }>, {
     build: {
+        redirects: boolean;
         format: "file" | "directory";
         client: import("url").URL;
         server: import("url").URL;
         assets: string;
         serverEntry: string;
-        redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
         assetsPrefix?: string | undefined;
     };
@@ -997,6 +997,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants: boolean;
     };
     vite: ViteUserConfig;
+    redirects: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>;
     output: "server" | "static" | "hybrid";
     server: {
         host: string | boolean;
@@ -1005,10 +1009,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
     };
-    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;
@@ -1082,11 +1082,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants?: boolean | undefined;
     } | undefined;
     vite?: ViteUserConfig | undefined;
-    output?: "server" | "static" | "hybrid" | undefined;
     redirects?: Record<string, string | {
         status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
         destination: string;
     }> | undefined;
+    output?: "server" | "static" | "hybrid" | undefined;
     site?: string | undefined;
     base?: string | undefined;
     trailingSlash?: "ignore" | "always" | "never" | undefined;
@@ -1153,12 +1153,12 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     server?: unknown;
 }>, {
     build: {
+        redirects: boolean;
         format: "file" | "directory";
         client: import("url").URL;
         server: import("url").URL;
         assets: string;
         serverEntry: string;
-        redirects: boolean;
         inlineStylesheets: "always" | "never" | "auto";
         assetsPrefix?: string | undefined;
     };
@@ -1177,6 +1177,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants: boolean;
     };
     vite: ViteUserConfig;
+    redirects: Record<string, string | {
+        status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
+        destination: string;
+    }>;
     output: "server" | "static" | "hybrid";
     server: {
         host: string | boolean;
@@ -1185,10 +1189,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
     };
-    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;
@@ -1262,11 +1262,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         smartypants?: boolean | undefined;
     } | undefined;
     vite?: ViteUserConfig | undefined;
-    output?: "server" | "static" | "hybrid" | undefined;
     redirects?: Record<string, string | {
         status: 300 | 301 | 302 | 303 | 304 | 307 | 308;
         destination: string;
     }> | undefined;
+    output?: "server" | "static" | "hybrid" | undefined;
     site?: string | undefined;
     base?: string | undefined;
     trailingSlash?: "ignore" | "always" | "never" | undefined;

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -21,7 +21,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.0.2";
+  const currentVersion = "4.0.4";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/logger/core.d.ts

@@ -7,7 +7,7 @@ export type LoggerLevel = 'debug' | 'info' | 'warn' | 'error' | 'silent';
  * rather than specific to a single command, function, use, etc. The label will be
  * shown in the log message to the user, so it should be relevant.
  */
-export type LoggerLabel = 'add' | 'build' | 'check' | 'config' | 'content' | 'deprecated' | 'markdown' | 'router' | 'types' | 'vite' | 'watch' | 'middleware' | 'preferences' | 'SKIP_FORMAT';
+export type LoggerLabel = 'add' | 'build' | 'check' | 'config' | 'content' | 'deprecated' | 'markdown' | 'router' | 'types' | 'vite' | 'watch' | 'middleware' | 'preferences' | 'redirects' | 'SKIP_FORMAT';
 export interface LogOptions {
     dest: LogWritable<LogMessage>;
     level: LoggerLevel;

package/dist/core/messages.js

@@ -27,7 +27,7 @@ function req({
   statusCode,
   reqTime
 }) {
-  const color = statusCode >= 400 ? red : statusCode >= 300 ? yellow : blue;
+  const color = statusCode >= 500 ? red : statusCode >= 300 ? yellow : blue;
   return color(`[${statusCode}]`) + ` ` + (method && method !== "GET" ? color(method) + " " : "") + url + ` ` + (reqTime ? dim(Math.round(reqTime) + "ms") : "");
 }
 function serverStart({
@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.0.2";
+  const version = "4.0.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -258,7 +258,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.0.2"}`
+        `v${"4.0.4"}`
       )} ${headline}`
     );
   }

package/dist/core/routing/manifest/create.js

@@ -308,6 +308,20 @@ This route collides with: "${collision.component}".`
     const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
     const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
+    {
+      let destination;
+      if (typeof to === "string") {
+        destination = to;
+      } else {
+        destination = to.destination;
+      }
+      if (/^https?:\/\//.test(destination)) {
+        logger.warn(
+          "redirects",
+          `Redirecting to an external URL is not officially supported: ${from} -> ${to}`
+        );
+      }
+    }
     const routeData = {
       type: "redirect",
       route,

package/dist/runtime/client/dev-overlay/plugins/settings.js

@@ -13,7 +13,7 @@ const settingsRows = [
           devOverlay.setNotificationVisible(!evt.currentTarget.checked);
         }
         settings.updateSetting("disablePluginNotification", evt.currentTarget.checked);
-        const action = evt.currentTarget.checked ? "enabled" : "disabled";
+        const action = evt.currentTarget.checked ? "disabled" : "enabled";
         settings.log(`Plugin notification badges ${action}`);
       }
     }

package/dist/vite-plugin-astro/index.js

@@ -113,6 +113,7 @@ File: ${id}`
       const compileProps = {
         astroConfig: config,
         viteConfig: resolvedConfig,
+        preferences: settings.preferences,
         filename: normalizePath(parsedId.filename),
         source
       };
@@ -149,6 +150,7 @@ File: ${id}`
       const compile = () => cachedCompilation({
         astroConfig: config,
         viteConfig: resolvedConfig,
+        preferences: settings.preferences,
         filename,
         source
       });

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

@@ -253,7 +253,7 @@ async function handleRoute({
       req({
         url: pathname,
         method: incomingRequest.method,
-        statusCode: response.status,
+        statusCode: status ?? response.status,
         reqTime: timeEnd - timeStart
       })
     );
@@ -277,22 +277,16 @@ async function handleRoute({
   }
   if (route.type === "endpoint") {
     await writeWebResponse(incomingResponse, response);
-  } else {
-    if (
-      // We are in a recursion, and it's possible that this function is called itself with a status code
-      // By default, the status code passed via parameters is computed by the matched route.
-      //
-      // By default, we should give priority to the status code passed, although it's possible that
-      // the `Response` emitted by the user is a redirect. If so, then return the returned response.
-      response.status < 400 && response.status >= 300
-    ) {
-      await writeSSRResult(request, response, incomingResponse);
-      return;
-    } else if (status && response.status !== status && (status === 404 || status === 500)) {
-      response = new Response(response.body, { ...response, status });
-    }
+    return;
+  }
+  if (response.status < 400 && response.status >= 300) {
     await writeSSRResult(request, response, incomingResponse);
+    return;
+  }
+  if (status && response.status !== status && (status === 404 || status === 500)) {
+    response = new Response(response.body, { ...response, status });
   }
+  await writeSSRResult(request, response, incomingResponse);
 }
 async function getScriptsAndStyles({ pipeline, filePath }) {
   const moduleLoader = pipeline.getModuleLoader();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -157,9 +157,9 @@
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
-    "@astrojs/markdown-remark": "4.0.0",
-    "@astrojs/telemetry": "3.0.4",
-    "@astrojs/internal-helpers": "0.2.1"
+    "@astrojs/internal-helpers": "0.2.1",
+    "@astrojs/markdown-remark": "4.0.1",
+    "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
     "sharp": "^0.32.5"
@@ -187,6 +187,7 @@
     "@types/probe-image-size": "^7.2.3",
     "@types/prompts": "^2.4.8",
     "@types/resolve": "^1.20.5",
+    "@types/semver": "^7.5.2",
     "@types/send": "^0.17.4",
     "@types/server-destroy": "^1.0.3",
     "@types/unist": "^3.0.2",