astro 4.15.3 → 4.15.4

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/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";
@@ -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.3";
+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

@@ -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.15.3";
+  const currentVersion = "4.15.4";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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' | 'sync' | '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.3";
+  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.3"}`
+        `v${"4.15.4"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.15.3",
+  "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",