astro 6.0.0-beta.11 → 6.0.0-beta.13

package/dist/cli/add/index.js

@@ -2,16 +2,14 @@ import fsMod, { existsSync, promises as fs } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import * as clack from "@clack/prompts";
 import { assertValidPackageName } from "@astrojs/internal-helpers/cli";
-import boxen from "boxen";
 import { diffWords } from "diff";
 import { builders, generateCode, loadFile } from "magicast";
 import { getDefaultExportOptions } from "magicast/helpers";
 import { detect, resolveCommand } from "package-manager-detector";
 import colors from "piccolore";
-import prompts from "prompts";
 import maxSatisfying from "semver/ranges/max-satisfying.js";
-import yoctoSpinner from "yocto-spinner";
 import {
   loadTSConfig,
   resolveConfig,
@@ -435,19 +433,21 @@ ${list}`
         )
       );
       if (integrations.find((integration) => integration.integrationName === "tailwind")) {
-        const code = boxen(getDiffContent("---\n---", "---\nimport '../styles/global.css'\n---"), {
-          margin: 0.5,
-          padding: 0.5,
-          borderStyle: "round",
-          title: "src/layouts/Layout.astro"
-        });
         logger.warn(
           "SKIP_FORMAT",
           msg.actionRequired(
             "You must import your Tailwind stylesheet, e.g. in a shared layout:\n"
           )
         );
-        logger.info("SKIP_FORMAT", code + "\n");
+        clack.box(
+          getDiffContent("---\n---", "---\nimport '../styles/global.css'\n---"),
+          "src/layouts/Layout.astro",
+          {
+            rounded: true,
+            withGuide: false,
+            width: "auto"
+          }
+        );
       }
     }
   }
@@ -571,20 +571,16 @@ async function updateAstroConfig({
   if (!diff) {
     return 0 /* none */;
   }
-  const message = `
-${boxen(diff, {
-    margin: 0.5,
-    padding: 0.5,
-    borderStyle: "round",
-    title: configURL.pathname.split("/").pop()
-  })}
-`;
   logger.info(
     "SKIP_FORMAT",
     `
-  ${magenta("Astro will make the following changes to your config file:")}
-${message}`
+  ${magenta("Astro will make the following changes to your config file:")}`
   );
