Merge branch 'main' into feat/image-validate-options

.changeset/early-kangaroos-invent.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': patch
+---
+
+fix `config.base` trimming logic for cloudflare integration `_routes.json` generation

.changeset/empty-ravens-complain.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Support tsconfig aliases in styles

.changeset/forty-dodos-dress.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+don't finish the action of the copy before removing all files.

.changeset/gorgeous-beds-tickle.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix Invalid Input error when trying to use a custom Image Service

.changeset/perfect-humans-wink.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix image() type to be compatible with ImageMetadata

.changeset/shy-walls-divide.md

@@ -0,0 +1,6 @@
+---
+'astro': patch
+'@astrojs/markdown-remark': patch
+---
+
+Vendor `image-size` to fix CJS-related issues

.changeset/small-pens-knock.md

@@ -0,0 +1,6 @@
+---
+'@astrojs/markdoc': patch
+'@astrojs/mdx': patch
+---
+
+Fix integration return type

.changeset/yellow-grapes-design.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix prerendered 404 page handling in SSR

packages/astro-rss/README.md

@@ -116,18 +116,18 @@ When providing a formatted RSS item list, see the `RSSFeedItem` type reference b
 
 ```ts
 type RSSFeedItem = {
-	/** Link to item */
-	link: string;
-	/** Title of item */
-	title: string;
-	/** Publication date of item */
-	pubDate: Date;
-	/** Item description */
-	description?: string;
-	/** Full content of the item, should be valid HTML */
-	content?: string;
-	/** Append some other XML-valid data to this item */
-	customData?: string;
+  /** Link to item */
+  link: string;
+  /** Title of item */
+  title: string;
+  /** Publication date of item */
+  pubDate: Date;
+  /** Item description */
+  description?: string;
+  /** Full content of the item, should be valid HTML */
+  content?: string;
+  /** Append some other XML-valid data to this item */
+  customData?: string;
 };
 ```
 

packages/astro/package.json

@@ -94,9 +94,9 @@
   ],
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
-    "build": "pnpm run prebuild && astro-scripts build \"src/**/*.ts\" && tsc && pnpm run postbuild",
-    "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.ts\" && pnpm run postbuild",
-    "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.ts\"",
+    "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && tsc && pnpm run postbuild",
+    "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && pnpm run postbuild",
+    "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"",
     "test:unit": "mocha --exit --timeout 30000 ./test/units/**/*.test.js",
     "test:unit:match": "mocha --exit --timeout 30000 ./test/units/**/*.test.js -g",
@@ -136,7 +136,6 @@
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
     "html-escaper": "^3.0.3",
-    "image-size": "^1.0.2",
     "kleur": "^4.1.4",
     "magic-string": "^0.27.0",
     "mime": "^3.0.0",

packages/astro/src/assets/utils/metadata.ts

@@ -1,19 +1,16 @@
 import fs from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 import type { ImageMetadata, InputFormat } from '../types.js';
+import imageSize from '../vendor/image-size/index.js';
 
 export interface Metadata extends ImageMetadata {
 	orientation?: number;
 }
 
