astro 2.9.1 → 2.9.2

package/astro-jsx.d.ts

@@ -901,6 +901,7 @@ declare namespace astroHTML.JSX {
 		crossorigin?: string | undefined | null;
 		defer?: boolean | string | undefined | null;
 		fetchpriority?: 'auto' | 'high' | 'low' | undefined | null;
+		referrerpolicy?: HTMLAttributeReferrerPolicy | undefined | null;
 		integrity?: string | undefined | null;
 		nomodule?: boolean | string | undefined | null;
 		nonce?: string | undefined | null;

package/dist/assets/image-endpoint.d.ts

@@ -1,5 +1,5 @@
 import type { APIRoute } from '../@types/astro.js';
 /**
- * Endpoint used in SSR to serve optimized images
+ * Endpoint used in dev and SSR to serve optimized images by the base image services
  */
 export declare const get: APIRoute;

package/dist/assets/internal.js

@@ -29,8 +29,8 @@ async function getImage(options, serviceConfig) {
     });
   }
   const service = await getConfiguredImageService();
-  const validatedOptions = service.validateOptions ? service.validateOptions(options, serviceConfig) : options;
-  let imageURL = service.getURL(validatedOptions, serviceConfig);
+  const validatedOptions = service.validateOptions ? await service.validateOptions(options, serviceConfig) : options;
+  let imageURL = await service.getURL(validatedOptions, serviceConfig);
   if (isLocalService(service) && globalThis.astroAsset.addStaticImage) {
     imageURL = globalThis.astroAsset.addStaticImage(validatedOptions);
   }

package/dist/assets/services/service.d.ts

