astro 2.4.0 → 2.4.2

package/client-base.d.ts

@@ -389,7 +389,7 @@ declare module '*?inline' {
 }
 
 // eslint-disable-next-line  @typescript-eslint/no-namespace
-export namespace App {
+declare namespace App {
 	// eslint-disable-next-line  @typescript-eslint/no-empty-interface
 	export interface Locals {}
 }

package/config.d.ts

@@ -1,6 +1,7 @@
 type ViteUserConfig = import('vite').UserConfig;
 type ViteUserConfigFn = import('vite').UserConfigFn;
 type AstroUserConfig = import('./dist/@types/astro.js').AstroUserConfig;
+type ImageServiceConfig = import('./dist/@types/astro.js').ImageServiceConfig;
 
 /**
  * See the full Astro Configuration API Documentation
@@ -12,3 +13,14 @@ export function defineConfig(config: AstroUserConfig): AstroUserConfig;
  * Use Astro to generate a fully resolved Vite config
  */
 export function getViteConfig(config: ViteUserConfig): ViteUserConfigFn;
+
+/**
+ * Return the configuration needed to use the Sharp-based image service
+ * See: https://docs.astro.build/en/guides/assets/#using-sharp
+ */
+export function sharpImageService(): ImageServiceConfig;
+
+/**
+ * Return the configuration needed to use the Squoosh-based image service
+ */
+export function squooshImageService(): ImageServiceConfig;

package/config.mjs

@@ -1 +1,15 @@
 export { defineConfig, getViteConfig } from './dist/config/index.js';
+
+export function sharpImageService() {
+	return {
+		entrypoint: 'astro/assets/services/sharp',
+		config: {},
+	};
+}
+
+export function squooshImageService() {
+	return {
+		entrypoint: 'astro/assets/services/squoosh',
+		config: {},
+	};
+}

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

@@ -460,8 +460,8 @@ export interface AstroUserConfig {
      * @name scopedStyleStrategy
      * @type {('where' | 'class')}
      * @default `'where'`
-     * @description
      * @version 2.4
+     * @description
      *
      * Specify the strategy used for scoping styles within Astro components. Choose from:
      *   - `'where'` - Use `:where` selectors, causing no specifity increase.
@@ -976,6 +976,7 @@ export interface AstroUserConfig {
          *		assets: true,
          * 	},
          * }
+         * ```
          */
         assets?: boolean;
         /**
@@ -984,8 +985,8 @@ export interface AstroUserConfig {
          * @type {('always' | 'auto' | 'never')}
          * @default `never`
          * @description
-         * Control whether styles are sent to the browser in a separate css file or inlined into <style> tags. Choose from the following options:
-         *  - `'always'` - all styles are inlined into <style> tags
+         * Control whether styles are sent to the browser in a separate css file or inlined into `<style>` tags. Choose from the following options:
+         *  - `'always'` - all styles are inlined into `<style>` tags
          *  - `'auto'` - only stylesheets smaller than `ViteConfig.build.assetsInlineLimit` (default: 4kb) are inlined. Otherwise, styles are sent in external stylesheets.
          *  - `'never'` - all styles are sent in external stylesheets
          *
@@ -995,6 +996,7 @@ export interface AstroUserConfig {
          *		inlineStylesheets: `auto`,
          * 	},
          * }
+         * ```
          */
         inlineStylesheets?: 'always' | 'auto' | 'never';
         /**
@@ -1014,6 +1016,7 @@ export interface AstroUserConfig {
          *		middleware: true,
          * 	},
          * }
+         * ```
          */
         middleware?: boolean;
     };

package/dist/assets/index.d.ts

@@ -1,8 +1,5 @@
-import type { ImageServiceConfig } from '../@types/astro.js';
 export { getConfiguredImageService, getImage } from './internal.js';
 export { baseService, isLocalService } from './services/service.js';
 export { type LocalImageProps, type RemoteImageProps } from './types.js';
 export { emitESMImage } from './utils/emitAsset.js';
 export { imageMetadata } from './utils/metadata.js';
-export declare function sharpImageService(): ImageServiceConfig;
-export declare function squooshImageService(): ImageServiceConfig;

package/dist/assets/index.js

@@ -3,25 +3,11 @@ import { baseService, isLocalService } from "./services/service.js";
 import {} from "./types.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { imageMetadata } from "./utils/metadata.js";
-function sharpImageService() {
-  return {
-    entrypoint: "astro/assets/services/sharp",
-    config: {}
-  };
-}
-function squooshImageService() {
-  return {
-    entrypoint: "astro/assets/services/squoosh",
-    config: {}
-  };
-}
 export {
   baseService,
   emitESMImage,
   getConfiguredImageService,
   getImage,
   imageMetadata,
-  isLocalService,
-  sharpImageService,
-  squooshImageService
+  isLocalService
 };

package/dist/assets/internal.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import { basename, join } from "node:path/posix";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { warn } from "../core/logger/core.js";
 import { prependForwardSlash } from "../core/path.js";
 import { isLocalService } from "./services/service.js";
 function isESMImportedImage(src) {
@@ -60,9 +61,10 @@ async function generateImage(buildOpts, options, filepath) {
   try {
     await fs.promises.mkdir(assetsCacheDir, { recursive: true });
   } catch (err) {
-    console.error(
-      "An error was encountered while creating the cache directory. Proceeding without caching. Error: ",
-      err
+    warn(
+      buildOpts.logging,
+      "astro:assets",
+      `An error was encountered while creating the cache directory. Proceeding without caching. Error: ${err}`
     );
     useCache = false;
   }
@@ -105,9 +107,10 @@ async function generateImage(buildOpts, options, filepath) {
       await fs.promises.writeFile(cachedFileURL, resultData.data);
       await fs.promises.copyFile(cachedFileURL, finalFileURL);
     } catch (e) {
-      console.error(
-        `There was an error creating the cache entry for ${filepath}. Attempting to write directly to output directory. Error: `,
-        e
+      warn(
+        buildOpts.logging,
+        "astro:assets",
+        `An error was encountered while creating the cache directory. Proceeding without caching. Error: ${e}`
       );
       await fs.promises.writeFile(finalFileURL, resultData.data);
     }

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.4.0";
+  const currentVersion = "2.4.2";
   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.4.0";
+  const version = "2.4.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.4.0"}`
+        `v${"2.4.2"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/callMiddleware.js

@@ -5,9 +5,11 @@ async function callMiddleware(onRequest, apiContext, responseFunction) {
     resolveResolve = resolve;
   });
   let nextCalled = false;
+  let responseFunctionPromise = void 0;
   const next = async () => {
     nextCalled = true;
-    return await responseFunction();
+    responseFunctionPromise = responseFunction();
+    return responseFunctionPromise;
   };
   let middlewarePromise = onRequest(apiContext, next);
   return await Promise.resolve(middlewarePromise).then(async (value) => {
@@ -18,8 +20,11 @@ async function callMiddleware(onRequest, apiContext, responseFunction) {
         }
         return value;
       } else {
-        const responseResult = await responseFunction();
-        return responseResult;
+        if (responseFunctionPromise) {
+          return responseFunctionPromise;
+        } else {
+          throw new AstroError(AstroErrorData.MiddlewareNotAResponse);
+        }
       }
     } else if (typeof value === "undefined") {
       throw new AstroError(AstroErrorData.MiddlewareNoDataOrNextCalled);

package/package.json

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