astro 5.10.0 → 5.10.2

package/dist/core/config/tsconfig.js

@@ -1,9 +1,9 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import {
-  TSConfckParseError,
   find,
   parse,
+  TSConfckParseError,
   toJson
 } from "tsconfck";
 const defaultTSConfig = { extends: "astro/tsconfigs/base" };

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.10.0";
+const ASTRO_VERSION = "5.10.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/cookies/index.d.ts

@@ -1,3 +1,3 @@
+export type { AstroCookieGetOptions, AstroCookieSetOptions } from './cookies.js';
 export { AstroCookies } from './cookies.js';
 export { attachCookiesToResponse, getSetCookiesFromResponse, } from './response.js';
-export type { AstroCookieSetOptions, AstroCookieGetOptions } from './cookies.js';

package/dist/core/create-vite.js

@@ -20,9 +20,9 @@ import astroVirtualManifestPlugin from "../manifest/virtual-module.js";
 import astroPrefetch from "../prefetch/vite-plugin-prefetch.js";
 import astroDevToolbar from "../toolbar/vite-plugin-dev-toolbar.js";
 import astroTransitions from "../transitions/vite-plugin-transitions.js";
+import astroVitePlugin from "../vite-plugin-astro/index.js";
 import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
 import { vitePluginAstroServer } from "../vite-plugin-astro-server/index.js";
-import astroVitePlugin from "../vite-plugin-astro/index.js";
 import configAliasVitePlugin from "../vite-plugin-config-alias/index.js";
 import vitePluginFileURL from "../vite-plugin-fileurl/index.js";
 import astroHeadPlugin from "../vite-plugin-head/index.js";

package/dist/core/csp/common.js