@@ -12,14 +12,14 @@ interface SharedServiceProps {
      * For external services, this should point to the URL your images are coming from, for instance, `/_vercel/image`
      *
      */
-    getURL: (options: ImageTransform, serviceConfig: Record<string, any>) => string;
+    getURL: (options: ImageTransform, serviceConfig: Record<string, any>) => string | Promise<string>;
     /**
      * Return any additional HTML attributes separate from `src` that your service requires to show the image properly.
      *
      * For example, you might want to return the `width` and `height` to avoid CLS, or a particular `class` or `style`.
      * In most cases, you'll want to return directly what your user supplied you, minus the attributes that were used to generate the image.
      */
-    getHTMLAttributes?: (options: ImageTransform, serviceConfig: Record<string, any>) => Record<string, any>;
+    getHTMLAttributes?: (options: ImageTransform, serviceConfig: Record<string, any>) => Record<string, any> | Promise<Record<string, any>>;
     /**
      * Validate and return the options passed by the user.
      *
@@ -28,7 +28,7 @@ interface SharedServiceProps {
      *
      * This method should returns options, and can be used to set defaults (ex: a default output format to be used if the user didn't specify one.)
      */
-    validateOptions?: (options: ImageTransform, serviceConfig: Record<string, any>) => ImageTransform;
+    validateOptions?: (options: ImageTransform, serviceConfig: Record<string, any>) => ImageTransform | Promise<ImageTransform>;
 }
 export type ExternalImageService = SharedServiceProps;
 export type LocalImageTransform = {
@@ -37,11 +37,11 @@ export type LocalImageTransform = {
 };
 export interface LocalImageService extends SharedServiceProps {
     /**
-     * Parse the requested parameters passed in the URL from `getURL` back into an object to be used later by `transform`
+     * Parse the requested parameters passed in the URL from `getURL` back into an object to be used later by `transform`.
      *
      * In most cases, this will get query parameters using, for example, `params.get('width')` and return those.
      */
-    parseURL: (url: URL, serviceConfig: Record<string, any>) => LocalImageTransform | undefined;
+    parseURL: (url: URL, serviceConfig: Record<string, any>) => LocalImageTransform | undefined | Promise<LocalImageTransform> | Promise<undefined>;
     /**
      * Performs the image transformations on the input image and returns both the binary data and
      * final image format of the optimized image.

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

@@ -1 +1,4 @@
 export { emitESMImage } from './emitAsset.js';
+export { imageMetadata } from './metadata.js';
+export { getOrigQueryParams } from './queryParams.js';
+export { hashTransform, propsToFilename } from './transformToPath.js';

package/dist/assets/utils/index.js

@@ -1,4 +1,11 @@
 import { emitESMImage } from "./emitAsset.js";
+import { imageMetadata } from "./metadata.js";
+import { getOrigQueryParams } from "./queryParams.js";
+import { hashTransform, propsToFilename } from "./transformToPath.js";
 export {
-  emitESMImage
+  emitESMImage,
+  getOrigQueryParams,
+  hashTransform,
+  imageMetadata,
+  propsToFilename
 };

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

@@ -1,8 +1,5 @@
 import { bold } from "kleur/colors";
 import MagicString from "magic-string";
-import mime from "mime/lite.js";
-import fs from "node:fs/promises";
-import { Readable } from "node:stream";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { error } from "../core/logger/core.js";
@@ -14,10 +11,7 @@ import {
 } from "../core/path.js";
 import { VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { isESMImportedImage } from "./internal.js";
-import { isLocalService } from "./services/service.js";
 import { emitESMImage } from "./utils/emitAsset.js";
-import { imageMetadata } from "./utils/metadata.js";
-import { getOrigQueryParams } from "./utils/queryParams.js";
 import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
 const rawRE = /(?:\?|&)raw(?:&|$)/;
@@ -84,54 +78,6 @@ function assets({
 				`;
         }
       },
-      // Handle serving images during development
-      configureServer(server) {
-        server.middlewares.use(async (req, res, next) => {
-          var _a2, _b;
-          if ((_a2 = req.url) == null ? void 0 : _a2.startsWith("/_image")) {
-            if (!isLocalService(globalThis.astroAsset.imageService)) {
-              return next();
-            }
-            const url = new URL(req.url, "file:");
-            if (!url.searchParams.has("href")) {
-              return next();
-            }
-            const filePath = (_b = url.searchParams.get("href")) == null ? void 0 : _b.slice("/@fs".length);
-            const filePathURL = new URL("." + filePath, "file:");
-            const file = await fs.readFile(filePathURL);
-            let meta = getOrigQueryParams(filePathURL.searchParams);
-            if (!meta) {
-              meta = await imageMetadata(filePathURL, file);
-              if (!meta) {
-                return next();
-              }
-            }
-            const transform = await globalThis.astroAsset.imageService.parseURL(
-              url,
-              settings.config.image.service.config
-            );
-            if (transform === void 0) {
-              error(logging, "image", `Failed to parse transform for ${url}`);
-            }
-            let data = file;
-            let format = meta.format;
-            if (transform) {
-              const result = await globalThis.astroAsset.imageService.transform(
-                file,
-                transform,
-                settings.config.image.service.config
-              );
-              data = result.data;
-              format = result.format;
-            }
-            res.setHeader("Content-Type", mime.getType(format) ?? `image/${format}`);
-            res.setHeader("Cache-Control", "max-age=360000");
-            const stream = Readable.from(data);
-            return stream.pipe(res);
-          }
-          return next();
-        });
-      },
       buildStart() {
         if (mode != "build") {
           return;

package/dist/cli/load-settings.js

@@ -17,10 +17,11 @@ async function loadSettings({ cmd, flags, logging }) {
     await handleConfigError(e, { cmd, cwd: root, flags, logging });
     return {};
   });
+  const mode = cmd === "build" ? "build" : "dev";
   if (!initialAstroConfig)
     return;
   telemetry.record(event.eventCliSession(cmd, initialUserConfig, flags));
-  return createSettings(initialAstroConfig, root);
+  return createSettings(initialAstroConfig, mode, root);
 }
 async function handleConfigError(e, { cmd, cwd, flags, logging }) {
   const path = await resolveConfigPath({ cwd, flags, fs });

package/dist/config/index.js

@@ -26,7 +26,7 @@ function getViteConfig(inlineConfig) {
       level: "info"
     };
     const { astroConfig: config } = await openConfig({ cmd });
-    const settings = createSettings(config, inlineConfig.root);
+    const settings = createSettings(config, cmd, inlineConfig.root);
     await runHookConfigSetup({ settings, command: cmd, logging });
     const viteConfig = await createVite(
       {

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

@@ -1,4 +1,4 @@
 import type { AstroConfig, AstroSettings, AstroUserConfig } from '../../@types/astro';
-export declare function createBaseSettings(config: AstroConfig): AstroSettings;
-export declare function createSettings(config: AstroConfig, cwd?: string): AstroSettings;
+export declare function createBaseSettings(config: AstroConfig, mode: 'build' | 'dev'): AstroSettings;
+export declare function createSettings(config: AstroConfig, mode: 'build' | 'dev', cwd?: string): AstroSettings;
 export declare function createDefaultDevSettings(userConfig?: AstroUserConfig, root?: string | URL): Promise<AstroSettings>;

package/dist/core/config/settings.js

@@ -12,14 +12,14 @@ import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import { createDefaultDevConfig } from "./config.js";
 import { AstroTimer } from "./timer.js";
 import { loadTSConfig } from "./tsconfig.js";
-function createBaseSettings(config) {
+function createBaseSettings(config, mode) {
   const { contentDir } = getContentPaths(config);
   return {
     config,
     tsConfig: void 0,
     tsConfigPath: void 0,
     adapter: void 0,
-    injectedRoutes: config.experimental.assets && isServerLikeOutput(config) ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint", prerender: false }] : [],
+    injectedRoutes: config.experimental.assets && (isServerLikeOutput(config) || mode === "dev") ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint", prerender: false }] : [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     contentEntryTypes: [markdownContentEntryType],
     dataEntryTypes: [
@@ -92,9 +92,9 @@ function createBaseSettings(config) {
     timer: new AstroTimer()
   };
 }
-function createSettings(config, cwd) {
+function createSettings(config, mode, cwd) {
   const tsconfig = loadTSConfig(cwd);
-  const settings = createBaseSettings(config);
+  const settings = createBaseSettings(config, mode);
   const watchFiles = (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : [];
   if (cwd) {
     watchFiles.push(fileURLToPath(new URL("./package.json", pathToFileURL(cwd))));
@@ -109,7 +109,7 @@ async function createDefaultDevSettings(userConfig = {}, root) {
     root = fileURLToPath(root);
   }
   const config = await createDefaultDevConfig(userConfig, root);
-  return createBaseSettings(config);
+  return createBaseSettings(config, "dev");
 }
 export {
   createBaseSettings,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.9.1";
+const ASTRO_VERSION = "2.9.2";
 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.9.1";
+  const currentVersion = "2.9.2";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/dev/restart.js

@@ -62,7 +62,7 @@ async function restartContainer({
     });
     info(logging, "astro", logMsg + "\n");
     let astroConfig = newConfig.astroConfig;
-    const settings = createSettings(astroConfig, resolvedRoot);
+    const settings = createSettings(astroConfig, "dev", resolvedRoot);
     await close();
     return {
       container: await createRestartedContainer(container, settings, needsStart),

package/dist/core/messages.js

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

package/dist/runtime/server/render/common.js

@@ -89,7 +89,8 @@ function chunkToByteArray(result, chunk) {
   if (ArrayBuffer.isView(chunk)) {
     return chunk;
   } else {
-    return encoder.encode(stringifyChunk(result, chunk));
+    const stringified = stringifyChunk(result, chunk);
+    return encoder.encode(stringified.toString());
   }
 }
 export {

package/dist/vite-plugin-astro/compile.js

@@ -17,7 +17,6 @@ async function cachedFullCompilation({
       tsconfigRaw: {
         compilerOptions: {
           // Ensure client:only imports are treeshaken
-          // @ts-expect-error anticipate esbuild 0.18 feature
           verbatimModuleSyntax: false,
           importsNotUsedAsValues: "remove"
         }

package/dist/vite-plugin-jsx/index.js

@@ -121,7 +121,6 @@ function jsx({ settings, logging }) {
           tsconfigRaw: {
             compilerOptions: {
               // Ensure client:only imports are treeshaken
-              // @ts-expect-error anticipate esbuild 0.18 feature
               verbatimModuleSyntax: false,
               importsNotUsedAsValues: "remove"
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -155,7 +155,7 @@
     "typescript": "*",
     "unist-util-visit": "^4.1.2",
     "vfile": "^5.3.7",
-    "vite": "^4.3.9",
+    "vite": "^4.4.6",
     "vitefu": "^0.2.4",
     "which-pm": "^2.0.0",
     "yargs-parser": "^21.1.1",