astro 2.9.7 → 3.0.0-beta.0

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.9.7";
+  const version = "3.0.0-beta.0";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -162,7 +162,6 @@ ${errorList.join(
   )}`;
 }
 function formatErrorMessage(err, args = []) {
-  var _a, _b, _c;
   const isOurError = AstroError.is(err) || CompilerError.is(err);
   args.push(
     `${bgRed(black(` error `))}${red(
@@ -175,11 +174,11 @@ function formatErrorMessage(err, args = []) {
       yellow(padMultilineString(isOurError ? renderErrorMarkdown(err.hint, "cli") : err.hint, 4))
     );
   }
-  if (err.id || ((_a = err.loc) == null ? void 0 : _a.file)) {
+  if (err.id || err.loc?.file) {
     args.push(`  ${bold("File:")}`);
     args.push(
       red(
-        `    ${err.id ?? ((_b = err.loc) == null ? void 0 : _b.file)}${((_c = err.loc) == null ? void 0 : _c.line) && err.loc.column ? `:${err.loc.line}:${err.loc.column}` : ""}`
+        `    ${err.id ?? err.loc?.file}${err.loc?.line && err.loc.column ? `:${err.loc.line}:${err.loc.column}` : ""}`
       )
     );
   }
@@ -233,7 +232,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.9.7"}`
+        `v${"3.0.0-beta.0"}`
       )} ${headline}`
     );
   }

package/dist/core/module-loader/vite.js

@@ -5,7 +5,7 @@ function createViteLoader(viteServer) {
   viteServer.watcher.on("unlink", (...args) => events.emit("file-unlink", args));
   viteServer.watcher.on("change", (...args) => events.emit("file-change", args));
   wrapMethod(viteServer.ws, "send", (msg) => {
-    if ((msg == null ? void 0 : msg.type) === "error") {
+    if (msg?.type === "error") {
       events.emit("hmr-error", msg);
     }
   });
@@ -15,7 +15,7 @@ function createViteLoader(viteServer) {
     },
     async resolveId(spec, parent) {
       const ret = await viteServer.pluginContainer.resolveId(spec, parent);
-      return ret == null ? void 0 : ret.id;
+      return ret?.id;
     },
     getModuleById(id) {
       return viteServer.moduleGraph.getModuleById(id);

package/dist/core/polyfill.js

@@ -1,8 +1,16 @@
-import { polyfill } from "@astrojs/webapi";
+import { File } from "node:buffer";
+import crypto from "node:crypto";
 function apply() {
-  polyfill(globalThis, {
-    exclude: "window document"
-  });
+  if (!globalThis.crypto) {
+    Object.defineProperty(globalThis, "crypto", {
+      value: crypto.webcrypto
+    });
+  }
+  if (!globalThis.File) {
+    Object.defineProperty(globalThis, "File", {
+      value: File
+    });
+  }
 }
 export {
   apply

package/dist/core/redirects/helpers.js

@@ -1,11 +1,11 @@
 function routeIsRedirect(route) {
-  return (route == null ? void 0 : route.type) === "redirect";
+  return route?.type === "redirect";
 }
 function redirectRouteGenerate(redirectRoute, data) {
   const routeData = redirectRoute.redirectRoute;
   const route = redirectRoute.redirect;
   if (typeof routeData !== "undefined") {
-    return (routeData == null ? void 0 : routeData.generate(data)) || (routeData == null ? void 0 : routeData.pathname) || "/";
+    return routeData?.generate(data) || routeData?.pathname || "/";
   } else if (typeof route === "string") {
     return route;
   } else if (typeof route === "undefined") {
@@ -15,7 +15,7 @@ function redirectRouteGenerate(redirectRoute, data) {
 }
 function redirectRouteStatus(redirectRoute, method = "GET") {
   const routeData = redirectRoute.redirectRoute;
-  if (typeof (routeData == null ? void 0 : routeData.redirect) === "object") {
+  if (typeof routeData?.redirect === "object") {
     return routeData.redirect.status;
   } else if (method !== "GET") {
     return 308;

package/dist/core/render/core.js

@@ -37,10 +37,7 @@ async function renderPage({ mod, renderContext, env, cookies }) {
     cookies,
     locals: renderContext.locals ?? {}
   });
-  if (typeof mod.components === "object") {
-    Object.assign(renderContext.props, { components: mod.components });
-  }
-  let response = await runtimeRenderPage(
+  const response = await runtimeRenderPage(
     result,
     Component,
     renderContext.props,

package/dist/core/render/params-and-props.js

@@ -1,6 +1,6 @@
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { getParams } from "../routing/params.js";
-import { callGetStaticPaths, findPathItemByKey } from "./route-cache.js";
+import { RouteCache, callGetStaticPaths, findPathItemByKey } from "./route-cache.js";
 async function getParamsAndProps(opts) {
   const { logging, mod, route, routeCache, pathname, ssr } = opts;
   if (!route || route.pathname) {
@@ -12,7 +12,6 @@ async function getParamsAndProps(opts) {
     mod,
     route,
     routeCache,
-    isValidate: true,
     logging,
     ssr
   });
@@ -24,7 +23,7 @@ async function getParamsAndProps(opts) {
       hint: AstroErrorData.NoMatchingStaticPathFound.hint([route.component])
     });
   }
-  const props = (matchedStaticPath == null ? void 0 : matchedStaticPath.props) ? { ...matchedStaticPath.props } : {};
+  const props = matchedStaticPath?.props ? { ...matchedStaticPath.props } : {};
   return [params, props];
 }
 function getRouteParams(route, pathname) {

package/dist/core/render/result.js

@@ -7,10 +7,9 @@ import { warn } from "../logger/core.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const responseSentSymbol = Symbol.for("astro.responseSent");
 function getFunctionExpression(slot) {
-  var _a;
   if (!slot)
     return;
-  if (((_a = slot.expressions) == null ? void 0 : _a.length) !== 1)
+  if (slot.expressions?.length !== 1)
     return;
   return slot.expressions[0];
 }

package/dist/core/render/route-cache.d.ts

@@ -4,11 +4,10 @@ interface CallGetStaticPathsOptions {
     mod: ComponentInstance;
     route: RouteData;
     routeCache: RouteCache;
-    isValidate: boolean;
     logging: LogOptions;
     ssr: boolean;
 }
-export declare function callGetStaticPaths({ mod, route, routeCache, isValidate, logging, ssr, }: CallGetStaticPathsOptions): Promise<GetStaticPathsResultKeyed>;
+export declare function callGetStaticPaths({ mod, route, routeCache, logging, ssr, }: CallGetStaticPathsOptions): Promise<GetStaticPathsResultKeyed>;
 interface RouteCacheEntry {
     staticPaths: GetStaticPathsResultKeyed;
 }

package/dist/core/render/route-cache.js

@@ -7,12 +7,11 @@ async function callGetStaticPaths({
   mod,
   route,
   routeCache,
-  isValidate,
   logging,
   ssr
 }) {
   const cached = routeCache.get(route);
-  if (cached == null ? void 0 : cached.staticPaths)
+  if (cached?.staticPaths)
     return cached.staticPaths;
   validateDynamicRouteModule(mod, { ssr, route });
   if (ssr && !route.prerender) {
@@ -30,12 +29,7 @@ async function callGetStaticPaths({
       throw new AstroError(AstroErrorData.GetStaticPathsRemovedRSSHelper);
     }
   });
-  if (Array.isArray(staticPaths)) {
-    staticPaths = staticPaths.flat();
-  }
-  if (isValidate) {
-    validateGetStaticPathsResult(staticPaths, logging, route);
-  }
+  validateGetStaticPathsResult(staticPaths, logging, route);
   const keyedStaticPaths = staticPaths;
   keyedStaticPaths.keyed = /* @__PURE__ */ new Map();
   for (const sp of keyedStaticPaths) {
@@ -46,8 +40,10 @@ async function callGetStaticPaths({
   return keyedStaticPaths;
 }
 class RouteCache {
+  logging;
+  cache = {};
+  mode;
   constructor(logging, mode = "production") {
-    this.cache = {};
     this.logging = logging;
     this.mode = mode;
   }
@@ -56,8 +52,7 @@ class RouteCache {
     this.cache = {};
   }
   set(route, entry) {
-    var _a;
-    if (this.mode === "production" && ((_a = this.cache[route.component]) == null ? void 0 : _a.staticPaths)) {
+    if (this.mode === "production" && this.cache[route.component]?.staticPaths) {
       warn(
         this.logging,
         "routeCache",

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

@@ -132,7 +132,6 @@ function injectedRouteToItem({ config, cwd }, { pattern, entryPoint }) {
   };
 }
 function createRouteManifest({ settings, cwd, fsMod }, logging) {
-  var _a;
   const components = [];
   const routes = [];
   const validPageExtensions = /* @__PURE__ */ new Set([
@@ -245,7 +244,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
     const pagesDirRootRelative = pages.href.slice(settings.config.root.href.length);
     warn(logging, "astro", `Missing pages directory: ${pagesDirRootRelative}`);
   }
-  (_a = settings.injectedRoutes) == null ? void 0 : _a.sort(
+  settings.injectedRoutes?.sort(
     (a, b) => (
       // sort injected routes in the same way as user-defined routes
       comparator(injectedRouteToItem({ config, cwd }, a), injectedRouteToItem({ config, cwd }, b))
@@ -313,10 +312,7 @@ This route collides with: "${collision.component}".`
       redirect: to,
       redirectRoute: routes.find((r) => r.route === to)
     };
