astro 7.2.2 → 7.2.4

package/dist/core/base-pipeline.js

@@ -1,293 +0,0 @@
-import { NOOP_ACTIONS_MOD } from "../actions/noop-actions.js";
-import { createOriginCheckMiddleware } from "./app/origin-check.js";
-import { ActionNotFoundError } from "./errors/errors-data.js";
-import { AstroError } from "./errors/index.js";
-import { AstroLogger } from "./logger/core.js";
-import { NOOP_MIDDLEWARE_FN } from "./middleware/noop-middleware.js";
-import { sequence } from "./middleware/sequence.js";
-import { RedirectSinglePageBuiltModule } from "./redirects/index.js";
-import { RouteCache } from "./render/route-cache.js";
-import { createDefaultRoutes } from "./routing/default.js";
-import { ensure404Route } from "./routing/astro-designed-error-pages.js";
-import { Router } from "./routing/router.js";
-import { FORBIDDEN_PATH_KEYS } from "@astrojs/internal-helpers/object";
-const PipelineFeatures = {
-  redirects: 1 << 0,
-  sessions: 1 << 1,
-  actions: 1 << 2,
-  middleware: 1 << 3,
-  i18n: 1 << 4,
-  cache: 1 << 5
-};
-const ALL_PIPELINE_FEATURES = PipelineFeatures.redirects | PipelineFeatures.sessions | PipelineFeatures.actions | PipelineFeatures.middleware | PipelineFeatures.i18n | PipelineFeatures.cache;
-class Pipeline {
-  internalMiddleware;
-  resolvedMiddleware = void 0;
-  resolvedLogger = false;
-  resolvedActions = void 0;
-  resolvedSessionDriver = void 0;
-  resolvedCacheProvider = void 0;
-  compiledCacheRoutes = void 0;
-  /**
-   * Bit mask of pipeline features activated by handler classes.
-   * Each handler sets its bit via `|=`. Only meaningful when a
-   * custom `src/fetch.ts` fetch handler is in use.
-   */
-  usedFeatures = 0;
-  logger;
-  manifest;
-  /**
-   * "development" or "production" only
-   */
-  runtimeMode;
-  renderers;
-  resolve;
-  streaming;
-  /**
-   * Used to provide better error messages for `Astro.clientAddress`
-   */
-  adapterName;
-  clientDirectives;
-  inlinedScripts;
-  compressHTML;
-  i18n;
-  middleware;
-  routeCache;
-  /**
-   * Used for `Astro.site`.
-   */
-  site;
-  /**
-   * Array of built-in, internal, routes.
-   * Used to find the route module
-   */
-  defaultRoutes;
-  actions;
-  sessionDriver;
-  cacheProvider;
-  cacheConfig;
-  serverIslands;
-  /** Route data derived from the manifest, used for route matching. */
-  manifestData;
-  /** Pattern-matching router built from manifestData. */
-  #router;
-  constructor(logger, manifest, runtimeMode, renderers, resolve, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, inlinedScripts = manifest.inlinedScripts, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, runtimeMode), site = manifest.site ? new URL(manifest.site) : void 0, defaultRoutes = createDefaultRoutes(manifest), actions = manifest.actions, sessionDriver = manifest.sessionDriver, cacheProvider = manifest.cacheProvider, cacheConfig = manifest.cacheConfig, serverIslands = manifest.serverIslandMappings) {
-    this.logger = logger;
-    this.manifest = manifest;
-    this.runtimeMode = runtimeMode;
-    this.renderers = renderers;
-    this.resolve = resolve;
-    this.streaming = streaming;
-    this.adapterName = adapterName;
-    this.clientDirectives = clientDirectives;
-    this.inlinedScripts = inlinedScripts;
-    this.compressHTML = compressHTML;
-    this.i18n = i18n;
-    this.middleware = middleware;
-    this.routeCache = routeCache;
-    this.site = site;
-    this.defaultRoutes = defaultRoutes;
-    this.actions = actions;
-    this.sessionDriver = sessionDriver;
-    this.cacheProvider = cacheProvider;
-    this.cacheConfig = cacheConfig;
-    this.serverIslands = serverIslands;
-    this.manifestData = { routes: (manifest.routes ?? []).map((route) => route.routeData) };
-    ensure404Route(this.manifestData);
-    this.#router = new Router(this.manifestData.routes, {
-      base: manifest.base,
-      trailingSlash: manifest.trailingSlash,
-      buildFormat: manifest.buildFormat
-    });
-    this.internalMiddleware = [];
-  }
-  /**
-   * Low-level route matching against the manifest routes. Returns the
-   * matched `RouteData` or `undefined`. Does not filter prerendered
-   * routes or check public assets — use `BaseApp.match()` for that.
-   */
-  matchRoute(pathname) {
-    const match = this.#router.match(pathname, { allowWithoutBase: true });
-    if (match.type !== "match") return void 0;
-    return match.route;
-  }
-  /**
-   * Returns all routes matching the given pathname, in priority order.
-   * Used when the first match cannot serve the request (e.g. a
-   * prerendered dynamic route that doesn't cover this specific path)
-   * and the caller needs to try subsequent matches.
-   */
-  matchAllRoutes(pathname) {
-    return this.#router.matchAll(pathname, { allowWithoutBase: true });
-  }
-  /**
-   * Rebuilds the internal router after routes have been added or
-   * removed (e.g. by the dev server on HMR).
-   */
-  rebuildRouter() {
-    this.#router = new Router(this.manifestData.routes, {
-      base: this.manifest.base,
-      trailingSlash: this.manifest.trailingSlash,
-      buildFormat: this.manifest.buildFormat
-    });
-  }
-  /**
-   * Resolves the middleware from the manifest, and returns the `onRequest` function. If `onRequest` isn't there,
-   * it returns a no-op function
-   */
-  async getMiddleware() {
-    if (this.resolvedMiddleware) {
-      return this.resolvedMiddleware;
-    }
-    if (this.middleware) {
-      const middlewareInstance = await this.middleware();
-      const onRequest = middlewareInstance.onRequest ?? NOOP_MIDDLEWARE_FN;
-      const internalMiddlewares = [onRequest];
-      if (this.manifest.checkOrigin) {
-        internalMiddlewares.unshift(createOriginCheckMiddleware());
-      }
-      this.resolvedMiddleware = sequence(...internalMiddlewares);
-      return this.resolvedMiddleware;
-    } else {
-      this.resolvedMiddleware = NOOP_MIDDLEWARE_FN;
-      return this.resolvedMiddleware;
-    }
-  }
-  /**
-   * Clears the cached middleware so it is re-resolved on the next request.
-   * Called via HMR when middleware files change during development.
-   */
-  clearMiddleware() {
-    this.resolvedMiddleware = void 0;
-  }
-  /**
-   * Resolves the logger destination from the manifest and updates the pipeline logger.
-   * If the user configured `logger`, the bundled logger factory is loaded
-   * and replaces the default console destination. This is lazy and only resolves once.
-   */
-  async getLogger() {
-    if (this.resolvedLogger) {
-      return this.logger;
-    }
-    this.resolvedLogger = true;
-    const destination = (await this.manifest.logger?.())?.default;
-    if (destination) {
-      this.logger = new AstroLogger({
-        destination,
-        level: this.manifest.logLevel
-      });
-    }
-    return this.logger;
-  }
-  async getActions() {
-    if (this.resolvedActions) {
-      return this.resolvedActions;
-    } else if (this.actions) {
-      this.resolvedActions = await this.actions();
-      return this.resolvedActions;
-    }
-    return NOOP_ACTIONS_MOD;
-  }
-  async getSessionDriver() {
-    if (this.resolvedSessionDriver !== void 0) {
-      return this.resolvedSessionDriver;
-    }
-    if (this.sessionDriver) {
-      const driverModule = await this.sessionDriver();
-      this.resolvedSessionDriver = driverModule?.default || null;
-      return this.resolvedSessionDriver;
-    }
-    this.resolvedSessionDriver = null;
-    return null;
-  }
-  async getCacheProvider() {
-    if (this.resolvedCacheProvider !== void 0) {
-      return this.resolvedCacheProvider;
-    }
-    if (this.cacheProvider) {
-      const mod = await this.cacheProvider();
-      const factory = mod?.default || null;
-      this.resolvedCacheProvider = factory ? factory(this.cacheConfig?.options) : null;
-      return this.resolvedCacheProvider;
-    }
-    this.resolvedCacheProvider = null;
-    return null;
-  }
-  async getServerIslands() {
-    if (this.serverIslands) {
-      return this.serverIslands();
-    }
-    return {
-      serverIslandMap: /* @__PURE__ */ new Map(),
-      serverIslandNameMap: /* @__PURE__ */ new Map()
-    };
-  }
-  async getAction(path) {
-    const pathKeys = path.split(".").map((key) => decodeURIComponent(key));
-    let { server } = await this.getActions();
-    if (!server || !(typeof server === "object")) {
-      throw new TypeError(
-        `Expected \`server\` export in actions file to be an object. Received ${typeof server}.`
-      );
-    }
-    for (const key of pathKeys) {
-      if (typeof server === "function") {
-        throw new AstroError({
-          ...ActionNotFoundError,
-          message: ActionNotFoundError.message(pathKeys.join("."))
-        });
-      }
-      if (FORBIDDEN_PATH_KEYS.has(key)) {
-        throw new AstroError({
-          ...ActionNotFoundError,
-          message: ActionNotFoundError.message(pathKeys.join("."))
-        });
-      }
-      if (!Object.hasOwn(server, key)) {
-        throw new AstroError({
-          ...ActionNotFoundError,
-          message: ActionNotFoundError.message(pathKeys.join("."))
-        });
-      }
-      server = server[key];
-    }
-    if (typeof server !== "function") {
-      throw new TypeError(
-        `Expected handler for action ${pathKeys.join(".")} to be a function. Received ${typeof server}.`
-      );
-    }
-    return server;
-  }
-  async getModuleForRoute(route) {
-    for (const defaultRoute of this.defaultRoutes) {
-      if (route.component === defaultRoute.component) {
-        return {
-          page: () => Promise.resolve(defaultRoute.instance)
-        };
-      }
-    }
-    if (route.type === "redirect") {
-      return RedirectSinglePageBuiltModule;
-    } else {
-      if (this.manifest.pageMap) {
-        const importComponentInstance = this.manifest.pageMap.get(route.component);
-        if (!importComponentInstance) {
-          throw new Error(
-            `Unexpectedly unable to find a component instance for route ${route.route}`
-          );
-        }
-        return await importComponentInstance();
-      } else if (this.manifest.pageModule) {
-        return this.manifest.pageModule;
-      }
-      throw new Error(
-        "Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error, please file an issue."
-      );
-    }
-  }
-}
-export {
-  ALL_PIPELINE_FEATURES,
-  Pipeline,
-  PipelineFeatures
-};

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