@@ -1,8 +1,8 @@
 import { readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
-import { ISLAND_STYLES } from "../../runtime/server/astro-island-styles.js";
-import astroIslandPrebuiltDev from "../../runtime/server/astro-island.prebuilt-dev.js";
 import astroIslandPrebuilt from "../../runtime/server/astro-island.prebuilt.js";
+import astroIslandPrebuiltDev from "../../runtime/server/astro-island.prebuilt-dev.js";
+import { ISLAND_STYLES } from "../../runtime/server/astro-island-styles.js";
 import { generateCspDigest } from "../encryption.js";
 function shouldTrackCspHashes(csp) {
   return csp === true || typeof csp === "object";

package/dist/core/dev/container.d.ts

@@ -1,8 +1,8 @@
+import nodeFs from 'node:fs';
 import type * as http from 'node:http';
 import type { AddressInfo } from 'node:net';
-import type { AstroSettings } from '../../types/astro.js';
-import nodeFs from 'node:fs';
 import * as vite from 'vite';
+import type { AstroSettings } from '../../types/astro.js';
 import type { AstroInlineConfig } from '../../types/public/config.js';
 import type { Logger } from '../logger/core.js';
 export interface Container {

package/dist/core/dev/dev.js

@@ -12,8 +12,8 @@ import { ensureProcessNodeEnv } from "../util.js";
 import { startContainer } from "./container.js";
 import { createContainerWithAutomaticRestart } from "./restart.js";
 import {
-  MAX_PATCH_DISTANCE,
   fetchLatestAstroVersion,
+  MAX_PATCH_DISTANCE,
   shouldCheckForUpdates
 } from "./update-check.js";
 async function dev(inlineConfig) {
@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.10.0";
+  const currentVersion = "5.10.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/dev/restart.js

@@ -51,6 +51,12 @@ async function restartContainer(container) {
   container.restartInFlight = true;
   try {
     const { astroConfig } = await resolveConfig(container.inlineConfig, "dev", container.fs);
+    if (astroConfig.experimental.csp) {
+      logger.warn(
+        "config",
+        "Astro's Content Security Policy (CSP) does not work in development mode. To verify your CSP implementation, build the project and run the preview server."
+      );
+    }
     const settings = await createSettings(astroConfig, fileURLToPath(existingSettings.config.root));
     await close();
     return await createRestartedContainer(container, settings);
@@ -80,9 +86,20 @@ async function createContainerWithAutomaticRestart({
 }) {
   const logger = createNodeLogger(inlineConfig ?? {});
   const { userConfig, astroConfig } = await resolveConfig(inlineConfig ?? {}, "dev", fs);
+  if (astroConfig.experimental.csp) {
+    logger.warn(
+      "config",
+      "Astro's Content Security Policy (CSP) does not work in development mode. To verify your CSP implementation, build the project and run the preview server."
+    );
+  }
   telemetry.record(eventCliSession("dev", userConfig));
   const settings = await createSettings(astroConfig, fileURLToPath(astroConfig.root));
-  const initialContainer = await createContainer({ settings, logger, inlineConfig, fs });
+  const initialContainer = await createContainer({
+    settings,
+    logger,
+    inlineConfig,
+    fs
+  });
   let resolveRestart;
   let restartComplete = new Promise((resolve) => {
     resolveRestart = resolve;

package/dist/core/errors/dev/vite.js

@@ -1,8 +1,8 @@
 import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { codeToHtml, createCssVariablesTheme } from "shiki";
-import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from "../errors-data.js";
 import { AstroError } from "../errors.js";
+import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from "../errors-data.js";
 import { createSafeError } from "../utils.js";
 import { getDocsForError, renderErrorMarkdown } from "./utils.js";
 function enhanceViteSSRError({

package/dist/core/errors/errors-data.d.ts

@@ -1517,7 +1517,7 @@ export declare const ContentEntryDataError: {
  * @description
  * Error in live content config.
  * @see
- * - [Experimental live content](https://astro.build/en/reference/experimental-flags/live-content-collections/)
+ * - [Experimental live content](https://docs.astro.build/en/reference/experimental-flags/live-content-collections/)
  */
 export declare const LiveContentConfigError: {
     name: string;

package/dist/core/errors/index.d.ts

@@ -1,5 +1,5 @@
-export * as AstroErrorData from './errors-data.js';
-export { AggregateError, AstroError, AstroUserError, CSSError, CompilerError, MarkdownError, isAstroError, } from './errors.js';
 export type { ErrorWithMetadata } from './errors.js';
+export { AggregateError, AstroError, AstroUserError, CompilerError, CSSError, isAstroError, MarkdownError, } from './errors.js';
+export * as AstroErrorData from './errors-data.js';
 export { createSafeError, positionAt } from './utils.js';
 export { errorMap } from './zod-error-map.js';

package/dist/core/errors/index.js

@@ -1,13 +1,13 @@
-import * as AstroErrorData from "./errors-data.js";
 import {
   AggregateError,
   AstroError,
   AstroUserError,
-  CSSError,
   CompilerError,
-  MarkdownError,
-  isAstroError
+  CSSError,
+  isAstroError,
+  MarkdownError
 } from "./errors.js";
+import * as AstroErrorData from "./errors-data.js";
 import { createSafeError, positionAt } from "./utils.js";
 import { errorMap } from "./zod-error-map.js";
 export {

package/dist/core/logger/console.js

@@ -3,7 +3,7 @@ const consoleLogDestination = {
   write(event) {
     let dest = console.error;
     if (levels[event.level] < levels["error"]) {
-      dest = console.log;
+      dest = console.info;
     }
     if (event.label === "SKIP_FORMAT") {
       dest(event.message);

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.10.0";
+  const version = "5.10.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.10.0"}`
+        `v${"5.10.2"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/sequence.js

@@ -1,8 +1,8 @@
 import { AstroCookies } from "../cookies/cookies.js";
 import { ForbiddenRewrite } from "../errors/errors-data.js";
 import { AstroError } from "../errors/index.js";
-import { apiContextRoutesSymbol } from "../render-context.js";
 import { getParams } from "../render/index.js";
+import { apiContextRoutesSymbol } from "../render-context.js";
 import { setOriginPathname } from "../routing/rewrite.js";
 import { defineMiddleware } from "./index.js";
 function sequence(...handlers) {
@@ -54,7 +54,12 @@ function sequence(...handlers) {
             handleContext.url = new URL(newRequest.url);
             handleContext.cookies = new AstroCookies(newRequest);
             handleContext.params = getParams(routeData, pathname);
-            setOriginPathname(handleContext.request, oldPathname);
+            setOriginPathname(
+              handleContext.request,
+              oldPathname,
+              pipeline.manifest.trailingSlash,
+              pipeline.manifest.buildFormat
+            );
           }
           return applyHandle(i + 1, handleContext);
         } else {

package/dist/core/module-loader/index.d.ts

@@ -1,3 +1,3 @@
-export { createLoader } from './loader.js';
 export type { LoaderEvents, ModuleInfo, ModuleLoader, ModuleNode } from './loader.js';
+export { createLoader } from './loader.js';
 export { createViteLoader } from './vite.js';

package/dist/core/render-context.js

@@ -11,21 +11,22 @@ import { renderEndpoint } from "../runtime/server/endpoint.js";
 import { renderPage } from "../runtime/server/index.js";
 import {
   ASTRO_VERSION,
+  clientAddressSymbol,
   REROUTE_DIRECTIVE_HEADER,
   REWRITE_DIRECTIVE_HEADER_KEY,
   REWRITE_DIRECTIVE_HEADER_VALUE,
   ROUTE_TYPE_HEADER,
-  clientAddressSymbol,
   responseSentSymbol
 } from "./constants.js";
 import { AstroCookies, attachCookiesToResponse } from "./cookies/index.js";
 import { getCookiesFromResponse } from "./cookies/response.js";
+import { generateCspDigest } from "./encryption.js";
 import { CspNotEnabled, ForbiddenRewrite } from "./errors/errors-data.js";
 import { AstroError, AstroErrorData } from "./errors/index.js";
 import { callMiddleware } from "./middleware/callMiddleware.js";
 import { sequence } from "./middleware/index.js";
 import { renderRedirect } from "./redirects/render.js";
-import { Slots, getParams, getProps } from "./render/index.js";
+import { getParams, getProps, Slots } from "./render/index.js";
 import { isRoute404or500, isRouteExternalRedirect, isRouteServerIsland } from "./routing/match.js";
 import { copyRequest, getOriginPathname, setOriginPathname } from "./routing/rewrite.js";
 import { AstroSession } from "./session.js";
@@ -72,7 +73,12 @@ class RenderContext {
   }) {
     const pipelineMiddleware = await pipeline.getMiddleware();
     const pipelineActions = actions ?? await pipeline.getActions();
-    setOriginPathname(request, pathname);
+    setOriginPathname(
+      request,
+      pathname,
+      pipeline.manifest.trailingSlash,
+      pipeline.manifest.buildFormat
+    );
     return new RenderContext(
       pipeline,
       locals,
@@ -159,7 +165,12 @@ class RenderContext {
         this.params = getParams(routeData, pathname);
         this.pathname = pathname;
         this.status = 200;
-        setOriginPathname(this.request, oldPathname);
+        setOriginPathname(
+          this.request,
+          oldPathname,
+          this.pipeline.manifest.trailingSlash,
+          this.pipeline.manifest.buildFormat
+        );
       }
       let response2;
       if (!ctx.isPrerendered) {
@@ -268,7 +279,12 @@ class RenderContext {
     this.pathname = pathname;
     this.isRewriting = true;
     this.status = 200;
-    setOriginPathname(this.request, oldPathname);
+    setOriginPathname(
+      this.request,
+      oldPathname,
+      this.pipeline.manifest.trailingSlash,
+      this.pipeline.manifest.buildFormat
+    );
     return await this.render(componentInstance);
   }
   createActionAPIContext() {
@@ -362,6 +378,18 @@ class RenderContext {
     const { cookies, pathname, pipeline, routeData, status } = this;
     const { clientDirectives, inlinedScripts, compressHTML, manifest, renderers, resolve } = pipeline;
     const { links, scripts, styles } = await pipeline.headElements(routeData);
+    const extraStyleHashes = [];
+    const extraScriptHashes = [];
+    const shouldInjectCspMetaTags = !!manifest.csp;
+    const cspAlgorithm = manifest.csp?.algorithm ?? "SHA-256";
+    if (shouldInjectCspMetaTags) {
+      for (const style of styles) {
+        extraStyleHashes.push(await generateCspDigest(style.children, cspAlgorithm));
+      }
+      for (const script of scripts) {
+        extraScriptHashes.push(await generateCspDigest(script.children, cspAlgorithm));
+      }
+    }
     const componentMetadata = await pipeline.componentMetadata(routeData) ?? manifest.componentMetadata;
     const headers = new Headers({ "Content-Type": "text/html" });
     const partial = typeof this.partial === "boolean" ? this.partial : Boolean(mod.partial);
@@ -411,13 +439,13 @@ class RenderContext {
         hasRenderedServerIslandRuntime: false,
         headInTree: false,
         extraHead: [],
-        extraStyleHashes: [],
-        extraScriptHashes: [],
+        extraStyleHashes,
+        extraScriptHashes,
         propagators: /* @__PURE__ */ new Set()
       },
       cspDestination: manifest.csp?.cspDestination ?? (routeData.prerender ? "meta" : "header"),
-      shouldInjectCspMetaTags: !!manifest.csp,
-      cspAlgorithm: manifest.csp?.algorithm ?? "SHA-256",
+      shouldInjectCspMetaTags,
+      cspAlgorithm,
       // The following arrays must be cloned, otherwise they become mutable across routes.
       scriptHashes: manifest.csp?.scriptHashes ? [...manifest.csp.scriptHashes] : [],
       scriptResources: manifest.csp?.scriptResources ? [...manifest.csp.scriptResources] : [],

package/dist/core/routing/default.js

@@ -1,8 +1,8 @@
 import { DEFAULT_404_COMPONENT } from "../constants.js";
 import {
+  createEndpoint as createServerIslandEndpoint,
   SERVER_ISLAND_COMPONENT,
-  SERVER_ISLAND_ROUTE,
-  createEndpoint as createServerIslandEndpoint
+  SERVER_ISLAND_ROUTE
 } from "../server-islands/endpoint.js";
 import { DEFAULT_404_ROUTE, default404Instance } from "./astro-designed-error-pages.js";
 const DEFAULT_COMPONENTS = [DEFAULT_404_COMPONENT, SERVER_ISLAND_COMPONENT];

package/dist/core/routing/manifest/create.d.ts

@@ -1,6 +1,6 @@
+import nodeFs from 'node:fs';
 import type { AstroSettings, RoutesList } from '../../../types/astro.js';
 import type { Logger } from '../../logger/core.js';
-import nodeFs from 'node:fs';
 interface CreateRouteManifestParams {
     /** Astro Settings object */
     settings: AstroSettings;

package/dist/core/routing/rewrite.d.ts

@@ -32,6 +32,6 @@ export declare function findRouteToRewrite({ payload, routes, request, trailingS
  * @param routePattern
  */
 export declare function copyRequest(newUrl: URL, oldRequest: Request, isPrerendered: boolean, logger: Logger, routePattern: string): Request;
-export declare function setOriginPathname(request: Request, pathname: string): void;
+export declare function setOriginPathname(request: Request, pathname: string, trailingSlash: AstroConfig['trailingSlash'], buildFormat: AstroConfig['build']['format']): void;
 export declare function getOriginPathname(request: Request): string;
 export {};

package/dist/core/routing/rewrite.js

@@ -110,8 +110,20 @@ function copyRequest(newUrl, oldRequest, isPrerendered, logger, routePattern) {
     }
   });
 }
-function setOriginPathname(request, pathname) {
-  Reflect.set(request, originPathnameSymbol, encodeURIComponent(pathname));
+function setOriginPathname(request, pathname, trailingSlash, buildFormat) {
+  if (!pathname) {
+    pathname = "/";
+  }
+  const shouldAppendSlash = shouldAppendForwardSlash(trailingSlash, buildFormat);
+  let finalPathname;
+  if (pathname === "/") {
+    finalPathname = "/";
+  } else if (shouldAppendSlash) {
+    finalPathname = appendForwardSlash(pathname);
+  } else {
+    finalPathname = removeTrailingForwardSlash(pathname);
+  }
+  Reflect.set(request, originPathnameSymbol, encodeURIComponent(finalPathname));
 }
 function getOriginPathname(request) {
   const origin = Reflect.get(request, originPathnameSymbol);

package/dist/core/viteUtils.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { prependForwardSlash, slash } from "../core/path.js";
-import { VALID_ID_PREFIX, resolveJsToTs, unwrapId, viteID } from "./util.js";
+import { resolveJsToTs, unwrapId, VALID_ID_PREFIX, viteID } from "./util.js";
 const isWindows = typeof process !== "undefined" && process.platform === "win32";
 function normalizePath(id) {
   return path.posix.normalize(isWindows ? slash(id) : id);

package/dist/env/runtime.d.ts

@@ -1,6 +1,6 @@
 import { AstroError } from '../core/errors/index.js';
 import type { ValidationResultInvalid } from './validators.js';
-export { validateEnvVariable, getEnvFieldType } from './validators.js';
+export { getEnvFieldType, validateEnvVariable } from './validators.js';
 export type GetEnv = (key: string) => string | undefined;
 type OnSetGetEnv = () => void;
 export declare function setGetEnv(fn: GetEnv): void;

package/dist/env/runtime.js

@@ -1,6 +1,6 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { invalidVariablesToError } from "./errors.js";
-import { validateEnvVariable, getEnvFieldType } from "./validators.js";
+import { getEnvFieldType, validateEnvVariable } from "./validators.js";
 let _getEnv = (key) => process.env[key];
 function setGetEnv(fn) {
   _getEnv = fn;

package/dist/env/setup.d.ts

@@ -1 +1 @@
-export { setGetEnv, type GetEnv } from './runtime.js';
+export { type GetEnv, setGetEnv } from './runtime.js';

package/dist/i18n/index.js

@@ -1,7 +1,7 @@
 import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { REROUTE_DIRECTIVE_HEADER } from "../core/constants.js";
-import { MissingLocale, i18nNoLocaleFoundInPath } from "../core/errors/errors-data.js";
+import { i18nNoLocaleFoundInPath, MissingLocale } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
 import { createI18nMiddleware } from "./middleware.js";
 function requestHasLocale(locales) {

package/dist/jsx-runtime/index.js

@@ -1,4 +1,4 @@
-import { Fragment, Renderer, markHTMLString } from "../runtime/server/index.js";
+import { Fragment, markHTMLString, Renderer } from "../runtime/server/index.js";
 const AstroJSX = "astro:jsx";
 const Empty = Symbol("empty");
 const toSlotName = (slotAttr) => slotAttr;

package/dist/runtime/client/dev-toolbar/ui-library/index.d.ts

@@ -3,8 +3,8 @@ export { DevToolbarButton } from './button.js';
 export { DevToolbarCard } from './card.js';
 export { DevToolbarHighlight } from './highlight.js';
 export { DevToolbarIcon } from './icon.js';
+export { DevToolbarRadioCheckbox } from './radio-checkbox.js';
 export { DevToolbarSelect } from './select.js';
 export { DevToolbarToggle } from './toggle.js';
 export { DevToolbarTooltip } from './tooltip.js';
 export { DevToolbarWindow } from './window.js';
-export { DevToolbarRadioCheckbox } from './radio-checkbox.js';

package/dist/runtime/client/dev-toolbar/ui-library/index.js

@@ -3,11 +3,11 @@ import { DevToolbarButton } from "./button.js";
 import { DevToolbarCard } from "./card.js";
 import { DevToolbarHighlight } from "./highlight.js";
 import { DevToolbarIcon } from "./icon.js";
+import { DevToolbarRadioCheckbox } from "./radio-checkbox.js";
 import { DevToolbarSelect } from "./select.js";
 import { DevToolbarToggle } from "./toggle.js";
 import { DevToolbarTooltip } from "./tooltip.js";
 import { DevToolbarWindow } from "./window.js";
-import { DevToolbarRadioCheckbox } from "./radio-checkbox.js";
 export {
   DevToolbarBadge,
   DevToolbarButton,

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

@@ -1 +1 @@
-export { Fragment, addAttribute, createAstro, createComponent, createTransitionScope, defineScriptVars, defineStyleVars, maybeRenderHead, mergeSlots, render, renderComponent, renderHead, renderScript, renderSlot, renderTransition, spreadAttributes, unescapeHTML, } from '../server/index.js';
+export { addAttribute, createAstro, createComponent, createTransitionScope, defineScriptVars, defineStyleVars, Fragment, maybeRenderHead, mergeSlots, render, renderComponent, renderHead, renderScript, renderSlot, renderTransition, spreadAttributes, unescapeHTML, } from '../server/index.js';

package/dist/runtime/compiler/index.js

@@ -1,11 +1,11 @@
 import {
-  Fragment,
   addAttribute,
   createAstro,
   createComponent,
   createTransitionScope,
   defineScriptVars,
   defineStyleVars,
+  Fragment,
   maybeRenderHead,
   mergeSlots,
   render,

package/dist/runtime/server/endpoint.js

@@ -1,7 +1,7 @@
 import { bold } from "kleur/colors";
 import { REROUTABLE_STATUS_CODES, REROUTE_DIRECTIVE_HEADER } from "../../core/constants.js";
-import { EndpointDidNotReturnAResponse } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/errors.js";
+import { EndpointDidNotReturnAResponse } from "../../core/errors/errors-data.js";
 async function renderEndpoint(mod, context, isPrerendered, logger) {
   const { request, url } = context;
   const method = request.method.toUpperCase();

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

@@ -3,8 +3,8 @@ export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, isHTMLString, markHTMLString, unescapeHTML, } from './escape.js';
 export { renderJSX } from './jsx.js';
-export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderTemplate as render, renderComponent, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScript, renderScriptElement, renderSlot, renderSlotToString, renderTemplate, renderToString, renderUniqueStylesheet, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, ComponentSlots, RenderInstruction, } from './render/index.js';
+export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, Renderer as Renderer, renderComponent, renderHead, renderHTMLElement, renderPage, renderScript, renderScriptElement, renderSlot, renderSlotToString, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, voidElementNames, } from './render/index.js';
 export type { ServerIslandComponent } from './render/server-islands.js';
 export { createTransitionScope, renderTransition } from './transition.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;

package/dist/runtime/server/index.js

@@ -16,9 +16,8 @@ import {
   defineScriptVars,
   Fragment,
   maybeRenderHead,
-  renderTemplate,
-  renderComponent,
   Renderer,
+  renderComponent,
   renderHead,
   renderHTMLElement,
   renderPage,
@@ -26,6 +25,7 @@ import {
   renderScriptElement,
   renderSlot,
   renderSlotToString,
+  renderTemplate,
   renderTemplate as renderTemplate2,
   renderToString,
   renderUniqueStylesheet,
@@ -33,7 +33,7 @@ import {
 } from "./render/index.js";
 import { createTransitionScope, renderTransition } from "./transition.js";
 import { markHTMLString as markHTMLString2 } from "./escape.js";
-import { Renderer as Renderer2, addAttribute as addAttribute2 } from "./render/index.js";
+import { addAttribute as addAttribute2, Renderer as Renderer2 } from "./render/index.js";
 function mergeSlots(...slotted) {
   const slots = {};
   for (const slot of slotted) {
@@ -67,7 +67,7 @@ function spreadAttributes(values = {}, _name, { class: scopedClassName } = {}) {
     }
   }
   for (const [key, value] of Object.entries(values)) {
-    output += addAttribute2(value, key, true);
+    output += addAttribute2(value, key, true, _name);
   }
   return markHTMLString2(output);
 }

package/dist/runtime/server/jsx.js

@@ -1,7 +1,7 @@
 import { AstroJSX, isVNode } from "../../jsx-runtime/index.js";
 import {
-  HTMLString,
   escapeHTML,
+  HTMLString,
   markHTMLString,
   spreadAttributes,
   voidElementNames

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

@@ -1,7 +1,7 @@
-export { isAstroComponentFactory } from './factory.js';
 export type { AstroComponentFactory } from './factory.js';
+export { isAstroComponentFactory } from './factory.js';
 export { createHeadAndContent, isHeadAndContent } from './head-and-content.js';
-export { createAstroComponentInstance, isAstroComponentInstance } from './instance.js';
 export type { AstroComponentInstance } from './instance.js';
-export { isRenderTemplateResult, renderTemplate } from './render-template.js';
+export { createAstroComponentInstance, isAstroComponentInstance } from './instance.js';
 export { renderToReadableStream, renderToString } from './render.js';
+export { isRenderTemplateResult, renderTemplate } from './render-template.js';

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

@@ -1,8 +1,8 @@
 import { isAstroComponentFactory } from "./factory.js";
 import { createHeadAndContent, isHeadAndContent } from "./head-and-content.js";
 import { createAstroComponentInstance, isAstroComponentInstance } from "./instance.js";
-import { isRenderTemplateResult, renderTemplate } from "./render-template.js";
 import { renderToReadableStream, renderToString } from "./render.js";
+import { isRenderTemplateResult, renderTemplate } from "./render-template.js";
 export {
   createAstroComponentInstance,
   createHeadAndContent,

package/dist/runtime/server/render/astro/instance.d.ts

@@ -1,7 +1,7 @@
-import type { ComponentSlots } from '../slot.js';
-import type { AstroComponentFactory, AstroFactoryReturnValue } from './factory.js';
 import type { SSRResult } from '../../../../types/public/internal.js';
 import type { RenderDestination } from '../common.js';
+import type { ComponentSlots } from '../slot.js';
+import type { AstroComponentFactory, AstroFactoryReturnValue } from './factory.js';
 type ComponentProps = Record<string | number, any>;
 declare const astroComponentInstanceSym: unique symbol;
 export declare class AstroComponentInstance {

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

@@ -1,4 +1,3 @@
-import { createRenderInstruction } from "./instruction.js";
 import { clsx } from "clsx";
 import { AstroError, AstroErrorData } from "../../../core/errors/index.js";
 import { markHTMLString } from "../escape.js";
@@ -11,14 +10,15 @@ import { renderTemplate } from "./astro/index.js";
 import { createAstroComponentInstance } from "./astro/instance.js";
 import { bufferHeadContent } from "./astro/render.js";
 import {
+  chunkToString,
   Fragment,
-  Renderer,
-  chunkToString
+  Renderer
 } from "./common.js";
 import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
 import { maybeRenderHead } from "./head.js";
-import { ServerIslandComponent, containsServerDirective } from "./server-islands.js";
-import { renderSlotToString, renderSlots } from "./slot.js";
+import { createRenderInstruction } from "./instruction.js";
+import { containsServerDirective, ServerIslandComponent } from "./server-islands.js";
+import { renderSlots, renderSlotToString } from "./slot.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
 const needsHeadRenderingSymbol = Symbol.for("astro.needsHeadRendering");
 const rendererAliases = /* @__PURE__ */ new Map([["solid", "solid-js"]]);
@@ -228,7 +228,9 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     const Tag = sanitizeElementName(Component);
     const childSlots = Object.values(children).join("");
     const renderTemplateResult = renderTemplate`<${Tag}${internalSpreadAttributes(
-      props
+      props,
+      true,
+      Tag
     )}${markHTMLString(
       childSlots === "" && voidElementNames.test(Tag) ? `/>` : `>${childSlots}</${Tag}>`
     )}`;

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

@@ -1,12 +1,12 @@
-export { createHeadAndContent, renderTemplate, renderToString } from './astro/index.js';
 export type { AstroComponentFactory, AstroComponentInstance } from './astro/index.js';
-export { Fragment, Renderer, chunkToByteArray, chunkToString } from './common.js';
+export { createHeadAndContent, renderTemplate, renderToString } from './astro/index.js';
+export { chunkToByteArray, chunkToString, Fragment, Renderer } from './common.js';
 export { renderComponent, renderComponentToString } from './component.js';
-export { renderScript } from './script.js';
 export { renderHTMLElement } from './dom.js';
 export { maybeRenderHead, renderHead } from './head.js';
 export type { RenderInstruction } from './instruction.js';
 export { renderPage } from './page.js';
-export { renderSlot, renderSlotToString, type ComponentSlots } from './slot.js';
+export { renderScript } from './script.js';
+export { type ComponentSlots, renderSlot, renderSlotToString } from './slot.js';
 export { renderScriptElement, renderUniqueStylesheet } from './tags.js';
 export { addAttribute, defineScriptVars, voidElementNames } from './util.js';