+  clack.box(diff, configURL.pathname.split("/").pop(), {
+    rounded: true,
+    withGuide: false,
+    width: "auto"
+  });
   if (logAdapterInstructions) {
     logger.info(
       "SKIP_FORMAT",
@@ -635,20 +631,16 @@ async function updatePackageJsonScripts({
   if (!diff) {
     return 0 /* none */;
   }
-  const message = `
-${boxen(diff, {
-    margin: 0.5,
-    padding: 0.5,
-    borderStyle: "round",
-    title: "package.json"
-  })}
-`;
   logger.info(
     "SKIP_FORMAT",
     `
-  ${magenta("Astro will add the following scripts to your package.json:")}
-${message}`
+  ${magenta("Astro will add the following scripts to your package.json:")}`
   );
+  clack.box(diff, "package.json", {
+    rounded: true,
+    withGuide: false,
+    width: "auto"
+  });
   if (await askToContinue({ flags, logger })) {
     await fs.writeFile(pkgPath, output, { encoding: "utf-8" });
     logger.debug("add", "Updated package.json scripts");
@@ -712,24 +704,22 @@ async function tryToInstallIntegrations({
     (specifiers) => installCommand.command === "deno" ? specifiers.map((specifier) => `npm:${specifier}`) : specifiers
   );
   const coloredOutput = `${bold(installCommand.command)} ${installCommand.args.join(" ")} ${cyan(installSpecifiers.join(" "))}`;
-  const message = `
-${boxen(coloredOutput, {
-    margin: 0.5,
-    padding: 0.5,
-    borderStyle: "round"
-  })}
-`;
   logger.info(
     "SKIP_FORMAT",
     `
   ${magenta("Astro will run the following command:")}
   ${dim(
       "If you skip this step, you can always run it yourself later"
-    )}
-${message}`
+    )}`
   );
+  clack.box(coloredOutput, void 0, {
+    rounded: true,
+    withGuide: false,
+    width: "auto"
+  });
   if (await askToContinue({ flags, logger })) {
-    const spinner = yoctoSpinner({ text: "Installing dependencies..." }).start();
+    const spinner = clack.spinner({ withGuide: false });
+    spinner.start("Installing dependencies...");
     try {
       await exec(installCommand.command, [...installCommand.args, ...installSpecifiers], {
         nodeOptions: {
@@ -738,10 +728,10 @@ ${message}`
           env: { NODE_ENV: void 0 }
         }
       });
-      spinner.success();
+      spinner.stop("Dependencies installed.");
       return 1 /* updated */;
     } catch (err) {
-      spinner.error();
+      spinner.error("Error installing dependencies.");
       logger.debug("add", "Error installing dependencies", err);
       console.error("\n", err.stdout || err.message, "\n");
       return 3 /* failure */;
@@ -754,7 +744,8 @@ async function validateIntegrations(integrations, flags, logger) {
   for (const integration of integrations) {
     assertValidPackageName(integration);
   }
-  const spinner = yoctoSpinner({ text: "Resolving packages..." }).start();
+  const spinner = clack.spinner({ withGuide: false });
+  spinner.start("Resolving packages...");
   try {
     const integrationEntries = await Promise.all(
       integrations.map(async (integration) => {
@@ -771,9 +762,9 @@ async function validateIntegrations(integrations, flags, logger) {
           const firstPartyPkgCheck = await fetchPackageJson("@astrojs", name, tag);
           if (firstPartyPkgCheck instanceof Error) {
             if (firstPartyPkgCheck.message) {
-              spinner.warning(yellow(firstPartyPkgCheck.message));
+              spinner.message(yellow(firstPartyPkgCheck.message));
             }
-            spinner.warning(yellow(`${bold(integration)} is not an official Astro package.`));
+            spinner.message(yellow(`${bold(integration)} is not an official Astro package.`));
             if (!await askToContinue({ flags, logger })) {
               throw new Error(
                 `No problem! Find our official integrations at ${cyan(
@@ -781,7 +772,7 @@ async function validateIntegrations(integrations, flags, logger) {
                 )}`
               );
             }
-            spinner.start("Resolving with third party packages...");
+            spinner.message("Resolving with third party packages...");
             pkgType = "third-party";
           } else {
             pkgType = "first-party";
@@ -792,7 +783,7 @@ async function validateIntegrations(integrations, flags, logger) {
           const thirdPartyPkgCheck = await fetchPackageJson(scope, name, tag);
           if (thirdPartyPkgCheck instanceof Error) {
             if (thirdPartyPkgCheck.message) {
-              spinner.warning(yellow(thirdPartyPkgCheck.message));
+              spinner.message(yellow(thirdPartyPkgCheck.message));
             }
             throw new Error(`Unable to fetch ${bold(integration)}. Does the package exist?`);
           } else {
@@ -846,7 +837,7 @@ async function validateIntegrations(integrations, flags, logger) {
         };
       })
     );
-    spinner.success();
+    spinner.stop("Resolved packages.");
     return integrationEntries;
   } catch (e) {
     if (e instanceof Error) {
@@ -895,19 +886,10 @@ async function updateTSConfig(cwd = process.cwd(), logger, integrationsInfo, fla
   if (!diff) {
     return 0 /* none */;
   }
-  const message = `
-${boxen(diff, {
-    margin: 0.5,
-    padding: 0.5,
-    borderStyle: "round",
-    title: configFileName
-  })}
-`;
   logger.info(
     "SKIP_FORMAT",
     `
-  ${magenta(`Astro will make the following changes to your ${configFileName}:`)}
-${message}`
+  ${magenta(`Astro will make the following changes to your ${configFileName}:`)}`
   );
   if (firstIntegrationWithTSSettings) {
     const conflictingIntegrations = Array.from(presets.keys()).filter(
@@ -964,13 +946,12 @@ async function askToContinue({
     hasHintedAboutYesFlag = true;
     logger.info("SKIP_FORMAT", dim("  To run this command without prompts, pass the --yes flag\n"));
   }
-  const response = await prompts({
-    type: "confirm",
-    name: "askToContinue",
-    message: "Continue?",
-    initial: true
+  const response = await clack.confirm({
+    message: colors.bold("Continue?"),
+    initialValue: true,
+    withGuide: false
   });
-  return Boolean(response.askToContinue);
+  return response === true;
 }
 function getDiffContent(input, output) {
   let changes = [];

package/dist/cli/index.js

@@ -74,7 +74,7 @@ async function runCommand(cmd, flags) {
         { TinyexecCommandExecutor },
         { getPackageManager },
         { StyledDebugInfoFormatter },
-        { PromptsPrompt },
+        { ClackPrompt },
         { CliClipboard },
         { PassthroughTextStyler },
         { infoCommand }
@@ -87,7 +87,7 @@ async function runCommand(cmd, flags) {
         import("./infra/tinyexec-command-executor.js"),
         import("./info/core/get-package-manager.js"),
         import("./info/infra/styled-debug-info-formatter.js"),
-        import("./info/infra/prompts-prompt.js"),
+        import("./info/infra/clack-prompt.js"),
         import("./info/infra/cli-clipboard.js"),
         import("./infra/passthrough-text-styler.js"),
         import("./info/core/info.js")
@@ -107,7 +107,7 @@ async function runCommand(cmd, flags) {
         }),
         nodeVersionProvider
       });
-      const prompt = new PromptsPrompt({ force: flags.copy });
+      const prompt = new ClackPrompt({ force: flags.copy });
       const clipboard = new CliClipboard({
         commandExecutor,
         logger,

package/dist/cli/info/infra/{prompts-prompt.d.ts → clack-prompt.d.ts}

@@ -1,5 +1,5 @@
 import type { Prompt } from '../definitions.js';
-export declare class PromptsPrompt implements Prompt {
+export declare class ClackPrompt implements Prompt {
     #private;
     constructor({ force }: {
         force: boolean;

package/dist/cli/info/infra/{prompts-prompt.js → clack-prompt.js}

@@ -1,5 +1,5 @@
-import prompts from "prompts";
-class PromptsPrompt {
+import { confirm } from "@clack/prompts";
+class ClackPrompt {
   #force;
   constructor({ force }) {
     this.#force = force;
@@ -11,15 +11,14 @@ class PromptsPrompt {
     if (this.#force) {
       return true;
     }
-    const { value } = await prompts({
-      type: "confirm",
-      name: "value",
+    const response = await confirm({
       message,
-      initial: defaultValue
+      initialValue: defaultValue,
+      withGuide: false
     });
-    return value;
+    return response === true;
   }
 }
 export {
-  PromptsPrompt
+  ClackPrompt
 };

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.0.0-beta.11";
+  version = "6.0.0-beta.13";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/cli/install-package.js

@@ -1,10 +1,8 @@
 import { createRequire } from "node:module";
-import boxen from "boxen";
+import * as clack from "@clack/prompts";
 import ci from "ci-info";
 import { detect, resolveCommand } from "package-manager-detector";
 import colors from "piccolore";
-import prompts from "prompts";
-import yoctoSpinner from "yocto-spinner";
 import { exec } from "./exec.js";
 const require2 = createRequire(import.meta.url);
 const { bold, cyan, dim, magenta } = colors;
@@ -48,35 +46,32 @@ async function installPackage(packageNames, options, logger) {
     packageNames = packageNames.map((name) => `npm:${name}`);
   }
   const coloredOutput = `${bold(installCommand.command)} ${installCommand.args.join(" ")} ${cyan(packageNames.join(" "))}`;
-  const message = `
-${boxen(coloredOutput, {
-    margin: 0.5,
-    padding: 0.5,
-    borderStyle: "round"
-  })}
-`;
   logger.info(
     "SKIP_FORMAT",
     `
   ${magenta("Astro will run the following command:")}
   ${dim(
       "If you skip this step, you can always run it yourself later"
-    )}
-${message}`
+    )}`
   );
+  clack.box(coloredOutput, void 0, {
+    rounded: true,
+    withGuide: false,
+    width: "auto"
+  });
   let response;
   if (options.skipAsk) {
     response = true;
   } else {
-    response = (await prompts({
-      type: "confirm",
-      name: "askToContinue",
-      message: "Continue?",
-      initial: true
-    })).askToContinue;
+    response = await clack.confirm({
+      message: colors.bold("Continue?"),
+      initialValue: true,
+      withGuide: false
+    }) === true;
   }
   if (Boolean(response)) {
-    const spinner = yoctoSpinner({ text: "Installing dependencies..." }).start();
+    const spinner = clack.spinner({ withGuide: false });
+    spinner.start("Installing dependencies...");
     try {
       await exec(installCommand.command, [...installCommand.args, ...packageNames], {
         nodeOptions: {
@@ -85,11 +80,11 @@ ${message}`
           env: { NODE_ENV: void 0 }
         }
       });
-      spinner.success();
+      spinner.stop("Dependencies installed.");
       return true;
     } catch (err) {
       logger.debug("add", "Error installing dependencies", err);
-      spinner.error();
+      spinner.error("Failed to install dependencies.");
       return false;
     }
   } else {

package/dist/container/index.js

@@ -50,6 +50,7 @@ function createManifest(manifest, renderers, middleware) {
     middleware: manifest?.middleware ?? middlewareInstance,
     key: createKey(),
     csp: manifest?.csp,
+    image: manifest?.image ?? {},
     shouldInjectCspMetaTags: false,
     devToolbar: {
       enabled: false,

package/dist/content/content-layer.js

@@ -181,7 +181,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.11") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.13") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -189,8 +189,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.0-beta.11") {
-      await this.#store.metaStore().set("astro-version", "6.0.0-beta.11");
+    if ("6.0.0-beta.13") {
+      await this.#store.metaStore().set("astro-version", "6.0.0-beta.13");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/vite-plugin-content-imports.js

@@ -122,6 +122,7 @@ export const _internal = {
         viteServer.watcher.on("all", async (event, entry) => {
           if (CHOKIDAR_MODIFIED_EVENTS.includes(event)) {
             const environment = viteServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
+            const timestamp = Date.now();
             const entryType = getEntryType(entry, contentPaths, contentEntryExts, dataEntryExts);
             if (!COLLECTION_TYPES_TO_INVALIDATE_ON.includes(entryType)) return;
             if (entryType === "content" || entryType === "data") {
@@ -136,7 +137,7 @@ export const _internal = {
                 try {
                   const mod = await environment.moduleGraph.getModuleByUrl(modUrl);
                   if (mod) {
-                    environment.moduleGraph.invalidateModule(mod);
+                    environment.moduleGraph.invalidateModule(mod, void 0, timestamp, true);
                   }
                 } catch (e) {
                   if (e.code === "ERR_CLOSED_SERVER") break;

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

@@ -27,7 +27,8 @@ function invalidateDataStore(viteServer) {
   const environment = viteServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
   const module = environment.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
   if (module) {
-    environment.moduleGraph.invalidateModule(module);
+    const timestamp = Date.now();
+    environment.moduleGraph.invalidateModule(module, void 0, timestamp, true);
   }
   viteServer.environments.client.hot.send({
     type: "full-reload",

package/dist/core/app/entrypoints/index.d.ts

@@ -0,0 +1,7 @@
+export type { RoutesList } from '../../../types/astro.js';
+export { App } from '../app.js';
+export { BaseApp, type RenderErrorOptions, type RenderOptions } from '../base.js';
+export { fromRoutingStrategy, toRoutingStrategy } from '../common.js';
+export { createConsoleLogger } from '../logging.js';
+export { deserializeManifest, deserializeRouteData, deserializeRouteInfo, serializeRouteData, serializeRouteInfo, } from '../manifest.js';
+export { AppPipeline } from '../pipeline.js';

package/dist/core/app/{index.js → entrypoints/index.js}

@@ -1,15 +1,15 @@
-import { App } from "./app.js";
-import { BaseApp } from "./base.js";
-import { fromRoutingStrategy, toRoutingStrategy } from "./common.js";
-import { createConsoleLogger } from "./logging.js";
+import { App } from "../app.js";
+import { BaseApp } from "../base.js";
+import { fromRoutingStrategy, toRoutingStrategy } from "../common.js";
+import { createConsoleLogger } from "../logging.js";
 import {
   deserializeManifest,
   deserializeRouteData,
   deserializeRouteInfo,
   serializeRouteData,
   serializeRouteInfo
-} from "./manifest.js";
-import { AppPipeline } from "./pipeline.js";
+} from "../manifest.js";
+import { AppPipeline } from "../pipeline.js";
 export {
   App,
   AppPipeline,

package/dist/core/app/entrypoints/manifest.d.ts

@@ -0,0 +1 @@
+export { type SerializedRouteData, deserializeManifest, deserializeRouteData, deserializeRouteInfo, serializeRouteData, serializeRouteInfo, } from '../manifest.js';

package/dist/core/app/entrypoints/manifest.js

@@ -0,0 +1,14 @@
+import {
+  deserializeManifest,
+  deserializeRouteData,
+  deserializeRouteInfo,
+  serializeRouteData,
+  serializeRouteInfo
+} from "../manifest.js";
+export {
+  deserializeManifest,
+  deserializeRouteData,
+  deserializeRouteInfo,
+  serializeRouteData,
+  serializeRouteInfo
+};

package/dist/core/app/entrypoints/node.d.ts

@@ -0,0 +1 @@
+export { NodeApp, loadApp, loadManifest, createRequest, writeResponse } from '../node.js';

package/dist/core/app/entrypoints/node.js

@@ -0,0 +1,8 @@
+import { NodeApp, loadApp, loadManifest, createRequest, writeResponse } from "../node.js";
+export {
+  NodeApp,
+  createRequest,
+  loadApp,
+  loadManifest,
+  writeResponse
+};

package/dist/core/app/entrypoints/virtual/dev.d.ts

@@ -0,0 +1,2 @@
+import type { CreateApp } from '../../types.js';
+export declare const createApp: CreateApp;

package/dist/core/app/{entrypoint → entrypoints/virtual}/dev.js

@@ -1,10 +1,10 @@
 import { manifest } from "virtual:astro:manifest";
-import { DevApp } from "../dev/app.js";
-import { createConsoleLogger } from "../logging.js";
+import { DevApp } from "../../dev/app.js";
+import { createConsoleLogger } from "../../logging.js";
 let currentDevApp = null;
-function createApp() {
+const createApp = ({ streaming } = {}) => {
   const logger = createConsoleLogger(manifest.logLevel);
-  currentDevApp = new DevApp(manifest, true, logger);
+  currentDevApp = new DevApp(manifest, streaming, logger);
   if (import.meta.hot) {
     import.meta.hot.on("astro:routes-updated", async () => {
       if (!currentDevApp) return;
@@ -21,7 +21,7 @@ function createApp() {
     });
   }
   return currentDevApp;
-}
+};
 export {
   createApp
 };

package/dist/core/app/entrypoints/virtual/index.d.ts

@@ -0,0 +1,2 @@
+import type { CreateApp } from '../../types.js';
+export declare const createApp: CreateApp;

package/dist/core/app/entrypoints/virtual/index.js

@@ -0,0 +1,5 @@
+import { createApp as _createApp } from "virtual:astro:app";
+const createApp = _createApp;
+export {
+  createApp
+};

package/dist/core/app/entrypoints/virtual/prod.d.ts

@@ -0,0 +1,2 @@
+import type { CreateApp } from '../../types.js';
+export declare const createApp: CreateApp;

package/dist/core/app/entrypoints/virtual/prod.js

@@ -0,0 +1,8 @@
+import { manifest } from "virtual:astro:manifest";
+import { App } from "../../app.js";
+const createApp = ({ streaming } = {}) => {
+  return new App(manifest, streaming);
+};
+export {
+  createApp
+};

package/dist/core/app/node.d.ts

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { RemotePattern } from '../../types/public/config.js';
-import type { RenderOptions } from './index.js';
-import { App } from './index.js';
+import type { RenderOptions } from './base.js';
+import { App } from './app.js';
 import type { NodeAppHeadersJson, SSRManifest } from './types.js';
 /**
  * Allow the request body to be explicitly overridden. For example, this
@@ -10,6 +10,48 @@ import type { NodeAppHeadersJson, SSRManifest } from './types.js';
 interface NodeRequest extends IncomingMessage {
     body?: unknown;
 }
+/**
+ * Converts a NodeJS IncomingMessage into a web standard Request.
+ * ```js
+ * import { createApp } from 'astro/app/entrypoint';
+ * import { createRequest } from 'astro/app/node';
+ * import { createServer } from 'node:http';
+ *
+ * const app = createApp();
+ *
+ * const server = createServer(async (req, res) => {
+ *     const request = createRequest(req);
+ *     const response = await app.render(request);
+ * })
+ * ```
+ */
+export declare function createRequest(req: NodeRequest, { skipBody, allowedDomains, }?: {
+    skipBody?: boolean;
+    allowedDomains?: Partial<RemotePattern>[];
+}): Request;
+/**
+ * Streams a web-standard Response into a NodeJS Server Response.
+ * ```js
+ * import { createApp } from 'astro/app/entrypoint';
+ * import { createRequest, writeResponse } from 'astro/app/node';
+ * import { createServer } from 'node:http';
+ *
+ * const app = createApp();
+ *
+ * const server = createServer(async (req, res) => {
+ *     const request = createRequest(req);
+ *     const response = await app.render(request);
+ *     await writeResponse(response, res);
+ * })
+ * ```
+ * @param source WhatWG Response
+ * @param destination NodeJS ServerResponse
+ */
+export declare function writeResponse(source: Response, destination: ServerResponse): Promise<ServerResponse<IncomingMessage> | undefined>;
+/**
+ * @deprecated Use `App` or `createApp()` instead, and use in conjunction with `convertRequest()`
+ * and `writeResponse()` helpers. This will be removed in a future major version.
+ */
 export declare class NodeApp extends App {
     headersMap: NodeAppHeadersJson | undefined;
     setHeadersMap(headers: NodeAppHeadersJson): void;
@@ -28,10 +70,7 @@ export declare class NodeApp extends App {
      * })
      * ```
      */
-    static createRequest(req: NodeRequest, { skipBody, allowedDomains, }?: {
-        skipBody?: boolean;
-        allowedDomains?: Partial<RemotePattern>[];
-    }): Request;
+    static createRequest: typeof createRequest;
     /**
      * Streams a web-standard Response into a NodeJS Server Response.
      * ```js
@@ -47,8 +86,10 @@ export declare class NodeApp extends App {
      * @param source WhatWG Response
      * @param destination NodeJS ServerResponse
      */
-    static writeResponse(source: Response, destination: ServerResponse): Promise<ServerResponse<IncomingMessage> | undefined>;
+    static writeResponse: typeof writeResponse;
 }
+/** @deprecated This will be removed in a future major version. */
 export declare function loadManifest(rootFolder: URL): Promise<SSRManifest>;
+/** @deprecated This will be removed in a future major version. */
 export declare function loadApp(rootFolder: URL): Promise<NodeApp>;
 export {};