astro 2.10.0 → 3.0.0-beta.0

package/astro.js

@@ -13,8 +13,8 @@ const CI_INSTRUCTIONS = {
 };
 
 // Hardcode supported Node.js version so we don't have to read differently in CJS & ESM.
-const engines = '>=16.12.0';
-const skipSemverCheckIfAbove = 16;
+const engines = '>=18.14.1';
+const skipSemverCheckIfAbove = 19;
 
 /** `astro *` */
 async function main() {

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

@@ -15,6 +15,7 @@ import type { AstroConfigSchema } from '../core/config';
 import type { AstroTimer } from '../core/config/timer';
 import type { AstroCookies } from '../core/cookies';
 import type { LogOptions, LoggerLevel } from '../core/logger/core';
+import { AstroIntegrationLogger } from '../core/logger/core';
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
@@ -278,7 +279,7 @@ type ServerConfig = {
     /**
      * @name server.port
      * @type {number}
-     * @default `3000`
+     * @default `4321`
      * @description
      * Set which port the dev server should listen on.
      *
@@ -843,7 +844,7 @@ export interface AstroUserConfig {
      * ```js
      * {
      *   // Example: Use the function syntax to customize based on command
-     *   server: ({ command }) => ({ port: command === 'dev' ? 3000 : 4000 })
+     *   server: ({ command }) => ({ port: command === 'dev' ? 4321 : 4000 })
      * }
      * ```
      */
@@ -863,7 +864,7 @@ export interface AstroUserConfig {
      * @docs
      * @name server.port
      * @type {number}
-     * @default `3000`
+     * @default `4321`
      * @description
      * Set which port the server should listen on.
      *
@@ -911,7 +912,7 @@ export interface AstroUserConfig {
          * @docs
          * @name image.service (Experimental)
          * @type {{entrypoint: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | string, config: Record<string, any>}}
-         * @default `{entrypoint: 'astro/assets/services/squoosh', config?: {}}`
+         * @default `{entrypoint: 'astro/assets/services/sharp', config?: {}}`
          * @version 2.1.0
          * @description
          * Set which image service is used for Astro’s experimental assets support.
@@ -1300,6 +1301,16 @@ export type GetDataEntryInfoReturnType = {
     data: Record<string, unknown>;
     rawData?: string;
 };
+export interface AstroAdapterFeatures {
+    /**
+     * Creates and edge function that will communiate with the Astro middleware
+     */
+    edgeMiddleware: boolean;
+    /**
+     * SSR only. Each route becomes its own function/file.
+     */
+    functionPerRoute: boolean;
+}
 export interface AstroSettings {
     config: AstroConfig;
     adapter: AstroAdapter | undefined;
@@ -1392,7 +1403,7 @@ export type GetStaticPathsResultKeyed = GetStaticPathsResult & {
  *
  * [Astro Reference](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
  */
-export type GetStaticPaths = (options: GetStaticPathsOptions) => Promise<GetStaticPathsResult | GetStaticPathsResult[]> | GetStaticPathsResult | GetStaticPathsResult[];
+export type GetStaticPaths = (options: GetStaticPathsOptions) => Promise<GetStaticPathsResult> | GetStaticPathsResult;
 /**
  * Infers the shape of the `params` property returned by `getStaticPaths()`.
  *
@@ -1511,12 +1522,49 @@ export interface Page<T = any> {
 }
 export type PaginateFunction = (data: any[], args?: PaginateOptions) => GetStaticPathsResult;
 export type Params = Record<string, string | undefined>;
+export type SupportsKind = 'unsupported' | 'stable' | 'experimental' | 'deprecated';
+export type AstroFeatureMap = {
+    /**
+     * The adapter is able serve static pages
+     */
+    staticOutput?: SupportsKind;
+    /**
+     * The adapter is able to serve pages that are static or rendered via server
+     */
+    hybridOutput?: SupportsKind;
+    /**
+     * The adapter is able to serve SSR pages
+     */
+    serverOutput?: SupportsKind;
+    /**
+     * The adapter can emit static assets
+     */
+    assets?: AstroAssetsFeature;
+};
+export interface AstroAssetsFeature {
+    supportKind?: SupportsKind;
+    /**
+     * Whether if this adapter deploys files in an enviroment that is compatible with the library `sharp`
+     */
+    isSharpCompatible?: boolean;
+    /**
+     * Whether if this adapter deploys files in an enviroment that is compatible with the library `squoosh`
+     */
+    isSquooshCompatible?: boolean;
+}
 export interface AstroAdapter {
     name: string;
     serverEntrypoint?: string;
     previewEntrypoint?: string;
     exports?: string[];
     args?: any;
+    adapterFeatures?: AstroAdapterFeatures;
+    /**
+     * List of features supported by an adapter.
+     *
+     * If the adapter is not able to handle certain configurations, Astro will throw an error.
+     */
+    supportedAstroFeatures?: AstroFeatureMap;
 }
 type Body = string;
 export type ValidRedirectStatus = 300 | 301 | 302 | 303 | 304 | 307 | 308;
@@ -1696,18 +1744,24 @@ export interface AstroIntegration {
             injectScript: (stage: InjectedScriptStage, content: string) => void;
             injectRoute: (injectRoute: InjectedRoute) => void;
             addClientDirective: (directive: ClientDirectiveConfig) => void;
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
         'astro:config:done'?: (options: {
             config: AstroConfig;
             setAdapter: (adapter: AstroAdapter) => void;
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
         'astro:server:setup'?: (options: {
             server: vite.ViteDevServer;
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
         'astro:server:start'?: (options: {
             address: AddressInfo;
+            logger: AstroIntegrationLogger;
+        }) => void | Promise<void>;
+        'astro:server:done'?: (options: {
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
-        'astro:server:done'?: () => void | Promise<void>;
         'astro:build:ssr'?: (options: {
             manifest: SerializedSSRManifest;
             /**
@@ -1719,16 +1773,21 @@ export interface AstroIntegration {
              * File path of the emitted middleware
              */
             middlewareEntryPoint: URL | undefined;
+            logger: AstroIntegrationLogger;
+        }) => void | Promise<void>;
+        'astro:build:start'?: (options: {
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
-        'astro:build:start'?: () => void | Promise<void>;
         'astro:build:setup'?: (options: {
             vite: vite.InlineConfig;
             pages: Map<string, PageBuildData>;
             target: 'client' | 'server';
             updateConfig: (newConfig: vite.InlineConfig) => void;
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
         'astro:build:generated'?: (options: {
             dir: URL;
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
         'astro:build:done'?: (options: {
             pages: {
@@ -1736,6 +1795,7 @@ export interface AstroIntegration {
             }[];
             dir: URL;
             routes: RouteData[];
+            logger: AstroIntegrationLogger;
         }) => void | Promise<void>;
     };
 }

package/dist/@types/astro.js

@@ -0,0 +1 @@
+import { AstroIntegrationLogger } from "../core/logger/core";

package/dist/assets/generate.js

@@ -5,6 +5,11 @@ import { prependForwardSlash } from "../core/path.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { getConfiguredImageService, isESMImportedImage } from "./internal.js";
 async function generateImage(buildOpts, options, filepath) {
+  if (typeof buildOpts.settings.config.image === "undefined") {
+    throw new Error(
+      "Astro hasn't set a default service for `astro:assets`. This is an internal error and you should report it."
+    );
+  }
   if (!isESMImportedImage(options.src)) {
     return void 0;
   }
@@ -78,11 +83,10 @@ async function generateImage(buildOpts, options, filepath) {
   };
 }
 function getStaticImageList() {
-  var _a, _b;
-  if (!((_a = globalThis == null ? void 0 : globalThis.astroAsset) == null ? void 0 : _a.staticImages)) {
+  if (!globalThis?.astroAsset?.staticImages) {
     return [];
   }
-  return (_b = globalThis.astroAsset.staticImages) == null ? void 0 : _b.entries();
+  return globalThis.astroAsset.staticImages?.entries();
 }
 export {
   generateImage,

package/dist/assets/image-endpoint.d.ts

@@ -2,4 +2,4 @@ import type { APIRoute } from '../@types/astro.js';
 /**
  * Endpoint used in dev and SSR to serve optimized images by the base image services
  */
-export declare const get: APIRoute;
+export declare const GET: APIRoute;

package/dist/assets/image-endpoint.js

@@ -15,7 +15,7 @@ async function loadRemoteImage(src) {
     return void 0;
   }
 }
-const get = async ({ request }) => {
+const GET = async ({ request }) => {
   try {
     const imageService = await getConfiguredImageService();
     if (!isLocalService(imageService)) {
@@ -23,7 +23,7 @@ const get = async ({ request }) => {
     }
     const url = new URL(request.url);
     const transform = await imageService.parseURL(url, imageServiceConfig);
-    if (!(transform == null ? void 0 : transform.src)) {
+    if (!transform?.src) {
       throw new Error("Incorrect transform returned by `parseURL`");
     }
     let inputBuffer = void 0;
@@ -51,5 +51,5 @@ const get = async ({ request }) => {
   }
 };
 export {
-  get
+  GET
 };

package/dist/assets/internal.js

@@ -12,8 +12,7 @@ function isESMImportedImage(src) {
   return typeof src === "object";
 }
 async function getConfiguredImageService() {
-  var _a;
-  if (!((_a = globalThis == null ? void 0 : globalThis.astroAsset) == null ? void 0 : _a.imageService)) {
+  if (!globalThis?.astroAsset?.imageService) {
     const { default: service } = await import(
       // @ts-expect-error
       "virtual:image-service"

package/dist/assets/services/noop.d.ts

@@ -0,0 +1,3 @@
+import { type LocalImageService } from './service.js';
+declare const noopService: LocalImageService;
+export default noopService;

package/dist/assets/services/noop.js

@@ -0,0 +1,17 @@
+import { baseService } from "./service.js";
+const noopService = {
+  validateOptions: baseService.validateOptions,
+  getURL: baseService.getURL,
+  parseURL: baseService.parseURL,
+  getHTMLAttributes: baseService.getHTMLAttributes,
+  async transform(inputBuffer, transformOptions) {
+    return {
+      data: inputBuffer,
+      format: transformOptions.format
+    };
+  }
+};
+var noop_default = noopService;
+export {
+  noop_default as default
+};

package/dist/assets/services/vendor/squoosh/image_data.js

@@ -2,6 +2,9 @@ class ImageData {
   static from(input) {
     return new ImageData(input.data || input._data, input.width, input.height);
   }
+  _data;
+  width;
+  height;
   get data() {
     if (Object.prototype.toString.call(this._data) === "[object Object]") {
       return Buffer.from(Object.values(this._data));

package/dist/assets/services/vendor/squoosh/impl.js

@@ -18,16 +18,15 @@ function maybeDelay() {
   return Promise.resolve();
 }
 async function decodeBuffer(_buffer) {
-  var _a;
   const buffer = Buffer.from(_buffer);
   const firstChunk = buffer.slice(0, 16);
   const firstChunkString = Array.from(firstChunk).map((v) => String.fromCodePoint(v)).join("");
   if (firstChunkString.includes("GIF")) {
     throw Error(`GIF images are not supported, please install the @astrojs/image/sharp plugin`);
   }
-  const key = (_a = Object.entries(supportedFormats).find(
+  const key = Object.entries(supportedFormats).find(
     ([, { detectors }]) => detectors.some((detector) => detector.exec(firstChunkString))
-  )) == null ? void 0 : _a[0];
+  )?.[0];
   if (!key) {
     throw Error(`Buffer has an unsupported format`);
   }

package/dist/assets/services/vendor/squoosh/utils/workerPool.js

@@ -3,6 +3,10 @@ function uuid() {
   return Array.from({ length: 16 }, () => Math.floor(Math.random() * 256).toString(16)).join("");
 }
 class WorkerPool {
+  numWorkers;
+  jobQueue;
+  workerQueue;
+  done;
   constructor(numWorkers, workerFile) {
     this.numWorkers = numWorkers;
     this.jobQueue = new TransformStream();

package/dist/assets/vendor/image-size/types/tiff.js

@@ -26,7 +26,7 @@ function nextTag(buffer) {
 function extractTags(buffer, isBigEndian) {
   const tags = {};
   let temp = buffer;
-  while (temp == null ? void 0 : temp.length) {
+  while (temp?.length) {
     const code = readUInt(temp, 16, 0, isBigEndian);
     const type = readUInt(temp, 16, 2, isBigEndian);
     const length = readUInt(temp, 32, 4, isBigEndian);

package/dist/assets/vendor/queue/queue.d.ts

@@ -23,11 +23,11 @@ export default class Queue extends EventTarget {
     shift(): any;
     indexOf(searchElement: any, fromIndex: any): number;
     lastIndexOf(searchElement: any, fromIndex: any): number;
-    slice(start: any, end: any): Queue;
-    reverse(): Queue;
+    slice(start: any, end: any): this;
+    reverse(): this;
     push(...workers: any[]): number;
     unshift(...workers: any[]): number;
-    splice(start: any, deleteCount: any, ...workers: any[]): Queue;
+    splice(start: any, deleteCount: any, ...workers: any[]): this;
     get length(): number;
     start(callback: any): any;
     stop(): void;

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

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

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

@@ -1,8 +1,6 @@
-import { bold } from "kleur/colors";
 import MagicString from "magic-string";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
-import { error } from "../core/logger/core.js";
 import {
   appendForwardSlash,
   joinPaths,
@@ -18,30 +16,10 @@ const rawRE = /(?:\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 function assets({
   settings,
-  logging,
   mode
 }) {
-  var _a;
   let resolvedConfig;
   globalThis.astroAsset = {};
-  const UNSUPPORTED_ADAPTERS = /* @__PURE__ */ new Set([
-    "@astrojs/cloudflare",
-    "@astrojs/deno",
-    "@astrojs/netlify/edge-functions",
-    "@astrojs/vercel/edge"
-  ]);
-  const adapterName = (_a = settings.config.adapter) == null ? void 0 : _a.name;
-  if (["astro/assets/services/sharp", "astro/assets/services/squoosh"].includes(
-    settings.config.image.service.entrypoint
-  ) && adapterName && UNSUPPORTED_ADAPTERS.has(adapterName)) {
-    error(
-      logging,
-      "assets",
-      `The currently selected adapter \`${adapterName}\` does not run on Node, however the currently used image service depends on Node built-ins. ${bold(
-        "Your project will NOT be able to build."
-      )}`
-    );
-  }
   return [
     // Expose the components and different utilities from `astro:assets` and handle serving images from `/_image` in dev
     {

package/dist/cli/add/index.js

@@ -58,17 +58,15 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   deno: "@astrojs/deno"
 };
 async function getRegistry() {
-  var _a, _b;
-  const packageManager = ((_a = await preferredPM(process.cwd())) == null ? void 0 : _a.name) || "npm";
+  const packageManager = (await preferredPM(process.cwd()))?.name || "npm";
   try {
     const { stdout } = await execa(packageManager, ["config", "get", "registry"]);
-    return ((_b = stdout == null ? void 0 : stdout.trim()) == null ? void 0 : _b.replace(/\/$/, "")) || "https://registry.npmjs.org";
+    return stdout?.trim()?.replace(/\/$/, "") || "https://registry.npmjs.org";
   } catch (e) {
     return "https://registry.npmjs.org";
   }
 }
 async function add(names, { flags }) {
-  var _a;
   telemetry.record(eventCliSession("add"));
   applyPolyfill();
   if (flags.help || names.length === 0) {
@@ -145,7 +143,7 @@ async function add(names, { flags }) {
           defaultConfigContent: SVELTE_CONFIG_STUB
         });
       }
-      if (integrations.find((integration) => integration.id === "lit") && ((_a = await preferredPM(fileURLToPath(root))) == null ? void 0 : _a.name) === "pnpm") {
+      if (integrations.find((integration) => integration.id === "lit") && (await preferredPM(fileURLToPath(root)))?.name === "pnpm") {
         await setupIntegrationConfig({
           root,
           logging,
@@ -186,7 +184,7 @@ async function add(names, { flags }) {
     configURL = new URL("./astro.config.mjs", root);
     await fs.writeFile(fileURLToPath(configURL), ASTRO_CONFIG_STUB, { encoding: "utf-8" });
   }
-  if (configURL == null ? void 0 : configURL.pathname.endsWith("package.json")) {
+  if (configURL?.pathname.endsWith("package.json")) {
     throw new Error(
       `Unable to use "astro add" with package.json configuration. Try migrating to \`astro.config.mjs\` and try again.`
     );
@@ -594,7 +592,6 @@ async function validateIntegrations(integrations) {
   try {
     const integrationEntries = await Promise.all(
       integrations.map(async (integration) => {
-        var _a;
         const parsed = parseIntegrationName(integration);
         if (!parsed) {
           throw new Error(`${bold(integration)} does not appear to be a valid package name!`);
@@ -646,7 +643,7 @@ async function validateIntegrations(integrations) {
         if (pkgJson["peerDependencies"]) {
           const meta = pkgJson["peerDependenciesMeta"] || {};
           for (const peer in pkgJson["peerDependencies"]) {
-            const optional = ((_a = meta[peer]) == null ? void 0 : _a.optional) || false;
+            const optional = meta[peer]?.optional || false;
             const isAstro = peer === "astro";
             if (!optional && !isAstro) {
               dependencies.push([peer, pkgJson["peerDependencies"][peer]]);
@@ -743,7 +740,7 @@ ${message}`
     );
   }
   if (await askToContinue({ flags })) {
-    await fs.writeFile((inputConfig == null ? void 0 : inputConfig.path) ?? path.join(cwd, "tsconfig.json"), output, {
+    await fs.writeFile(inputConfig?.path ?? path.join(cwd, "tsconfig.json"), output, {
       encoding: "utf-8"
     });
     debug("add", `Updated ${configFileName} file`);

package/dist/cli/build/index.js

@@ -2,7 +2,7 @@ import _build from "../../core/build/index.js";
 import { printHelp } from "../../core/messages.js";
 import { flagsToAstroInlineConfig } from "../flags.js";
 async function build({ flags }) {
-  if ((flags == null ? void 0 : flags.help) || (flags == null ? void 0 : flags.h)) {
+  if (flags?.help || flags?.h) {
     printHelp({
       commandName: "astro build",
       usage: "[...flags]",

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

@@ -1,78 +1,2 @@
-/// <reference types="node" />
-import { AstroCheck } from '@astrojs/language-server';
-import fs from 'node:fs';
-import type { Arguments as Flags } from 'yargs-parser';
-import type { AstroSettings } from '../../@types/astro';
-import type { LogOptions } from '../../core/logger/core.js';
-import type { syncInternal } from '../../core/sync';
-export type CheckPayload = {
-    /**
-     * Flags passed via CLI
-     */
-    flags: Flags;
-};
-/**
- *
- * Types of response emitted by the checker
- */
-export declare enum CheckResult {
-    /**
-     * Operation finished without errors
-     */
-    ExitWithSuccess = 0,
-    /**
-     * Operation finished with errors
-     */
-    ExitWithError = 1,
-    /**
-     * The consumer should not terminate the operation
-     */
-    Listen = 2
-}
-/**
- * Checks `.astro` files for possible errors.
- *
- * If the `--watch` flag is provided, the command runs indefinitely and provides diagnostics
- * when `.astro` files are modified.
- *
- * Every time an astro files is modified, content collections are also generated.
- *
- * @param {CheckPayload} options Options passed {@link AstroChecker}
- * @param {Flags} options.flags Flags coming from the CLI
- */
-export declare function check({ flags }: CheckPayload): Promise<AstroChecker | undefined>;
-type CheckerConstructor = {
-    diagnosticChecker: AstroCheck;
-    isWatchMode: boolean;
-    syncInternal: typeof syncInternal;
-    settings: Readonly<AstroSettings>;
-    logging: Readonly<LogOptions>;
-    fileSystem: typeof fs;
-};
-/**
- * Responsible to check files - classic or watch mode - and report diagnostics.
- *
- * When in watch mode, the class does a whole check pass, and then starts watching files.
- * When a change occurs to an `.astro` file, the checker builds content collections again and lint all the `.astro` files.
- */
-export declare class AstroChecker {
-    #private;
-    constructor({ diagnosticChecker, isWatchMode, syncInternal, settings, fileSystem, logging, }: CheckerConstructor);
-    /**
-     * Check all `.astro` files once and then finishes the operation.
-     */
-    check(): Promise<CheckResult>;
-    /**
-     * Check all `.astro` files and then start watching for changes.
-     */
-    watch(): Promise<CheckResult>;
-    /**
-     * Stops the watch. It terminates the inner server.
-     */
-    stop(): Promise<void>;
-    /**
-     * Whether the checker should run in watch mode
-     */
-    get isWatchMode(): boolean;
-}
-export {};
+import type { Arguments } from 'yargs-parser';
+export declare function check(flags: Arguments): Promise<boolean | void>;