astro 2.7.2 → 2.7.4

package/astro.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-/* eslint-disable no-console */
 'use strict';
 
 // ISOMORPHIC FILE: NO TOP-LEVEL IMPORT/REQUIRE() ALLOWED

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

@@ -765,7 +765,7 @@ export interface AstroUserConfig {
          * @docs
          * @name build.split
          * @type {boolean}
-         * @default {false}
+         * @default `false`
          * @version 2.7.0
          * @description
          * Defines how the SSR code should be bundled when built.
@@ -1269,7 +1269,6 @@ export interface AstroSettings {
     tsConfig: TsConfigJson | undefined;
     tsConfigPath: string | undefined;
     watchFiles: string[];
-    forceDisableTelemetry: boolean;
     timer: AstroTimer;
 }
 export type AsyncRendererComponentFn<U> = (Component: any, props: any, slots: Record<string, string>, metadata?: AstroComponentMetadata) => Promise<U>;
@@ -1600,15 +1599,15 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      */
     locals: App.Locals;
 }
-export type Props = Record<string, unknown>;
 export interface EndpointOutput {
     body: Body;
     encoding?: BufferEncoding;
 }
-export type APIRoute = (context: APIContext) => EndpointOutput | Response | Promise<EndpointOutput | Response>;
+export type APIRoute<Props extends Record<string, any> = Record<string, any>> = (context: APIContext<Props>) => EndpointOutput | Response | Promise<EndpointOutput | Response>;
 export interface EndpointHandler {
     [method: string]: APIRoute | ((params: Params, request: Request) => EndpointOutput | Response);
 }
