astro 4.15.2 → 4.15.4

package/dist/assets/build/generate.js

@@ -48,9 +48,9 @@ function getFullImagePath(originalFilePath, env) {
   return new URL(removeLeadingForwardSlash(originalFilePath), env.serverRoot);
 }
 async function generateImagesForPath(originalFilePath, transformsAndPath, env, queue) {
-  const originalImageData = await loadImage(originalFilePath, env);
+  let originalImage;
   for (const [_, transform] of transformsAndPath.transforms) {
-    await queue.add(async () => generateImage(originalImageData, transform.finalPath, transform.transform)).catch((e) => {
+    await queue.add(async () => generateImage(transform.finalPath, transform.transform)).catch((e) => {
       throw e;
     });
   }
@@ -66,9 +66,9 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
     } catch {
     }
   }
-  async function generateImage(originalImage, filepath, options) {
+  async function generateImage(filepath, options) {
     const timeStart = performance.now();
-    const generationData = await generateImageInternal(originalImage, filepath, options);
+    const generationData = await generateImageInternal(filepath, options);
     const timeEnd = performance.now();
     const timeChange = getTimeStat(timeStart, timeEnd);
     const timeIncrease = `(+${timeChange})`;
@@ -80,7 +80,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
     );
     env.count.current++;
   }
-  async function generateImageInternal(originalImage, filepath, options) {
+  async function generateImageInternal(filepath, options) {
     const isLocalImage = isESMImportedImage(options.src);
     const finalFileURL = new URL("." + filepath, env.clientRoot);
     const cacheFile = basename(filepath) + (isLocalImage ? "" : ".json");
@@ -116,6 +116,9 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
     const finalFolderURL = new URL("./", finalFileURL);
     await fs.promises.mkdir(finalFolderURL, { recursive: true });
     const originalImagePath = isLocalImage ? options.src.src : options.src;
+    if (!originalImage) {
+      originalImage = await loadImage(originalFilePath, env);
+    }
     let resultData = {
       data: void 0,
       expires: originalImage.expires

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

@@ -10,5 +10,5 @@ interface IntegrationInfo {
     type: 'integration' | 'adapter';
 }
 export declare function add(names: string[], { flags }: AddOptions): Promise<void>;
-export declare function setAdapter(mod: ProxifiedModule<any>, adapter: IntegrationInfo): void;
+export declare function setAdapter(mod: ProxifiedModule<any>, adapter: IntegrationInfo, exportName: string): void;
 export {};

package/dist/cli/add/index.js

@@ -247,7 +247,7 @@ async function add(names, { flags }) {
       if (isAdapter(integration)) {
         const officialExportName = OFFICIAL_ADAPTER_TO_IMPORT_MAP[integration.id];
         if (officialExportName) {
-          setAdapter(mod, integration);
+          setAdapter(mod, integration, officialExportName);
         } else {
           logger.info(
             "SKIP_FORMAT",
@@ -371,14 +371,14 @@ function addIntegration(mod, integration) {
     config.integrations.push(builders.functionCall(integrationId));
   }
 }
-function setAdapter(mod, adapter) {
+function setAdapter(mod, adapter, exportName) {
   const config = getDefaultExportOptions(mod);
   const adapterId = toIdent(adapter.id);
   if (!mod.imports.$items.some((imp) => imp.local === adapterId)) {
     mod.imports.$append({
       imported: "default",
       local: adapterId,
-      from: adapter.packageName
+      from: exportName
     });
   }
   if (!config.output) {

package/dist/cli/create-key/index.d.ts

@@ -0,0 +1,6 @@
+import { type Flags } from '../flags.js';
+interface CreateKeyOptions {
+    flags: Flags;
+}
+export declare function createKey({ flags }: CreateKeyOptions): Promise<0 | 1>;
+export {};

package/dist/cli/create-key/index.js

@@ -0,0 +1,27 @@
+import { createNodeLogger } from "../../core/config/logging.js";
+import { createKey as createCryptoKey, encodeKey } from "../../core/encryption.js";
+import { flagsToAstroInlineConfig } from "../flags.js";
+async function createKey({ flags }) {
+  try {
+    const inlineConfig = flagsToAstroInlineConfig(flags);
+    const logger = createNodeLogger(inlineConfig);
+    const keyPromise = createCryptoKey();
+    const key = await keyPromise;
+    const encoded = await encodeKey(key);
+    logger.info(
+      "crypto",
+      `Generated a key to encrypt props passed to Server islands. To reuse the same key across builds, set this value as ASTRO_KEY in an environment variable on your build server.
+
+ASTRO_KEY=${encoded}`
+    );
+  } catch (err) {
+    if (err != null) {
+      console.error(err.toString());
+    }
+    return 1;
+  }
+  return 0;
+}
+export {
+  createKey
+};

package/dist/cli/index.js

@@ -12,6 +12,7 @@ async function printAstroHelp() {
         ["add", "Add an integration."],
         ["build", "Build your project and write it to disk."],
         ["check", "Check your project for errors."],
+        ["create-key", "Create a cryptography key"],
         ["db", "Manage your Astro database."],
         ["dev", "Start the development server."],
         ["docs", "Open documentation in your web browser."],
@@ -55,6 +56,7 @@ function resolveCommand(flags) {
     "build",
     "preview",
     "check",
+    "create-key",
     "docs",
     "db",
     "info",
@@ -81,6 +83,11 @@ async function runCommand(cmd, flags) {
       await printInfo({ flags });
       return;
     }
+    case "create-key": {
+      const { createKey } = await import("./create-key/index.js");
+      const exitCode = await createKey({ flags });
+      return process.exit(exitCode);
+    }
     case "docs": {
       const { docs } = await import("./docs/index.js");
       await docs({ flags });

package/dist/content/content-layer.d.ts

@@ -33,6 +33,12 @@ export declare class ContentLayer {
 export declare function simpleLoader<TData extends {
     id: string;
 }>(handler: () => Array<TData> | Promise<Array<TData>>, context: LoaderContext): Promise<void>;
+/**
+ * Get the path to the data store file.
+ * During development, this is in the `.astro` directory so that the Vite watcher can see it.
+ * In production, it's in the cache directory so that it's preserved between builds.
+ */
+export declare function getDataStoreFile(settings: AstroSettings, isDev?: boolean): URL;
 export declare const globalContentLayer: {
     init: (options: ContentLayerOptions) => ContentLayer;
     get: () => ContentLayer | null;

package/dist/content/content-layer.js

@@ -170,7 +170,7 @@ class ContentLayer {
     if (!existsSync(this.#settings.config.cacheDir)) {
       await fs.mkdir(this.#settings.config.cacheDir, { recursive: true });
     }
-    const cacheFile = new URL(DATA_STORE_FILE, this.#settings.config.cacheDir);
+    const cacheFile = getDataStoreFile(this.#settings);
     await this.#store.writeToDisk(cacheFile);
     if (!existsSync(this.#settings.dotAstroDir)) {
       await fs.mkdir(this.#settings.dotAstroDir, { recursive: true });
@@ -224,6 +224,10 @@ async function simpleLoader(handler, context) {
     context.store.set({ id: raw.id, data: item });
   }
 }
+function getDataStoreFile(settings, isDev) {
+  isDev ??= process?.env.NODE_ENV === "development";
+  return new URL(DATA_STORE_FILE, isDev ? settings.dotAstroDir : settings.config.cacheDir);
+}
 function contentLayerSingleton() {
   let instance = null;
   return {
@@ -242,6 +246,7 @@ function contentLayerSingleton() {
 const globalContentLayer = contentLayerSingleton();
 export {
   ContentLayer,
+  getDataStoreFile,
   globalContentLayer,
   simpleLoader
 };

package/dist/content/data-store.js

@@ -39,6 +39,9 @@ class DataStore {
   static async fromModule() {
     try {
       const data = await import("astro:data-layer-content");
+      if (data.default instanceof Map) {
+        return DataStore.fromMap(data.default);
+      }
       const map = devalue.unflatten(data.default);
       return DataStore.fromMap(map);
     } catch {

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -17,7 +17,6 @@ import {
   CONTENT_FLAG,
   CONTENT_RENDER_FLAG,
   DATA_FLAG,
-  DATA_STORE_FILE,
   DATA_STORE_VIRTUAL_ID,
   MODULES_IMPORTS_FILE,
   MODULES_MJS_ID,
@@ -26,6 +25,7 @@ import {
   RESOLVED_VIRTUAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 } from "./consts.js";
+import { getDataStoreFile } from "./content-layer.js";
 import {
   getContentEntryIdAndSlug,
   getContentPaths,
@@ -44,12 +44,13 @@ function astroContentVirtualModPlugin({
 }) {
   let IS_DEV = false;
   const IS_SERVER = isServerLikeOutput(settings.config);
-  const dataStoreFile = new URL(DATA_STORE_FILE, settings.config.cacheDir);
+  let dataStoreFile;
   return {
     name: "astro-content-virtual-mod-plugin",
     enforce: "pre",
     configResolved(config) {
       IS_DEV = config.mode === "development";
+      dataStoreFile = getDataStoreFile(settings, IS_DEV);
     },
     async resolveId(id) {
       if (id === VIRTUAL_MODULE_ID) {
@@ -161,20 +162,25 @@ function astroContentVirtualModPlugin({
     },
     configureServer(server) {
       const dataStorePath = fileURLToPath(dataStoreFile);
-      if (Array.isArray(server.watcher.options.ignored)) {
-        server.watcher.options.ignored.push(`!${dataStorePath}`);
-      }
       server.watcher.add(dataStorePath);
+      function invalidateDataStore() {
+        const module = server.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
+        if (module) {
+          server.moduleGraph.invalidateModule(module);
+        }
+        server.ws.send({
+          type: "full-reload",
+          path: "*"
+        });
+      }
+      server.watcher.on("add", (addedPath) => {
+        if (addedPath === dataStorePath) {
+          invalidateDataStore();
+        }
+      });
       server.watcher.on("change", (changedPath) => {
         if (changedPath === dataStorePath) {
-          const module = server.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
-          if (module) {
-            server.moduleGraph.invalidateModule(module);
-          }
-          server.ws.send({
-            type: "full-reload",
-            path: "*"
-          });
+          invalidateDataStore();
         }
       });
     }

package/dist/core/build/index.js

@@ -15,7 +15,7 @@ import { resolveConfig } from "../config/config.js";
 import { createNodeLogger } from "../config/logging.js";
 import { createSettings } from "../config/settings.js";
 import { createVite } from "../create-vite.js";
-import { createKey } from "../encryption.js";
+import { createKey, getEnvironmentKey, hasEnvironmentKey } from "../encryption.js";
 import { levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { createRouteManifest } from "../routing/index.js";
@@ -31,6 +31,7 @@ async function build(inlineConfig, options = {}) {
   const logger = createNodeLogger(inlineConfig);
   const { userConfig, astroConfig } = await resolveConfig(inlineConfig, "build");
   telemetry.record(eventCliSession("build", userConfig));
+  const settings = await createSettings(astroConfig, fileURLToPath(astroConfig.root));
   if (inlineConfig.force) {
     if (astroConfig.experimental.contentCollectionCache) {
       const contentCacheDir = new URL("./content/", astroConfig.cacheDir);
@@ -40,9 +41,8 @@ async function build(inlineConfig, options = {}) {
         logger.warn("content", "content cache cleared (force)");
       }
     }
-    await clearContentLayerCache({ astroConfig, logger, fs });
+    await clearContentLayerCache({ settings, logger, fs });
   }
-  const settings = await createSettings(astroConfig, fileURLToPath(astroConfig.root));
   const builder = new AstroBuilder(settings, {
     ...options,
     logger,
@@ -131,6 +131,8 @@ class AstroBuilder {
       "build",
       green(`\u2713 Completed in ${getTimeStat(this.timer.init, performance.now())}.`)
     );
+    const hasKey = hasEnvironmentKey();
+    const keyPromise = hasKey ? getEnvironmentKey() : createKey();
     const opts = {
       allPages,
       settings: this.settings,
@@ -141,7 +143,7 @@ class AstroBuilder {
       pageNames,
       teardownCompiler: this.teardownCompiler,
       viteConfig,
-      key: createKey()
+      key: keyPromise
     };
     const { internals, ssrOutputChunkNames, contentFileNames } = await viteBuild(opts);
     await staticBuild(opts, internals, ssrOutputChunkNames, contentFileNames);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.15.2";
+const ASTRO_VERSION = "4.15.4";
 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

@@ -2,8 +2,7 @@ import fs, { existsSync } from "node:fs";
 import { performance } from "node:perf_hooks";
 import { green } from "kleur/colors";
 import { gt, major, minor, patch } from "semver";
-import { DATA_STORE_FILE } from "../../content/consts.js";
-import { globalContentLayer } from "../../content/content-layer.js";
+import { getDataStoreFile, globalContentLayer } from "../../content/content-layer.js";
 import { attachContentServerListeners } from "../../content/index.js";
 import { MutableDataStore } from "../../content/mutable-data-store.js";
 import { globalContentConfigObserver } from "../../content/utils.js";
@@ -23,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.15.2";
+  const currentVersion = "4.15.4";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {
@@ -70,7 +69,7 @@ async function dev(inlineConfig) {
   await attachContentServerListeners(restart.container);
   let store;
   try {
-    const dataStoreFile = new URL(DATA_STORE_FILE, restart.container.settings.config.cacheDir);
+    const dataStoreFile = getDataStoreFile(restart.container.settings);
     if (existsSync(dataStoreFile)) {
       store = await MutableDataStore.fromFile(dataStoreFile);
     }

package/dist/core/encryption.d.ts

@@ -2,6 +2,18 @@
  * Creates a CryptoKey object that can be used to encrypt any string.
  */
 export declare function createKey(): Promise<CryptoKey>;
+/**
+ * Get the encoded value of the ASTRO_KEY env var.
+ */
+export declare function getEncodedEnvironmentKey(): string;
+/**
+ * See if the environment variable key ASTRO_KEY is set.
+ */
+export declare function hasEnvironmentKey(): boolean;
+/**
+ * Get the environment variable key and decode it into a CryptoKey.
+ */
+export declare function getEnvironmentKey(): Promise<CryptoKey>;
 /**
  * Takes a key that has been serialized to an array of bytes and returns a CryptoKey
  */

package/dist/core/encryption.js

@@ -11,6 +11,22 @@ async function createKey() {
   );
   return key;
 }
+const ENVIRONMENT_KEY_NAME = "ASTRO_KEY";
+function getEncodedEnvironmentKey() {
+  return process.env[ENVIRONMENT_KEY_NAME] || "";
+}
+function hasEnvironmentKey() {
+  return getEncodedEnvironmentKey() !== "";
+}
+async function getEnvironmentKey() {
+  if (!hasEnvironmentKey()) {
+    throw new Error(
+      `There is no environment key defined. If you see this error there is a bug in Astro.`
+    );
+  }
+  const encodedKey = getEncodedEnvironmentKey();
+  return decodeKey(encodedKey);
+}
 async function importKey(bytes) {
   const key = await crypto.subtle.importKey("raw", bytes, ALGORITHM, true, ["encrypt", "decrypt"]);
   return key;
@@ -60,5 +76,8 @@ export {
   decryptString,
   encodeKey,
   encryptString,
+  getEncodedEnvironmentKey,
+  getEnvironmentKey,
+  hasEnvironmentKey,
   importKey
 };

package/dist/core/logger/core.d.ts

@@ -7,7 +7,7 @@ export type LoggerLevel = 'debug' | 'info' | 'warn' | 'error' | 'silent';
  * rather than specific to a single command, function, use, etc. The label will be
  * shown in the log message to the user, so it should be relevant.
  */
-export type LoggerLabel = 'add' | 'build' | 'check' | 'config' | 'content' | 'deprecated' | 'markdown' | 'router' | 'types' | 'vite' | 'watch' | 'middleware' | 'preferences' | 'redirects' | 'toolbar' | 'assets' | 'env' | 'update' | 'SKIP_FORMAT';
+export type LoggerLabel = 'add' | 'build' | 'check' | 'config' | 'content' | 'crypto' | 'deprecated' | 'markdown' | 'router' | 'types' | 'vite' | 'watch' | 'middleware' | 'preferences' | 'redirects' | 'sync' | 'toolbar' | 'assets' | 'env' | 'update' | 'SKIP_FORMAT';
 export interface LogOptions {
     dest: LogWritable<LogMessage>;
     level: LoggerLevel;

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.15.2";
+  const version = "4.15.4";
   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.15.2"}`
+        `v${"4.15.4"}`
       )} ${headline}`
     );
   }

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

@@ -1,5 +1,5 @@
 import fsMod from 'node:fs';
-import type { AstroConfig, AstroInlineConfig, AstroSettings } from '../../@types/astro.js';
+import type { AstroInlineConfig, AstroSettings } from '../../@types/astro.js';
 import type { Logger } from '../logger/core.js';
 export type SyncOptions = {
     logger: Logger;
@@ -16,8 +16,8 @@ export default function sync(inlineConfig: AstroInlineConfig, { fs, telemetry: _
 /**
  * Clears the content layer and content collection cache, forcing a full rebuild.
  */
-export declare function clearContentLayerCache({ astroConfig, logger, fs, }: {
-    astroConfig: AstroConfig;
+export declare function clearContentLayerCache({ settings, logger, fs, }: {
+    settings: AstroSettings;
     logger: Logger;
     fs?: typeof fsMod;
 }): Promise<void>;

package/dist/core/sync/index.js

@@ -3,8 +3,8 @@ import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { dim } from "kleur/colors";
 import { createServer } from "vite";
-import { CONTENT_TYPES_FILE, DATA_STORE_FILE } from "../../content/consts.js";
-import { globalContentLayer } from "../../content/content-layer.js";
+import { CONTENT_TYPES_FILE } from "../../content/consts.js";
+import { getDataStoreFile, globalContentLayer } from "../../content/content-layer.js";
 import { createContentTypesGenerator } from "../../content/index.js";
 import { MutableDataStore } from "../../content/mutable-data-store.js";
 import { getContentPaths, globalContentConfigObserver } from "../../content/utils.js";
@@ -41,15 +41,23 @@ async function sync(inlineConfig, { fs, telemetry: _telemetry = false } = {}) {
     settings,
     logger
   });
-  await runHookConfigDone({ settings, logger });
+  try {
+    await runHookConfigDone({ settings, logger });
+  } catch (err) {
+    if (err instanceof Error) {
+      const errorMessage = err.toString();
+      logger.error("sync", errorMessage);
+    }
+    throw err;
+  }
   return await syncInternal({ settings, logger, fs, force: inlineConfig.force });
 }
 async function clearContentLayerCache({
-  astroConfig,
+  settings,
   logger,
   fs = fsMod
 }) {
-  const dataStore = new URL(DATA_STORE_FILE, astroConfig.cacheDir);
+  const dataStore = getDataStoreFile(settings);
   if (fs.existsSync(dataStore)) {
     logger.debug("content", "clearing data store");
     await fs.promises.rm(dataStore, { force: true });
@@ -64,7 +72,7 @@ async function syncInternal({
   force
 }) {
   if (force) {
-    await clearContentLayerCache({ astroConfig: settings.config, logger, fs });
+    await clearContentLayerCache({ settings, logger, fs });
   }
   const timerStart = performance.now();
   try {
@@ -73,7 +81,7 @@ async function syncInternal({
       settings.timer.start("Sync content layer");
       let store;
       try {
-        const dataStoreFile = new URL(DATA_STORE_FILE, settings.config.cacheDir);
+        const dataStoreFile = getDataStoreFile(settings);
         if (existsSync(dataStoreFile)) {
           store = await MutableDataStore.fromFile(dataStoreFile);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.15.2",
+  "version": "4.15.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -164,7 +164,7 @@
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
     "vite": "^5.4.2",
-    "vitefu": "^0.2.5",
+    "vitefu": "^1.0.2",
     "which-pm": "^3.0.0",
     "xxhash-wasm": "^1.0.2",
     "yargs-parser": "^21.1.1",
@@ -182,8 +182,6 @@
     "@astrojs/check": "^0.9.3",
     "@playwright/test": "^1.46.1",
     "@types/aria-query": "^5.0.4",
-    "@types/babel__generator": "^7.6.8",
-    "@types/babel__traverse": "^7.20.6",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
     "@types/debug": "^4.1.12",