astro 1.0.0-beta.23 → 1.0.0-beta.26

package/README.md

@@ -1,7 +1,6 @@
 <br/>
 <p align="center">
-  <img src="../../assets/brand/logo-square-black.png#gh-light-mode-only" alt="Astro logo" width="120">
-  <img src="../../assets/brand/logo-square-white.png#gh-dark-mode-only" alt="Astro logo" width="120">
+  <img src="../../assets/social/banner-minimal.png" alt="Astro logo">
   <br/><br/>
   <a href="https://astro.build">Astro</a> is a website build tool for the modern web &mdash;
   <br/>

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.23";
+  const version = "1.0.0-beta.26";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.23" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.26" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.23",
+          astroVersion: "1.0.0-beta.26",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.23", cliCommand: "dev" }, config));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "dev" }, config));
         await devServer(config, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.23", cliCommand: "build" }, config));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "build" }, config));
         return await build(config, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const config = await loadConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.23", cliCommand: "check" }, config));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "check" }, config));
       const ret = await check(config);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const config = await loadConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.23", cliCommand: "preview" }, config));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.26", cliCommand: "preview" }, config));
         const server = await preview(config, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.23",
+          astroVersion: "1.0.0-beta.26",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/app/index.js

@@ -119,14 +119,12 @@ renderPage_fn = async function(request, routeData, mod) {
     return result.response;
   }
   let html = result.html;
+  let init = result.response;
+  let headers = init.headers;
   let bytes = __privateGet(this, _encoder).encode(html);
-  return new Response(bytes, {
-    status: 200,
-    headers: {
-      "Content-Type": "text/html",
-      "Content-Length": bytes.byteLength.toString()
-    }
-  });
+  headers.set("Content-Type", "text/html");
+  headers.set("Content-Length", bytes.byteLength.toString());
+  return new Response(bytes, init);
 };
 _callEndpoint = new WeakSet();
 callEndpoint_fn = async function(request, routeData, mod) {

package/dist/core/build/static-build.js

@@ -137,7 +137,12 @@ async function ssrBuild(opts, internals, input) {
     ssr: viteConfig.ssr,
     resolve: viteConfig.resolve
   };
-  await runHookBuildSetup({ config: astroConfig, vite: viteBuildConfig, target: "server" });
+  await runHookBuildSetup({
+    config: astroConfig,
+    pages: internals.pagesByComponent,
+    vite: viteBuildConfig,
+    target: "server"
+  });
   return await vite.build(viteBuildConfig);
 }
 async function clientBuild(opts, internals, input) {
@@ -188,7 +193,12 @@ ${bgGreen(black(" building client "))}`);
     server: viteConfig.server,
     base: astroConfig.base
   };
-  await runHookBuildSetup({ config: astroConfig, vite: viteBuildConfig, target: "client" });
+  await runHookBuildSetup({
+    config: astroConfig,
+    pages: internals.pagesByComponent,
+    vite: viteBuildConfig,
+    target: "client"
+  });
   const buildResult = await vite.build(viteBuildConfig);
   info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.
 `));

package/dist/core/create-vite.js