-let sizeOf: typeof import('image-size').default | undefined;
 export async function imageMetadata(
 	src: URL | string,
 	data?: Buffer
 ): Promise<Metadata | undefined> {
-	if (!sizeOf) {
-		sizeOf = await import('image-size').then((mod) => mod.default);
-	}
 	let file = data;
 	if (!file) {
 		try {
@@ -23,7 +20,7 @@ export async function imageMetadata(
 		}
 	}
 
-	const { width, height, type, orientation } = await sizeOf!(file);
+	const { width, height, type, orientation } = imageSize(file);
 	const isPortrait = (orientation || 0) >= 5;
 
 	if (!width || !height || !type) {

packages/astro/src/assets/vendor/README.md

@@ -0,0 +1,3 @@
+Vendored version of `image-size` and `queue` because we had issues with the CJS nature of those packages.
+
+Should hopefully be fixed by https://github.com/image-size/image-size/pull/370

packages/astro/src/assets/vendor/image-size/LICENSE

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright © 2017 Aditya Yadav, http://netroy.in
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/astro/src/assets/vendor/image-size/detector.ts

@@ -0,0 +1,30 @@
+import { imageType, typeHandlers } from './types.js'
+
+const keys = Object.keys(typeHandlers) as imageType[]
+
+// This map helps avoid validating for every single image type
+const firstBytes: { [byte: number]: imageType } = {
+  0x38: 'psd',
+  0x42: 'bmp',
+  0x44: 'dds',
+  0x47: 'gif',
+  0x49: 'tiff',
+  0x4d: 'tiff',
+  0x52: 'webp',
+  0x69: 'icns',
+  0x89: 'png',
+  0xff: 'jpg'
+}
+
+export function detector(buffer: Buffer): imageType | undefined {
+  const byte = buffer[0]
+  if (byte in firstBytes) {
+    const type = firstBytes[byte]
+    if (type && typeHandlers[type].validate(buffer)) {
+      return type
+    }
+  }
+
+  const finder = (key: imageType) => typeHandlers[key].validate(buffer)
+  return keys.find(finder)
+}

packages/astro/src/assets/vendor/image-size/index.ts

@@ -0,0 +1,146 @@
+import * as fs from "fs";
+import * as path from "path";
+import Queue from "../queue/queue.js";
+import { detector } from "./detector.js";
+import { imageType, typeHandlers } from "./types.js";
+import type { ISizeCalculationResult } from "./types/interface.js";
+
+type CallbackFn = (e: Error | null, r?: ISizeCalculationResult) => void;
+
+// Maximum buffer size, with a default of 512 kilobytes.
+// TO-DO: make this adaptive based on the initial signature of the image
+const MaxBufferSize = 512 * 1024;
+
+// This queue is for async `fs` operations, to avoid reaching file-descriptor limits
+const queue = new Queue({ concurrency: 100, autostart: true });
+
+interface Options {
+  disabledFS: boolean;
+  disabledTypes: imageType[];
+}
+
+const globalOptions: Options = {
+  disabledFS: false,
+  disabledTypes: [],
+};
+
+/**
+ * Return size information based on a buffer
+ *
+ * @param {Buffer} buffer
+ * @param {String} filepath
+ * @returns {Object}
+ */
+function lookup(buffer: Buffer, filepath?: string): ISizeCalculationResult {
+  // detect the file type.. don't rely on the extension
+  const type = detector(buffer);
+
+  if (typeof type !== "undefined") {
+    if (globalOptions.disabledTypes.indexOf(type) > -1) {
+      throw new TypeError("disabled file type: " + type);
+    }
+
+    // find an appropriate handler for this file type
+    if (type in typeHandlers) {
+      const size = typeHandlers[type].calculate(buffer, filepath);
+      if (size !== undefined) {
+        size.type = type;
+        return size;
+      }
+    }
+  }
+
+  // throw up, if we don't understand the file
+  throw new TypeError(
+    "unsupported file type: " + type + " (file: " + filepath + ")"
+  );
+}
+
+/**
+ * Reads a file into a buffer.
+ * @param {String} filepath
+ * @returns {Promise<Buffer>}
+ */
+async function asyncFileToBuffer(filepath: string): Promise<Buffer> {
+  const handle = await fs.promises.open(filepath, "r");
+  const { size } = await handle.stat();
+  if (size <= 0) {
+    await handle.close();
+    throw new Error("Empty file");
+  }
+  const bufferSize = Math.min(size, MaxBufferSize);
+  const buffer = Buffer.alloc(bufferSize);
+  await handle.read(buffer, 0, bufferSize, 0);
+  await handle.close();
+  return buffer;
+}
+
+/**
+ * Synchronously reads a file into a buffer, blocking the nodejs process.
+ *
+ * @param {String} filepath
+ * @returns {Buffer}
+ */
+function syncFileToBuffer(filepath: string): Buffer {
+  // read from the file, synchronously
+  const descriptor = fs.openSync(filepath, "r");
+  const { size } = fs.fstatSync(descriptor);
+  if (size <= 0) {
+    fs.closeSync(descriptor);
+    throw new Error("Empty file");
+  }
+  const bufferSize = Math.min(size, MaxBufferSize);
+  const buffer = Buffer.alloc(bufferSize);
+  fs.readSync(descriptor, buffer, 0, bufferSize, 0);
+  fs.closeSync(descriptor);
+  return buffer;
+}
+
+export default imageSize;
+export function imageSize(input: Buffer | string): ISizeCalculationResult;
+export function imageSize(input: string, callback: CallbackFn): void;
+
+/**
+ * @param {Buffer|string} input - buffer or relative/absolute path of the image file
+ * @param {Function=} [callback] - optional function for async detection
+ */
+export function imageSize(
+  input: Buffer | string,
+  callback?: CallbackFn
+): ISizeCalculationResult | void {
+  // Handle buffer input
+  if (Buffer.isBuffer(input)) {
+    return lookup(input);
+  }
+
+  // input should be a string at this point
+  if (typeof input !== "string" || globalOptions.disabledFS) {
+    throw new TypeError("invalid invocation. input should be a Buffer");
+  }
+
+  // resolve the file path
+  const filepath = path.resolve(input);
+  if (typeof callback === "function") {
+    queue.push(() =>
+      asyncFileToBuffer(filepath)
+        .then((buffer) =>
+          process.nextTick(callback, null, lookup(buffer, filepath))
+        )
+        .catch(callback)
+    );
+  } else {
+    const buffer = syncFileToBuffer(filepath);
+    return lookup(buffer, filepath);
+  }
+}
+
+export const disableFS = (v: boolean): void => {
+  globalOptions.disabledFS = v;
+};
+export const disableTypes = (types: imageType[]): void => {
+  globalOptions.disabledTypes = types;
+};
+export const setConcurrency = (c: number): void => {
+  queue.concurrency = c;
+};
+export const types = Object.keys(typeHandlers);

packages/astro/src/assets/vendor/image-size/readUInt.ts

@@ -0,0 +1,10 @@
+type Bits = 16 | 32
+type MethodName = 'readUInt16BE' | 'readUInt16LE' | 'readUInt32BE' | 'readUInt32LE'
+
+// Abstract reading multi-byte unsigned integers
+export function readUInt(buffer: Buffer, bits: Bits, offset: number, isBigEndian: boolean): number {
+  offset = offset || 0
+  const endian = isBigEndian ? 'BE' : 'LE'
+  const methodName: MethodName = ('readUInt' + bits + endian) as MethodName
+  return buffer[methodName].call(buffer, offset)
+}

packages/astro/src/assets/vendor/image-size/types.ts

@@ -0,0 +1,38 @@
+// load all available handlers explicitely for browserify support
+import { BMP } from './types/bmp.js'
+import { CUR } from './types/cur.js'
+import { DDS } from './types/dds.js'
+import { GIF } from './types/gif.js'
+import { ICNS } from './types/icns.js'
+import { ICO } from './types/ico.js'
+import { J2C } from './types/j2c.js'
+import { JP2 } from './types/jp2.js'
+import { JPG } from './types/jpg.js'
+import { KTX } from './types/ktx.js'
+import { PNG } from './types/png.js'
+import { PNM } from './types/pnm.js'
+import { PSD } from './types/psd.js'
+import { SVG } from './types/svg.js'
+import { TIFF } from './types/tiff.js'
+import { WEBP } from './types/webp.js'
+
+export const typeHandlers = {
+  bmp: BMP,
+  cur: CUR,
+  dds: DDS,
+  gif: GIF,
+  icns: ICNS,
+  ico: ICO,
+  j2c: J2C,
+  jp2: JP2,
+  jpg: JPG,
+  ktx: KTX,
+  png: PNG,
+  pnm: PNM,
+  psd: PSD,
+  svg: SVG,
+  tiff: TIFF,
+  webp: WEBP,
+}
+
+export type imageType = keyof typeof typeHandlers

packages/astro/src/assets/vendor/image-size/types/bmp.ts

@@ -0,0 +1,14 @@
+import type { IImage } from './interface'
+
+export const BMP: IImage = {
+  validate(buffer) {
+    return ('BM' === buffer.toString('ascii', 0, 2))
+  },
+
+  calculate(buffer) {
+    return {
+      height: Math.abs(buffer.readInt32LE(22)),
+      width: buffer.readUInt32LE(18)
+    }
+  }
+}