astro 4.4.0 → 4.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -151,7 +151,6 @@
     "rehype": "^13.0.1",
     "resolve": "^1.22.4",
     "semver": "^7.5.4",
-    "server-destroy": "^1.0.1",
     "shikiji": "^0.9.19",
     "shikiji-core": "^0.9.19",
     "string-width": "^7.0.0",
@@ -198,14 +197,11 @@
     "@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",
     "@types/yargs-parser": "^21.0.3",
-    "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "eol": "^0.9.1",
     "memfs": "^4.6.0",
-    "mocha": "^10.2.0",
     "node-mocks-http": "^1.13.0",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
@@ -231,10 +227,9 @@
     "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && pnpm run postbuild",
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"",
-    "test": "pnpm run test:node && mocha ./test/*.test.js --exit --timeout 30000 --ignore ./test/lit-element.test.js && mocha ./test/lit-element.test.js --timeout 30000",
-    "test:match": "mocha ./test/*.test.js --timeout 30000 -g",
+    "test": "pnpm run test:node",
     "test:e2e": "playwright test",
     "test:e2e:match": "playwright test -g",
-    "test:node": "astro-scripts test \"test/**/*.nodetest.js\""
+    "test:node": "astro-scripts test \"test/**/*.test.js\""
   }
 }

package/dist/core/app/ssrPipeline.d.ts

@@ -1,3 +0,0 @@
-import { Pipeline } from '../pipeline.js';
-export declare class SSRRoutePipeline extends Pipeline {
-}

package/dist/core/app/ssrPipeline.js

@@ -1,6 +0,0 @@
-import { Pipeline } from "../pipeline.js";
-class SSRRoutePipeline extends Pipeline {
-}
-export {
-  SSRRoutePipeline
-};

package/dist/core/build/buildPipeline.js