+export type Props = Record<string, unknown>;
 export interface AstroRenderer {
     /** Name of the renderer. */
     name: string;

package/dist/assets/image-endpoint.js

@@ -23,7 +23,7 @@ const get = async ({ request }) => {
     }
     const url = new URL(request.url);
     const transform = await imageService.parseURL(url, imageServiceConfig);
-    if (!transform || !transform.src) {
+    if (!(transform == null ? void 0 : transform.src)) {
       throw new Error("Incorrect transform returned by `parseURL`");
     }
     let inputBuffer = void 0;

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

@@ -211,7 +211,6 @@ const codecs = {
   avif: {
     name: "AVIF",
     extension: "avif",
-    // eslint-disable-next-line no-control-regex
     detectors: [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/],
     dec: () => instantiateEmscriptenWasm(avifDec, avifDecWasm),
     enc: async () => {
@@ -241,7 +240,6 @@ const codecs = {
   oxipng: {
     name: "OxiPNG",
     extension: "png",
-    // eslint-disable-next-line no-control-regex
     detectors: [/^\x89PNG\x0D\x0A\x1A\x0A/],
     dec: async () => {
       await pngEncDecInit();

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 && temp.length) {
+  while (temp == null ? void 0 : 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/cli/index.js

@@ -109,7 +109,7 @@ async function runCommand(cmd, flags) {
       const { default: add } = await import("../core/add/index.js");
       telemetry.record(event.eventCliSession(cmd));
       const packages = flags._.slice(3);
-      return await add(packages, { cwd: root, flags, logging, telemetry });
+      return await add(packages, { cwd: root, flags, logging });
     }
     case "docs": {
       telemetry.record(event.eventCliSession(cmd));
@@ -128,7 +128,7 @@ async function runCommand(cmd, flags) {
     case "telemetry": {
       const telemetryHandler = await import("./telemetry.js");
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
-      return await telemetryHandler.update(subcommand, { flags, telemetry });
+      return await telemetryHandler.update(subcommand, { flags });
     }
   }
   if (!process.env.NODE_ENV) {
@@ -157,7 +157,6 @@ async function runCommand(cmd, flags) {
         configFlagPath,
         flags,
         logging,
-        telemetry,
         handleConfigError(e) {
           handleConfigError(e, { cmd, cwd: root, flags, logging });
           info(logging, "astro", "Continuing with previous valid configuration\n");
@@ -171,7 +170,6 @@ async function runCommand(cmd, flags) {
       return await build(settings, {
         flags,
         logging,
-        telemetry,
         teardownCompiler: true,
         mode: flags.mode
       });
@@ -197,7 +195,7 @@ async function runCommand(cmd, flags) {
     }
     case "preview": {
       const { default: preview } = await import("../core/preview/index.js");
-      const server = await preview(settings, { logging, telemetry, flags });
+      const server = await preview(settings, { logging, flags });
       if (server) {
         return await server.closed();
       }

package/dist/cli/telemetry.d.ts

@@ -1,7 +1,5 @@
-import type { AstroTelemetry } from '@astrojs/telemetry';
 import type yargs from 'yargs-parser';
 export interface TelemetryOptions {
     flags: yargs.Arguments;
-    telemetry: AstroTelemetry;
 }
-export declare function update(subcommand: string, { flags, telemetry }: TelemetryOptions): Promise<void>;
+export declare function update(subcommand: string, { flags }: TelemetryOptions): Promise<void>;

package/dist/cli/telemetry.js

@@ -1,5 +1,6 @@
 import * as msg from "../core/messages.js";
-async function update(subcommand, { flags, telemetry }) {
+import { telemetry } from "../events/index.js";
+async function update(subcommand, { flags }) {
   const isValid = ["enable", "disable", "reset"].includes(subcommand);
   if (flags.help || flags.h || !isValid) {
     msg.printHelp({

package/dist/content/utils.d.ts

@@ -119,7 +119,7 @@ export declare function getContentEntryIdAndSlug({ entry, contentDir, collection
 };
 export declare function getEntryType(entryPath: string, paths: Pick<ContentPaths, 'config' | 'contentDir'>, contentFileExts: string[], dataFileExts: string[], experimentalAssets?: boolean): 'content' | 'data' | 'config' | 'ignored' | 'unsupported';
 export declare function hasUnderscoreBelowContentDirectoryPath(fileUrl: URL, contentDir: ContentPaths['contentDir']): boolean;
-export declare function parseFrontmatter(fileContents: string, filePath: string): matter.GrayMatterFile<string>;
+export declare function parseFrontmatter(fileContents: string): matter.GrayMatterFile<string>;
 /**
  * The content config is loaded separately from other `src/` files.
  * This global observable lets dependent plugins (like the content flag plugin)

package/dist/content/utils.js

@@ -209,7 +209,7 @@ function getYAMLErrorLine(rawData, objectKey) {
   const numNewlinesBeforeKey = dataBeforeKey.split("\n").length;
   return numNewlinesBeforeKey;
 }
-function parseFrontmatter(fileContents, filePath) {
+function parseFrontmatter(fileContents) {
   try {
     matter.clearCache();
     return matter(fileContents);

package/dist/core/add/index.d.ts

@@ -1,10 +1,8 @@
-import type { AstroTelemetry } from '@astrojs/telemetry';
 import type yargs from 'yargs-parser';
 import { type LogOptions } from '../logger/core.js';
 export interface AddOptions {
     logging: LogOptions;
     flags: yargs.Arguments;
-    telemetry: AstroTelemetry;
     cwd?: string;
 }
 export interface IntegrationInfo {
@@ -13,5 +11,5 @@ export interface IntegrationInfo {
     dependencies: [name: string, version: string][];
     type: 'integration' | 'adapter';
 }
-export default function add(names: string[], { cwd, flags, logging, telemetry }: AddOptions): Promise<void>;
+export default function add(names: string[], { cwd, flags, logging }: AddOptions): Promise<void>;
 export declare function validateIntegrations(integrations: string[]): Promise<IntegrationInfo[]>;

package/dist/core/add/index.js

@@ -56,12 +56,16 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   deno: "@astrojs/deno"
 };
 async function getRegistry() {
-  var _a;
+  var _a, _b;
   const packageManager = ((_a = await preferredPM(process.cwd())) == null ? void 0 : _a.name) || "npm";
-  const { stdout } = await execa(packageManager, ["config", "get", "registry"]);
-  return stdout || "https://registry.npmjs.org";
+  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";
+  } catch (e) {
+    return "https://registry.npmjs.org";
+  }
 }
-async function add(names, { cwd, flags, logging, telemetry }) {
+async function add(names, { cwd, flags, logging }) {
   var _a;
   applyPolyfill();
   if (flags.help || names.length === 0) {

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

@@ -7,7 +7,7 @@ declare class NodeIncomingMessage extends IncomingMessage {
     /**
      * The read-only body property of the Request interface contains a ReadableStream with the body contents that have been added to the request.
      */
-    body?: any | undefined;
+    body?: unknown;
 }
 export declare class NodeApp extends App {
     match(req: NodeIncomingMessage | Request, opts?: MatchOptions): RouteData | undefined;

package/dist/core/build/generate.js

@@ -222,27 +222,25 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
     builtPaths.add(pageData.route.pathname);
   } else {
     const route = pageData.route;
-    const result = await callGetStaticPaths({
+    const staticPaths = await callGetStaticPaths({
       mod,
-      route: pageData.route,
+      route,
+      routeCache: opts.routeCache,
       isValidate: false,
       logging: opts.logging,
       ssr: isServerLikeOutput(opts.settings.config)
-    }).then((_result) => {
-      const label = _result.staticPaths.length === 1 ? "page" : "pages";
-      debug(
-        "build",
-        `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.magenta(
-          `[${_result.staticPaths.length} ${label}]`
-        )}`
-      );
-      return _result;
     }).catch((err) => {
       debug("build", `\u251C\u2500\u2500 ${colors.bold(colors.red("\u2717"))} ${route.component}`);
       throw err;
     });
-    opts.routeCache.set(route, result);
-    paths = result.staticPaths.map((staticPath) => {
+    const label = staticPaths.length === 1 ? "page" : "pages";
+    debug(
+      "build",
+      `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.magenta(
+        `[${staticPaths.length} ${label}]`
+      )}`
+    );
+    paths = staticPaths.map((staticPath) => {
       try {
         return route.generate(staticPath.params);
       } catch (e) {
@@ -330,15 +328,7 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
 }
 async function generatePath(pathname, opts, gopts, onRequest) {
   const { settings, logging, origin, routeCache } = opts;
-  const {
-    mod,
-    internals,
-    linkIds,
-    scripts: hoistedScripts,
-    styles: _styles,
-    pageData,
-    renderers
-  } = gopts;
+  const { mod, internals, scripts: hoistedScripts, styles: _styles, pageData, renderers } = gopts;
   if (pageData.route.type === "page") {
     addPageName(pathname, opts);
   }

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

@@ -1,11 +1,9 @@
-import type { AstroTelemetry } from '@astrojs/telemetry';
 import type { AstroSettings, RuntimeMode } from '../../@types/astro';
 import type yargs from 'yargs-parser';
 import { type LogOptions } from '../logger/core.js';
 export interface BuildOptions {
     mode?: RuntimeMode;
     logging: LogOptions;
-    telemetry: AstroTelemetry;
     /**
      * Teardown the compiler WASM instance after build. This can improve performance when
      * building once, but may cause a performance hit if building multiple times in a row.

package/dist/core/build/plugins/index.js

@@ -16,11 +16,11 @@ function registerAllPlugins({ internals, options, register }) {
   register(pluginAliasResolve(internals));
   register(pluginAnalyzer(internals));
   register(pluginInternals(internals));
-  register(pluginRenderers(options, internals));
-  register(pluginMiddleware(options, internals));
+  register(pluginRenderers(options));
+  register(pluginMiddleware(options));
   register(pluginPages(options, internals));
   register(pluginCSS(options, internals));
-  register(astroHeadBuildPlugin(options, internals));
+  register(astroHeadBuildPlugin(internals));
   register(pluginPrerender(options, internals));
   register(astroConfigBuildPlugin(options, internals));
   register(pluginHoistedScripts(options, internals));

package/dist/core/build/plugins/plugin-analyzer.js

@@ -98,7 +98,7 @@ function vitePluginAnalyzer(internals) {
       const ids = this.getModuleIds();
       for (const id of ids) {
         const info = this.getModuleInfo(id);
-        if (!info || !((_a = info.meta) == null ? void 0 : _a.astro))
+        if (!((_a = info == null ? void 0 : info.meta) == null ? void 0 : _a.astro))
           continue;
         const astro = info.meta.astro;
         const pageData = getPageDataByViteID(internals, id);

package/dist/core/build/plugins/plugin-css.js

@@ -64,7 +64,7 @@ function rollupPluginAstroBuildCSS(options) {
       });
     },
     async generateBundle(_outputOptions, bundle) {
-      for (const [_, chunk] of Object.entries(bundle)) {
+      for (const [, chunk] of Object.entries(bundle)) {
         if (chunk.type !== "chunk")
           continue;
         if ("viteMetadata" in chunk === false)

package/dist/core/build/plugins/plugin-middleware.d.ts

@@ -1,7 +1,6 @@
 import type { Plugin as VitePlugin } from 'vite';
-import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
 import type { StaticBuildOptions } from '../types';
 export declare const MIDDLEWARE_MODULE_ID = "@astro-middleware";
-export declare function vitePluginMiddleware(opts: StaticBuildOptions, _internals: BuildInternals): VitePlugin;
-export declare function pluginMiddleware(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;
+export declare function vitePluginMiddleware(opts: StaticBuildOptions): VitePlugin;
+export declare function pluginMiddleware(opts: StaticBuildOptions): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-middleware.js

@@ -2,7 +2,7 @@ import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../../constants.js";
 import { addRollupInput } from "../add-rollup-input.js";
 const MIDDLEWARE_MODULE_ID = "@astro-middleware";
 const EMPTY_MIDDLEWARE = "\0empty-middleware";
-function vitePluginMiddleware(opts, _internals) {
+function vitePluginMiddleware(opts) {
   return {
     name: "@astro/plugin-middleware",
     options(options) {
@@ -30,13 +30,13 @@ function vitePluginMiddleware(opts, _internals) {
     }
   };
 }
-function pluginMiddleware(opts, internals) {
+function pluginMiddleware(opts) {
   return {
     build: "ssr",
     hooks: {
       "build:before": () => {
         return {
-          vitePlugin: vitePluginMiddleware(opts, internals)
+          vitePlugin: vitePluginMiddleware(opts)
         };
       }
     }

package/dist/core/build/plugins/plugin-renderers.d.ts

@@ -1,8 +1,7 @@
 import type { Plugin as VitePlugin } from 'vite';
-import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
 import type { StaticBuildOptions } from '../types';
 export declare const RENDERERS_MODULE_ID = "@astro-renderers";
 export declare const RESOLVED_RENDERERS_MODULE_ID: string;
-export declare function vitePluginRenderers(opts: StaticBuildOptions, _internals: BuildInternals): VitePlugin;
-export declare function pluginRenderers(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;
+export declare function vitePluginRenderers(opts: StaticBuildOptions): VitePlugin;
+export declare function pluginRenderers(opts: StaticBuildOptions): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-renderers.js

@@ -1,8 +1,7 @@
 import { addRollupInput } from "../add-rollup-input.js";
 const RENDERERS_MODULE_ID = "@astro-renderers";
 const RESOLVED_RENDERERS_MODULE_ID = `\0${RENDERERS_MODULE_ID}`;
-let inputs = /* @__PURE__ */ new Set();
-function vitePluginRenderers(opts, _internals) {
+function vitePluginRenderers(opts) {
   return {
     name: "@astro/plugin-renderers",
     options(options) {
@@ -34,13 +33,13 @@ ${exports.join("\n")}`;
     }
   };
 }
-function pluginRenderers(opts, internals) {
+function pluginRenderers(opts) {
   return {
     build: "ssr",
     hooks: {
       "build:before": () => {
         return {
-          vitePlugin: vitePluginRenderers(opts, internals)
+          vitePlugin: vitePluginRenderers(opts)
         };
       }
     }

package/dist/core/build/plugins/plugin-ssr.js

@@ -31,10 +31,7 @@ function vitePluginSSR(internals, adapter, options) {
     },
     async load(id) {
       if (id === RESOLVED_SSR_VIRTUAL_MODULE_ID) {
-        const {
-          settings: { config },
-          allPages
-        } = options;
+        const { allPages } = options;
         const imports = [];
         const contents = [];
         const exports = [];
@@ -66,7 +63,7 @@ function vitePluginSSR(internals, adapter, options) {
       return void 0;
     },
     async generateBundle(_opts, bundle) {
-      for (const [_chunkName, chunk] of Object.entries(bundle)) {
+      for (const [, chunk] of Object.entries(bundle)) {
         if (chunk.type === "asset") {
           internals.staticFiles.add(chunk.fileName);
         }
@@ -141,10 +138,6 @@ function vitePluginSSRSplit(internals, adapter, options) {
     },
     async load(id) {
       if (id.startsWith(RESOLVED_SPLIT_MODULE_ID)) {
-        const {
-          settings: { config },
-          allPages
-        } = options;
         const imports = [];
         const contents = [];
         const exports = [];
@@ -162,7 +155,7 @@ function vitePluginSSRSplit(internals, adapter, options) {
       return void 0;
     },
     async generateBundle(_opts, bundle) {
-      for (const [_chunkName, chunk] of Object.entries(bundle)) {
+      for (const [, chunk] of Object.entries(bundle)) {
         if (chunk.type === "asset") {
           internals.staticFiles.add(chunk.fileName);
         }
@@ -215,7 +208,7 @@ function pluginSSRSplit(options, internals) {
           logging: options.logging,
           entryPoints: internals.entryPoints
         });
-        for (const [moduleName, chunk] of internals.ssrSplitEntryChunks) {
+        for (const [, chunk] of internals.ssrSplitEntryChunks) {
           const code = injectManifest(manifest, chunk);
           mutate(chunk, "server", code);
         }

package/dist/core/compile/compile.js

@@ -68,7 +68,6 @@ function handleCompileResultErrors(result, cssTransformErrors) {
     case 0:
       break;
     case 1: {
-      const error = cssTransformErrors[0];
       throw cssTransformErrors[0];
     }
     default: {