astro 2.2.0 → 2.2.2

package/client-base.d.ts

@@ -178,6 +178,10 @@ declare module '*.module.pcss' {
 	const classes: CSSModuleClasses;
 	export default classes;
 }
+declare module '*.module.sss' {
+	const classes: CSSModuleClasses;
+	export default classes;
+}
 
 // CSS
 declare module '*.css' {
@@ -208,9 +212,31 @@ declare module '*.pcss' {
 	const css: string;
 	export default css;
 }
+declare module '*.sss' {
+	const css: string;
+	export default css;
+}
 
 // Built-in asset types
-// see `src/constants.ts`
+// see `src/node/constants.ts`
+
+// images
+declare module '*.jfif' {
+	const src: string;
+	export default src;
+}
+declare module '*.pjpeg' {
+	const src: string;
+	export default src;
+}
+declare module '*.pjp' {
+	const src: string;
+	export default src;
+}
+declare module '*.ico' {
+	const src: string;
+	export default src;
+}
 
 // media
 declare module '*.mp4' {
@@ -242,6 +268,11 @@ declare module '*.aac' {
 	export default src;
 }
 
+declare module '*.opus' {
+	const src: string;
+	export default src;
+}
+
 // fonts
 declare module '*.woff' {
 	const src: string;
@@ -265,10 +296,6 @@ declare module '*.otf' {
 }
 
 // other
-declare module '*.wasm' {
-	const initWasm: (options: WebAssembly.Imports) => Promise<WebAssembly.Exports>;
-	export default initWasm;
-}
 declare module '*.webmanifest' {
 	const src: string;
 	export default src;
@@ -282,6 +309,12 @@ declare module '*.txt' {
 	export default src;
 }
 
+// wasm?init
+declare module '*.wasm?init' {
+	const initWasm: (options: WebAssembly.Imports) => Promise<WebAssembly.Instance>;
+	export default initWasm;
+}
+
 // web worker
 declare module '*?worker' {
 	const workerConstructor: {
@@ -297,6 +330,11 @@ declare module '*?worker&inline' {
 	export default workerConstructor;
 }
 
+declare module '*?worker&url' {
+	const src: string;
+	export default src;
+}
+
 declare module '*?sharedworker' {
 	const sharedWorkerConstructor: {
 		new (): SharedWorker;
@@ -304,6 +342,18 @@ declare module '*?sharedworker' {
 	export default sharedWorkerConstructor;
 }
 
+declare module '*?sharedworker&inline' {
+	const sharedWorkerConstructor: {
+		new (): SharedWorker;
+	};
+	export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&url' {
+	const src: string;
+	export default src;
+}
+
 declare module '*?raw' {
 	const src: string;
 	export default src;

package/dist/cli/check/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { AstroCheck } from '@astrojs/language-server';
-import fsMod from 'fs';
+import fs from 'fs';
 import type { Arguments as Flags } from 'yargs-parser';
 import type { AstroSettings } from '../../@types/astro';
 import type { LogOptions } from '../../core/logger/core.js';
@@ -53,7 +53,7 @@ type CheckerConstructor = {
     syncCli: (settings: AstroSettings, options: SyncOptions) => Promise<ProcessExit>;
     settings: Readonly<AstroSettings>;
     logging: Readonly<LogOptions>;
-    fileSystem: typeof fsMod;
+    fileSystem: typeof fs;
 };
 /**
  * Responsible to check files - classic or watch mode - and report diagnostics.

package/dist/cli/check/index.js

@@ -3,7 +3,7 @@ import {
   DiagnosticSeverity
 } from "@astrojs/language-server";
 import glob from "fast-glob";
-import * as fs from "fs";
+import fs from "fs";
 import { bold, dim, red, yellow } from "kleur/colors";
 import { createRequire } from "module";
 import { join } from "node:path";

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -16,6 +16,7 @@ import envVitePlugin from "../vite-plugin-env/index.js";
 import astroHeadPlugin from "../vite-plugin-head/index.js";
 import htmlVitePlugin from "../vite-plugin-html/index.js";
 import { astroInjectEnvTsPlugin } from "../vite-plugin-inject-env-ts/index.js";
+import astroIntegrationsContainerPlugin from "../vite-plugin-integrations-container/index.js";
 import jsxVitePlugin from "../vite-plugin-jsx/index.js";
 import astroLoadFallbackPlugin from "../vite-plugin-load-fallback/index.js";
 import markdownVitePlugin from "../vite-plugin-markdown/index.js";
@@ -93,6 +94,7 @@ async function createVite(commandConfig, { settings, logging, mode, command, fs
       htmlVitePlugin(),
       jsxVitePlugin({ settings, logging }),
       astroPostprocessVitePlugin({ settings }),
+      mode === "dev" && astroIntegrationsContainerPlugin({ settings, logging }),
       astroScriptsPageSSRPlugin({ settings }),
       astroHeadPlugin({ settings }),
       astroScannerPlugin({ settings }),

package/dist/core/dev/container.js

@@ -4,7 +4,6 @@ import {
   runHookConfigDone,
   runHookConfigSetup,
   runHookServerDone,
-  runHookServerSetup,
   runHookServerStart
 } from "../../integrations/index.js";
 import { createDefaultDevSettings, resolveRoot } from "../config/index.js";
@@ -48,7 +47,6 @@ async function createContainer(params = {}) {
   );
   await runHookConfigDone({ settings, logging });
   const viteServer = await vite.createServer(viteConfig);
-  runHookServerSetup({ config: settings.config, server: viteServer, logging });
   const container = {
     configFlag: params.configFlag,
     configFlagPath: params.configFlagPath,

package/dist/core/dev/dev.js

@@ -53,7 +53,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.2.0";
+  const currentVersion = "2.2.2";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/overlay.js

@@ -583,6 +583,7 @@ class ErrorOverlay extends HTMLElement {
     super();
     this.root = this.attachShadow({ mode: "open" });
     this.root.innerHTML = overlayTemplate;
+    this.dir = "ltr";
     const themeToggle = this.root.querySelector(".theme-toggle-checkbox");
     if (localStorage.astroErrorOverlayTheme === "dark" || !("astroErrorOverlayTheme" in localStorage) && window.matchMedia("(prefers-color-scheme: dark)").matches) {
       this == null ? void 0 : this.classList.add("astro-dark");

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.2.0";
+  const version = "2.2.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.2.0"}`
+        `v${"2.2.2"}`
       )} ${headline}`
     );
   }

package/dist/core/render/result.js

@@ -1,4 +1,7 @@
-import { renderSlot, stringifyChunk } from "../../runtime/server/index.js";
+import {
+  renderSlotToString,
+  stringifyChunk
+} from "../../runtime/server/index.js";
 import { renderJSX } from "../../runtime/server/jsx.js";
 import { AstroCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
@@ -67,7 +70,9 @@ class Slots {
       const expression = getFunctionExpression(component);
       if (expression) {
         const slot = () => expression(...args);
-        return await renderSlot(result, slot).then((res) => res != null ? String(res) : res);
+        return await renderSlotToString(result, slot).then(
+          (res) => res != null ? String(res) : res
+        );
       }
       if (typeof component === "function") {
         return await renderJSX(result, component(...args)).then(
@@ -75,7 +80,7 @@ class Slots {
         );
       }
     }
-    const content = await renderSlot(result, this.#slots[name]);
+    const content = await renderSlotToString(result, this.#slots[name]);
     const outHTML = stringifyChunk(result, content);
     return outHTML;
   }

package/dist/runtime/server/index.d.ts

@@ -3,7 +3,7 @@ export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
 export { renderJSX } from './jsx.js';
-export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderStyleElement, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
+export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderSlotToString, renderStyleElement, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, ComponentSlots, RenderInstruction, } from './render/index.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;
 /** @internal Associate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */

package/dist/runtime/server/index.js

@@ -18,6 +18,7 @@ import {
   renderPage,
   renderScriptElement,
   renderSlot,
+  renderSlotToString,
   renderStyleElement,
   renderTemplate,
   renderTemplate as renderTemplate2,
@@ -107,6 +108,7 @@ export {
   renderPage,
   renderScriptElement,
   renderSlot,
+  renderSlotToString,
   renderStyleElement,
   renderTemplate2 as renderTemplate,
   renderToString,

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

@@ -13,7 +13,7 @@ import {
 } from "./astro/index.js";
 import { Fragment, Renderer, stringifyChunk } from "./common.js";
 import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
-import { renderSlot, renderSlots } from "./slot.js";
+import { renderSlots, renderSlotToString } from "./slot.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
 const rendererAliases = /* @__PURE__ */ new Map([["solid", "solid-js"]]);
 function guessRenderers(componentUrl) {
@@ -166,7 +166,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     }
   } else {
     if (metadata.hydrate === "only") {
-      html = await renderSlot(result, slots == null ? void 0 : slots.fallback);
+      html = await renderSlotToString(result, slots == null ? void 0 : slots.fallback);
     } else {
       ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
         { result },
@@ -261,7 +261,7 @@ function sanitizeElementName(tag) {
   return tag.trim().split(unsafe)[0].trim();
 }
 async function renderFragmentComponent(result, slots = {}) {
-  const children = await renderSlot(result, slots == null ? void 0 : slots.default);
+  const children = await renderSlotToString(result, slots == null ? void 0 : slots.default);
   if (children == null) {
     return children;
   }

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

@@ -1,5 +1,5 @@
 import { markHTMLString } from "../escape.js";
-import { renderSlot } from "./slot.js";
+import { renderSlotToString } from "./slot.js";
 import { toAttributeString } from "./util.js";
 function componentIsHTMLElement(Component) {
   return typeof HTMLElement !== "undefined" && HTMLElement.isPrototypeOf(Component);
@@ -11,7 +11,7 @@ async function renderHTMLElement(result, constructor, props, slots) {
     attrHTML += ` ${attr}="${toAttributeString(await props[attr])}"`;
   }
   return markHTMLString(
-    `<${name}${attrHTML}>${await renderSlot(result, slots == null ? void 0 : slots.default)}</${name}>`
+    `<${name}${attrHTML}>${await renderSlotToString(result, slots == null ? void 0 : slots.default)}</${name}>`
   );
 }
 function getHTMLElementName(constructor) {

package/dist/runtime/server/render/index.d.ts

@@ -5,7 +5,7 @@ export { renderComponent, renderComponentToIterable } from './component.js';
 export { renderHTMLElement } from './dom.js';
 export { maybeRenderHead, renderHead } from './head.js';
 export { renderPage } from './page.js';
-export { renderSlot, type ComponentSlots } from './slot.js';
+export { renderSlot, renderSlotToString, type ComponentSlots } from './slot.js';
 export { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from './tags.js';
 export type { RenderInstruction } from './types';
 export { addAttribute, defineScriptVars, voidElementNames } from './util.js';

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

@@ -9,7 +9,7 @@ import { renderComponent, renderComponentToIterable } from "./component.js";
 import { renderHTMLElement } from "./dom.js";
 import { maybeRenderHead, renderHead } from "./head.js";
 import { renderPage } from "./page.js";
-import { renderSlot } from "./slot.js";
+import { renderSlot, renderSlotToString } from "./slot.js";
 import { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from "./tags.js";
 import { addAttribute, defineScriptVars, voidElementNames } from "./util.js";
 export {
@@ -27,6 +27,7 @@ export {
   renderPage,
   renderScriptElement,
   renderSlot,
+  renderSlotToString,
   renderStyleElement,
   renderTemplate,
   renderToString,

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

@@ -48,8 +48,9 @@ async function bufferHeadContent(result) {
   }
 }
 async function renderPage(result, componentFactory, props, children, streaming, route) {
-  var _a;
+  var _a, _b;
   if (!isAstroComponentFactory(componentFactory)) {
+    result._metadata.headInTree = ((_a = result.componentMetadata.get(componentFactory.moduleId)) == null ? void 0 : _a.containsHead) ?? false;
     const pageProps = { ...props ?? {}, "server:root": true };
     let output;
     let head = "";
@@ -91,7 +92,7 @@ async function renderPage(result, componentFactory, props, children, streaming,
       ])
     });
   }
-  result._metadata.headInTree = ((_a = result.componentMetadata.get(componentFactory.moduleId)) == null ? void 0 : _a.containsHead) ?? false;
+  result._metadata.headInTree = ((_b = result.componentMetadata.get(componentFactory.moduleId)) == null ? void 0 : _b.containsHead) ?? false;
   const factoryReturnValue = await componentFactory(result, props, children);
   const factoryIsHeadAndContent = isHeadAndContent(factoryReturnValue);
   if (isRenderTemplateResult(factoryReturnValue) || factoryIsHeadAndContent) {

package/dist/runtime/server/render/slot.d.ts

@@ -12,7 +12,8 @@ export declare class SlotString extends HTMLString {
     constructor(content: string, instructions: null | RenderInstruction[]);
 }
 export declare function isSlotString(str: string): str is any;
-export declare function renderSlot(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): Promise<string>;
+export declare function renderSlot(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): AsyncGenerator<any, void, undefined>;
+export declare function renderSlotToString(result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult): Promise<string>;
 interface RenderSlotsResult {
     slotInstructions: null | RenderInstruction[];
     children: Record<string, string>;

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

@@ -12,27 +12,30 @@ slotString;
 function isSlotString(str) {
   return !!str[slotString];
 }
-async function renderSlot(result, slotted, fallback) {
+async function* renderSlot(result, slotted, fallback) {
   if (slotted) {
     let iterator = renderChild(typeof slotted === "function" ? slotted(result) : slotted);
-    let content = "";
-    let instructions = null;
-    for await (const chunk of iterator) {
-      if (typeof chunk.type === "string") {
-        if (instructions === null) {
-          instructions = [];
-        }
-        instructions.push(chunk);
-      } else {
-        content += chunk;
-      }
-    }
-    return markHTMLString(new SlotString(content, instructions));
+    yield* iterator;
   }
   if (fallback) {
-    return renderSlot(result, fallback);
+    yield* renderSlot(result, fallback);
+  }
+}
+async function renderSlotToString(result, slotted, fallback) {
+  let content = "";
+  let instructions = null;
+  let iterator = renderSlot(result, slotted, fallback);
+  for await (const chunk of iterator) {
+    if (typeof chunk.type === "string") {
+      if (instructions === null) {
+        instructions = [];
+      }
+      instructions.push(chunk);
+    } else {
+      content += chunk;
+    }
   }
-  return "";
+  return markHTMLString(new SlotString(content, instructions));
 }
 async function renderSlots(result, slots = {}) {
   let slotInstructions = null;
@@ -40,7 +43,7 @@ async function renderSlots(result, slots = {}) {
   if (slots) {
     await Promise.all(
       Object.entries(slots).map(
-        ([key, value]) => renderSlot(result, value).then((output) => {
+        ([key, value]) => renderSlotToString(result, value).then((output) => {
           if (output.instructions) {
             if (slotInstructions === null) {
               slotInstructions = [];
@@ -58,5 +61,6 @@ export {
   SlotString,
   isSlotString,
   renderSlot,
+  renderSlotToString,
   renderSlots
 };

package/dist/vite-plugin-integrations-container/index.d.ts

@@ -0,0 +1,8 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { AstroSettings } from '../@types/astro.js';
+import type { LogOptions } from '../core/logger/core.js';
+/** Connect Astro integrations into Vite, as needed. */
+export default function astroIntegrationsContainerPlugin({ settings, logging, }: {
+    settings: AstroSettings;
+    logging: LogOptions;
+}): VitePlugin;

package/dist/vite-plugin-integrations-container/index.js

@@ -0,0 +1,15 @@
+import { runHookServerSetup } from "../integrations/index.js";
+function astroIntegrationsContainerPlugin({
+  settings,
+  logging
+}) {
+  return {
+    name: "astro:integration-container",
+    configureServer(server) {
+      runHookServerSetup({ config: settings.config, server, logging });
+    }
+  };
+}
+export {
+  astroIntegrationsContainerPlugin as default
+};

package/dist/vite-plugin-load-fallback/index.js

@@ -5,7 +5,7 @@ function loadFallbackPlugin({
   fs,
   root
 }) {
-  if (!fs || fs === nodeFs) {
+  if (!fs || fs === nodeFs || fs.default === nodeFs) {
     return false;
   }
   const tryLoadModule = async (id) => {
@@ -38,11 +38,6 @@ function loadFallbackPlugin({
           } catch {
           }
         }
-        let resolved = await this.resolve(id, parent, { skipSelf: true });
-        if (resolved) {
-          return resolved.id;
-        }
-        return slashify(id);
       },
       async load(id) {
         const source = await tryLoadModule(id);

package/dist/vite-plugin-scanner/scan.js

@@ -8,6 +8,21 @@ function includesExport(code) {
   }
   return false;
 }
+function isQuoted(value) {
+  return (value[0] === '"' || value[0] === "'") && value[value.length - 1] === value[0];
+}
+function isTruthy(value) {
+  if (isQuoted(value)) {
+    value = value.slice(1, -1);
+  }
+  return value === "true" || value === "1";
+}
+function isFalsy(value) {
+  if (isQuoted(value)) {
+    value = value.slice(1, -1);
+  }
+  return value === "false" || value === "0";
+}
 let didInit = false;
 async function scan(code, id) {
   if (!includesExport(code))
@@ -23,14 +38,14 @@ async function scan(code, id) {
     if (BOOLEAN_EXPORTS.has(name)) {
       const prefix = code.slice(0, endOfLocalName).split("export").pop().trim().replace("prerender", "").trim();
       const suffix = code.slice(endOfLocalName).trim().replace(/\=/, "").trim().split(/[;\n]/)[0];
-      if (prefix !== "const" || !(suffix === "true" || suffix === "false")) {
+      if (prefix !== "const" || !(isTruthy(suffix) || isFalsy(suffix))) {
         throw new AstroError({
           ...AstroErrorData.InvalidPrerenderExport,
           message: AstroErrorData.InvalidPrerenderExport.message(prefix, suffix),
           location: { file: id }
         });
       } else {
-        pageOptions[name] = suffix === "true";
+        pageOptions[name] = isTruthy(suffix);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -93,7 +93,7 @@
     "src/content/template"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.3.0",
+    "@astrojs/compiler": "^1.3.1",
     "@astrojs/language-server": "^0.28.3",
     "@astrojs/markdown-remark": "^2.1.3",
     "@astrojs/telemetry": "^2.1.0",

package/src/content/template/types.d.ts

@@ -33,7 +33,7 @@ declare module 'astro:content' {
 	export const image: never;
 
 	// This needs to be in sync with ImageMetadata
-	type ImageFunction = () => import('astro/zod').ZodObject<{
+	export type ImageFunction = () => import('astro/zod').ZodObject<{
 		src: import('astro/zod').ZodString;
 		width: import('astro/zod').ZodNumber;
 		height: import('astro/zod').ZodNumber;
@@ -63,15 +63,10 @@ declare module 'astro:content' {
 		| BaseSchemaWithoutEffects
 		| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;
 
+	export type SchemaContext = { image: ImageFunction };
+
 	type BaseCollectionConfig<S extends BaseSchema> = {
-		schema?: S | (({ image }: { image: ImageFunction }) => S);
-		slug?: (entry: {
-			id: CollectionEntry<keyof typeof entryMap>['id'];
-			defaultSlug: string;
-			collection: string;
-			body: string;
-			data: import('astro/zod').infer<S>;
-		}) => string | Promise<string>;
+		schema?: S | ((context: SchemaContext) => S);
 	};
 	export function defineCollection<S extends BaseSchema>(
 		input: BaseCollectionConfig<S>