@@ -1,150 +0,0 @@
-import { getOutputDirectory, isServerLikeOutput } from "../../prerender/utils.js";
-import { BEFORE_HYDRATION_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-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,
-  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";
-class BuildPipeline extends Pipeline {
-  #internals;
-  #staticBuildOptions;
-  #manifest;
-  constructor(staticBuildOptions, internals, manifest) {
-    const ssr = isServerLikeOutput(staticBuildOptions.settings.config);
-    const resolveCache = /* @__PURE__ */ new Map();
-    super(
-      createEnvironment({
-        adapterName: manifest.adapterName,
-        logger: staticBuildOptions.logger,
-        mode: staticBuildOptions.mode,
-        renderers: manifest.renderers,
-        clientDirectives: manifest.clientDirectives,
-        compressHTML: manifest.compressHTML,
-        async 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;
-        },
-        routeCache: staticBuildOptions.routeCache,
-        site: manifest.site,
-        ssr,
-        streaming: true
-      })
-    );
-    this.#internals = internals;
-    this.#staticBuildOptions = staticBuildOptions;
-    this.#manifest = manifest;
-  }
-  getInternals() {
-    return this.#internals;
-  }
-  getSettings() {
-    return this.#staticBuildOptions.settings;
-  }
-  getStaticBuildOptions() {
-    return this.#staticBuildOptions;
-  }
-  getConfig() {
-    return this.#staticBuildOptions.settings.config;
-  }
-  getManifest() {
-    return this.#manifest;
-  }
-  getLogger() {
-    return this.getEnvironment().logger;
-  }
-  /**
-   * The SSR build emits two important files:
-   * - dist/server/manifest.mjs
-   * - dist/renderers.mjs
-   *
-   * These two files, put together, will be used to generate the pages.
-   *
-   * ## Errors
-   *
-   * It will throw errors if the previous files can't be found in the file system.
-   *
-   * @param staticBuildOptions
-   */
-  static async retrieveManifest(staticBuildOptions, internals) {
-    const config = staticBuildOptions.settings.config;
-    const baseDirectory = getOutputDirectory(config);
-    const manifestEntryUrl = new URL(
-      `${internals.manifestFileName}?time=${Date.now()}`,
-      baseDirectory
-    );
-    const { manifest } = await import(manifestEntryUrl.toString());
-    if (!manifest) {
-      throw new Error(
-        "Astro couldn't find the emitted manifest. This is an internal error, please file an issue."
-      );
-    }
-    const renderersEntryUrl = new URL(`renderers.mjs?time=${Date.now()}`, baseDirectory);
-    const renderers = await import(renderersEntryUrl.toString());
-    const middleware = await import(new URL("middleware.mjs", baseDirectory).toString()).then((mod) => mod.onRequest).catch(() => manifest.middleware);
-    if (!renderers) {
-      throw new Error(
-        "Astro couldn't find the emitted renderers. This is an internal error, please file an issue."
-      );
-    }
-    return {
-      ...manifest,
-      renderers: renderers.renderers,
-      middleware
-    };
-  }
-  /**
-   * 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 Map();
-    for (const [entrypoint, filePath] of this.#internals.entrySpecifierToBundleMap) {
-      if (entrypoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || entrypoint.includes(RESOLVED_SPLIT_MODULE_ID)) {
-        const [, pageName] = entrypoint.split(":");
-        const pageData = this.#internals.pagesByComponent.get(
-          `${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".")}`
-        );
-        if (!pageData) {
-          throw new Error(
-            "Build failed. Astro couldn't find the emitted page from " + pageName + " pattern"
-          );
-        }
-        pages.set(pageData, filePath);
-      }
-    }
-    for (const [path, pageData] of this.#internals.pagesByComponent.entries()) {
-      if (routeIsRedirect(pageData.route)) {
-        pages.set(pageData, path);
-      } else if (routeIsFallback(pageData.route) && (i18nHasFallback(this.getConfig()) || routeIsFallback(pageData.route) && pageData.route.route === "/")) {
-        const moduleSpecifier = getVirtualModulePageNameFromPath(path);
-        const filePath = this.#internals.entrySpecifierToBundleMap.get(moduleSpecifier);
-        if (filePath) {
-          pages.set(pageData, filePath);
-        }
-      }
-    }
-    return pages;
-  }
-}
-export {
-  BuildPipeline
-};

package/dist/core/pipeline.d.ts

@@ -1,39 +0,0 @@
-import type { ComponentInstance, MiddlewareHandler } from '../@types/astro.js';
-import { type Environment, type RenderContext } from './render/index.js';
-export type PipelineHookFunction = (ctx: RenderContext, mod: ComponentInstance | undefined) => void;
-/**
- * This is the basic class of a pipeline.
- *
- * Check the {@link ./README.md|README} for more information about the pipeline.
- */
-export declare class Pipeline {
-    #private;
-    env: Environment;
-    /**
-     * When creating a pipeline, an environment is mandatory.
-     * The environment won't change for the whole lifetime of the pipeline.
-     */
-    constructor(env: Environment);
-    setEnvironment(): void;
-    /**
-     * A middleware function that will be called before each request.
-     */
-    setMiddlewareFunction(onRequest: MiddlewareHandler): void;
-    /**
-     * Removes the current middleware function. Subsequent requests won't trigger any middleware.
-     */
-    unsetMiddlewareFunction(): void;
-    /**
-     * Returns the current environment
-     */
-    getEnvironment(): Readonly<Environment>;
-    /**
-     * The main function of the pipeline. Use this function to render any route known to Astro;
-     */
-    renderRoute(renderContext: RenderContext, componentInstance: ComponentInstance | undefined): Promise<Response>;
-    /**
-     * Store a function that will be called before starting the rendering phase.
-     * @param fn
-     */
-    onBeforeRenderRoute(fn: PipelineHookFunction): void;
-}

package/dist/core/pipeline.js

@@ -1,107 +0,0 @@
-import { callEndpoint, createAPIContext } from "./endpoint/index.js";
-import { callMiddleware } from "./middleware/callMiddleware.js";
-import { renderPage } from "./render/core.js";
-import {} from "./render/index.js";
-class Pipeline {
-  env;
-  #onRequest;
-  #hooks = {
-    before: []
-  };
-  /**
-   * When creating a pipeline, an environment is mandatory.
-   * The environment won't change for the whole lifetime of the pipeline.
-   */
-  constructor(env) {
-    this.env = env;
-  }
-  setEnvironment() {
-  }
-  /**
-   * A middleware function that will be called before each request.
-   */
-  setMiddlewareFunction(onRequest) {
-    this.#onRequest = onRequest;
-  }
-  /**
-   * Removes the current middleware function. Subsequent requests won't trigger any middleware.
-   */
-  unsetMiddlewareFunction() {
-    this.#onRequest = void 0;
-  }
-  /**
-   * Returns the current environment
-   */
-  getEnvironment() {
-    return this.env;
-  }
-  /**
-   * The main function of the pipeline. Use this function to render any route known to Astro;
-   */
-  async renderRoute(renderContext, componentInstance) {
-    for (const hook of this.#hooks.before) {
-      hook(renderContext, componentInstance);
-    }
-    return await this.#tryRenderRoute(renderContext, this.env, componentInstance, this.#onRequest);
-  }
-  /**
-   * It attempts to render a route. A route can be a:
-   * - page
-   * - redirect
-   * - endpoint
-   *
-   * ## Errors
-   *
-   * It throws an error if the page can't be rendered.
-   */
-  async #tryRenderRoute(renderContext, env, mod, onRequest) {
-    const apiContext = createAPIContext({
-      request: renderContext.request,
-      params: renderContext.params,
-      props: renderContext.props,
-      site: env.site,
-      adapterName: env.adapterName,
-      locales: renderContext.locales,
-      routingStrategy: renderContext.routing,
-      defaultLocale: renderContext.defaultLocale
-    });
-    switch (renderContext.route.type) {
-      case "page":
-      case "fallback":
-      case "redirect": {
-        if (onRequest) {
-          return await callMiddleware(onRequest, apiContext, () => {
-            return renderPage({
-              mod,
-              renderContext,
-              env,
-              cookies: apiContext.cookies
-            });
-          });
-        } else {
-          return await renderPage({
-            mod,
-            renderContext,
-            env,
-            cookies: apiContext.cookies
-          });
-        }
-      }
-      case "endpoint": {
-        return await callEndpoint(mod, env, renderContext, onRequest);
-      }
-      default:
-        throw new Error(`Couldn't find route of type [${renderContext.route.type}]`);
-    }
-  }
-  /**
-   * Store a function that will be called before starting the rendering phase.
-   * @param fn
-   */
-  onBeforeRenderRoute(fn) {
-    this.#hooks.before.push(fn);
-  }
-}
-export {
-  Pipeline
-};

