astro 3.0.12 → 3.1.0

package/dist/vite-plugin-astro-server/response.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import type http from 'node:http';
 import type { ErrorWithMetadata } from '../core/errors/index.js';
-import type { ModuleLoader } from '../core/module-loader/index';
+import type { ModuleLoader } from '../core/module-loader/index.js';
 export declare function handle404Response(origin: string, req: http.IncomingMessage, res: http.ServerResponse): Promise<void>;
 export declare function handle500Response(loader: ModuleLoader, res: http.ServerResponse, err: ErrorWithMetadata): Promise<void>;
 export declare function writeHtmlResponse(res: http.ServerResponse, statusCode: number, html: string): void;

package/dist/vite-plugin-astro-server/route.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import type http from 'node:http';
-import type { ComponentInstance, ManifestData, RouteData, SSRManifest } from '../@types/astro';
+import type { ComponentInstance, ManifestData, RouteData, SSRManifest } from '../@types/astro.js';
 import type DevPipeline from './devPipeline.js';
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (...args: any) => Promise<infer R> ? R : any;
 export interface MatchedRoute {

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

@@ -241,7 +241,6 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
     });
     styles.add({
       props: {
-        type: "text/css",
         // Track the ID so we can match it to Vite's injected style later
         "data-astro-dev-id": viteID(new URL(`.${url}`, settings.config.root))
       },

package/dist/vite-plugin-astro-server/scripts.d.ts

@@ -1,3 +1,3 @@
-import type { SSRElement } from '../@types/astro';
-import type { ModuleLoader } from '../core/module-loader';
+import type { SSRElement } from '../@types/astro.js';
+import type { ModuleLoader } from '../core/module-loader/index.js';
 export declare function getScriptsForURL(filePath: URL, root: URL, loader: ModuleLoader): Promise<Set<SSRElement>>;

package/dist/vite-plugin-astro-server/vite.d.ts

@@ -1,3 +1,3 @@
-import type { ModuleLoader, ModuleNode } from '../core/module-loader/index';
+import type { ModuleLoader, ModuleNode } from '../core/module-loader/index.js';
 /** recursively crawl the module graph to get all style files imported by parent id */
 export declare function crawlGraph(loader: ModuleLoader, _id: string, isRootFile: boolean, scanned?: Set<string>): AsyncGenerator<ModuleNode, void, unknown>;

package/dist/vite-plugin-config-alias/index.d.ts

@@ -1,5 +1,5 @@
 import { type Plugin as VitePlugin } from 'vite';
-import type { AstroSettings } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro.js';
 /** Returns a Vite plugin used to alias paths from tsconfig.json and jsconfig.json. */
 export default function configAliasVitePlugin({ settings, }: {
     settings: AstroSettings;

package/dist/vite-plugin-env/index.d.ts

@@ -1,5 +1,5 @@
 import type * as vite from 'vite';
-import type { AstroSettings } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro.js';
 interface EnvPluginOptions {
     settings: AstroSettings;
 }

package/dist/vite-plugin-inject-env-ts/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import type fsMod from 'node:fs';
 import { type Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';

package/dist/vite-plugin-load-fallback/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import nodeFs from 'node:fs';
 import type * as vite from 'vite';
 type NodeFileSystemModule = typeof nodeFs;

package/dist/vite-plugin-markdown/index.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'vite';
-import type { AstroSettings } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
 interface AstroPluginOptions {
     settings: AstroSettings;

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

@@ -1,8 +1,7 @@
-import { renderMarkdown } from "@astrojs/markdown-remark";
 import {
-  InvalidAstroDataError,
-  safelyGetAstroData
-} from "@astrojs/markdown-remark/dist/internal.js";
+  createMarkdownProcessor,
+  InvalidAstroDataError
+} from "@astrojs/markdown-remark";
 import matter from "gray-matter";
 import fs from "node:fs";
 import path from "node:path";
@@ -41,9 +40,13 @@ const astroErrorModulePath = normalizePath(
   fileURLToPath(new URL("../core/errors/index.js", import.meta.url))
 );
 function markdown({ settings, logger }) {
+  let processor;
   return {
     enforce: "pre",
     name: "astro:markdown",
+    async buildStart() {
+      processor = await createMarkdownProcessor(settings.config.markdown);
+    },
     // Why not the "transform" hook instead of "load" + readFile?
     // A: Vite transforms all "import.meta.env" references to their values before
     // passing to the transform hook. This lets us get the truly raw value
@@ -53,27 +56,24 @@ function markdown({ settings, logger }) {
         const { fileId, fileUrl } = getFileInfo(id, settings.config);
         const rawFile = await fs.promises.readFile(fileId, "utf-8");
         const raw = safeMatter(rawFile, id);
-        const renderResult = await renderMarkdown(raw.content, {
-          ...settings.config.markdown,
+        const renderResult = await processor.render(raw.content, {
           fileURL: new URL(`file://${fileId}`),
           frontmatter: raw.data
+        }).catch((err) => {
+          if (err instanceof InvalidAstroDataError) {
+            throw new AstroError(AstroErrorData.InvalidFrontmatterInjectionError);
+          }
+          throw err;
         });
         let html = renderResult.code;
-        const { headings } = renderResult.metadata;
-        let imagePaths = [];
-        if (renderResult.vfile.data.imagePaths) {
-          for (let imagePath of renderResult.vfile.data.imagePaths.values()) {
-            imagePaths.push({
-              raw: imagePath,
-              resolved: (await this.resolve(imagePath, id))?.id ?? path.join(path.dirname(id), imagePath)
-            });
-          }
-        }
-        const astroData = safelyGetAstroData(renderResult.vfile.data);
-        if (astroData instanceof InvalidAstroDataError) {
-          throw new AstroError(AstroErrorData.InvalidFrontmatterInjectionError);
+        const { headings, imagePaths: rawImagePaths, frontmatter } = renderResult.metadata;
+        const imagePaths = [];
+        for (const imagePath of rawImagePaths.values()) {
+          imagePaths.push({
+            raw: imagePath,
+            resolved: (await this.resolve(imagePath, id))?.id ?? path.join(path.dirname(id), imagePath)
+          });
         }
-        const { frontmatter } = astroData;
         const { layout } = frontmatter;
         if (frontmatter.setup) {
           logger.warn(

package/dist/vite-plugin-mdx/index.d.ts

@@ -1,5 +1,5 @@
 import { type Plugin } from 'vite';
-import type { AstroSettings } from '../@types/astro';
+import type { AstroSettings } from '../@types/astro.js';
 import type { Logger } from '../core/logger/core.js';
 interface AstroPluginJSXOptions {
     settings: AstroSettings;

package/dist/vite-plugin-utils/index.d.ts

@@ -1,4 +1,4 @@
-import type { AstroConfig } from '../@types/astro';
+import type { AstroConfig } from '../@types/astro.js';
 /**
  * Converts the first dot in `import.meta.env` to its Unicode escape sequence,
  * which prevents Vite from replacing strings like `import.meta.env.SITE`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.12",
+  "version": "3.1.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -141,6 +141,7 @@
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.2.1",
     "preferred-pm": "^3.1.2",
+    "probe-image-size": "^7.2.3",
     "prompts": "^2.4.2",
     "rehype": "^12.0.1",
     "resolve": "^1.22.4",
@@ -159,7 +160,7 @@
     "yargs-parser": "^21.1.1",
     "zod": "3.21.1",
     "@astrojs/internal-helpers": "0.2.0",
-    "@astrojs/markdown-remark": "3.1.0",
+    "@astrojs/markdown-remark": "3.2.0",
     "@astrojs/telemetry": "3.0.1"
   },
   "optionalDependencies": {
@@ -184,6 +185,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/mime": "^3.0.1",
     "@types/mocha": "^10.0.1",
+    "@types/probe-image-size": "^7.2.0",
     "@types/prompts": "^2.4.4",
     "@types/resolve": "^1.20.2",
     "@types/send": "^0.17.1",

package/types.d.ts

@@ -1,5 +1,5 @@
 import './astro-jsx';
-import { AstroBuiltinAttributes } from './dist/@types/astro';
+import { AstroBuiltinAttributes } from './dist/@types/astro.js';
 
 /** Any supported HTML or SVG element name, as defined by the HTML specification */
 export type HTMLTag = keyof astroHTML.JSX.DefinedIntrinsicElements;
@@ -9,6 +9,11 @@ export type HTMLAttributes<Tag extends HTMLTag> = Omit<
 	keyof Omit<AstroBuiltinAttributes, 'class:list'>
 >;
 
+/**
+ * All the CSS properties available, as defined by the CSS specification
+ */
+export type CSSProperty = keyof astroHTML.JSX.KebabCSSDOMProperties;
+
 type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<P & HTMLAttributes<P['as']>, 'as'> & {
 	as?: P['as'];
 };

package/dist/assets/vendor/image-size/detector.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="node" />
-import { type imageType } from './types.js';
-export declare function detector(buffer: Buffer): imageType | undefined;

package/dist/assets/vendor/image-size/detector.js

@@ -1,28 +0,0 @@
-import { typeHandlers } from "./types.js";
-const keys = Object.keys(typeHandlers);
-const firstBytes = {
-  56: "psd",
-  66: "bmp",
-  68: "dds",
-  71: "gif",
-  73: "tiff",
-  77: "tiff",
-  82: "webp",
-  105: "icns",
-  137: "png",
-  255: "jpg"
-};
-function detector(buffer) {
-  const byte = buffer[0];
-  if (byte in firstBytes) {
-    const type = firstBytes[byte];
-    if (type && typeHandlers[type].validate(buffer)) {
-      return type;
-    }
-  }
-  const finder = (key) => typeHandlers[key].validate(buffer);
-  return keys.find(finder);
-}
-export {
-  detector
-};

package/dist/assets/vendor/image-size/index.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="node" />
-import { type imageType } from "./types.js";
-import type { ISizeCalculationResult } from "./types/interface.js";
-type CallbackFn = (e: Error | null, r?: ISizeCalculationResult) => void;
-export default imageSize;
-export declare function imageSize(input: Buffer | string): ISizeCalculationResult;
-export declare function imageSize(input: string, callback: CallbackFn): void;
-export declare const disableFS: (v: boolean) => void;
-export declare const disableTypes: (types: imageType[]) => void;
-export declare const setConcurrency: (c: number) => void;
-export declare const types: string[];

package/dist/assets/vendor/image-size/index.js

@@ -1,93 +0,0 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import Queue from "../queue/queue.js";
-import { detector } from "./detector.js";
-import { typeHandlers } from "./types.js";
-const MaxBufferSize = 512 * 1024;
-const queue = new Queue({ concurrency: 100, autostart: true });
-const globalOptions = {
-  disabledFS: false,
-  disabledTypes: []
-};
-function lookup(buffer, filepath) {
-  const type = detector(buffer);
-  if (typeof type !== "undefined") {
-    if (globalOptions.disabledTypes.indexOf(type) > -1) {
-      throw new TypeError("disabled file type: " + type);
-    }
-    if (type in typeHandlers) {
-      const size = typeHandlers[type].calculate(buffer, filepath);
-      if (size !== void 0) {
-        size.type = type;
-        return size;
-      }
-    }
-  }
-  throw new TypeError(
-    "unsupported file type: " + type + " (file: " + filepath + ")"
-  );
-}
-async function asyncFileToBuffer(filepath) {
-  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;
-}
-function syncFileToBuffer(filepath) {
-  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;
-}
-var image_size_default = imageSize;
-function imageSize(input, callback) {
-  if (Buffer.isBuffer(input)) {
-    return lookup(input);
-  }
-  if (typeof input !== "string" || globalOptions.disabledFS) {
-    throw new TypeError("invalid invocation. input should be a Buffer");
-  }
-  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);
-  }
-}
-const disableFS = (v) => {
-  globalOptions.disabledFS = v;
-};
-const disableTypes = (types2) => {
-  globalOptions.disabledTypes = types2;
-};
-const setConcurrency = (c) => {
-  queue.concurrency = c;
-};
-const types = Object.keys(typeHandlers);
-export {
-  image_size_default as default,
-  disableFS,
-  disableTypes,
-  imageSize,
-  setConcurrency,
-  types
-};

package/dist/assets/vendor/image-size/readUInt.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-type Bits = 16 | 32;
-export declare function readUInt(buffer: Buffer, bits: Bits, offset: number, isBigEndian: boolean): number;
-export {};

package/dist/assets/vendor/image-size/readUInt.js

@@ -1,9 +0,0 @@
-function readUInt(buffer, bits, offset, isBigEndian) {
-  offset = offset || 0;
-  const endian = isBigEndian ? "BE" : "LE";
-  const methodName = "readUInt" + bits + endian;
-  return buffer[methodName].call(buffer, offset);
-}
-export {
-  readUInt
-};

package/dist/assets/vendor/image-size/types/bmp.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const BMP: IImage;

package/dist/assets/vendor/image-size/types/bmp.js

@@ -1,14 +0,0 @@
-const BMP = {
-  validate(buffer) {
-    return "BM" === buffer.toString("ascii", 0, 2);
-  },
-  calculate(buffer) {
-    return {
-      height: Math.abs(buffer.readInt32LE(22)),
-      width: buffer.readUInt32LE(18)
-    };
-  }
-};
-export {
-  BMP
-};

package/dist/assets/vendor/image-size/types/cur.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const CUR: IImage;

package/dist/assets/vendor/image-size/types/cur.js

@@ -1,16 +0,0 @@
-import { ICO } from "./ico.js";
-const TYPE_CURSOR = 2;
-const CUR = {
-  validate(buffer) {
-    if (buffer.readUInt16LE(0) !== 0) {
-      return false;
-    }
-    return buffer.readUInt16LE(2) === TYPE_CURSOR;
-  },
-  calculate(buffer) {
-    return ICO.calculate(buffer);
-  }
-};
-export {
-  CUR
-};

package/dist/assets/vendor/image-size/types/dds.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const DDS: IImage;

package/dist/assets/vendor/image-size/types/dds.js

@@ -1,14 +0,0 @@
-const DDS = {
-  validate(buffer) {
-    return buffer.readUInt32LE(0) === 542327876;
-  },
-  calculate(buffer) {
-    return {
-      height: buffer.readUInt32LE(12),
-      width: buffer.readUInt32LE(16)
-    };
-  }
-};
-export {
-  DDS
-};

package/dist/assets/vendor/image-size/types/gif.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const GIF: IImage;

package/dist/assets/vendor/image-size/types/gif.js

@@ -1,16 +0,0 @@
-const gifRegexp = /^GIF8[79]a/;
-const GIF = {
-  validate(buffer) {
-    const signature = buffer.toString("ascii", 0, 6);
-    return gifRegexp.test(signature);
-  },
-  calculate(buffer) {
-    return {
-      height: buffer.readUInt16LE(8),
-      width: buffer.readUInt16LE(6)
-    };
-  }
-};
-export {
-  GIF
-};

package/dist/assets/vendor/image-size/types/icns.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const ICNS: IImage;

package/dist/assets/vendor/image-size/types/icns.js

@@ -1,87 +0,0 @@
-const SIZE_HEADER = 4 + 4;
-const FILE_LENGTH_OFFSET = 4;
-const ENTRY_LENGTH_OFFSET = 4;
-const ICON_TYPE_SIZE = {
-  ICON: 32,
-  "ICN#": 32,
-  // m => 16 x 16
-  "icm#": 16,
-  icm4: 16,
-  icm8: 16,
-  // s => 16 x 16
-  "ics#": 16,
-  ics4: 16,
-  ics8: 16,
-  is32: 16,
-  s8mk: 16,
-  icp4: 16,
-  // l => 32 x 32
-  icl4: 32,
-  icl8: 32,
-  il32: 32,
-  l8mk: 32,
-  icp5: 32,
-  ic11: 32,
-  // h => 48 x 48
-  ich4: 48,
-  ich8: 48,
-  ih32: 48,
-  h8mk: 48,
-  // . => 64 x 64
-  icp6: 64,
-  ic12: 32,
-  // t => 128 x 128
-  it32: 128,
-  t8mk: 128,
-  ic07: 128,
-  // . => 256 x 256
-  ic08: 256,
-  ic13: 256,
-  // . => 512 x 512
-  ic09: 512,
-  ic14: 512,
-  // . => 1024 x 1024
-  ic10: 1024
-};
-function readImageHeader(buffer, imageOffset) {
-  const imageLengthOffset = imageOffset + ENTRY_LENGTH_OFFSET;
-  return [
-    buffer.toString("ascii", imageOffset, imageLengthOffset),
-    buffer.readUInt32BE(imageLengthOffset)
-  ];
-}
-function getImageSize(type) {
-  const size = ICON_TYPE_SIZE[type];
-  return { width: size, height: size, type };
-}
-const ICNS = {
-  validate(buffer) {
-    return "icns" === buffer.toString("ascii", 0, 4);
-  },
-  calculate(buffer) {
-    const bufferLength = buffer.length;
-    const fileLength = buffer.readUInt32BE(FILE_LENGTH_OFFSET);
-    let imageOffset = SIZE_HEADER;
-    let imageHeader = readImageHeader(buffer, imageOffset);
-    let imageSize = getImageSize(imageHeader[0]);
-    imageOffset += imageHeader[1];
-    if (imageOffset === fileLength) {
-      return imageSize;
-    }
-    const result = {
-      height: imageSize.height,
-      images: [imageSize],
-      width: imageSize.width
-    };
-    while (imageOffset < fileLength && imageOffset < bufferLength) {
-      imageHeader = readImageHeader(buffer, imageOffset);
-      imageSize = getImageSize(imageHeader[0]);
-      imageOffset += imageHeader[1];
-      result.images.push(imageSize);
-    }
-    return result;
-  }
-};
-export {
-  ICNS
-};

package/dist/assets/vendor/image-size/types/ico.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const ICO: IImage;

package/dist/assets/vendor/image-size/types/ico.js

@@ -1,42 +0,0 @@
-const TYPE_ICON = 1;
-const SIZE_HEADER = 2 + 2 + 2;
-const SIZE_IMAGE_ENTRY = 1 + 1 + 1 + 1 + 2 + 2 + 4 + 4;
-function getSizeFromOffset(buffer, offset) {
-  const value = buffer.readUInt8(offset);
-  return value === 0 ? 256 : value;
-}
-function getImageSize(buffer, imageIndex) {
-  const offset = SIZE_HEADER + imageIndex * SIZE_IMAGE_ENTRY;
-  return {
-    height: getSizeFromOffset(buffer, offset + 1),
-    width: getSizeFromOffset(buffer, offset)
-  };
-}
-const ICO = {
-  validate(buffer) {
-    if (buffer.readUInt16LE(0) !== 0) {
-      return false;
-    }
-    return buffer.readUInt16LE(2) === TYPE_ICON;
-  },
-  calculate(buffer) {
-    const nbImages = buffer.readUInt16LE(4);
-    const imageSize = getImageSize(buffer, 0);
-    if (nbImages === 1) {
-      return imageSize;
-    }
-    const imgs = [imageSize];
-    for (let imageIndex = 1; imageIndex < nbImages; imageIndex += 1) {
-      imgs.push(getImageSize(buffer, imageIndex));
-    }
-    const result = {
-      height: imageSize.height,
-      images: imgs,
-      width: imageSize.width
-    };
-    return result;
-  }
-};
-export {
-  ICO
-};

package/dist/assets/vendor/image-size/types/interface.d.ts

@@ -1,14 +0,0 @@
-/// <reference types="node" />
-export interface ISize {
-    width: number | undefined;
-    height: number | undefined;
-    orientation?: number;
-    type?: string;
-}
-export interface ISizeCalculationResult extends ISize {
-    images?: ISize[];
-}
-export interface IImage {
-    validate: (buffer: Buffer) => boolean;
-    calculate: (buffer: Buffer, filepath?: string) => ISizeCalculationResult;
-}

package/dist/assets/vendor/image-size/types/j2c.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const J2C: IImage;

package/dist/assets/vendor/image-size/types/j2c.js

@@ -1,14 +0,0 @@
-const J2C = {
-  validate(buffer) {
-    return buffer.toString("hex", 0, 4) === "ff4fff51";
-  },
-  calculate(buffer) {
-    return {
-      height: buffer.readUInt32BE(12),
-      width: buffer.readUInt32BE(8)
-    };
-  }
-};
-export {
-  J2C
-};

package/dist/assets/vendor/image-size/types/jp2.d.ts

@@ -1,2 +0,0 @@
-import type { IImage } from './interface';
-export declare const JP2: IImage;