@@ -1,38 +0,0 @@
-import type { ComponentInstance } from '../../types/astro.js';
-import type { RewritePayload } from '../../types/public/common.js';
-import type { RouteData, SSRResult } from '../../types/public/internal.js';
-import type { SSRManifest } from '../app/types.js';
-import type { TryRewriteResult } from '../base-pipeline.js';
-import { Pipeline } from '../base-pipeline.js';
-import { type DefaultRouteParams } from '../routing/default.js';
-import type { BuildInternals } from './internal.js';
-import type { SinglePageBuiltModule, StaticBuildOptions } from './types.js';
-/**
- * The build pipeline is responsible to gather the files emitted by the SSR build and generate the pages by executing these files.
- */
-export declare class BuildPipeline extends Pipeline {
-    #private;
-    internals: BuildInternals | undefined;
-    options: StaticBuildOptions | undefined;
-    readonly manifest: SSRManifest;
-    readonly defaultRoutes: Array<DefaultRouteParams>;
-    getName(): string;
-    getSettings(): import("../../types/astro.js").AstroSettings;
-    getOptions(): StaticBuildOptions;
-    getInternals(): BuildInternals;
-    private constructor();
-    getRoutes(): RouteData[];
-    static create({ manifest }: Pick<BuildPipeline, 'manifest'>): BuildPipeline;
-    setInternals(internals: BuildInternals): void;
-    setOptions(options: StaticBuildOptions): void;
-    headElements(routeData: RouteData): Pick<SSRResult, 'scripts' | 'styles' | 'links'>;
-    componentMetadata(): void;
-    /**
-     * It collects the routes to generate during the build.
-     * It returns a map of page information and their relative entry point as a string.
-     */
-    retrieveRoutesToGenerate(): Set<RouteData>;
-    getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    getModuleForRoute(route: RouteData): Promise<SinglePageBuiltModule>;
-    tryRewrite(payload: RewritePayload, request: Request): Promise<TryRewriteResult>;
-}