package/dist/core/render/context.d.ts

@@ -1,52 +0,0 @@
-import type { ComponentInstance, Locales, Params, Props, RouteData, SSRElement, SSRResult } from '../../@types/astro.js';
-import type { Environment } from './environment.js';
-import type { RoutingStrategies } from '../config/schema.js';
-/**
- * The RenderContext represents the parts of rendering that are specific to one request.
- */
-export interface RenderContext {
-    request: Request;
-    pathname: string;
-    scripts?: Set<SSRElement>;
-    links?: Set<SSRElement>;
-    styles?: Set<SSRElement>;
-    componentMetadata?: SSRResult['componentMetadata'];
-    route: RouteData;
-    status?: number;
-    params: Params;
-    props: Props;
-    locals?: object;
-    locales: Locales | undefined;
-    defaultLocale: string | undefined;
-    routing: RoutingStrategies | undefined;
-}
-export type CreateRenderContextArgs = Partial<Omit<RenderContext, 'params' | 'props' | 'locals'>> & {
-    route: RouteData;
-    request: RenderContext['request'];
-    mod: ComponentInstance | undefined;
-    env: Environment;
-};
-export declare function createRenderContext(options: CreateRenderContextArgs): Promise<RenderContext>;
-type BrowserLocale = {
-    locale: string;
-    qualityValue: number | undefined;
-};
-/**
- * Parses the value of the `Accept-Header` language:
- *
- * More info: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Language
- *
- * Complex example: `fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5`
- *
- */
-export declare function parseLocale(header: string): BrowserLocale[];
-/**
- * Set the current locale by parsing the value passed from the `Accept-Header`.
- *
- * If multiple locales are present in the header, they are sorted by their quality value and the highest is selected as current locale.
- *
- */
-export declare function computePreferredLocale(request: Request, locales: Locales): string | undefined;
-export declare function computePreferredLocaleList(request: Request, locales: Locales): string[];
-export declare function computeCurrentLocale(request: Request, locales: Locales, routingStrategy: RoutingStrategies | undefined, defaultLocale: string | undefined): undefined | string;
-export {};

