astro 2.1.7 → 2.1.8

package/astro-jsx.d.ts

@@ -789,9 +789,9 @@ declare namespace astroHTML.JSX {
 		fetchpriority?: 'auto' | 'high' | 'low' | undefined | null;
 		integrity?: string | undefined | null;
 		media?: string | undefined | null;
-		imageSrcSet?: string | undefined | null;
-		imageSizes?: string | undefined | null;
-		referrerPolicy?: HTMLAttributeReferrerPolicy | undefined | null;
+		imagesrcset?: string | undefined | null;
+		imagesizes?: string | undefined | null;
+		referrerpolicy?: HTMLAttributeReferrerPolicy | undefined | null;
 		rel?: string | undefined | null;
 		sizes?: string | undefined | null;
 		type?: string | undefined | null;

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

@@ -68,6 +68,7 @@ export interface CLIFlags {
     port?: number;
     config?: string;
     drafts?: boolean;
+    open?: boolean;
     experimentalAssets?: boolean;
 }
 export interface BuildConfig {
@@ -975,6 +976,7 @@ export interface ContentEntryType {
         contents: string;
     }): GetEntryInfoReturnType | Promise<GetEntryInfoReturnType>;
     getRenderModule?(this: rollup.PluginContext, params: {
+        viteId: string;
         entry: ContentEntryModule;
     }): rollup.LoadResult | Promise<rollup.LoadResult>;
     contentModuleTypes?: string;

package/dist/assets/internal.js

@@ -1,5 +1,7 @@
 import fs from "node:fs";
+import { basename, join } from "node:path/posix";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { prependForwardSlash } from "../core/path.js";
 import { isLocalService } from "./services/service.js";
 function isESMImportedImage(src) {
   return typeof src === "object";
@@ -53,8 +55,16 @@ async function generateImage(buildOpts, options, filepath) {
     serverRoot = buildOpts.settings.config.outDir;
     clientRoot = buildOpts.settings.config.outDir;
   }
-  const fileData = await fs.promises.readFile(new URL("." + options.src.src, serverRoot));
-  const resultData = await imageService.transform(fileData, { ...options, src: options.src.src });
+  const originalImagePath = options.src.src;
+  const fileData = await fs.promises.readFile(
+    new URL(
+      "." + prependForwardSlash(
+        join(buildOpts.settings.config.build.assets, basename(originalImagePath))
+      ),
+      serverRoot
+    )
+  );
+  const resultData = await imageService.transform(fileData, { ...options, src: originalImagePath });
   const finalFileURL = new URL("." + filepath, clientRoot);
   const finalFolderURL = new URL("./", finalFileURL);
   await fs.promises.mkdir(finalFolderURL, { recursive: true });

package/dist/assets/utils/transformToPath.d.ts

@@ -1,2 +1,2 @@
 import type { ImageTransform } from '../types.js';
-export declare function propsToFilename(transform: ImageTransform): string;
+export declare function propsToFilename(transform: ImageTransform, imageService: string): string;

package/dist/assets/utils/transformToPath.js

@@ -2,15 +2,17 @@ import { basename, extname } from "path";
 import { removeQueryString } from "../../core/path.js";
 import { shorthash } from "../../runtime/server/shorthash.js";
 import { isESMImportedImage } from "../internal.js";
-function propsToFilename(transform) {
+function propsToFilename(transform, imageService) {
   if (!isESMImportedImage(transform.src)) {
     return transform.src;
   }
   let filename = removeQueryString(transform.src.src);
   const ext = extname(filename);
   filename = basename(filename, ext);
+  const { alt, ...rest } = transform;
+  const hashFields = { ...rest, imageService };
   const outputExt = transform.format ? `.${transform.format}` : ext;
-  return `/${filename}_${shorthash(JSON.stringify(transform))}${outputExt}`;
+  return `/${filename}_${shorthash(JSON.stringify(hashFields))}${outputExt}`;
 }
 export {
   propsToFilename

package/dist/assets/vite-plugin-assets.js

@@ -135,14 +135,13 @@ function assets({
             }
             filePath = prependForwardSlash(
               joinPaths(
-                settings.config.base,
                 settings.config.build.assets,
-                propsToFilename(options)
+                propsToFilename(options, settings.config.image.service)
               )
             );
             globalThis.astroAsset.staticImages.set(options, filePath);
           }
-          return filePath;
+          return prependForwardSlash(joinPaths(settings.config.base, filePath));
         };
       },
       async buildEnd() {

package/dist/content/types-generator.js

@@ -173,8 +173,14 @@ async function createContentTypesGenerator({
       return;
     events.push(event);
     debounceTimeout && clearTimeout(debounceTimeout);
+    const runEventsSafe = async () => {
+      try {
+        await runEvents(opts);
+      } catch {
+      }
+    };
     debounceTimeout = setTimeout(
-      async () => runEvents(opts),
+      runEventsSafe,
       50
       /* debounce to batch chokidar events */
     );

package/dist/content/vite-plugin-content-imports.js

@@ -106,7 +106,7 @@ export const _internal = {
             )}. Did you import this module directly without using a content collection query?`
           });
         }
-        return contentRenderer.bind(this)({ entry });
+        return contentRenderer.bind(this)({ entry, viteId });
       }
     });
   }

package/dist/core/app/node.js

@@ -34,7 +34,7 @@ class NodeApp extends App {
         routeData
       );
     }
-    if (typeof req.body === "object" && Object.keys(req.body).length > 0) {
+    if (typeof req.body === "object" && req.body !== null && Object.keys(req.body).length > 0) {
       return super.render(
         req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(JSON.stringify(req.body))),
         routeData

package/dist/core/config/config.js

@@ -71,6 +71,7 @@ function resolveFlags(flags) {
     site: typeof flags.site === "string" ? flags.site : void 0,
     base: typeof flags.base === "string" ? flags.base : void 0,
     port: typeof flags.port === "number" ? flags.port : void 0,
+    open: typeof flags.open === "boolean" ? flags.open : void 0,
     config: typeof flags.config === "string" ? flags.config : void 0,
     host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
     drafts: typeof flags.drafts === "boolean" ? flags.drafts : void 0,
@@ -99,6 +100,9 @@ function mergeCLIFlags(astroConfig, flags) {
   if (typeof flags.host === "string" || typeof flags.host === "boolean") {
     astroConfig.server.host = flags.host;
   }
+  if (typeof flags.open === "boolean") {
+    astroConfig.server.open = flags.open;
+  }
   return astroConfig;
 }
 async function search(fsMod, root) {

package/dist/core/config/schema.d.ts

@@ -56,19 +56,23 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry?: string | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        open: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
         port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         headers: z.ZodOptional<z.ZodType<OutgoingHttpHeaders, z.ZodTypeDef, OutgoingHttpHeaders>>;
     }, "strip", z.ZodTypeAny, {
         headers?: OutgoingHttpHeaders | undefined;
+        open: boolean;
         host: string | boolean;
         port: number;
     }, {
+        open?: boolean | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
         headers?: OutgoingHttpHeaders | undefined;
     }>>>, {
         headers?: OutgoingHttpHeaders | undefined;
+        open: boolean;
         host: string | boolean;
         port: number;
     }, unknown>;
@@ -165,6 +169,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     trailingSlash: "never" | "always" | "ignore";
     server: {
         headers?: OutgoingHttpHeaders | undefined;
+        open: boolean;
         host: string | boolean;
         port: number;
     };
@@ -350,20 +355,24 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
         host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
         port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+        open: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         headers: z.ZodOptional<z.ZodType<OutgoingHttpHeaders, z.ZodTypeDef, OutgoingHttpHeaders>>;
         streaming: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
         headers?: OutgoingHttpHeaders | undefined;
+        open: boolean;
         host: string | boolean;
         port: number;
         streaming: boolean;
     }, {
+        open?: boolean | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
         headers?: OutgoingHttpHeaders | undefined;
         streaming?: boolean | undefined;
     }>>>, {
         headers?: OutgoingHttpHeaders | undefined;
+        open: boolean;
         host: string | boolean;
         port: number;
         streaming: boolean;
@@ -397,6 +406,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     trailingSlash: "never" | "always" | "ignore";
     server: {
         headers?: OutgoingHttpHeaders | undefined;
+        open: boolean;
         host: string | boolean;
         port: number;
         streaming: boolean;
@@ -493,6 +503,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     trailingSlash: "never" | "always" | "ignore";
     server: {
         headers?: OutgoingHttpHeaders | undefined;
+        open: boolean;
         host: string | boolean;
         port: number;
         streaming: boolean;

package/dist/core/config/schema.js

@@ -19,7 +19,8 @@ const ASTRO_CONFIG_DEFAULTS = {
   server: {
     host: false,
     port: 3e3,
-    streaming: true
+    streaming: true,
+    open: false
   },
   integrations: [],
   markdown: {
@@ -62,6 +63,7 @@ const AstroConfigSchema = z.object({
     (val) => typeof val === "function" ? val({ command: "error" }) : val,
     // validate
     z.object({
+      open: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.server.open),
       host: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.host),
       port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port),
       headers: z.custom().optional()
@@ -137,6 +139,7 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
       z.object({
         host: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.host),
         port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port),
+        open: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.server.open),
         headers: z.custom().optional(),
         streaming: z.boolean().optional().default(true)
       }).optional().default({})

package/dist/core/constants.js

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

package/dist/core/dev/container.js

@@ -34,12 +34,12 @@ async function createContainer(params = {}) {
     logging,
     isRestart
   });
-  const { host, headers } = settings.config.server;
+  const { host, headers, open } = settings.config.server;
   const rendererClientEntries = settings.renderers.map((r) => r.clientEntrypoint).filter(Boolean);
   const viteConfig = await createVite(
     {
       mode: "development",
-      server: { host, headers },
+      server: { host, headers, open },
       optimizeDeps: {
         include: rendererClientEntries
       },

package/dist/core/dev/dev.js

@@ -17,6 +17,7 @@ async function dev(settings, options) {
           ["--port", `Specify which port to run on. Defaults to 3000.`],
           ["--host", `Listen on all addresses, including LAN and public addresses.`],
           ["--host <custom-address>", `Expose on a network IP address at <custom-address>`],
+          ["--open", "Automatically open the app in the browser on server start"],
           ["--help (-h)", "See all available flags."]
         ]
       },
@@ -52,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.1.7";
+  const currentVersion = "2.1.8";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

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

@@ -466,6 +466,22 @@ export declare const AstroErrorData: {
         readonly message: (format: string, imagePath: string, supportedFormats: readonly string[]) => string;
         readonly hint: "If you do not need optimization, using an `img` tag directly instead of the `Image` component might be what you're looking for.";
     };
+    /**
+     * @docs
+     * @see
+     * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+     * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
+     * @description
+     * The endpoint is prerendered with an `undefined` param so the generated path will collide with another route.
+     *
+     * If you cannot prevent passing `undefined`, then an additional extension can be added to the endpoint file name to generate the file with a different name. For example, renaming `pages/api/[slug].ts` to `pages/api/[slug].json.ts`.
+     */
+    readonly PrerenderDynamicEndpointPathCollide: {
+        readonly title: "Prerendered dynamic endpoint has path collision.";
+        readonly code: 3026;
+        readonly message: (pathname: string) => string;
+        readonly hint: (filename: string) => string;
+    };
     /**
      * @docs
      * @see

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

@@ -479,6 +479,22 @@ Expected \`true\` value but got \`${suffix}\`.`;
     )} are supported for optimization.`,
     hint: "If you do not need optimization, using an `img` tag directly instead of the `Image` component might be what you're looking for."
   },
+  /**
+   * @docs
+   * @see
+   * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+   * - [`params`](https://docs.astro.build/en/reference/api-reference/#params)
+   * @description
+   * The endpoint is prerendered with an `undefined` param so the generated path will collide with another route.
+   *
+   * If you cannot prevent passing `undefined`, then an additional extension can be added to the endpoint file name to generate the file with a different name. For example, renaming `pages/api/[slug].ts` to `pages/api/[slug].json.ts`.
+   */
+  PrerenderDynamicEndpointPathCollide: {
+    title: "Prerendered dynamic endpoint has path collision.",
+    code: 3026,
+    message: (pathname) => `Could not render \`${pathname}\` with an \`undefined\` param as the generated path will collide during prerendering. Prevent passing \`undefined\` as \`params\` for the endpoint's \`getStaticPaths()\` function, or add an additional extension to the endpoint's filename.`,
+    hint: (filename) => `Rename \`${filename}\` to \`${filename.replace(/\.(js|ts)/, (m) => `.json` + m)}\``
+  },
   // 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.1.7";
+  const version = "2.1.8";
   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.1.7"}`
+        `v${"2.1.8"}`
       )} ${headline}`
     );
   }

package/dist/core/preview/index.js

@@ -11,7 +11,10 @@ async function preview(_settings, { logging, flags }) {
       commandName: "astro preview",
       usage: "[...flags]",
       tables: {
-        Flags: [["--help (-h)", "See all available flags."]]
+        Flags: [
+          ["--open", "Automatically open the app in the browser on server start"],
+          ["--help (-h)", "See all available flags."]
+        ]
       },
       description: `Starts a local server to serve your static dist/ directory. Check ${cyan(
         "https://docs.astro.build/en/reference/cli-reference/#astro-preview"

package/dist/core/preview/static-preview-server.js

@@ -20,7 +20,8 @@ async function createStaticPreviewServer(settings, logging) {
       preview: {
         host: settings.config.server.host,
         port: settings.config.server.port,
-        headers: settings.config.server.headers
+        headers: settings.config.server.headers,
+        open: settings.config.server.open
       },
       plugins: [vitePluginAstroPreview(settings)]
     });

package/dist/core/render/core.js

@@ -17,6 +17,21 @@ async function getParamsAndProps(opts) {
       const paramsMatch = route.pattern.exec(pathname);
       if (paramsMatch) {
         params = getParams(route.params)(paramsMatch);
+        if (route.type === "endpoint" && mod.getStaticPaths) {
+          const lastSegment = route.segments[route.segments.length - 1];
+          const paramValues = Object.values(params);
+          const lastParam = paramValues[paramValues.length - 1];
+          if (lastSegment.length === 1 && lastSegment[0].dynamic && lastParam === void 0) {
+            throw new AstroError({
+              ...AstroErrorData.PrerenderDynamicEndpointPathCollide,
+              message: AstroErrorData.PrerenderDynamicEndpointPathCollide.message(route.route),
+              hint: AstroErrorData.PrerenderDynamicEndpointPathCollide.hint(route.component),
+              location: {
+                file: route.component
+              }
+            });
+          }
+        }
       }
     }
     let routeCacheEntry = routeCache.get(route);

package/package.json

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