astro 2.6.1 → 2.6.2

package/dist/cli/index.js

@@ -1,7 +1,7 @@
 import fs from "fs";
 import * as colors from "kleur/colors";
 import yargs from "yargs-parser";
-import { z } from "zod";
+import { ZodError } from "zod";
 import {
   createSettings,
   openConfig,
@@ -69,15 +69,19 @@ function resolveCommand(flags) {
   }
   return "help";
 }
-async function handleConfigError(e, { cwd, flags, logging }) {
+async function handleConfigError(e, { cmd, cwd, flags, logging }) {
   const path = await resolveConfigPath({ cwd, flags, fs });
-  if (e instanceof Error) {
-    if (path) {
-      error(logging, "astro", `Unable to load ${colors.bold(path)}
+  error(logging, "astro", `Unable to load ${path ? colors.bold(path) : "your Astro config"}
 `);
-    }
+  if (e instanceof ZodError) {
+    console.error(formatConfigErrorMessage(e) + "\n");
+  } else if (e instanceof Error) {
     console.error(formatErrorMessage(collectErrorMetadata(e)) + "\n");
   }
+  const telemetryPromise = telemetry.record(eventConfigError({ cmd, err: e, isFatal: true }));
+  await telemetryPromise.catch(
+    (err2) => debug("telemetry", `record() error: ${err2.message}`)
+  );
 }
 async function runCommand(cmd, flags) {
   var _a;
@@ -136,7 +140,7 @@ async function runCommand(cmd, flags) {
     cmd,
     logging
   }).catch(async (e) => {
-    await handleConfigError(e, { cwd: root, flags, logging });
+    await handleConfigError(e, { cmd, cwd: root, flags, logging });
     return {};
   });
   if (!initialAstroConfig)
@@ -155,7 +159,7 @@ async function runCommand(cmd, flags) {
         logging,
         telemetry,
         handleConfigError(e) {
-          handleConfigError(e, { cwd: root, flags, logging });
+          handleConfigError(e, { cmd, cwd: root, flags, logging });
           info(logging, "astro", "Continuing with previous valid configuration\n");
         }
       });
@@ -218,14 +222,9 @@ async function throwAndExit(cmd, err) {
     console.error(errorMessage);
     process.exit(1);
   }
-  if (err instanceof z.ZodError) {
-    telemetryPromise = telemetry.record(eventConfigError({ cmd, err, isFatal: true }));
-    errorMessage = formatConfigErrorMessage(err);
-  } else {
-    const errorWithMetadata = collectErrorMetadata(createSafeError(err));
-    telemetryPromise = telemetry.record(eventError({ cmd, err: errorWithMetadata, isFatal: true }));
-    errorMessage = formatErrorMessage(errorWithMetadata);
-  }
+  const errorWithMetadata = collectErrorMetadata(createSafeError(err));
+  telemetryPromise = telemetry.record(eventError({ cmd, err: errorWithMetadata, isFatal: true }));
+  errorMessage = formatErrorMessage(errorWithMetadata);
   setTimeout(exitWithErrorMessage, 400);
   await telemetryPromise.catch((err2) => debug("telemetry", `record() error: ${err2.message}`)).then(exitWithErrorMessage);
 }

package/dist/core/add/index.js

@@ -55,6 +55,12 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   node: "@astrojs/node",
   deno: "@astrojs/deno"
 };
+async function getRegistry() {
+  var _a;
+  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";
+}
 async function add(names, { cwd, flags, logging, telemetry }) {
   var _a;
   applyPolyfill();
@@ -561,7 +567,8 @@ ${message}`
 }
 async function fetchPackageJson(scope, name, tag) {
   const packageName = `${scope ? `${scope}/` : ""}${name}`;
-  const res = await fetch(`https://registry.npmjs.org/${packageName}/${tag}`);
+  const registry = await getRegistry();
+  const res = await fetch(`${registry}/${packageName}/${tag}`);
   if (res.status === 404) {
     return new Error();
   } else {

package/dist/core/build/generate.js

@@ -20,7 +20,7 @@ import { runHookBuildGenerated } from "../../integrations/index.js";
 import { isServerLikeOutput } from "../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { callEndpoint, createAPIContext, throwIfRedirectNotAllowed } from "../endpoint/index.js";
-import { AstroError } from "../errors/index.js";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 import { debug, info } from "../logger/core.js";
 import { callMiddleware } from "../middleware/callMiddleware.js";
 import {
@@ -221,7 +221,16 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
       throw err;
     });
     opts.routeCache.set(route, result);
-    paths = result.staticPaths.map((staticPath) => staticPath.params && route.generate(staticPath.params)).filter((staticPath) => {
+    paths = result.staticPaths.map((staticPath) => {
+      try {
+        return route.generate(staticPath.params);
+      } catch (e) {
+        if (e instanceof TypeError) {
+          throw getInvalidRouteSegmentError(e, route, staticPath);
+        }
+        throw e;
+      }
+    }).filter((staticPath) => {
       if (!builtPaths.has(removeTrailingForwardSlash(staticPath))) {
         return true;
       }
@@ -234,6 +243,33 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
   }
   return paths;
 }
+function getInvalidRouteSegmentError(e, route, staticPath) {
+  var _a, _b;
+  const invalidParam = (_a = e.message.match(/^Expected "([^"]+)"/)) == null ? void 0 : _a[1];
+  const received = invalidParam ? staticPath.params[invalidParam] : void 0;
+  let hint = "Learn about dynamic routes at https://docs.astro.build/en/core-concepts/routing/#dynamic-routes";
+  if (invalidParam && typeof received === "string") {
+    const matchingSegment = (_b = route.segments.find(
+      (segment) => {
+        var _a2;
+        return ((_a2 = segment[0]) == null ? void 0 : _a2.content) === invalidParam;
+      }
+    )) == null ? void 0 : _b[0];
+    const mightBeMissingSpread = (matchingSegment == null ? void 0 : matchingSegment.dynamic) && !(matchingSegment == null ? void 0 : matchingSegment.spread);
+    if (mightBeMissingSpread) {
+      hint = `If the param contains slashes, try using a rest parameter: **[...${invalidParam}]**. Learn more at https://docs.astro.build/en/core-concepts/routing/#dynamic-routes`;
+    }
+  }
+  return new AstroError({
+    ...AstroErrorData.InvalidDynamicRoute,
+    message: invalidParam ? AstroErrorData.InvalidDynamicRoute.message(
+      route.route,
+      JSON.stringify(invalidParam),
+      JSON.stringify(received)
+    ) : `Generated path for ${route.route} is invalid.`,
+    hint
+  });
+}
 function shouldAppendForwardSlash(trailingSlash, buildFormat) {
   switch (trailingSlash) {
     case "always":

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.6.1";
+const ASTRO_VERSION = "2.6.2";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.6.1";
+  const currentVersion = "2.6.2";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/index.js

@@ -115,7 +115,7 @@ function isRedirect(statusCode) {
   return statusCode >= 300 && statusCode < 400;
 }
 function throwIfRedirectNotAllowed(response, config) {
-  if (!isServerLikeOutput(config) && isRedirect(response.status)) {
+  if (!isServerLikeOutput(config) && isRedirect(response.status) && !config.experimental.redirects) {
     throw new AstroError(AstroErrorData.StaticRedirectNotAvailable);
   }
 }

package/dist/core/errors/errors-data.d.ts

@@ -655,6 +655,18 @@ export declare const AstroErrorData: {
         readonly title: "A redirect must be given a location with the `Location` header.";
         readonly code: 3037;
     };
+    /**
+     * @docs
+     * @see
+     * - [Dynamic routes](https://docs.astro.build/en/core-concepts/routing/#dynamic-routes)
+     * @description
+     * A dynamic route param is invalid. This is often caused by an `undefined` parameter or a missing [rest parameter](https://docs.astro.build/en/core-concepts/routing/#rest-parameters).
+     */
+    readonly InvalidDynamicRoute: {
+        readonly title: "Invalid dynamic route.";
+        readonly code: 3038;
+        readonly message: (route: string, invalidParam: string, received: string) => string;
+    };
     /**
      * @docs
      * @see

package/dist/core/errors/errors-data.js

@@ -689,6 +689,18 @@ Expected \`${defaultExpectedValue}\` value but got \`${suffix}\`.`;
     title: "A redirect must be given a location with the `Location` header.",
     code: 3037
   },
+  /**
+   * @docs
+   * @see
+   * - [Dynamic routes](https://docs.astro.build/en/core-concepts/routing/#dynamic-routes)
+   * @description
+   * A dynamic route param is invalid. This is often caused by an `undefined` parameter or a missing [rest parameter](https://docs.astro.build/en/core-concepts/routing/#rest-parameters).
+   */
+  InvalidDynamicRoute: {
+    title: "Invalid dynamic route.",
+    code: 3038,
+    message: (route, invalidParam, received) => `The ${invalidParam} param for route ${route} is invalid. Received **${received}**.`
+  },
   // No headings here, that way Vite errors are merged with Astro ones in the docs, which makes more sense to users.
   // Vite Errors - 4xxx
   /**

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.6.1";
+  const version = "2.6.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.6.1"}`
+        `v${"2.6.2"}`
       )} ${headline}`
     );
   }

package/dist/prerender/routing.d.ts

@@ -1,13 +1,14 @@
 import type { AstroSettings, RouteData } from '../@types/astro';
-import { type DevelopmentEnvironment } from '../core/render/dev/index.js';
+import { type ComponentPreload, type DevelopmentEnvironment } from '../core/render/dev/index.js';
 type GetSortedPreloadedMatchesParams = {
     env: DevelopmentEnvironment;
     matches: RouteData[];
     settings: AstroSettings;
 };
-export declare function getSortedPreloadedMatches({ env, matches, settings, }: GetSortedPreloadedMatchesParams): Promise<{
-    readonly preloadedComponent: import("../core/render/dev/index.js").ComponentPreload;
-    readonly route: RouteData;
-    readonly filePath: URL;
-}[]>;
+export declare function getSortedPreloadedMatches({ env, matches, settings, }: GetSortedPreloadedMatchesParams): Promise<PreloadAndSetPrerenderStatusResult[]>;
+type PreloadAndSetPrerenderStatusResult = {
+    filePath: URL;
+    route: RouteData;
+    preloadedComponent: ComponentPreload;
+};
 export {};

package/dist/prerender/routing.js

@@ -1,4 +1,7 @@
-import { preload } from "../core/render/dev/index.js";
+import { RedirectComponentInstance, routeIsRedirect } from "../core/redirects/index.js";
+import {
+  preload
+} from "../core/render/dev/index.js";
 import { getPrerenderStatus } from "./metadata.js";
 async function getSortedPreloadedMatches({
   env,
@@ -19,6 +22,14 @@ async function preloadAndSetPrerenderStatus({
   const preloaded = await Promise.all(
     matches.map(async (route) => {
       const filePath = new URL(`./${route.component}`, settings.config.root);
+      if (routeIsRedirect(route)) {
+        const preloadedComponent2 = [[], RedirectComponentInstance];
+        return {
+          preloadedComponent: preloadedComponent2,
+          route,
+          filePath
+        };
+      }
       const preloadedComponent = await preload({ env, filePath });
       const prerenderStatus = getPrerenderStatus({
         filePath,

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

@@ -8,7 +8,7 @@ export type { AstroComponentFactory, AstroComponentInstance, ComponentSlots, Ren
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;
 /** @internal Associate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */
 export declare function __astro_tag_component__(Component: unknown, rendererName: string): void;
-export declare function spreadAttributes(values: Record<any, any>, _name?: string, { class: scopedClassName }?: {
+export declare function spreadAttributes(values?: Record<any, any>, _name?: string, { class: scopedClassName }?: {
     class?: string;
 }): any;
 export declare function defineStyleVars(defs: Record<any, any> | Record<any, any>[]): any;

package/dist/runtime/server/index.js

@@ -59,7 +59,7 @@ function __astro_tag_component__(Component, rendererName) {
     writable: false
   });
 }
-function spreadAttributes(values, _name, { class: scopedClassName } = {}) {
+function spreadAttributes(values = {}, _name, { class: scopedClassName } = {}) {
   let output = "";
   if (scopedClassName) {
     if (typeof values.class !== "undefined") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",