astro 4.16.8 → 4.16.9

package/dist/assets/types.d.ts

@@ -1,4 +1,4 @@
-import type { WithRequired } from '../type-utils.js';
+import type { OmitPreservingIndexSignature, Simplify, WithRequired } from '../type-utils.js';
 import type { VALID_INPUT_FORMATS, VALID_OUTPUT_FORMATS } from './consts.js';
 import type { ImageService } from './services/service.js';
 export type ImageQualityPreset = 'low' | 'mid' | 'high' | 'max' | (string & {});
@@ -48,12 +48,12 @@ export type SrcSetValue = UnresolvedSrcSetValue & {
 /**
  * A yet to be resolved image transform. Used by `getImage`
  */
-export type UnresolvedImageTransform = Omit<ImageTransform, 'src'> & {
+export type UnresolvedImageTransform = Simplify<OmitPreservingIndexSignature<ImageTransform, 'src'> & {
     src: ImageMetadata | string | Promise<{
         default: ImageMetadata;
     }>;
     inferSize?: boolean;
-} & {
+}> & {
     [isESMImport]?: never;
 };
 /**

package/dist/config/index.js

@@ -1,4 +1,3 @@
-import { Logger } from "../core/logger/core.js";
 function defineConfig(config) {
   return config;
 }
@@ -8,7 +7,7 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     const [
       fs,
       { mergeConfig },
-      { nodeLogDestination },
+      { createNodeLogger },
       { resolveConfig, createSettings },
       { createVite },
       { runHookConfigSetup, runHookConfigDone },
@@ -16,16 +15,13 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     ] = await Promise.all([
       import("node:fs"),
       import("vite"),
-      import("../core/logger/node.js"),
+      import("../core/config/logging.js"),
       import("../core/config/index.js"),
       import("../core/create-vite.js"),
       import("../integrations/hooks.js"),
       import("./vite-plugin-content-listen.js")
     ]);
-    const logger = new Logger({
-      dest: nodeLogDestination,
-      level: "info"
-    });
+    const logger = createNodeLogger(inlineAstroConfig);
     const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
     let settings = await createSettings(config, userViteConfig.root);
     settings = await runHookConfigSetup({ settings, command: cmd, logger });

package/dist/content/content-layer.js

@@ -121,7 +121,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "4.16.8") {
+    if (previousAstroVersion !== "4.16.9") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -129,8 +129,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("4.16.8") {
-      await this.#store.metaStore().set("astro-version", "4.16.8");
+    if ("4.16.9") {
+      await this.#store.metaStore().set("astro-version", "4.16.9");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/core/app/node.js

@@ -100,8 +100,10 @@ class NodeApp extends App {
         result = await reader.read();
       }
       destination.end();
-    } catch {
-      destination.end("Internal server error");
+    } catch (err) {
+      destination.write("Internal server error", () => {
+        err instanceof Error ? destination.destroy(err) : destination.destroy();
+      });
     }
   }
 }

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.16.8";
+  const currentVersion = "4.16.9";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/dev/restart.js

@@ -118,7 +118,9 @@ async function createContainerWithAutomaticRestart({
     watcher.on("change", handleChangeRestart("Configuration file updated."));
     watcher.on("unlink", handleChangeRestart("Configuration file removed."));
     watcher.on("add", handleChangeRestart("Configuration file added."));
-    restart.container.viteServer.restart = () => handleServerRestart();
+    restart.container.viteServer.restart = async () => {
+      if (!restart.container.restartInFlight) await handleServerRestart();
+    };
     const customShortcuts = [
       // Disable default Vite shortcuts that don't work well with Astro
       { key: "r", description: "" },

package/dist/core/messages.js

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

package/dist/env/runtime.js

@@ -1,11 +1,7 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { invalidVariablesToError } from "./errors.js";
-import { ENV_SYMBOL } from "./runtime-constants.js";
 import { validateEnvVariable, getEnvFieldType } from "./validators.js";
-let _getEnv = (key) => {
-  const env = globalThis[ENV_SYMBOL] ?? {};
-  return env[key];
-};
+let _getEnv = (key) => process.env[key];
 function setGetEnv(fn, reset = false) {
   _getEnv = fn;
   _onSetGetEnv(reset);

package/dist/env/vite-plugin-env.js

@@ -7,7 +7,6 @@ import {
   VIRTUAL_MODULES_IDS_VALUES
 } from "./constants.js";
 import { invalidVariablesToError } from "./errors.js";
-import { ENV_SYMBOL } from "./runtime-constants.js";
 import { getEnvFieldType, validateEnvVariable } from "./validators.js";
 function astroEnv({
   settings,
@@ -29,7 +28,11 @@ function astroEnv({
         fileURLToPath(settings.config.root),
         ""
       );
-      globalThis[ENV_SYMBOL] = loadedEnv;
+      for (const [key, value] of Object.entries(loadedEnv)) {
+        if (value !== void 0) {
+          process.env[key] = value;
+        }
+      }
       const validatedVariables = validatePublicVariables({
         schema,
         loadedEnv,

package/dist/prefetch/vite-plugin-prefetch.js

@@ -30,10 +30,20 @@ function astroPrefetch({ settings }) {
     },
     transform(code, id) {
       if (id.includes(prefetchInternalModuleFsSubpath)) {
-        return code.replace("__PREFETCH_PREFETCH_ALL__", JSON.stringify(prefetch?.prefetchAll)).replace("__PREFETCH_DEFAULT_STRATEGY__", JSON.stringify(prefetch?.defaultStrategy)).replace(
+        code = code.replace(
+          "__PREFETCH_PREFETCH_ALL__",
+          // length: 25
+          `${JSON.stringify(prefetch?.prefetchAll)}`.padEnd(25)
+        ).replace(
+          "__PREFETCH_DEFAULT_STRATEGY__",
+          // length: 29
+          `${JSON.stringify(prefetch?.defaultStrategy)}`.padEnd(29)
+        ).replace(
           "__EXPERIMENTAL_CLIENT_PRERENDER__",
-          JSON.stringify(settings.config.experimental.clientPrerender)
+          // length: 33
+          `${JSON.stringify(settings.config.experimental.clientPrerender)}`.padEnd(33)
         );
+        return { code, map: null };
       }
     }
   };

package/dist/type-utils.d.ts

@@ -7,6 +7,9 @@ export type WithRequired<T, K extends keyof T> = T & {
 export type OmitIndexSignature<ObjectType> = {
     [KeyType in keyof ObjectType as object extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
 };
+export type OmitPreservingIndexSignature<T, K extends PropertyKey> = {
+    [P in keyof T as Exclude<P, K>]: T[P];
+};
 export type Kebab<T extends string, A extends string = ''> = T extends `${infer F}${infer R}` ? Kebab<R, `${A}${F extends Lowercase<F> ? '' : '-'}${Lowercase<F>}`> : A;
 export type KebabKeys<T> = {
     [K in keyof T as K extends string ? Kebab<K> : K]: T[K];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.16.8",
+  "version": "4.16.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -168,8 +168,8 @@
     "zod-to-json-schema": "^3.23.5",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "5.3.0",
-    "@astrojs/telemetry": "3.1.0"
+    "@astrojs/telemetry": "3.1.0",
+    "@astrojs/markdown-remark": "5.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"

package/dist/env/runtime-constants.d.ts

@@ -1 +0,0 @@
-export declare const ENV_SYMBOL: unique symbol;

package/dist/env/runtime-constants.js

@@ -1,4 +0,0 @@
-const ENV_SYMBOL = Symbol.for("astro:env/dev");
-export {
-  ENV_SYMBOL
-};