astro 5.0.0-beta.5 → 5.0.0-beta.7

package/client.d.ts

@@ -283,6 +283,7 @@ declare module '*.mdx' {
 	export const url: MDX['url'];
 	export const getHeadings: MDX['getHeadings'];
 	export const Content: MDX['Content'];
+	export const components: MDX['components'];
 
 	const load: MDX['default'];
 	export default load;

package/components/Welcome.astro

@@ -0,0 +1,172 @@
+---
+interface Props {
+	title?: string;
+}
+
+const cards = [
+	{
+		href: 'https://docs.astro.build/',
+		title: 'Documentation',
+		body: 'Learn how Astro works and explore the official API docs.',
+	},
+	{
+		href: 'https://astro.build/integrations/',
+		title: 'Integrations',
+		body: 'Supercharge your project with new frameworks and libraries.',
+	},
+	{
+		href: 'https://astro.build/themes/',
+		title: 'Themes',
+		body: 'Explore a galaxy of community-built starter themes.',
+	},
+	{
+		href: 'https://astro.build/chat/',
+		title: 'Community',
+		body: 'Come say hi to our amazing Discord community. ❤️',
+	},
+];
+
+const { title = 'Welcome to Astro' } = Astro.props;
+---
+
+<main>
+	<svg
+		class="astro-a"
+		width="495"
+		height="623"
+		viewBox="0 0 495 623"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg"
+		aria-hidden="true"
+	>
+		<path
+			fill-rule="evenodd"
+			clip-rule="evenodd"
+			d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
+			fill="url(#paint0_linear_1805_24383)"></path>
+		<defs>
+			<linearGradient
+				id="paint0_linear_1805_24383"
+				x1="247.358"
+				y1="0"
+				x2="247.358"
+				y2="622.479"
+				gradientUnits="userSpaceOnUse"
+			>
+				<stop stop-opacity="0.9"></stop>
+				<stop offset="1" stop-opacity="0.2"></stop>
+			</linearGradient>
+		</defs>
+	</svg>
+	<h1>{title}</h1>
+	<p class="instructions">
+		To get started, open the directory <code>src/pages</code> in your project.<br />
+		<strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
+	</p>
+	<ul role="list" class="link-card-grid">
+		{
+			cards.map((card) => (
+				<li class="link-card">
+					<a href={card.href}>
+						<h2>
+							{card.title}
+							<span>&rarr;</span>
+						</h2>
+						<p>{card.body}</p>
+					</a>
+				</li>
+			))
+		}
+	</ul>
+</main>
+
+<style>
+	main {
+		margin: auto;
+		padding: 1rem;
+		width: 800px;
+		max-width: calc(100% - 2rem);
+		color: white;
+		font-size: 20px;
+		line-height: 1.6;
+	}
+	.astro-a {
+		position: absolute;
+		top: -32px;
+		left: 50%;
+		transform: translatex(-50%);
+		width: 220px;
+		height: auto;
+		z-index: -1;
+	}
+	h1 {
+		font-size: 4rem;
+		font-weight: 700;
+		line-height: 1;
+		text-align: center;
+		margin-bottom: 1em;
+	}
+	.instructions {
+		margin-bottom: 2rem;
+		border: 1px solid rgba(var(--accent-light), 25%);
+		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
+		padding: 1.5rem;
+		border-radius: 8px;
+	}
+	.instructions code {
+		font-size: 0.8em;
+		font-weight: bold;
+		background: rgba(var(--accent-light), 12%);
+		color: rgb(var(--accent-light));
+		border-radius: 4px;
+		padding: 0.3em 0.4em;
+	}
+	.instructions strong {
+		color: rgb(var(--accent-light));
+	}
+	.link-card-grid {
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
+		gap: 2rem;
+		padding: 0;
+	}
+
+	.link-card {
+		list-style: none;
+		display: flex;
+		padding: 1px;
+		background-color: #23262d;
+		background-image: none;
+		background-size: 400%;
+		border-radius: 7px;
+		background-position: 100%;
+		transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+		box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
+	}
+	.link-card > a {
+		width: 100%;
+		text-decoration: none;
+		line-height: 1.4;
+		padding: calc(1.5rem - 1px);
+		border-radius: 8px;
+		color: white;
+		background-color: #23262d;
+		opacity: 0.8;
+	}
+	h2 {
+		margin: 0;
+		font-size: 1.25rem;
+		transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+	}
+	p {
+		margin-top: 0.5rem;
+		margin-bottom: 0;
+	}
+	.link-card:is(:hover, :focus-within) {
+		background-position: 0;
+		background-image: var(--accent-gradient);
+	}
+	.link-card:is(:hover, :focus-within) h2 {
+		color: rgb(var(--accent-light));
+	}
+</style>

package/components/index.ts

@@ -1,6 +1,8 @@
 // The `ts-ignore` comments here are necessary because we're importing this file inside the `astro:components`
-// virtual module's types, which means that `tsc` will try to resolve these imports. Don't mind the editor errors.
+// virtual module's types, which means that `tsc` will try to resolve these imports.
 // @ts-ignore
 export { default as Code } from './Code.astro';
 // @ts-ignore
 export { default as Debug } from './Debug.astro';
+// @ts-ignore
+export { default as Welcome } from './Welcome.astro';

package/dist/actions/runtime/middleware.js

@@ -1,6 +1,7 @@
 import { decodeBase64, encodeBase64 } from "@oslojs/encoding";
 import { yellow } from "kleur/colors";
 import { defineMiddleware } from "../../core/middleware/index.js";
+import { getOriginPathname } from "../../core/routing/rewrite.js";
 import { ACTION_QUERY_PARAMS } from "../consts.js";
 import { formContentTypes, hasContentType } from "./utils.js";
 import { getAction } from "./virtual/get-action.js";
@@ -14,7 +15,7 @@ const onRequest = defineMiddleware(async (context, next) => {
     if (context.request.method === "POST") {
       console.warn(
         yellow("[astro:actions]"),
-        'POST requests should not be sent to prerendered pages. If you\'re using Actions, disable prerendering with `export const prerender = "false".'
+        "POST requests should not be sent to prerendered pages. If you're using Actions, disable prerendering with `export const prerender = false`."
       );
     }
     return next();
@@ -66,7 +67,8 @@ async function handlePost({
   if (contentType && hasContentType(contentType, formContentTypes)) {
     formData = await request.clone().formData();
   }
-  const action = baseAction.bind(context);
+  const { getActionResult, callAction, props, redirect, ...actionAPIContext } = context;
+  const action = baseAction.bind(actionAPIContext);
   const actionResult = await action(formData);
   if (context.url.searchParams.get(ACTION_QUERY_PARAMS.actionRedirect) === "false") {
     return renderResult({
@@ -93,10 +95,14 @@ async function redirectWithResult({
   );
   context.cookies.set(ACTION_QUERY_PARAMS.actionPayload, cookieValue);
   if (actionResult.error) {
-    const referer = context.request.headers.get("Referer");
-    if (!referer) {
+    const referer2 = context.request.headers.get("Referer");
+    if (!referer2) {
       throw new Error("Internal: Referer unexpectedly missing from Action POST request.");
     }
+    return context.redirect(referer2);
+  }
+  const referer = getOriginPathname(context.request);
+  if (referer) {
     return context.redirect(referer);
   }
   return context.redirect(context.url.pathname);

package/dist/actions/runtime/route.js

@@ -23,7 +23,8 @@ const POST = async (context) => {
   } else {
     return new Response(null, { status: 415 });
   }
-  const action = baseAction.bind(context);
+  const { getActionResult, callAction, props, redirect, ...actionAPIContext } = context;
+  const action = baseAction.bind(actionAPIContext);
   const result = await action(args);
   const serialized = serializeActionResult(result);
   if (serialized.type === "empty") {

package/dist/actions/runtime/virtual/get-action.js

@@ -1,7 +1,7 @@
 import { ActionNotFoundError } from "../../../core/errors/errors-data.js";
 import { AstroError } from "../../../core/errors/errors.js";
 async function getAction(path) {
-  const pathKeys = path.replace("/_actions/", "").split(".").map((key) => decodeURIComponent(key));
+  const pathKeys = path.replace(/^.*\/_actions\//, "").split(".").map((key) => decodeURIComponent(key));
   let { server: actionLookup } = await import("astro:internal-actions");
   if (actionLookup == null || !(typeof actionLookup === "object")) {
     throw new TypeError(

package/dist/assets/endpoint/node.js

@@ -18,6 +18,10 @@ async function loadLocalImage(src, url) {
     fileUrl = pathToFileURL(removeQueryString(replaceFileSystemReferences(src)));
   } else {
     try {
+      const idx = url.pathname.indexOf("/_image");
+      if (idx > 0) {
+        src = src.slice(idx);
+      }
       fileUrl = new URL("." + src, outDir);
       const filePath = fileURLToPath(fileUrl);
       if (!isAbsolute(filePath) || !filePath.startsWith(assetsDirPath)) {

package/dist/assets/internal.js

@@ -1,3 +1,4 @@
+import { isRemotePath } from "@astrojs/internal-helpers/path";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { DEFAULT_HASH_PROPS } from "./consts.js";
 import { isLocalService } from "./services/service.js";
@@ -47,7 +48,7 @@ async function getImage(options, imageConfig) {
     ...options,
     src: await resolveSrc(options.src)
   };
-  if (options.inferSize && isRemoteImage(resolvedOptions.src)) {
+  if (options.inferSize && isRemoteImage(resolvedOptions.src) && isRemotePath(resolvedOptions.src)) {
     const result = await inferRemoteSize(resolvedOptions.src);
     resolvedOptions.width ??= result.width;
     resolvedOptions.height ??= result.height;

package/dist/assets/types.d.ts

@@ -1,4 +1,4 @@
-import type { WithRequired } from '../type-utils.js';
+import type { OmitPreservingIndexSignature, Simplify, WithRequired } from '../type-utils.js';
 import type { VALID_INPUT_FORMATS, VALID_OUTPUT_FORMATS } from './consts.js';
 import type { ImageService } from './services/service.js';
 export type ImageQualityPreset = 'low' | 'mid' | 'high' | 'max' | (string & {});
@@ -48,12 +48,12 @@ export type SrcSetValue = UnresolvedSrcSetValue & {
 /**
  * A yet to be resolved image transform. Used by `getImage`
  */
-export type UnresolvedImageTransform = Omit<ImageTransform, 'src'> & {
+export type UnresolvedImageTransform = Simplify<OmitPreservingIndexSignature<ImageTransform, 'src'> & {
     src: ImageMetadata | string | Promise<{
         default: ImageMetadata;
     }>;
     inferSize?: boolean;
-} & {
+}> & {
     [isESMImport]?: never;
 };
 /**

package/dist/assets/vite-plugin-assets.d.ts

@@ -1,5 +1,5 @@
 import type * as vite from 'vite';
-import type { AstroPluginOptions } from '../types/astro.js';
-export default function assets({ settings, mode, }: AstroPluginOptions & {
-    mode: string;
+import type { AstroSettings } from '../types/astro.js';
+export default function assets({ settings }: {
+    settings: AstroSettings;
 }): vite.Plugin[];

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

@@ -62,12 +62,10 @@ const addStaticImageFactory = (settings) => {
     }
   };
 };
-function assets({
-  settings,
-  mode
-}) {
+function assets({ settings }) {
   let resolvedConfig;
   let shouldEmitFile = false;
+  let isBuild = false;
   globalThis.astroAsset = {
     referencedImages: /* @__PURE__ */ new Set()
   };
@@ -75,6 +73,9 @@ function assets({
     // Expose the components and different utilities from `astro:assets`
     {
       name: "astro:assets",
+      config(_, env) {
+        isBuild = env.command === "build";
+      },
       async resolveId(id) {
         if (id === VIRTUAL_SERVICE_ID) {
           return await this.resolve(settings.config.image.service.entrypoint);
@@ -112,9 +113,7 @@ function assets({
         }
       },
       buildStart() {
-        if (mode != "build") {
-          return;
-        }
+        if (!isBuild) return;
         globalThis.astroAsset.addStaticImage = addStaticImageFactory(settings);
       },
       // In build, rewrite paths to ESM imported images in code to their final location

package/dist/cli/add/index.js

@@ -9,7 +9,6 @@ import { getDefaultExportOptions } from "magicast/helpers";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
 import maxSatisfying from "semver/ranges/max-satisfying.js";
-import { exec } from "tinyexec";
 import yoctoSpinner from "yocto-spinner";
 import {
   loadTSConfig,
@@ -28,6 +27,7 @@ import { appendForwardSlash } from "../../core/path.js";
 import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { ensureProcessNodeEnv, parseNpmName } from "../../core/util.js";
 import { eventCliSession, telemetry } from "../../events/index.js";
+import { exec } from "../exec.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { fetchPackageJson, fetchPackageVersions } from "../install-package.js";
 const ALIASES = /* @__PURE__ */ new Map([
@@ -73,7 +73,7 @@ export default async function seed() {
 };
 const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   netlify: "@astrojs/netlify",
-  vercel: "@astrojs/vercel/serverless",
+  vercel: "@astrojs/vercel",
   cloudflare: "@astrojs/cloudflare",
   node: "@astrojs/node"
 };
@@ -307,7 +307,9 @@ async function add(names, { flags }) {
       logger.info("SKIP_FORMAT", msg.success(`Configuration up-to-date.`));
       break;
     }
-    default: {
+    case 3 /* failure */:
+    case 1 /* updated */:
+    case void 0: {
       const list = integrations.map((integration) => `  - ${integration.packageName}`).join("\n");
       logger.info(
         "SKIP_FORMAT",
@@ -335,7 +337,7 @@ ${list}`
         `Unknown error parsing tsconfig.json or jsconfig.json. Could not update TypeScript settings.`
       );
     }
-    default:
+    case 1 /* updated */:
       logger.info("SKIP_FORMAT", msg.success(`Successfully updated TypeScript settings`));
   }
 }
@@ -343,7 +345,7 @@ function isAdapter(integration) {
   return integration.type === "adapter";
 }
 const toIdent = (name) => {
-  const ident = name.trim().replace(/[-_./]?astro(?:js)?[-_.]?/g, "").replace(/\.js/, "").replace(/[.\-_/]+([a-zA-Z])/g, (_, w) => w.toUpperCase()).replace(/^[^a-zA-Z$_]+/, "");
+  const ident = name.trim().replace(/[-_./]?astro(?:js)?[-_.]?/g, "").replace(/\.js/, "").replace(/[.\-_/]+([a-zA-Z])/g, (_, w) => w.toUpperCase()).replace(/^[^a-zA-Z$_]+/, "").replace(/@.*$/, "");
   return `${ident[0].toLowerCase()}${ident.slice(1)}`;
 };
 function createPrettyError(err) {

package/dist/cli/build/index.js

@@ -9,6 +9,11 @@ async function build({ flags }) {
       tables: {
         Flags: [
           ["--outDir <directory>", `Specify the output directory for the build.`],
+          ["--mode", `Specify the mode of the project. Defaults to "production".`],
+          [
+            "--devOutput",
+            "Output a development-based build similar to code transformed in `astro dev`."
+          ],
           [
             "--force",
             "Clear the content layer and content collection cache, forcing a full rebuild."
@@ -21,7 +26,7 @@ async function build({ flags }) {
     return;
   }
   const inlineConfig = flagsToAstroInlineConfig(flags);
-  await _build(inlineConfig);
+  await _build(inlineConfig, { devOutput: !!flags.devOutput });
 }
 export {
   build

package/dist/cli/dev/index.js

@@ -9,6 +9,7 @@ async function dev({ flags }) {
       usage: "[...flags]",
       tables: {
         Flags: [
+          ["--mode", `Specify the mode of the project. Defaults to "development".`],
           ["--port", `Specify which port to run on. Defaults to 4321.`],
           ["--host", `Listen on all addresses, including LAN and public addresses.`],
           ["--host <custom-address>", `Expose on a network IP address at <custom-address>`],

package/dist/cli/docs/open.d.ts

@@ -1,2 +1,2 @@
-import { type Result } from 'tinyexec';
+import type { Result } from 'tinyexec';
 export declare function openInBrowser(url: string): Promise<Result>;

package/dist/cli/docs/open.js

@@ -1,4 +1,4 @@
-import { exec } from "tinyexec";
+import { exec } from "../exec.js";
 const getPlatformSpecificCommand = () => {
   const isGitPod = Boolean(process.env.GITPOD_REPO_ROOT);
   const platform = isGitPod ? "gitpod" : process.platform;

package/dist/cli/exec.d.ts

@@ -0,0 +1,5 @@
+import { type Options } from 'tinyexec';
+/**
+ * Improve tinyexec error logging and set `throwOnError` to `true` by default
+ */
+export declare function exec(command: string, args?: string[], options?: Partial<Options>): PromiseLike<import("tinyexec").Output>;

package/dist/cli/exec.js

@@ -0,0 +1,23 @@
+import { NonZeroExitError, x } from "tinyexec";
+function exec(command, args, options) {
+  return x(command, args, {
+    throwOnError: true,
+    ...options
+  }).then(
+    (o) => o,
+    (e) => {
+      if (e instanceof NonZeroExitError) {
+        const fullCommand = args?.length ? `${command} ${args.map((a) => a.includes(" ") ? `"${a}"` : a).join(" ")}` : command;
+        const message = `The command \`${fullCommand}\` exited with code ${e.exitCode}`;
+        const newError = new Error(message, e.cause ? { cause: e.cause } : void 0);
+        newError.stderr = e.output?.stderr;
+        newError.stdout = e.output?.stdout;
+        throw newError;
+      }
+      throw e;
+    }
+  );
+}
+export {
+  exec
+};

package/dist/cli/index.js

@@ -61,7 +61,7 @@ function resolveCommand(flags) {
     "db",
     "info",
     "login",
-    "loutout",
+    "logout",
     "link",
     "init"
   ]);
@@ -101,8 +101,8 @@ async function runCommand(cmd, flags) {
     }
     case "sync": {
       const { sync } = await import("./sync/index.js");
-      const exitCode = await sync({ flags });
-      return process.exit(exitCode);
+      await sync({ flags });
+      return;
     }
     case "preferences": {
       const { preferences } = await import("./preferences/index.js");

package/dist/cli/install-package.js

@@ -4,9 +4,9 @@ import ci from "ci-info";
 import { bold, cyan, dim, magenta } from "kleur/colors";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
-import { exec } from "tinyexec";
 import whichPm from "which-pm";
 import yoctoSpinner from "yocto-spinner";
+import { exec } from "./exec.js";
 const require2 = createRequire(import.meta.url);
 async function getPackage(packageName, logger, options, otherDeps = []) {
   try {
@@ -109,7 +109,13 @@ ${message}`
       await exec(
         installCommand.pm,
         [installCommand.command, ...installCommand.flags, ...installCommand.dependencies],
-        { nodeOptions: { cwd } }
+        {
+          nodeOptions: {
+            cwd,
+            // reset NODE_ENV to ensure install command run in dev mode
+            env: { NODE_ENV: void 0 }
+          }
+        }
       );
       spinner.success();
       return true;

package/dist/cli/sync/index.d.ts

@@ -2,5 +2,5 @@ import { type Flags } from '../flags.js';
 interface SyncOptions {
     flags: Flags;
 }
-export declare function sync({ flags }: SyncOptions): Promise<0 | 1>;
+export declare function sync({ flags }: SyncOptions): Promise<0 | undefined>;
 export {};

package/dist/cli/sync/index.js

@@ -16,12 +16,7 @@ async function sync({ flags }) {
     });
     return 0;
   }
-  try {
-    await _sync(flagsToAstroInlineConfig(flags), { telemetry: true });
-    return 0;
-  } catch (_) {
-    return 1;
-  }
+  await _sync(flagsToAstroInlineConfig(flags), { telemetry: true });
 }
 export {
   sync

package/dist/config/entrypoint.d.ts

@@ -0,0 +1,15 @@
+import type { SharpImageServiceConfig } from '../assets/services/sharp.js';
+import type { ImageServiceConfig } from '../types/public/index.js';
+export { defineConfig, getViteConfig } from './index.js';
+export { envField } from '../env/config.js';
+/**
+ * Return the configuration needed to use the Sharp-based image service
+ */
+export declare function sharpImageService(config?: SharpImageServiceConfig): ImageServiceConfig;
+/**
+ * Return the configuration needed to use the passthrough image service. This image services does not perform
+ * any image transformations, and is mainly useful when your platform does not support other image services, or you are
+ * not using Astro's built-in image processing.
+ * See: https://docs.astro.build/en/guides/images/#configure-no-op-passthrough-service
+ */
+export declare function passthroughImageService(): ImageServiceConfig;

package/dist/config/entrypoint.js

@@ -0,0 +1,21 @@
+import { defineConfig, getViteConfig } from "./index.js";
+import { envField } from "../env/config.js";
+function sharpImageService(config = {}) {
+  return {
+    entrypoint: "astro/assets/services/sharp",
+    config
+  };
+}
+function passthroughImageService() {
+  return {
+    entrypoint: "astro/assets/services/noop",
+    config: {}
+  };
+}
+export {
+  defineConfig,
+  envField,
+  getViteConfig,
+  passthroughImageService,
+  sharpImageService
+};

package/dist/config/index.d.ts

@@ -1,7 +1,11 @@
-import type { UserConfig as ViteUserConfig } from 'vite';
-import type { AstroInlineConfig, AstroUserConfig } from '../types/public/config.js';
-export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
-export declare function getViteConfig(userViteConfig: ViteUserConfig, inlineAstroConfig?: AstroInlineConfig): ({ mode, command }: {
-    mode: "dev";
-    command: "serve" | "build";
-}) => Promise<Record<string, any>>;
+import type { UserConfig as ViteUserConfig, UserConfigFn as ViteUserConfigFn } from 'vite';
+import type { AstroInlineConfig, AstroUserConfig, Locales } from '../types/public/config.js';
+/**
+ * See the full Astro Configuration API Documentation
+ * https://astro.build/config
+ */
+export declare function defineConfig<const TLocales extends Locales = never>(config: AstroUserConfig<TLocales>): AstroUserConfig<TLocales>;
+/**
+ * Use Astro to generate a fully resolved Vite config
+ */
+export declare function getViteConfig(userViteConfig: ViteUserConfig, inlineAstroConfig?: AstroInlineConfig): ViteUserConfigFn;

package/dist/config/index.js

@@ -1,4 +1,3 @@
-import { Logger } from "../core/logger/core.js";
 import { createRouteManifest } from "../core/routing/index.js";
 import { createDevelopmentManifest } from "../vite-plugin-astro-server/plugin.js";
 function defineConfig(config) {
@@ -6,11 +5,11 @@ function defineConfig(config) {
 }
 function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
   return async ({ mode, command }) => {
-    const cmd = command === "serve" ? "dev" : command;
+    const cmd = command === "serve" ? "dev" : "build";
     const [
       fs,
       { mergeConfig },
-      { nodeLogDestination },
+      { createNodeLogger },
       { resolveConfig, createSettings },
       { createVite },
       { runHookConfigSetup, runHookConfigDone },
@@ -18,16 +17,13 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     ] = await Promise.all([
       import("node:fs"),
       import("vite"),
-      import("../core/logger/node.js"),
+      import("../core/config/logging.js"),
       import("../core/config/index.js"),
       import("../core/create-vite.js"),
       import("../integrations/hooks.js"),
       import("./vite-plugin-content-listen.js")
     ]);
-    const logger = new Logger({
-      dest: nodeLogDestination,
-      level: "info"
-    });
+    const logger = createNodeLogger(inlineAstroConfig);
     const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
     let settings = await createSettings(config, userViteConfig.root);
     settings = await runHookConfigSetup({ settings, command: cmd, logger });
@@ -35,13 +31,12 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     const devSSRManifest = createDevelopmentManifest(settings);
     const viteConfig = await createVite(
       {
-        mode,
         plugins: [
           // Initialize the content listener
           astroContentListenPlugin({ settings, logger, fs })
         ]
       },
-      { settings, logger, mode, sync: false, manifest, ssrManifest: devSSRManifest }
+      { settings, command: cmd, logger, mode, sync: false, manifest, ssrManifest: devSSRManifest }
     );
     await runHookConfigDone({ settings, logger });
     return mergeConfig(viteConfig, userViteConfig);