package/dist/core/build/pipeline.js

@@ -1,202 +0,0 @@
-import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from "../../vite-plugin-pages/const.js";
-import { getVirtualModulePageName } from "../../vite-plugin-pages/util.js";
-import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-import { createConsoleLogger } from "../app/entrypoints/index.js";
-import { RedirectSinglePageBuiltModule } from "../redirects/component.js";
-import { Pipeline } from "../base-pipeline.js";
-import { createAssetLink, createStylesheetElementSet } from "../render/ssr-element.js";
-import { createDefaultRoutes } from "../routing/default.js";
-import { getFallbackRoute, routeIsFallback, routeIsRedirect } from "../routing/helpers.js";
-import { findRouteToRewrite } from "../routing/rewrite.js";
-import { cssOrder, mergeInlineCss, getPageData } from "./runtime.js";
-class BuildPipeline extends Pipeline {
-  internals;
-  options;
-  manifest;
-  defaultRoutes;
-  getName() {
-    return "BuildPipeline";
-  }
-  /**
-   * This cache is needed to map a single `RouteData` to its file path.
-   * @private
-   */
-  #routesByFilePath = /* @__PURE__ */ new WeakMap();
-  getSettings() {
-    if (!this.options) {
-      throw new Error("No options defined");
-    }
-    return this.options.settings;
-  }
-  getOptions() {
-    if (!this.options) {
-      throw new Error("No options defined");
-    }
-    return this.options;
-  }
-  getInternals() {
-    if (!this.internals) {
-      throw new Error("No internals defined");
-    }
-    return this.internals;
-  }
-  constructor(manifest, defaultRoutes = createDefaultRoutes(manifest)) {
-    const resolveCache = /* @__PURE__ */ new Map();
-    async function resolve(specifier) {
-      if (resolveCache.has(specifier)) {
-        return resolveCache.get(specifier);
-      }
-      const hashedFilePath = manifest.entryModules[specifier];
-      if (typeof hashedFilePath !== "string" || hashedFilePath === "") {
-        if (specifier === BEFORE_HYDRATION_SCRIPT_ID) {
-          resolveCache.set(specifier, "");
-          return "";
-        }
-        throw new Error(`Cannot find the built path for ${specifier}`);
-      }
-      const assetLink = createAssetLink(hashedFilePath, manifest.base, manifest.assetsPrefix);
-      resolveCache.set(specifier, assetLink);
-      return assetLink;
-    }
-    const logger = createConsoleLogger({ level: manifest.logLevel });
-    super(logger, manifest, "production", manifest.renderers, resolve, manifest.serverLike);
-    this.manifest = manifest;
-    this.defaultRoutes = defaultRoutes;
-  }
-  getRoutes() {
-    return this.getOptions().routesList.routes;
-  }
-  static create({ manifest }) {
-    return new BuildPipeline(manifest);
-  }
-  setInternals(internals) {
-    this.internals = internals;
-  }
-  setOptions(options) {
-    this.options = options;
-  }
-  headElements(routeData) {
-    const {
-      manifest: { assetsPrefix, base }
-    } = this;
-    const settings = this.getSettings();
-    const internals = this.getInternals();
-    const links = /* @__PURE__ */ new Set();
-    const pageBuildData = getPageData(internals, routeData.route, routeData.component);
-    const scripts = /* @__PURE__ */ new Set();
-    const sortedCssAssets = pageBuildData?.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
-    const styles = createStylesheetElementSet(sortedCssAssets ?? [], base, assetsPrefix);
-    if (settings.scripts.some((script) => script.stage === "page")) {
-      const hashedFilePath = internals.entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
-      if (typeof hashedFilePath !== "string") {
-        throw new Error(`Cannot find the built path for ${PAGE_SCRIPT_ID}`);
-      }
-      const src = createAssetLink(hashedFilePath, base, assetsPrefix);
-      scripts.add({
-        props: { type: "module", src },
-        children: ""
-      });
-    }
-    for (const script of settings.scripts) {
-      if (script.stage === "head-inline") {
-        scripts.add({
-          props: {},
-          children: script.content
-        });
-      }
-    }
-    return { scripts, styles, links };
-  }
-  componentMetadata() {
-  }
-  /**
-   * It collects the routes to generate during the build.
-   * It returns a map of page information and their relative entry point as a string.
-   */
-  retrieveRoutesToGenerate() {
-    const pages = /* @__PURE__ */ new Set();
-    const defaultRouteComponents = new Set(this.defaultRoutes.map((route) => route.component));
-    for (const { routeData } of this.manifest.routes) {
-      if (routeIsRedirect(routeData)) {
-        pages.add(routeData);
-        continue;
-      }
-      if (routeIsFallback(routeData) && i18nHasFallback(this.manifest)) {
-        pages.add(routeData);
-        continue;
-      }
-      if (defaultRouteComponents.has(routeData.component)) {
-        continue;
-      }
-      pages.add(routeData);
-      const moduleSpecifier = getVirtualModulePageName(
-        VIRTUAL_PAGE_RESOLVED_MODULE_ID,
-        routeData.component
-      );
-      const filePath = this.internals?.entrySpecifierToBundleMap.get(moduleSpecifier);
-      if (filePath) {
-        this.#routesByFilePath.set(routeData, filePath);
-      }
-    }
-    return pages;
-  }
-  async getComponentByRoute(routeData) {
-    const module = await this.getModuleForRoute(routeData);
-    return module.page();
-  }
-  async getModuleForRoute(route) {
-    for (const defaultRoute of this.defaultRoutes) {
-      if (route.component === defaultRoute.component) {
-        return {
-          page: () => Promise.resolve(defaultRoute.instance)
-        };
-      }
-    }
-    let routeToProcess = route;
-    if (routeIsRedirect(route)) {
-      if (route.redirectRoute) {
-        routeToProcess = route.redirectRoute;
-      } else {
-        return RedirectSinglePageBuiltModule;
-      }
-    } else if (routeIsFallback(route)) {
-      routeToProcess = getFallbackRoute(route, this.manifest.routes);
-    }
-    if (this.manifest.pageMap) {
-      const importComponentInstance = this.manifest.pageMap.get(routeToProcess.component);
-      if (!importComponentInstance) {
-        throw new Error(
-          `Unexpectedly unable to find a component instance for route ${route.route}`
-        );
-      }
-      return await importComponentInstance();
-    } else if (this.manifest.pageModule) {
-      return this.manifest.pageModule;
-    }
-    throw new Error(
-      "Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error, please file an issue."
-    );
-  }
-  async tryRewrite(payload, request) {
-    const { routeData, pathname, newUrl } = findRouteToRewrite({
-      payload,
-      request,
-      routes: this.manifest.routes.map((routeInfo) => routeInfo.routeData),
-      trailingSlash: this.manifest.trailingSlash,
-      buildFormat: this.manifest.buildFormat,
-      base: this.manifest.base,
-      outDir: this.manifest.serverLike ? this.manifest.buildClientDir : this.manifest.outDir
-    });
-    const componentInstance = await this.getComponentByRoute(routeData);
-    return { routeData, componentInstance, newUrl, pathname };
-  }
-}
-function i18nHasFallback(manifest) {
-  if (manifest.i18n && manifest.i18n.fallback) {
-    return Object.keys(manifest.i18n.fallback).length > 0;
-  }
-  return false;
-}
-export {
-  BuildPipeline
-};

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