@@ -15,6 +15,7 @@ const ALWAYS_EXTERNAL = /* @__PURE__ */ new Set([
   ...builtinModules.map((name) => `node:${name}`),
   "@sveltejs/vite-plugin-svelte",
   "micromark-util-events-to-acorn",
+  "serialize-javascript",
   "node-fetch",
   "prismjs",
   "shiki",
@@ -61,6 +62,11 @@ async function createVite(commandConfig, { astroConfig, logging, mode }) {
     css: {
       postcss: astroConfig.style.postcss || {}
     },
+    resolve: {
+      alias: {
+        randombytes: "randombytes/browser"
+      }
+    },
     ssr: {
       external: [...ALWAYS_EXTERNAL],
       noExternal: [...ALWAYS_NOEXTERNAL, ...astroPackages]

package/dist/core/dev/index.js

@@ -36,7 +36,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.23";
+  const currentVersion = "1.0.0-beta.26";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.23";
+  const version = "1.0.0-beta.26";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -199,7 +199,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.23"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.26"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/core/render/core.js

@@ -110,7 +110,8 @@ async function render(opts) {
   }
   return {
     type: "html",
-    html
+    html,
+    response: result.response
   };
 }
 export {

package/dist/core/render/dev/index.js

@@ -131,7 +131,8 @@ async function render(renderers, mod, ssrOpts) {
   }
   return {
     type: "html",
-    html
+    html,
+    response: content.response
   };
 }
 async function ssr(preloadedComponent, ssrOpts) {

package/dist/core/render/result.js

@@ -110,6 +110,16 @@ function createResult(args) {
   const { markdown, params, pathname, renderers, request, resolve, site } = args;
   const url = new URL(request.url);
   const canonicalURL = createCanonicalURL("." + pathname, site ?? url.origin);
+  const response = {
+    status: 200,
+    statusText: "OK",
+    headers: new Headers()
+  };
+  Object.defineProperty(response, "headers", {
+    value: response.headers,
+    enumerable: true,
+    writable: false
+  });
   const result = {
     styles: /* @__PURE__ */ new Set(),
     scripts: args.scripts ?? /* @__PURE__ */ new Set(),
@@ -154,6 +164,7 @@ or consider make it a module like so:
 ${extra}`);
           return "";
         },
+        response,
         slots: astroSlots
       };
       Object.defineProperty(Astro, "__renderMarkdown", {
@@ -177,7 +188,8 @@ ${extra}`);
     _metadata: {
       renderers,
       pathname
-    }
+    },
+    response
   };
   return result;
 }

package/dist/integrations/index.js

@@ -111,11 +111,12 @@ async function runHookBuildStart({
 async function runHookBuildSetup({
   config,
   vite,
+  pages,
   target
 }) {
   for (const integration of config.integrations) {
     if (integration.hooks["astro:build:setup"]) {
-      await integration.hooks["astro:build:setup"]({ vite, target });
+      await integration.hooks["astro:build:setup"]({ vite, pages, target });
     }
   }
 }

package/dist/runtime/server/hydration.js

@@ -1,7 +1,7 @@
 import { hydrationSpecifier, serializeListValue } from "./util.js";
-import devalue from "devalue";
+import serializeJavaScript from "serialize-javascript";
 function serializeProps(value) {
-  return devalue(value);
+  return serializeJavaScript(value);
 }
 const HydrationDirectives = ["load", "idle", "media", "visible", "only"];
 function extractDirectives(inputProps) {

package/dist/runtime/server/index.js

@@ -329,7 +329,40 @@ async function renderEndpoint(mod, request, params) {
   if (!handler || typeof handler !== "function") {
     throw new Error(`Endpoint handler not found! Expected an exported function for "${chosenMethod}"`);
   }
-  return await handler.call(mod, params, request);
+  if (handler.length > 1) {
+    console.warn(`
+API routes with 2 arguments have been deprecated. Instead they take a single argument in the form of:
+
+export function get({ params, request }) {
+	//...
+}
+
+Update your code to remove this warning.`);
+  }
+  const context = {
+    request,
+    params
+  };
+  const proxy = new Proxy(context, {
+    get(target, prop) {
+      if (prop in target) {
+        return Reflect.get(target, prop);
+      } else if (prop in params) {
+        console.warn(`
+API routes no longer pass params as the first argument. Instead an object containing a params property is provided in the form of:
+
+export function get({ params }) {
+	// ...
+}
+
+Update your code to remove this warning.`);
+        return Reflect.get(params, prop);
+      } else {
+        return void 0;
+      }
+    }
+  });
+  return await handler.call(mod, proxy, request);
 }
 async function replaceHeadInjection(result, html) {
   let template = html;

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

@@ -8,6 +8,7 @@ import type { AstroConfigSchema } from '../core/config';
 import type { AstroComponentFactory, Metadata } from '../runtime/server';
 import type { ViteConfigWithSSR } from '../core/create-vite';
 import type { SerializedSSRManifest } from '../core/app/types';
+import type { PageBuildData } from '../core/build/types';
 export type { SSRManifest } from '../core/app/types';
 export interface AstroBuiltinProps {
     'client:load'?: boolean;
@@ -113,6 +114,18 @@ export interface AstroGlobal extends AstroGlobalPartial {
      * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrorequest)
      */
     request: Request;
+    /** Information about the outgoing response. This is a standard [ResponseInit](https://developer.mozilla.org/en-US/docs/Web/API/Response/Response#init) object
+     *
+     * For example, to change the status code you can set a different status on this object:
+     * ```typescript
+     * Astro.response.status = 404;
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroresponse)
+     */
+    response: ResponseInit & {
+        readonly headers: Headers;
+    };
     /** Redirect to another page (**SSR Only**)
      *
      * Example usage:
@@ -774,11 +787,23 @@ export interface AstroAdapter {
     exports?: string[];
     args?: any;
 }
+export interface APIContext {
+    params: Params;
+    request: Request;
+}
 export interface EndpointOutput<Output extends Body = Body> {
     body: Output;
 }
+interface APIRoute {
+    (context: APIContext): EndpointOutput | Response;
+    /**
+     * @deprecated
+     * Use { context: APIRouteContext } object instead.
+     */
+    (params: Params, request: Request): EndpointOutput | Response;
+}
 export interface EndpointHandler {
-    [method: string]: (params: any, request: Request) => EndpointOutput | Response;
+    [method: string]: APIRoute;
 }
 export interface AstroRenderer {
     /** Name of the renderer. */
@@ -831,8 +856,9 @@ export interface AstroIntegration {
         }) => void | Promise<void>;
         'astro:build:setup'?: (options: {
             vite: ViteConfigWithSSR;
+            pages: Map<string, PageBuildData>;
             target: 'client' | 'server';
-        }) => void;
+        }) => void | Promise<void>;
         'astro:build:done'?: (options: {
             pages: {
                 pathname: string;
@@ -925,5 +951,6 @@ export interface SSRResult {
     links: Set<SSRElement>;
     createAstro(Astro: AstroGlobalPartial, props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
     resolve: (s: string) => Promise<string>;
+    response: ResponseInit;
     _metadata: SSRMetadata;
 }

package/dist/types/core/render/core.d.ts

@@ -33,6 +33,7 @@ export interface RenderOptions {
 export declare function render(opts: RenderOptions): Promise<{
     type: 'html';
     html: string;
+    response: ResponseInit;
 } | {
     type: 'response';
     response: Response;

package/dist/types/core/render/dev/index.d.ts

@@ -28,6 +28,7 @@ export declare type ComponentPreload = [SSRLoadedRenderer[], ComponentInstance];
 export declare type RenderResponse = {
     type: 'html';
     html: string;
+    response: ResponseInit;
 } | {
     type: 'response';
     response: Response;

package/dist/types/integrations/index.d.ts

@@ -2,6 +2,7 @@
 import type { AddressInfo } from 'net';
 import type { ViteDevServer } from 'vite';
 import type { SerializedSSRManifest } from '../core/app/types';
+import type { PageBuildData } from '../core/build/types';
 import { AstroConfig, BuildConfig, RouteData } from '../@types/astro.js';
 import type { ViteConfigWithSSR } from '../core/create-vite.js';
 export declare function runHookConfigSetup({ config: _config, command, }: {
@@ -26,9 +27,10 @@ export declare function runHookBuildStart({ config, buildConfig, }: {
     config: AstroConfig;
     buildConfig: BuildConfig;
 }): Promise<void>;
-export declare function runHookBuildSetup({ config, vite, target, }: {
+export declare function runHookBuildSetup({ config, vite, pages, target, }: {
     config: AstroConfig;
     vite: ViteConfigWithSSR;
+    pages: Map<string, PageBuildData>;
     target: 'server' | 'client';
 }): Promise<void>;
 export declare function runHookBuildSsr({ config, manifest, }: {

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

@@ -67,8 +67,11 @@ async function writeSSRResult(result, res, statusCode) {
     await writeWebResponse(res, response);
     return;
   }
-  const { html } = result;
-  writeHtmlResponse(res, statusCode, html);
+  const { html, response: init } = result;
+  const headers = init.headers;
+  headers.set("Content-Type", "text/html; charset=utf-8");
+  headers.set("Content-Length", Buffer.byteLength(html, "utf-8").toString());
+  return writeWebResponse(res, new Response(html, init));
 }
 async function handle404Response(origin, config, req, res) {
   const site = config.site ? new URL(config.base, config.site) : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.23",
+  "version": "1.0.0-beta.26",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -83,7 +83,6 @@
     "ci-info": "^3.3.0",
     "common-ancestor-path": "^1.0.1",
     "debug": "^4.3.4",
-    "devalue": "^2.0.1",
     "diff": "^5.0.0",
     "eol": "^0.9.1",
     "es-module-lexer": "^0.10.5",
@@ -112,6 +111,7 @@
     "resolve": "^1.22.0",
     "rollup": "^2.70.2",
     "semver": "^7.3.7",
+    "serialize-javascript": "^6.0.0",
     "shiki": "^0.10.1",
     "sirv": "^2.0.2",
     "slash": "^4.0.0",