package/dist/core/render/core.d.ts

@@ -1,10 +0,0 @@
-import type { AstroCookies, ComponentInstance } from '../../@types/astro.js';
-import type { RenderContext } from './context.js';
-import type { Environment } from './environment.js';
-export type RenderPage = {
-    mod: ComponentInstance | undefined;
-    renderContext: RenderContext;
-    env: Environment;
-    cookies: AstroCookies;
-};
-export declare function renderPage({ mod, renderContext, env, cookies }: RenderPage): Promise<Response>;

package/dist/core/render/core.js

@@ -1,65 +0,0 @@
-import { renderPage as runtimeRenderPage } from "../../runtime/server/index.js";
-import { attachCookiesToResponse } from "../cookies/index.js";
-import { CantRenderPage } from "../errors/errors-data.js";
-import { AstroError } from "../errors/index.js";
-import { routeIsFallback } from "../redirects/helpers.js";
-import { redirectRouteGenerate, redirectRouteStatus, routeIsRedirect } from "../redirects/index.js";
-import { createResult } from "./result.js";
-async function renderPage({ mod, renderContext, env, cookies }) {
-  if (routeIsRedirect(renderContext.route)) {
-    return new Response(null, {
-      status: redirectRouteStatus(renderContext.route, renderContext.request.method),
-      headers: {
-        location: redirectRouteGenerate(renderContext.route, renderContext.params)
-      }
-    });
-  } else if (routeIsFallback(renderContext.route)) {
-    return new Response(null, {
-      status: 404
-    });
-  } else if (!mod) {
-    throw new AstroError(CantRenderPage);
-  }
-  const Component = mod.default;
-  if (!Component)
-    throw new Error(`Expected an exported Astro component but received typeof ${typeof Component}`);
-  const result = createResult({
-    adapterName: env.adapterName,
-    links: renderContext.links,
-    styles: renderContext.styles,
-    logger: env.logger,
-    params: renderContext.params,
-    pathname: renderContext.pathname,
-    componentMetadata: renderContext.componentMetadata,
-    resolve: env.resolve,
-    renderers: env.renderers,
-    clientDirectives: env.clientDirectives,
-    compressHTML: env.compressHTML,
-    request: renderContext.request,
-    partial: !!mod.partial,
-    site: env.site,
-    scripts: renderContext.scripts,
-    ssr: env.ssr,
-    status: renderContext.status ?? 200,
-    cookies,
-    locals: renderContext.locals ?? {},
-    locales: renderContext.locales,
-    defaultLocale: renderContext.defaultLocale,
-    routingStrategy: renderContext.routing
-  });
-  const response = await runtimeRenderPage(
-    result,
-    Component,
-    renderContext.props,
-    {},
-    env.streaming,
-    renderContext.route
-  );
-  if (result.cookies) {
-    attachCookiesToResponse(response, result.cookies);
-  }
-  return response;
-}
-export {
-  renderPage
-};

package/dist/core/render/environment.d.ts

@@ -1,34 +0,0 @@
-import type { RuntimeMode, SSRLoadedRenderer } from '../../@types/astro.js';
-import type { Logger } from '../logger/core.js';
-import type { RouteCache } from './route-cache.js';
-/**
- * An environment represents the static parts of rendering that do not change
- * between requests. These are mostly known when the server first starts up and do not change.
- * Thus, they can be created once and passed through to renderPage on each request.
- */
-export interface Environment {
-    /**
-     * Used to provide better error messages for `Astro.clientAddress`
-     */
-    adapterName?: string;
-    /** logging options */
-    logger: Logger;
-    /** "development" or "production" */
-    mode: RuntimeMode;
-    compressHTML: boolean;
-    renderers: SSRLoadedRenderer[];
-    clientDirectives: Map<string, string>;
-    resolve: (s: string) => Promise<string>;
-    routeCache: RouteCache;
-    /**
-     * Used for `Astro.site`
-     */
-    site?: string;
-    /**
-     * Value of Astro config's `output` option, true if "server" or "hybrid"
-     */
-    ssr: boolean;
-    streaming: boolean;
-}
-export type CreateEnvironmentArgs = Environment;
-export declare function createEnvironment(options: CreateEnvironmentArgs): Environment;

