astro 6.1.5 → 6.1.7

package/dist/runtime/server/render/server-islands.js

@@ -1,5 +1,5 @@
 import { encryptString, generateCspDigest } from "../../../core/encryption.js";
-import { markHTMLString } from "../escape.js";
+import { markHTMLString, stringifyForScript } from "../escape.js";
 import { renderChild } from "./any.js";
 import { createThinHead } from "./astro/head-and-content.js";
 import { createRenderInstruction } from "./instruction.js";
@@ -13,13 +13,6 @@ const internalProps = /* @__PURE__ */ new Set([
 function containsServerDirective(props) {
   return "server:component-directive" in props;
 }
-const SCRIPT_RE = /<\/script/giu;
-const COMMENT_RE = /<!--/gu;
-const SCRIPT_REPLACER = "<\\/script";
-const COMMENT_REPLACER = "\\u003C!--";
-function safeJsonStringify(obj) {
-  return JSON.stringify(obj).replace(SCRIPT_RE, SCRIPT_REPLACER).replace(COMMENT_RE, COMMENT_REPLACER);
-}
 function createSearchParams(encryptedComponentExport, encryptedProps, slots) {
   const params = new URLSearchParams();
   params.set("e", encryptedComponentExport);
@@ -154,7 +147,7 @@ class ServerIslandComponent {
       );
     }
     const adapterHeaders = this.result.internalFetchHeaders || {};
-    const headersJson = safeJsonStringify(adapterHeaders);
+    const headersJson = stringifyForScript(adapterHeaders);
     const method = useGETRequest ? (
       // GET request
       `const headers = new Headers(${headersJson});
@@ -162,9 +155,9 @@ let response = await fetch('${serverIslandUrl}', { headers });`
     ) : (
       // POST request
       `let data = {
-	encryptedComponentExport: ${safeJsonStringify(componentExportEncrypted)},
-	encryptedProps: ${safeJsonStringify(propsEncrypted)},
-	encryptedSlots: ${safeJsonStringify(slotsEncrypted)},
+	encryptedComponentExport: ${stringifyForScript(componentExportEncrypted)},
+	encryptedProps: ${stringifyForScript(propsEncrypted)},
+	encryptedSlots: ${stringifyForScript(slotsEncrypted)},
 };
 const headers = new Headers({ 'Content-Type': 'application/json', ...${headersJson} });
 let response = await fetch('${serverIslandUrl}', {

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

@@ -1,5 +1,5 @@
 import { clsx } from "clsx";
-import { HTMLString, markHTMLString } from "../escape.js";
+import { HTMLString, markHTMLString, stringifyForScript } from "../escape.js";
 import { isPromise } from "../util.js";
 const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
 const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|inert|loop|muted|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
@@ -19,10 +19,7 @@ const toStyleString = (obj) => Object.entries(obj).filter(([_, v]) => typeof v =
 function defineScriptVars(vars) {
   let output = "";
   for (const [key, value] of Object.entries(vars)) {
-    output += `const ${toIdent(key)} = ${JSON.stringify(value)?.replace(
-      /<\/script>/g,
-      "\\x3C/script>"
-    )};
+    output += `const ${toIdent(key)} = ${stringifyForScript(value)};
 `;
   }
   return markHTMLString(output);

package/dist/types/astro.d.ts

@@ -1,6 +1,6 @@
 import type { AstroTimer } from '../core/config/timer.js';
 import type { TSConfig } from '../core/config/tsconfig.js';
-import type { Logger, LoggerLevel } from '../core/logger/core.js';
+import type { AstroLogger, AstroLoggerLevel } from '../core/logger/core.js';
 import type { AstroPreferences } from '../preferences/index.js';
 import type { AstroComponentFactory } from '../runtime/server/index.js';
 import type { GetStaticPaths } from './public/common.js';
@@ -65,7 +65,7 @@ export interface AstroSettings {
         fontResources: Set<string>;
         styleHashes: Required<CspObject['styleDirective']>['hashes'];
     };
-    logLevel: LoggerLevel;
+    logLevel: AstroLoggerLevel;
 }
 /** Generic interface for a component (Astro, Svelte, React, etc.) */
 export interface ComponentInstance {
@@ -80,7 +80,7 @@ export interface RoutesList {
 }
 export interface AstroPluginOptions {
     settings: AstroSettings;
-    logger: Logger;
+    logger: AstroLogger;
 }
 export interface ImportedDevStyle {
     id: string;

package/dist/types/public/config.d.ts

@@ -10,7 +10,7 @@ import type { CacheProviderConfig, RouteRules } from '../../core/cache/types.js'
 import type { AstroConfigType } from '../../core/config/schemas/index.js';
 import type { REDIRECT_STATUS_CODES } from '../../core/constants.js';
 import type { CspAlgorithm, CspDirective, CspHash } from '../../core/csp/config.js';
-import type { LoggerLevel } from '../../core/logger/core.js';
+import type { AstroLoggerLevel } from '../../core/logger/core.js';
 import type { SessionConfig, SessionDriverConfig, SessionDriverName } from '../../core/session/types.js';
 import type { EnvSchema } from '../../env/schema.js';
 import type { AstroIntegration } from './integrations.js';
@@ -2934,7 +2934,7 @@ export interface AstroInlineOnlyConfig {
      *
      * @default "info"
      */
-    logLevel?: LoggerLevel;
+    logLevel?: AstroLoggerLevel;
     /**
      * Clear the content layer cache, forcing a rebuild of all content entries.
      */

package/dist/vite-plugin-app/app.d.ts

@@ -1,6 +1,6 @@
 import type http from 'node:http';
 import { BaseApp, type RenderErrorOptions } from '../core/app/entrypoints/index.js';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
 import type { CreateRenderContext, RenderContext } from '../core/render-context.js';
 import type { AstroSettings, RoutesList } from '../types/astro.js';
@@ -10,11 +10,11 @@ import { RunnablePipeline } from './pipeline.js';
 import type { DevMatch, LogRequestPayload } from '../core/app/base.js';
 export declare class AstroServerApp extends BaseApp<RunnablePipeline> {
     settings: AstroSettings;
-    logger: Logger;
+    logger: AstroLogger;
     loader: ModuleLoader;
     manifestData: RoutesList;
     currentRenderContext: RenderContext | undefined;
-    constructor(manifest: SSRManifest, streaming: boolean | undefined, logger: Logger, manifestData: RoutesList, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>);
+    constructor(manifest: SSRManifest, streaming: boolean | undefined, logger: AstroLogger, manifestData: RoutesList, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>);
     isDev(): boolean;
     /**
      * Updates the routes list when files change during development.
@@ -32,8 +32,8 @@ export declare class AstroServerApp extends BaseApp<RunnablePipeline> {
      */
     clearMiddleware(): void;
     devMatch(pathname: string): Promise<DevMatch | undefined>;
-    static create(manifest: SSRManifest, routesList: RoutesList, logger: Logger, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>): Promise<AstroServerApp>;
-    createPipeline(_streaming: boolean, manifest: SSRManifest, settings: AstroSettings, logger: Logger, loader: ModuleLoader, manifestData: RoutesList, getDebugInfo: () => Promise<string>): RunnablePipeline;
+    static create(manifest: SSRManifest, routesList: RoutesList, logger: AstroLogger, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>): Promise<AstroServerApp>;
+    createPipeline(_streaming: boolean, manifest: SSRManifest, settings: AstroSettings, logger: AstroLogger, loader: ModuleLoader, manifestData: RoutesList, getDebugInfo: () => Promise<string>): RunnablePipeline;
     createRenderContext(payload: CreateRenderContext): Promise<RenderContext>;
     handleRequest({ controller, incomingRequest, incomingResponse, isHttps, }: HandleRequest): Promise<void>;
     match(request: Request, _allowPrerenderedRoutes: boolean): RouteData | undefined;

package/dist/vite-plugin-app/createAstroServerApp.d.ts

@@ -1,8 +1,8 @@
 import type http from 'node:http';
-import { Logger } from '../core/logger/core.js';
+import { AstroLogger } from '../core/logger/core.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
 import type { AstroSettings } from '../types/astro.js';
 import type { DevServerController } from '../vite-plugin-astro-server/controller.js';
-export default function createAstroServerApp(controller: DevServerController, settings: AstroSettings, loader: ModuleLoader, logger?: Logger): Promise<{
+export default function createAstroServerApp(controller: DevServerController, settings: AstroSettings, loader: ModuleLoader, logger?: AstroLogger): Promise<{
     handler(incomingRequest: http.IncomingMessage, incomingResponse: http.ServerResponse): void;
 }>;

package/dist/vite-plugin-app/createAstroServerApp.js

@@ -9,12 +9,12 @@ import { BuildTimeAstroVersionProvider } from "../cli/infra/build-time-astro-ver
 import { PassthroughTextStyler } from "../cli/infra/passthrough-text-styler.js";
 import { ProcessOperatingSystemProvider } from "../cli/infra/process-operating-system-provider.js";
 import { TinyexecCommandExecutor } from "../cli/infra/tinyexec-command-executor.js";
-import { Logger } from "../core/logger/core.js";
+import { AstroLogger } from "../core/logger/core.js";
 import { nodeLogDestination } from "../core/logger/node.js";
 import { AstroServerApp } from "./app.js";
 async function createAstroServerApp(controller, settings, loader, logger) {
-  const actualLogger = logger ?? new Logger({
-    dest: nodeLogDestination,
+  const actualLogger = logger ?? new AstroLogger({
+    destination: nodeLogDestination,
     level: settings.logLevel
   });
   const routesList = { routes: routes.map((r) => r.routeData) };

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

@@ -1,11 +1,11 @@
 import { type CompileProps, type CompileResult } from '../core/compile/index.js';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { CompileMetadata } from './types.js';
 import type { SourceMapInput } from 'rollup';
 interface CompileAstroOption {
     compileProps: CompileProps;
     astroFileToCompileMetadata: Map<string, CompileMetadata>;
-    logger: Logger;
+    logger: AstroLogger;
 }
 export interface CompileAstroResult extends Omit<CompileResult, 'map'> {
     map: SourceMapInput;

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

@@ -1,9 +1,9 @@
 import type { HmrContext } from 'vite';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { CompileAstroResult } from './compile.js';
 import type { CompileMetadata } from './types.js';
 interface HandleHotUpdateOptions {
-    logger: Logger;
+    logger: AstroLogger;
     compile: (code: string, filename: string) => Promise<CompileAstroResult>;
     astroFileToCompileMetadata: Map<string, CompileMetadata>;
 }

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

@@ -1,12 +1,12 @@
 import type * as vite from 'vite';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
 import type { PluginMetadata as AstroPluginMetadata } from './types.js';
 export { getAstroMetadata } from './metadata.js';
 export type { AstroPluginMetadata };
 interface AstroPluginOptions {
     settings: AstroSettings;
-    logger: Logger;
+    logger: AstroLogger;
 }
 /** Transform .astro files for Vite */
 export default function astro({ settings, logger }: AstroPluginOptions): vite.Plugin[];

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

@@ -1,5 +1,5 @@
 import type * as vite from 'vite';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
 /**
  * Outcome of the base-URL evaluation for a dev-server request.
@@ -53,4 +53,4 @@ export declare function resolveDevRoot(base: string, site?: string): {
  * by the caller.
  */
 export declare function evaluateBaseRewrite(url: string, pathname: string, acceptHeader: string | undefined, devRoot: string, devRootReplacement: string): BaseRewriteDecision;
-export declare function baseMiddleware(settings: AstroSettings, logger: Logger): vite.Connect.NextHandleFunction;
+export declare function baseMiddleware(settings: AstroSettings, logger: AstroLogger): vite.Connect.NextHandleFunction;

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

@@ -1,6 +1,6 @@
 import type { SSRManifest } from '../core/app/types.js';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
-export declare function recordServerError(loader: ModuleLoader, manifest: SSRManifest, logger: Logger, err: Error): {
+export declare function recordServerError(loader: ModuleLoader, manifest: SSRManifest, logger: AstroLogger, err: Error): {
     errorWithMetadata: import("../core/errors/errors.js").ErrorWithMetadata;
 };

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

@@ -1,9 +1,9 @@
 import type * as vite from 'vite';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
 interface AstroPluginOptions {
     settings: AstroSettings;
-    logger: Logger;
+    logger: AstroLogger;
 }
 export default function createVitePluginAstroServer({ settings, logger, }: AstroPluginOptions): vite.Plugin;
 export {};

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

@@ -1,6 +1,6 @@
 import type { RemotePattern } from '@astrojs/internal-helpers/remote';
 import type * as vite from 'vite';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 /**
  * Middleware that validates Sec-Fetch metadata headers on incoming requests
  * to block cross-origin subresource requests (e.g. `<script>` tags from
@@ -18,4 +18,4 @@ import type { Logger } from '../core/logger/core.js';
  * dev server setups (e.g. ngrok, Cloudflare Tunnel) where the browser sees a
  * different origin than the dev server itself.
  */
-export declare function secFetchMiddleware(logger: Logger, allowedDomains?: Partial<RemotePattern>[]): vite.Connect.NextHandleFunction;
+export declare function secFetchMiddleware(logger: AstroLogger, allowedDomains?: Partial<RemotePattern>[]): vite.Connect.NextHandleFunction;

package/dist/vite-plugin-hmr-reload/index.js

@@ -1,6 +1,15 @@
 import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from "../vite-plugin-pages/const.js";
 import { getDevCssModuleNameFromPageVirtualModuleName } from "../vite-plugin-css/util.js";
 import { isAstroServerEnvironment } from "../environments.js";
+const STYLE_EXT_REGEX = /\.(?:css|scss|sass|less|styl|pcss)$/i;
+function isStyleModule(mod) {
+  if (mod.file && STYLE_EXT_REGEX.test(mod.file)) return true;
+  if (mod.id) {
+    const idPath = mod.id.split("?")[0];
+    if (STYLE_EXT_REGEX.test(idPath)) return true;
+  }
+  return false;
+}
 function hmrReload() {
   return {
     name: "astro:hmr-reload",
@@ -10,9 +19,14 @@ function hmrReload() {
       handler({ modules, server, timestamp }) {
         if (!isAstroServerEnvironment(this.environment)) return;
         let hasSsrOnlyModules = false;
+        let hasSkippedStyleModules = false;
         const invalidatedModules = /* @__PURE__ */ new Set();
         for (const mod of modules) {
           if (mod.id == null) continue;
+          if (isStyleModule(mod)) {
+            hasSkippedStyleModules = true;
+            continue;
+          }
           const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
           if (clientModule != null) continue;
           this.environment.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
@@ -31,6 +45,9 @@ function hmrReload() {
           server.ws.send({ type: "full-reload" });
           return [];
         }
+        if (hasSkippedStyleModules) {
+          return [];
+        }
       }
     }
   };

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

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

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

@@ -1,9 +1,9 @@
 import type { Plugin } from 'vite';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
 interface AstroPluginOptions {
     settings: AstroSettings;
-    logger: Logger;
+    logger: AstroLogger;
 }
 export default function markdown({ settings, logger }: AstroPluginOptions): Plugin;
 export {};

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

@@ -1,11 +1,11 @@
 import type fsMod from 'node:fs';
 import { type Plugin } from 'vite';
 import type { SerializedRouteInfo } from '../core/app/types.js';
-import type { Logger } from '../core/logger/core.js';
+import type { AstroLogger } from '../core/logger/core.js';
 import type { AstroSettings, RoutesList } from '../types/astro.js';
 type Payload = {
     settings: AstroSettings;
-    logger: Logger;
+    logger: AstroLogger;
     fsMod?: typeof fsMod;
     routesList: RoutesList;
     command: 'dev' | 'build';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.1.5",
+  "version": "6.1.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -152,9 +152,9 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
+    "@astrojs/internal-helpers": "0.8.0",
     "@astrojs/markdown-remark": "7.1.0",
-    "@astrojs/telemetry": "3.3.0",
-    "@astrojs/internal-helpers": "0.8.0"
+    "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -217,9 +217,7 @@
     "test:e2e:firefox": "playwright test --config playwright.firefox.config.js",
     "test:types": "tsc --project test/types/tsconfig.json",
     "typecheck:tests": "tsc --project tsconfig.test.json",
-    "test:unit": "pnpm run test:unit:js && pnpm run test:unit:ts",
-    "test:unit:js": "astro-scripts test \"test/units/**/*.test.js\" --teardown ./test/units/teardown.js",
-    "test:unit:ts": "astro-scripts test \"test/units/**/*.test.ts\" --strip-types --teardown ./test/units/teardown.js",
+    "test:unit": "astro-scripts test \"test/units/**/*.test.ts\" --strip-types --teardown ./test/units/teardown.ts",
     "test:integration": "pnpm run test:integration:js && pnpm run test:integration:ts",
     "test:integration:js": "astro-scripts test \"test/*.test.js\"",
     "test:integration:ts": "astro-scripts test \"test/*.test.ts\" --strip-types"