@@ -1,62 +0,0 @@
-import type http from 'node:http';
-import { BaseApp } from '../core/app/entrypoints/index.js';
-import type { ErrorHandler } from '../core/errors/handler.js';
-import type { AstroLogger } from '../core/logger/core.js';
-import type { ModuleLoader } from '../core/module-loader/index.js';
-import type { AstroSettings, RoutesList } from '../types/astro.js';
-import type { RouteData, SSRManifest } from '../types/public/index.js';
-import type { DevServerController } from '../vite-plugin-astro-server/controller.js';
-import { RunnablePipeline } from './pipeline.js';
-import type { DevMatch, LogRequestPayload } from '../core/app/base.js';
-export declare class AstroServerApp extends BaseApp<RunnablePipeline> {
-    #private;
-    settings: AstroSettings;
-    loader: ModuleLoader;
-    manifestData: RoutesList;
-    constructor(manifest: SSRManifest, streaming: boolean | undefined, logger: AstroLogger, manifestData: RoutesList, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>);
-    isDev(): boolean;
-    /**
-     * Updates the routes list when files change during development.
-     * Called via HMR when new pages are added/removed.
-     */
-    updateRoutes(newRoutesList: RoutesList): void;
-    /**
-     * Clears the route cache so that getStaticPaths() is re-evaluated.
-     * Called via HMR when content collection data changes.
-     */
-    clearRouteCache(): void;
-    /**
-     * Clears the cached middleware so it is re-resolved on the next request.
-     * Called via HMR when middleware files change.
-     */
-    clearMiddleware(): void;
-    /**
-     * Clears the cached actions so they are re-resolved on the next request.
-     * Called via HMR when action files change.
-     */
-    clearActions(): void;
-    devMatch(pathname: string, { prerenderOnly }?: {
-        prerenderOnly?: boolean;
-    }): Promise<DevMatch | undefined>;
-    static create(manifest: SSRManifest, routesList: RoutesList, logger: AstroLogger, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>): Promise<AstroServerApp>;
-    createPipeline(_streaming: boolean, manifest: SSRManifest, settings: AstroSettings, logger: AstroLogger, loader: ModuleLoader, manifestData: RoutesList, getDebugInfo: () => Promise<string>): RunnablePipeline;
-    /**
-     * Handle a request.
-     * @returns The return value indicates whether or not the request was handled
-     * by this handler. If the result is not `true`, then the request has not
-     * been handled yet and other handlers can be run.
-     */
-    handleRequest({ controller, incomingRequest, incomingResponse, isHttps, prerenderOnly, }: HandleRequest): Promise<boolean>;
-    match(request: Request, _allowPrerenderedRoutes: boolean): RouteData | undefined;
-    protected createErrorHandler(): ErrorHandler;
-    logRequest({ pathname, method, statusCode, isRewrite, reqTime }: LogRequestPayload): void;
-}
-type HandleRequest = {
-    controller: DevServerController;
-    incomingRequest: http.IncomingMessage;
-    incomingResponse: http.ServerResponse;
-    isHttps: boolean;
-    /** When true, only handle prerendered routes. Returns false for SSR routes. */
-    prerenderOnly?: boolean;
-};
-export {};