astro 2.8.4 → 2.8.5

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

@@ -0,0 +1 @@
+export { emitESMImage } from './emitAsset.js';

package/dist/assets/utils/index.js

@@ -0,0 +1,4 @@
+import { emitESMImage } from "./emitAsset.js";
+export {
+  emitESMImage
+};

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.8.4";
+  const version = "2.8.5";
   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.8.4"}`
+        `v${"2.8.5"}`
       )} ${headline}`
     );
   }

package/dist/core/render/route-cache.js

@@ -39,7 +39,7 @@ async function callGetStaticPaths({
   const keyedStaticPaths = staticPaths;
   keyedStaticPaths.keyed = /* @__PURE__ */ new Map();
   for (const sp of keyedStaticPaths) {
-    const paramsKey = stringifyParams(sp.params, route.component);
+    const paramsKey = stringifyParams(sp.params, route);
     keyedStaticPaths.keyed.set(paramsKey, sp);
   }
   routeCache.set(route, { ...cached, staticPaths: keyedStaticPaths });
@@ -71,7 +71,7 @@ class RouteCache {
   }
 }
 function findPathItemByKey(staticPaths, params, route) {
-  const paramsKey = stringifyParams(params, route.component);
+  const paramsKey = stringifyParams(params, route);
   const matchedStaticPath = staticPaths.keyed.get(paramsKey);
   if (matchedStaticPath) {
     return matchedStaticPath;

package/dist/core/routing/params.d.ts

@@ -1,4 +1,4 @@
-import type { GetStaticPathsItem, Params } from '../../@types/astro';
+import type { GetStaticPathsItem, Params, RouteData } from '../../@types/astro';
 /**
  * given an array of params like `['x', 'y', 'z']` for
  * src/routes/[x]/[y]/[z]/svelte, create a function
@@ -10,4 +10,4 @@ export declare function getParams(array: string[]): (match: RegExpExecArray) =>
  * values and create a stringified key for the route
  * that can be used to match request routes
  */
-export declare function stringifyParams(params: GetStaticPathsItem['params'], routeComponent: string): string;
+export declare function stringifyParams(params: GetStaticPathsItem['params'], route: RouteData): string;

package/dist/core/routing/params.js

@@ -13,14 +13,14 @@ function getParams(array) {
   };
   return fn;
 }
-function stringifyParams(params, routeComponent) {
+function stringifyParams(params, route) {
   const validatedParams = Object.entries(params).reduce((acc, next) => {
-    validateGetStaticPathsParameter(next, routeComponent);
+    validateGetStaticPathsParameter(next, route.component);
     const [key, value] = next;
     acc[key] = value == null ? void 0 : value.toString();
     return acc;
   }, {});
-  return JSON.stringify(validatedParams, Object.keys(params).sort());
+  return JSON.stringify(route.generate(validatedParams));
 }
 export {
   getParams,

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

@@ -3,7 +3,7 @@ import type http from 'node:http';
 import type { ComponentInstance, ManifestData, RouteData, SSRManifest } from '../@types/astro';
 import type { DevelopmentEnvironment } from '../core/render/dev/index';
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (...args: any) => Promise<infer R> ? R : any;
-interface MatchedRoute {
+export interface MatchedRoute {
     route: RouteData;
     filePath: URL;
     resolvedPathname: string;
@@ -22,6 +22,7 @@ type HandleRoute = {
     incomingRequest: http.IncomingMessage;
     incomingResponse: http.ServerResponse;
     manifest: SSRManifest;
+    status?: number;
 };
-export declare function handleRoute({ matchedRoute, url, pathname, body, origin, env, manifestData, incomingRequest, incomingResponse, manifest, }: HandleRoute): Promise<void>;
+export declare function handleRoute({ matchedRoute, url, pathname, status, body, origin, env, manifestData, incomingRequest, incomingResponse, manifest, }: HandleRoute): Promise<void>;
 export {};

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

@@ -81,6 +81,7 @@ async function handleRoute({
   matchedRoute,
   url,
   pathname,
+  status = getStatus(matchedRoute),
   body,
   origin,
   env,
@@ -142,6 +143,7 @@ async function handleRoute({
           matchedRoute: fourOhFourRoute,
           url: new URL("/404", url),
           pathname: "/404",
+          status: 404,
           body,
           origin,
           env,
@@ -171,10 +173,38 @@ async function handleRoute({
     }
   } else {
     const result = await renderPage(options);
+    if (result.status === 404) {
+      const fourOhFourRoute = await matchRoute("/404", env, manifestData);
+      return handleRoute({
+        ...options,
+        matchedRoute: fourOhFourRoute,
+        url: new URL(pathname, url),
+        status: 404,
+        body,
+        origin,
+        env,
+        manifestData,
+        incomingRequest,
+        incomingResponse,
+        manifest
+      });
+    }
     throwIfRedirectNotAllowed(result, config);
-    return await writeSSRResult(request, result, incomingResponse);
+    let response = result;
+    if (status && response.status !== status) {
+      response = new Response(result.body, { ...result, status });
+    }
+    return await writeSSRResult(request, response, incomingResponse);
   }
 }
+function getStatus(matchedRoute) {
+  if (!matchedRoute)
+    return 404;
+  if (matchedRoute.route.route === "/404")
+    return 404;
+  if (matchedRoute.route.route === "/500")
+    return 500;
+}
 export {
   handleRoute,
   matchRoute

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.8.4",
+  "version": "2.8.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -52,6 +52,7 @@
     "./components": "./components/index.ts",
     "./components/*": "./components/*",
     "./assets": "./dist/assets/index.js",
+    "./assets/utils": "./dist/assets/utils/index.js",
     "./assets/image-endpoint": "./dist/assets/image-endpoint.js",
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/squoosh": "./dist/assets/services/squoosh.js",