-    const lastSegmentIsDynamic = (r) => {
-      var _a2, _b;
-      return !!((_b = (_a2 = r.segments.at(-1)) == null ? void 0 : _a2.at(-1)) == null ? void 0 : _b.dynamic);
-    };
+    const lastSegmentIsDynamic = (r) => !!r.segments.at(-1)?.at(-1)?.dynamic;
     const redirBase = path.posix.dirname(route);
     const dynamicRedir = lastSegmentIsDynamic(routeData);
     let i = 0;

package/dist/core/routing/params.js

@@ -17,7 +17,7 @@ function stringifyParams(params, route) {
   const validatedParams = Object.entries(params).reduce((acc, next) => {
     validateGetStaticPathsParameter(next, route.component);
     const [key, value] = next;
-    acc[key] = value == null ? void 0 : value.toString();
+    acc[key] = value?.toString();
     return acc;
   }, {});
   return JSON.stringify(route.generate(validatedParams));

package/dist/core/routing/validation.js

@@ -34,18 +34,17 @@ function validateGetStaticPathsResult(result, logging, route) {
     });
   }
   result.forEach((pathObject) => {
-    if (pathObject.params === void 0 || pathObject.params === null || pathObject.params && Object.keys(pathObject.params).length === 0) {
+    if (typeof pathObject === "object" && Array.isArray(pathObject) || pathObject === null) {
       throw new AstroError({
-        ...AstroErrorData.GetStaticPathsExpectedParams,
-        location: {
-          file: route.component
-        }
+        ...AstroErrorData.InvalidGetStaticPathsEntry,
+        message: AstroErrorData.InvalidGetStaticPathsEntry.message(
+          Array.isArray(pathObject) ? "array" : typeof pathObject
+        )
       });
     }
-    if (typeof pathObject.params !== "object") {
+    if (pathObject.params === void 0 || pathObject.params === null || pathObject.params && Object.keys(pathObject.params).length === 0) {
       throw new AstroError({
-        ...AstroErrorData.InvalidGetStaticPathParam,
-        message: AstroErrorData.InvalidGetStaticPathParam.message(typeof pathObject.params),
+        ...AstroErrorData.GetStaticPathsExpectedParams,
         location: {
           file: route.component
         }

package/dist/core/sync/index.js

@@ -26,7 +26,7 @@ async function sync(inlineConfig, options) {
     logging,
     command: "build"
   });
-  return await syncInternal(settings, { logging, fs: options == null ? void 0 : options.fs });
+  return await syncInternal(settings, { logging, fs: options?.fs });
 }
 async function syncInternal(settings, { logging, fs }) {
   const timerStart = performance.now();

package/dist/core/util.js

@@ -12,7 +12,7 @@ function isURL(value) {
   return Object.prototype.toString.call(value) === "[object URL]";
 }
 function isMarkdownFile(fileId, option) {
-  const _suffix = (option == null ? void 0 : option.suffix) ?? "";
+  const _suffix = option?.suffix ?? "";
   for (let markdownFileExtension of SUPPORTED_MARKDOWN_FILE_EXTENSIONS) {
     if (fileId.endsWith(`${markdownFileExtension}${_suffix}`))
       return true;

package/dist/events/error.js

@@ -3,7 +3,7 @@ const EVENT_ERROR = "ASTRO_CLI_ERROR";
 const ANONYMIZE_MESSAGE_REGEX = /^(\w| )+/;
 function anonymizeErrorMessage(msg) {
   const matchedMessage = msg.match(ANONYMIZE_MESSAGE_REGEX);
-  if (!(matchedMessage == null ? void 0 : matchedMessage[0])) {
+  if (!matchedMessage?.[0]) {
     return void 0;
   }
   return matchedMessage[0].trim().substring(0, 20);

package/dist/events/session.js

@@ -33,25 +33,24 @@ function configKeys(obj, parentKey) {
   }).flat(1);
 }
 function eventCliSession(cliCommand, userConfig, flags) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
   const configValues = userConfig ? {
     markdownPlugins: [
-      ...((_b = (_a = userConfig == null ? void 0 : userConfig.markdown) == null ? void 0 : _a.remarkPlugins) == null ? void 0 : _b.map(
+      ...userConfig?.markdown?.remarkPlugins?.map(
         (p) => typeof p === "string" ? p : typeof p
-      )) ?? [],
-      ...((_d = (_c = userConfig == null ? void 0 : userConfig.markdown) == null ? void 0 : _c.rehypePlugins) == null ? void 0 : _d.map(
+      ) ?? [],
+      ...userConfig?.markdown?.rehypePlugins?.map(
         (p) => typeof p === "string" ? p : typeof p
-      )) ?? []
+      ) ?? []
     ],
-    adapter: ((_e = userConfig == null ? void 0 : userConfig.adapter) == null ? void 0 : _e.name) ?? null,
-    integrations: ((userConfig == null ? void 0 : userConfig.integrations) ?? []).filter(Boolean).flat().map((i) => i == null ? void 0 : i.name),
-    trailingSlash: userConfig == null ? void 0 : userConfig.trailingSlash,
-    build: (userConfig == null ? void 0 : userConfig.build) ? {
-      format: (_f = userConfig == null ? void 0 : userConfig.build) == null ? void 0 : _f.format
+    adapter: userConfig?.adapter?.name ?? null,
+    integrations: (userConfig?.integrations ?? []).filter(Boolean).flat().map((i) => i?.name),
+    trailingSlash: userConfig?.trailingSlash,
+    build: userConfig?.build ? {
+      format: userConfig?.build?.format
     } : void 0,
-    markdown: (userConfig == null ? void 0 : userConfig.markdown) ? {
-      drafts: (_g = userConfig.markdown) == null ? void 0 : _g.drafts,
-      syntaxHighlight: (_h = userConfig.markdown) == null ? void 0 : _h.syntaxHighlight
+    markdown: userConfig?.markdown ? {
+      drafts: userConfig.markdown?.drafts,
+      syntaxHighlight: userConfig.markdown?.syntaxHighlight
     } : void 0
   } : void 0;
   const cliFlags = flags ? Object.keys(flags).filter((name) => name != "_") : void 0;

package/dist/integrations/astroFeaturesValidation.d.ts

@@ -0,0 +1,14 @@
+import type { AstroConfig, AstroFeatureMap } from '../@types/astro';
+import { type LogOptions } from '../core/logger/core.js';
+type ValidationResult = {
+    [Property in keyof AstroFeatureMap]: boolean;
+};
+/**
+ * Checks whether an adapter supports certain features that are enabled via Astro configuration.
+ *
+ * If a configuration is enabled and "unlocks" a feature, but the adapter doesn't support, the function
+ * will throw a runtime error.
+ *
+ */
+export declare function validateSupportedFeatures(adapterName: string, featureMap: AstroFeatureMap | undefined, config: AstroConfig, logging: LogOptions): ValidationResult;
+export {};

package/dist/integrations/astroFeaturesValidation.js

@@ -0,0 +1,109 @@
+import { error, warn } from "../core/logger/core.js";
+const STABLE = "stable";
+const DEPRECATED = "deprecated";
+const UNSUPPORTED = "unsupported";
+const EXPERIMENTAL = "experimental";
+const UNSUPPORTED_ASSETS_FEATURE = {
+  supportKind: UNSUPPORTED,
+  isSquooshCompatible: false,
+  isSharpCompatible: false
+};
+const ALL_UNSUPPORTED = {
+  serverOutput: UNSUPPORTED,
+  staticOutput: UNSUPPORTED,
+  hybridOutput: UNSUPPORTED,
+  assets: UNSUPPORTED_ASSETS_FEATURE
+};
+function validateSupportedFeatures(adapterName, featureMap = ALL_UNSUPPORTED, config, logging) {
+  const {
+    assets = UNSUPPORTED_ASSETS_FEATURE,
+    serverOutput = UNSUPPORTED,
+    staticOutput = UNSUPPORTED,
+    hybridOutput = UNSUPPORTED
+  } = featureMap;
+  const validationResult = {};
+  validationResult.staticOutput = validateSupportKind(
+    staticOutput,
+    adapterName,
+    logging,
+    "staticOutput",
+    () => config?.output === "static"
+  );
+  validationResult.hybridOutput = validateSupportKind(
+    hybridOutput,
+    adapterName,
+    logging,
+    "hybridOutput",
+    () => config?.output === "hybrid"
+  );
+  validationResult.serverOutput = validateSupportKind(
+    serverOutput,
+    adapterName,
+    logging,
+    "serverOutput",
+    () => config?.output === "server"
+  );
+  validationResult.assets = validateAssetsFeature(assets, adapterName, config, logging);
+  return validationResult;
+}
+function validateSupportKind(supportKind, adapterName, logging, featureName, hasCorrectConfig) {
+  if (supportKind === STABLE) {
+    return true;
+  } else if (supportKind === DEPRECATED) {
+    featureIsDeprecated(adapterName, logging);
+  } else if (supportKind === EXPERIMENTAL) {
+    featureIsExperimental(adapterName, logging);
+  }
+  if (hasCorrectConfig() && supportKind === UNSUPPORTED) {
+    featureIsUnsupported(adapterName, logging, featureName);
+    return false;
+  } else {
+    return true;
+  }
+}
+function featureIsUnsupported(adapterName, logging, featureName) {
+  error(
+    logging,
+    `${adapterName}`,
+    `The feature ${featureName} is not supported by the adapter ${adapterName}.`
+  );
+}
+function featureIsExperimental(adapterName, logging) {
+  warn(logging, `${adapterName}`, "The feature is experimental and subject to issues or changes.");
+}
+function featureIsDeprecated(adapterName, logging) {
+  warn(
+    logging,
+    `${adapterName}`,
+    "The feature is deprecated and will be moved in the next release."
+  );
+}
+const SHARP_SERVICE = "astro/assets/services/sharp";
+const SQUOOSH_SERVICE = "astro/assets/services/squoosh";
+function validateAssetsFeature(assets, adapterName, config, logging) {
+  const {
+    supportKind = UNSUPPORTED,
+    isSharpCompatible = false,
+    isSquooshCompatible = false
+  } = assets;
+  if (config?.image?.service?.entrypoint === SHARP_SERVICE && !isSharpCompatible) {
+    error(
+      logging,
+      "astro",
+      `The currently selected adapter \`${adapterName}\` is not compatible with the image service "Sharp".`
+    );
+    return false;
+  }
+  if (config?.image?.service?.entrypoint === SQUOOSH_SERVICE && !isSquooshCompatible) {
+    error(
+      logging,
+      "astro",
+      `The currently selected adapter \`${adapterName}\` is not compatible with the image service "Squoosh".`
+    );
+    return false;
+  }
+  return validateSupportKind(supportKind, adapterName, logging, "assets", () => true);
+}
+export {
+  validateSupportedFeatures
+};

package/dist/integrations/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { AddressInfo } from 'node:net';
 import type { InlineConfig, ViteDevServer } from 'vite';
-import type { AstroConfig, AstroSettings, RouteData } from '../@types/astro.js';
+import type { AstroAdapter, AstroConfig, AstroSettings, RouteData } from '../@types/astro.js';
 import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
 import { type LogOptions } from '../core/logger/core.js';
@@ -59,4 +59,6 @@ type RunHookBuildDone = {
     logging: LogOptions;
 };
 export declare function runHookBuildDone({ config, pages, routes, logging }: RunHookBuildDone): Promise<void>;
+export declare function isFunctionPerRouteEnabled(adapter: AstroAdapter | undefined): boolean;
+export declare function isEdgeMiddlewareEnabled(adapter: AstroAdapter | undefined): boolean;
 export {};