astro 1.5.0 → 1.5.2

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

@@ -1,6 +1,6 @@
 import mime from "mime";
 import { Readable } from "stream";
-import { getSetCookiesFromResponse } from "../core/cookies/index.js";
+import { attachToResponse, getSetCookiesFromResponse } from "../core/cookies/index.js";
 import { call as callEndpoint } from "../core/endpoint/dev/index.js";
 import {
   collectErrorMetadata,
@@ -10,9 +10,8 @@ import {
 import { error, info, warn } from "../core/logger/core.js";
 import * as msg from "../core/messages.js";
 import { appendForwardSlash } from "../core/path.js";
-import { getParamsAndProps, GetParamsAndPropsError } from "../core/render/core.js";
-import { preload, ssr } from "../core/render/dev/index.js";
-import { RouteCache } from "../core/render/route-cache.js";
+import { createDevelopmentEnvironment, preload, renderPage } from "../core/render/dev/index.js";
+import { getParamsAndProps, GetParamsAndPropsError } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { createRouteManifest, matchAllRoutes } from "../core/routing/index.js";
 import { resolvePages } from "../core/util.js";
@@ -68,7 +67,7 @@ async function writeWebResponse(res, webResponse) {
 async function writeSSRResult(webResponse, res) {
   return writeWebResponse(res, webResponse);
 }
-async function handle404Response(origin, settings, req, res) {
+async function handle404Response(origin, req, res) {
   const pathname = decodeURI(new URL(origin + req.url).pathname);
   const html = notFoundTemplate({
     statusCode: 404,
@@ -129,11 +128,12 @@ function baseMiddleware(settings, logging) {
     next();
   };
 }
-async function matchRoute(pathname, routeCache, viteServer, logging, manifest, settings) {
+async function matchRoute(pathname, env, manifest) {
+  const { logging, settings, routeCache } = env;
   const matches = matchAllRoutes(pathname, manifest);
   for await (const maybeRoute of matches) {
     const filePath = new URL(`./${maybeRoute.component}`, settings.config.root);
-    const preloadedComponent = await preload({ settings, filePath, viteServer });
+    const preloadedComponent = await preload({ env, filePath });
     const [, mod] = preloadedComponent;
     const paramsAndPropsRes = await getParamsAndProps({
       mod,
@@ -163,7 +163,7 @@ async function matchRoute(pathname, routeCache, viteServer, logging, manifest, s
   const custom404 = getCustom404Route(settings, manifest);
   if (custom404) {
     const filePath = new URL(`./${custom404.component}`, settings.config.root);
-    const preloadedComponent = await preload({ settings, filePath, viteServer });
+    const preloadedComponent = await preload({ env, filePath });
     const [, mod] = preloadedComponent;
     return {
       route: custom404,
@@ -174,8 +174,9 @@ async function matchRoute(pathname, routeCache, viteServer, logging, manifest, s
   }
   return void 0;
 }
-async function handleRequest(routeCache, viteServer, logging, manifest, settings, req, res) {
+async function handleRequest(env, manifest, req, res) {
   var _a;
+  const { settings, viteServer } = env;
   const { config } = settings;
   const origin = `${viteServer.config.server.https ? "https" : "http"}://${req.headers.host}`;
   const buildingToSSR = config.output === "server";
@@ -201,39 +202,30 @@ async function handleRequest(routeCache, viteServer, logging, manifest, settings
   }
   let filePath;
   try {
-    const matchedRoute = await matchRoute(
-      pathname,
-      routeCache,
-      viteServer,
-      logging,
-      manifest,
-      settings
-    );
+    const matchedRoute = await matchRoute(pathname, env, manifest);
     filePath = matchedRoute == null ? void 0 : matchedRoute.filePath;
-    return await handleRoute(
-      matchedRoute,
-      url,
-      pathname,
-      body,
-      origin,
-      routeCache,
-      viteServer,
-      manifest,
-      logging,
-      settings,
-      req,
-      res
-    );
+    return await handleRoute(matchedRoute, url, pathname, body, origin, env, manifest, req, res);
   } catch (_err) {
     const err = fixViteErrorMessage(_err, viteServer, filePath);
     const errorWithMetadata = collectErrorMetadata(err);
-    error(logging, null, msg.formatErrorMessage(errorWithMetadata));
+    error(env.logging, null, msg.formatErrorMessage(errorWithMetadata));
     handle500Response(viteServer, origin, req, res, errorWithMetadata);
   }
 }
-async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache, viteServer, manifest, logging, settings, req, res) {
+function isRedirect(statusCode) {
+  return statusCode >= 300 && statusCode < 400;
+}
+function throwIfRedirectNotAllowed(response, config) {
+  if (config.output !== "server" && isRedirect(response.status)) {
+    throw new Error(
+      `Redirects are only available when using output: 'server'. Update your Astro config if you need SSR features.`
+    );
+  }
+}
+async function handleRoute(matchedRoute, url, pathname, body, origin, env, manifest, req, res) {
+  const { logging, settings } = env;
   if (!matchedRoute) {
-    return handle404Response(origin, settings, req, res);
+    return handle404Response(origin, req, res);
   }
   const { config } = settings;
   const filePath = matchedRoute.filePath;
@@ -251,50 +243,38 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache
   const paramsAndPropsRes = await getParamsAndProps({
     mod,
     route,
-    routeCache,
+    routeCache: env.routeCache,
     pathname,
     logging,
     ssr: config.output === "server"
   });
   const options = {
-    settings,
+    env,
     filePath,
-    logging,
-    mode: "development",
     origin,
+    preload: preloadedComponent,
     pathname,
-    route,
-    routeCache,
-    viteServer,
-    request
+    request,
+    route
   };
   if (route.type === "endpoint") {
     const result = await callEndpoint(options);
     if (result.type === "response") {
       if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
-        const fourOhFourRoute = await matchRoute(
-          "/404",
-          routeCache,
-          viteServer,
-          logging,
-          manifest,
-          settings
-        );
+        const fourOhFourRoute = await matchRoute("/404", env, manifest);
         return handleRoute(
           fourOhFourRoute,
           new URL("/404", url),
           "/404",
           body,
           origin,
-          routeCache,
-          viteServer,
+          env,
           manifest,
-          logging,
-          settings,
           req,
           res
         );
       }
+      throwIfRedirectNotAllowed(result.response, config);
       await writeWebResponse(res, result.response);
     } else {
       let contentType = "text/plain";
@@ -303,11 +283,18 @@ async function handleRoute(matchedRoute, url, pathname, body, origin, routeCache
       if (computedMimeType) {
         contentType = computedMimeType;
       }
-      res.writeHead(200, { "Content-Type": `${contentType};charset=utf-8` });
-      res.end(result.body);
+      const response = new Response(result.body, {
+        status: 200,
+        headers: {
+          "Content-Type": `${contentType};charset=utf-8`
+        }
+      });
+      attachToResponse(response, result.cookies);
+      await writeWebResponse(res, response);
     }
   } else {
-    const result = await ssr(preloadedComponent, options);
+    const result = await renderPage(options);
+    throwIfRedirectNotAllowed(result, config);
     return await writeSSRResult(result, res);
   }
 }
@@ -315,10 +302,10 @@ function createPlugin({ settings, logging }) {
   return {
     name: "astro:server",
     configureServer(viteServer) {
-      let routeCache = new RouteCache(logging, "development");
+      let env = createDevelopmentEnvironment(settings, logging, viteServer);
       let manifest = createRouteManifest({ settings }, logging);
       function rebuildManifest(needsManifestRebuild, file) {
-        routeCache.clearAll();
+        env.routeCache.clearAll();
         if (needsManifestRebuild) {
           manifest = createRouteManifest({ settings }, logging);
         }
@@ -337,7 +324,7 @@ function createPlugin({ settings, logging }) {
           if (!req.url || !req.method) {
             throw new Error("Incomplete request");
           }
-          handleRequest(routeCache, viteServer, logging, manifest, settings, req, res);
+          handleRequest(env, manifest, req, res);
         });
       };
     },

package/env.d.ts

@@ -4,7 +4,7 @@
 // As such, if the typings you're trying to add should be available inside ex: React components, they should instead
 // be inside `client-base.d.ts`
 
-type Astro = import('./dist/@types/astro').AstroGlobal;
+type Astro = import('./dist/@types/astro.js').AstroGlobal;
 
 // We have to duplicate the description here because editors won't show the JSDoc comment from the imported type
 // However, they will for its properties, ex: Astro.request will show the AstroGlobal.request description

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -37,7 +37,10 @@
     "./tsconfigs/*": "./tsconfigs/*.json",
     "./jsx/*": "./dist/jsx/*",
     "./jsx-runtime": "./dist/jsx-runtime/index.js",
-    "./config": "./config.mjs",
+    "./config": {
+      "types": "./config.d.ts",
+      "default": "./config.mjs"
+    },
     "./app": "./dist/core/app/index.js",
     "./app/node": "./dist/core/app/node.js",
     "./client/*": "./dist/runtime/client/*",