package/dist/core/render/environment.js

@@ -1,6 +0,0 @@
-function createEnvironment(options) {
-  return options;
-}
-export {
-  createEnvironment
-};

package/dist/runtime/server/consts.d.ts

@@ -1 +0,0 @@
-export declare const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";

package/dist/runtime/server/consts.js

@@ -1,4 +0,0 @@
-const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
-export {
-  REROUTE_DIRECTIVE_HEADER
-};

package/dist/vite-plugin-astro-server/devPipeline.d.ts

@@ -1,22 +0,0 @@
-import type { AstroConfig, AstroSettings, SSRManifest } from '../@types/astro.js';
-import type { Logger } from '../core/logger/core.js';
-import type { ModuleLoader } from '../core/module-loader/index.js';
-import { Pipeline } from '../core/pipeline.js';
-import type { Environment } from '../core/render/index.js';
-export default class DevPipeline extends Pipeline {
-    #private;
-    constructor({ manifest, logger, settings, loader, }: {
-        manifest: SSRManifest;
-        logger: Logger;
-        settings: AstroSettings;
-        loader: ModuleLoader;
-    });
-    clearRouteCache(): void;
-    getSettings(): Readonly<AstroSettings>;
-    getConfig(): Readonly<AstroConfig>;
-    getModuleLoader(): Readonly<ModuleLoader>;
-    get logger(): Readonly<Logger>;
-    loadRenderers(): Promise<void>;
-    static createDevelopmentEnvironment(manifest: SSRManifest, settings: AstroSettings, logger: Logger, loader: ModuleLoader): Environment;
-    handleFallback(): Promise<void>;
-}

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

@@ -1,65 +0,0 @@
-import { Pipeline } from "../core/pipeline.js";
-import { createEnvironment, loadRenderer } from "../core/render/index.js";
-import { RouteCache } from "../core/render/route-cache.js";
-import { isServerLikeOutput } from "../prerender/utils.js";
-import { createResolve } from "./resolve.js";
-class DevPipeline extends Pipeline {
-  #settings;
-  #loader;
-  #devLogger;
-  constructor({
-    manifest,
-    logger,
-    settings,
-    loader
-  }) {
-    const env = DevPipeline.createDevelopmentEnvironment(manifest, settings, logger, loader);
-    super(env);
-    this.#devLogger = logger;
-    this.#settings = settings;
-    this.#loader = loader;
-  }
-  clearRouteCache() {
-    this.env.routeCache.clearAll();
-  }
-  getSettings() {
-    return this.#settings;
-  }
-  getConfig() {
-    return this.#settings.config;
-  }
-  getModuleLoader() {
-    return this.#loader;
-  }
-  get logger() {
-    return this.#devLogger;
-  }
-  async loadRenderers() {
-    const renderers = await Promise.all(
-      this.#settings.renderers.map((r) => loadRenderer(r, this.#loader))
-    );
-    this.env.renderers = renderers.filter(Boolean);
-  }
-  static createDevelopmentEnvironment(manifest, settings, logger, loader) {
-    const mode = "development";
-    return createEnvironment({
-      adapterName: manifest.adapterName,
-      logger,
-      mode,
-      // This will be overridden in the dev server
-      renderers: [],
-      clientDirectives: manifest.clientDirectives,
-      compressHTML: manifest.compressHTML,
-      resolve: createResolve(loader, settings.config.root),
-      routeCache: new RouteCache(logger, mode),
-      site: manifest.site,
-      ssr: isServerLikeOutput(settings.config),
-      streaming: true
-    });
-  }
-  async handleFallback() {
-  }
-}
-export {
-  DevPipeline as default
-};