astro 5.14.8 → 5.15.0

package/components/Font.astro

@@ -1,5 +1,6 @@
 ---
 import * as mod from 'virtual:astro:assets/fonts/internal';
+import { filterPreloads } from 'astro/assets/fonts/runtime';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 
 // TODO: remove check when fonts are stabilized
@@ -12,7 +13,7 @@ interface Props {
 	/** The `cssVariable` registered in your Astro configuration. */
 	cssVariable: import('astro:assets').CssVariable;
 	/** Whether it should output [preload links](https://web.dev/learn/performance/optimize-web-fonts#preload) or not. */
-	preload?: boolean;
+	preload?: import('astro:assets').FontPreloadFilter;
 }
 
 const { cssVariable, preload = false } = Astro.props as Props;
@@ -23,12 +24,13 @@ if (!data) {
 		message: AstroErrorData.FontFamilyNotFound.message(cssVariable),
 	});
 }
+
+const filteredPreloadData = filterPreloads(data.preloadData, preload);
 ---
 
 <style set:html={data.css}></style>
 {
-	preload &&
-		data.preloadData.map(({ url, type }) => (
-			<link rel="preload" href={url} as="font" type={`font/${type}`} crossorigin />
-		))
+	filteredPreloadData?.map(({ url, type }) => (
+		<link rel="preload" href={url} as="font" type={`font/${type}`} crossorigin />
+	))
 }

package/dist/actions/runtime/virtual.js

@@ -1,4 +1,5 @@
 import { shouldAppendTrailingSlash } from "virtual:astro:actions/options";
+import { internalFetchHeaders } from "virtual:astro:adapter-config/client";
 import {
   ACTION_QUERY_PARAMS,
   ActionError,
@@ -73,6 +74,9 @@ async function handleAction(param, path, context) {
   }
   const headers = new Headers();
   headers.set("Accept", "application/json");
+  for (const [key, value] of Object.entries(internalFetchHeaders)) {
+    headers.set(key, value);
+  }
   let body = param;
   if (!(body instanceof FormData)) {
     try {

package/dist/assets/build/generate.js

@@ -1,6 +1,6 @@
 import fs, { readFileSync } from "node:fs";
 import { basename } from "node:path/posix";
-import { dim, green } from "kleur/colors";
+import colors from "picocolors";
 import { getOutDirWithinCwd } from "../../core/build/common.js";
 import { getTimeStat } from "../../core/build/util.js";
 import { AstroError } from "../../core/errors/errors.js";
@@ -74,7 +74,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env) {
     const count = `(${env.count.current}/${env.count.total})`;
     env.logger.info(
       null,
-      `  ${green("\u25B6")} ${filepath} ${dim(statsText)} ${dim(timeIncrease)} ${dim(count)}`
+      `  ${colors.green("\u25B6")} ${filepath} ${colors.dim(statsText)} ${colors.dim(timeIncrease)} ${colors.dim(count)}`
     );
     env.count.current++;
   }

package/dist/assets/fonts/implementations/url-proxy.js

@@ -1,3 +1,4 @@
+import { renderFontWeight } from "../utils.js";
 function createUrlProxy({
   hashResolver,
   dataCollector,
@@ -11,7 +12,13 @@ function createUrlProxy({
       dataCollector.collect({
         url: originalUrl,
         hash,
-        preload: collectPreload ? { url, type } : null,
+        preload: collectPreload ? {
+          url,
+          type,
+          weight: renderFontWeight(data.weight),
+          style: data.style,
+          subset: data.subset
+        } : null,
         data,
         init
       });

package/dist/assets/fonts/runtime.d.ts

@@ -1,4 +1,5 @@
-import type { ConsumableMap } from './types.js';
+import type { ConsumableMap, PreloadData, PreloadFilter } from './types.js';
 export declare function createGetFontData({ consumableMap }: {
     consumableMap?: ConsumableMap;
 }): (cssVariable: string) => import("./types.js").FontData[];
+export declare function filterPreloads(data: Array<PreloadData>, preload: PreloadFilter): Array<PreloadData> | null;

package/dist/assets/fonts/runtime.js

@@ -14,6 +14,41 @@ function createGetFontData({ consumableMap }) {
     return data;
   };
 }
+function filterPreloads(data, preload) {
+  if (!preload) {
+    return null;
+  }
+  if (preload === true) {
+    return data;
+  }
+  return data.filter(
+    ({ weight, style, subset }) => preload.some((p) => {
+      if (p.weight !== void 0 && weight !== void 0 && !checkWeight(p.weight.toString(), weight)) {
+        return false;
+      }
+      if (p.style !== void 0 && p.style !== style) {
+        return false;
+      }
+      if (p.subset !== void 0 && p.subset !== subset) {
+        return false;
+      }
+      return true;
+    })
+  );
+}
+function checkWeight(input, target) {
+  const trimmedInput = input.trim();
+  if (trimmedInput.includes(" ")) {
+    return trimmedInput === target;
+  }
+  if (target.includes(" ")) {
+    const [a, b] = target.split(" ");
+    const parsedInput = Number.parseInt(input);
+    return parsedInput >= Number.parseInt(a) && parsedInput <= Number.parseInt(b);
+  }
+  return input === target;
+}
 export {
-  createGetFontData
+  createGetFontData,
+  filterPreloads
 };

package/dist/assets/fonts/types.d.ts

@@ -44,6 +44,9 @@ export interface PreloadData {
      * A font type, eg. woff2, woff, ttf...
      */
     type: FontType;
+    weight: string | undefined;
+    style: string | undefined;
+    subset: string | undefined;
 }
 export type FontFaceMetrics = Pick<Font, 'ascent' | 'descent' | 'lineGap' | 'unitsPerEm' | 'xWidthAvg'>;
 export type GenericFallbackName = (typeof GENERIC_FALLBACK_NAMES)[number];
@@ -87,4 +90,9 @@ export interface FontData {
  */
 export type ConsumableMap = Map<string, Array<FontData>>;
 export type Style = z.output<typeof styleSchema>;
+export type PreloadFilter = boolean | Array<{
+    weight?: string | number;
+    style?: string;
+    subset?: string;
+}>;
 export {};

package/dist/assets/fonts/vite-plugin-fonts.js

@@ -2,7 +2,7 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { isAbsolute } from "node:path";
 import { fileURLToPath } from "node:url";
-import { bold } from "kleur/colors";
+import colors from "picocolors";
 import { getAlgorithm, shouldTrackCspHashes } from "../../core/csp/common.js";
 import { generateCspDigest } from "../../core/encryption.js";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
@@ -140,7 +140,7 @@ function fontsPlugin({ settings, sync, logger }) {
         });
       },
       defaults: DEFAULTS,
-      bold,
+      bold: colors.bold,
       stringMatcher
     });
     fontFileDataMap = res.fontFileDataMap;

package/dist/assets/utils/getAssetsPrefix.js

@@ -1,11 +1,14 @@
 function getAssetsPrefix(fileExtension, assetsPrefix) {
-  if (!assetsPrefix) return "";
-  if (typeof assetsPrefix === "string") return assetsPrefix;
-  const dotLessFileExtension = fileExtension.slice(1);
-  if (assetsPrefix[dotLessFileExtension]) {
-    return assetsPrefix[dotLessFileExtension];
+  let prefix = "";
+  if (!assetsPrefix) {
+    prefix = "";
+  } else if (typeof assetsPrefix === "string") {
+    prefix = assetsPrefix;
+  } else {
+    const dotLessFileExtension = fileExtension.slice(1);
+    prefix = assetsPrefix[dotLessFileExtension] || assetsPrefix.fallback;
   }
-  return assetsPrefix.fallback;
+  return prefix;
 }
 export {
   getAssetsPrefix

package/dist/cli/add/index.js

@@ -3,10 +3,10 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import boxen from "boxen";
 import { diffWords } from "diff";
-import { bold, cyan, dim, green, magenta, red, yellow } from "kleur/colors";
 import { builders, generateCode, loadFile } from "magicast";
 import { getDefaultExportOptions } from "magicast/helpers";
 import { detect, resolveCommand } from "package-manager-detector";
+import colors from "picocolors";
 import prompts from "prompts";
 import maxSatisfying from "semver/ranges/max-satisfying.js";
 import yoctoSpinner from "yocto-spinner";
@@ -30,6 +30,7 @@ import { eventCliSession, telemetry } from "../../events/index.js";
 import { exec } from "../exec.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { fetchPackageJson, fetchPackageVersions } from "../install-package.js";
+const { bold, cyan, dim, green, magenta, red, yellow } = colors;
 const ALIASES = /* @__PURE__ */ new Map([
   ["solid", "solid-js"],
   ["tailwindcss", "tailwind"]
@@ -61,7 +62,25 @@ export default defineDb({
 export default async function seed() {
 	// TODO
 }
-`
+`,
+  CLOUDFLARE_WRANGLER_CONFIG: (name) => `{
+	"main": "dist/_worker.js/index.js",
+	"name": ${JSON.stringify(name)},
+  "compatibility_date": ${JSON.stringify((/* @__PURE__ */ new Date()).toISOString().slice(0, 10))},
+  "compatibility_flags": [
+    "nodejs_compat",
+    "global_fetch_strictly_public"
+  ],
+	"assets": {
+		"binding": "ASSETS",
+		"directory": "./dist"
+	},
+	"observability": {
+    "enabled": true
+  }
+}`,
+  CLOUDFLARE_ASSETSIGNORE: `_worker.js
+_routes.json`
 };
 const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   netlify: "@astrojs/netlify",
@@ -122,8 +141,79 @@ async function add(names, { flags }) {
   const rootPath = resolveRoot(cwd);
   const root = pathToFileURL(rootPath);
   root.href = appendForwardSlash(root.href);
+  const rawConfigPath = await resolveConfigPath({
+    root: rootPath,
+    configFile: inlineConfig.configFile,
+    fs: fsMod
+  });
+  let configURL = rawConfigPath ? pathToFileURL(rawConfigPath) : void 0;
+  if (configURL) {
+    logger.debug("add", `Found config at ${configURL}`);
+  } else {
+    logger.info("add", `Unable to locate a config file, generating one for you.`);
+    configURL = new URL("./astro.config.mjs", root);
+    await fs.writeFile(fileURLToPath(configURL), STUBS.ASTRO_CONFIG, { encoding: "utf-8" });
+  }
+  let packageJson = { type: "unknown" };
+  async function getPackageJson() {
+    if (packageJson.type === "exists") {
+      return packageJson.data;
+    }
+    if (packageJson.type === "does-not-exist") {
+      return null;
+    }
+    const pkgURL = new URL("./package.json", configURL);
+    if (existsSync(pkgURL)) {
+      packageJson = {
+        type: "exists",
+        data: await fs.readFile(fileURLToPath(pkgURL)).then((res) => JSON.parse(res.toString()))
+      };
+      return packageJson.data;
+    }
+    packageJson = { type: "does-not-exist" };
+    return null;
+  }
   switch (installResult) {
     case 1 /* updated */: {
+      if (integrations.find((integration) => integration.id === "cloudflare")) {
+        const wranglerConfigURL = new URL("./wrangler.jsonc", configURL);
+        if (!existsSync(wranglerConfigURL)) {
+          logger.info(
+            "SKIP_FORMAT",
+            `
+  ${magenta(`Astro will scaffold ${green("./wrangler.jsonc")}.`)}
+`
+          );
+          if (await askToContinue({ flags })) {
+            const data = await getPackageJson();
+            await fs.writeFile(
+              wranglerConfigURL,
+              STUBS.CLOUDFLARE_WRANGLER_CONFIG(data?.name ?? "example"),
+              "utf-8"
+            );
+          }
+        } else {
+          logger.debug("add", "Using existing wrangler configuration");
+        }
+        const dir = new URL(userConfig.publicDir ?? "./public/", root);
+        const assetsignore = new URL("./.assetsignore", dir);
+        if (!existsSync(assetsignore)) {
+          logger.info(
+            "SKIP_FORMAT",
+            `
+  ${magenta(`Astro will scaffold ${green("./public/.assetsignore")}.`)}
+`
+          );
+          if (await askToContinue({ flags })) {
+            if (!existsSync(dir)) {
+              await fs.mkdir(dir);
+            }
+            await fs.writeFile(assetsignore, STUBS.CLOUDFLARE_ASSETSIGNORE, "utf-8");
+          }
+        } else {
+          logger.debug("add", `Using existing .assetsignore`);
+        }
+      }
       if (integrations.find((integration) => integration.id === "tailwind")) {
         const dir = new URL("./styles/", new URL(userConfig.srcDir ?? "./src/", root));
         const styles = new URL("./global.css", dir);
@@ -219,19 +309,6 @@ async function add(names, { flags }) {
     case 0 /* none */:
       break;
   }
-  const rawConfigPath = await resolveConfigPath({
-    root: rootPath,
-    configFile: inlineConfig.configFile,
-    fs: fsMod
-  });
-  let configURL = rawConfigPath ? pathToFileURL(rawConfigPath) : void 0;
-  if (configURL) {
-    logger.debug("add", `Found config at ${configURL}`);
-  } else {
-    logger.info("add", `Unable to locate a config file, generating one for you.`);
-    configURL = new URL("./astro.config.mjs", root);
-    await fs.writeFile(fileURLToPath(configURL), STUBS.ASTRO_CONFIG, { encoding: "utf-8" });
-  }
   let mod;
   try {
     mod = await loadFile(fileURLToPath(configURL));
@@ -294,9 +371,9 @@ async function add(names, { flags }) {
       break;
     }
     case 0 /* none */: {
-      const pkgURL = new URL("./package.json", configURL);
-      if (existsSync(fileURLToPath(pkgURL))) {
-        const { dependencies = {}, devDependencies = {} } = await fs.readFile(fileURLToPath(pkgURL)).then((res) => JSON.parse(res.toString()));
+      const data = await getPackageJson();
+      if (data) {
+        const { dependencies = {}, devDependencies = {} } = data;
         const deps = Object.keys(Object.assign(dependencies, devDependencies));
         const missingDeps = integrations.filter(
           (integration) => !deps.includes(integration.packageName)

package/dist/cli/dev/index.js

@@ -1,4 +1,4 @@
-import { cyan } from "kleur/colors";
+import colors from "picocolors";
 import devServer from "../../core/dev/index.js";
 import { printHelp } from "../../core/messages.js";
 import { flagsToAstroInlineConfig } from "../flags.js";
@@ -22,7 +22,7 @@ async function dev({ flags }) {
           ["--help (-h)", "See all available flags."]
         ]
       },
-      description: `Check ${cyan(
+      description: `Check ${colors.cyan(
         "https://docs.astro.build/en/reference/cli-reference/#astro-dev"
       )} for more information.`
     });

package/dist/cli/docs/core/open-docs.d.ts

@@ -0,0 +1,19 @@
+import type { Logger } from '../../../core/logger/core.js';
+import type { CommandExecutor, PlatformProvider } from '../definitions.js';
+interface Options {
+    url: string;
+    platformProvider: PlatformProvider;
+    logger: Logger;
+    commandExecutor: CommandExecutor;
+}
+export declare const openDocsCommand: {
+    help: {
+        commandName: string;
+        tables: {
+            Flags: [string, string][];
+        };
+        description: string;
+    };
+    run({ url, platformProvider, logger, commandExecutor }: Options): Promise<void>;
+};
+export {};

package/dist/cli/docs/core/open-docs.js

@@ -0,0 +1,49 @@
+import { defineCommand } from "../../domain/command.js";
+function getExecInputForPlatform(platform) {
+  switch (platform) {
+    case "android":
+    case "linux":
+      return ["xdg-open"];
+    case "darwin":
+      return ["open"];
+    case "win32":
+      return ["cmd", ["/c", "start"]];
+    case "gitpod":
+      return ["/ide/bin/remote-cli/gitpod-code", ["--openExternal"]];
+    case "aix":
+    case "freebsd":
+    case "haiku":
+    case "openbsd":
+    case "sunos":
+    case "cygwin":
+    case "netbsd":
+    default:
+      return null;
+  }
+}
+const openDocsCommand = defineCommand({
+  help: {
+    commandName: "astro docs",
+    tables: {
+      Flags: [["--help (-h)", "See all available flags."]]
+    },
+    description: `Launches the Astro Docs website directly from the terminal.`
+  },
+  async run({ url, platformProvider, logger, commandExecutor }) {
+    const platform = platformProvider.get();
+    const input = getExecInputForPlatform(platform);
+    if (!input) {
+      logger.error(
+        "SKIP_FORMAT",
+        `It looks like your platform ("${platform}") isn't supported!
+To view Astro's docs, please visit ${url}`
+      );
+      return;
+    }
+    const [command, args = []] = input;
+    await commandExecutor.execute(command, [...args, encodeURI(url)]);
+  }
+});
+export {
+  openDocsCommand
+};

package/dist/cli/docs/definitions.d.ts

@@ -0,0 +1,12 @@
+import type { Platform } from './domains/platform.js';
+export interface PlatformProvider {
+    get: () => Platform;
+}
+export interface CommandExecutor {
+    execute: (command: string, args?: Array<string>, options?: {
+        cwd?: string;
+        env: Record<string, string | undefined>;
+    }) => Promise<{
+        stdout: string;
+    }>;
+}

package/dist/cli/docs/domains/platform.d.ts

@@ -0,0 +1 @@
+export type Platform = NodeJS.Platform | 'gitpod';

package/dist/cli/docs/infra/process-platform-provider.d.ts

@@ -0,0 +1,2 @@
+import type { PlatformProvider } from '../definitions.js';
+export declare function createProcessPlatformProvider(): PlatformProvider;

package/dist/cli/docs/infra/process-platform-provider.js

@@ -0,0 +1,11 @@
+function createProcessPlatformProvider() {
+  const platform = Boolean(process.env.GITPOD_REPO_ROOT) ? "gitpod" : process.platform;
+  return {
+    get() {
+      return platform;
+    }
+  };
+}
+export {
+  createProcessPlatformProvider
+};

package/dist/cli/docs/infra/tinyexec-command-executor.d.ts

@@ -0,0 +1,2 @@
+import type { CommandExecutor } from '../definitions.js';
+export declare function createTinyexecCommandExecutor(): CommandExecutor;

package/dist/cli/docs/infra/tinyexec-command-executor.js

@@ -0,0 +1,30 @@
+import { NonZeroExitError, x } from "tinyexec";
+function createTinyexecCommandExecutor() {
+  return {
+    async execute(command, args, options) {
+      return await x(command, args, {
+        throwOnError: true,
+        nodeOptions: {
+          cwd: options?.cwd,
+          env: options?.env
+        }
+      }).then(
+        (o) => o,
+        (e) => {
+          if (e instanceof NonZeroExitError) {
+            const fullCommand = args?.length ? `${command} ${args.map((a) => a.includes(" ") ? `"${a}"` : a).join(" ")}` : command;
+            const message = `The command \`${fullCommand}\` exited with code ${e.exitCode}`;
+            const newError = new Error(message, e.cause ? { cause: e.cause } : void 0);
+            newError.stderr = e.output?.stderr;
+            newError.stdout = e.output?.stdout;
+            throw newError;
+          }
+          throw e;
+        }
+      );
+    }
+  };
+}
+export {
+  createTinyexecCommandExecutor
+};

package/dist/cli/exec.d.ts

@@ -1,5 +1,6 @@
 import { type Options } from 'tinyexec';
 /**
  * Improve tinyexec error logging and set `throwOnError` to `true` by default
+ * @deprecated use CommandExecutor instead
  */
 export declare function exec(command: string, args?: string[], options?: Partial<Options>): PromiseLike<import("tinyexec").Output>;

package/dist/cli/index.js

@@ -1,10 +1,4 @@
-import * as colors from "kleur/colors";
 import yargs from "yargs-parser";
-import { ASTRO_VERSION } from "../core/constants.js";
-function printVersion() {
-  console.log();
-  console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${ASTRO_VERSION}`)}`);
-}
 function resolveCommand(flags) {
   const cmd = flags._[2];
   if (flags.version) return "version";
@@ -34,19 +28,19 @@ function resolveCommand(flags) {
 async function runCommand(cmd, flags) {
   const [
     { createLoggerFromFlags },
-    { createKleurTextStyler },
+    { createPicocolorsTextStyler },
     { createBuildTimeAstroVersionProvider },
     { createLoggerHelpDisplay },
     { createCliCommandRunner }
   ] = await Promise.all([
     import("./flags.js"),
-    import("./infra/kleur-text-styler.js"),
+    import("./infra/picocolors-text-styler.js"),
     import("./infra/build-time-astro-version-provider.js"),
     import("./infra/logger-help-display.js"),
     import("./infra/cli-command-runner.js")
   ]);
   const logger = createLoggerFromFlags(flags);
-  const textStyler = createKleurTextStyler();
+  const textStyler = createPicocolorsTextStyler();
   const astroVersionProvider = createBuildTimeAstroVersionProvider();
   const helpDisplay = createLoggerHelpDisplay({
     logger,
@@ -62,8 +56,13 @@ async function runCommand(cmd, flags) {
       helpDisplay.show(DEFAULT_HELP_PAYLOAD);
       return;
     }
+    /** Display --version flag */
     case "version": {
-      printVersion();
+      const { formatVersion } = await import("./utils/format-version.js");
+      logger.info(
+        "SKIP_FORMAT",
+        formatVersion({ name: "astro", textStyler, astroVersionProvider })
+      );
       return;
     }
     case "info": {
@@ -80,9 +79,23 @@ async function runCommand(cmd, flags) {
       return await runner.run(createKeyCommand, { logger, keyGenerator });
     }
     case "docs": {
-      const { docs } = await import("./docs/index.js");
-      await docs({ flags });
-      return;
+      const [
+        { createTinyexecCommandExecutor },
+        { createProcessPlatformProvider },
+        { openDocsCommand }
+      ] = await Promise.all([
+        import("./docs/infra/tinyexec-command-executor.js"),
+        import("./docs/infra/process-platform-provider.js"),
+        import("./docs/core/open-docs.js")
+      ]);
+      const commandExecutor = createTinyexecCommandExecutor();
+      const platformProvider = createProcessPlatformProvider();
+      return await runner.run(openDocsCommand, {
+        url: "https://docs.astro.build/",
+        logger,
+        commandExecutor,
+        platformProvider
+      });
     }
     case "telemetry": {
       const { update } = await import("./telemetry/index.js");

package/dist/cli/info/index.js

@@ -1,6 +1,6 @@
 import { spawn, spawnSync } from "node:child_process";
 import { arch, platform } from "node:os";
-import * as colors from "kleur/colors";
+import colors from "picocolors";
 import prompts from "prompts";
 import { resolveConfig } from "../../core/config/index.js";
 import { ASTRO_VERSION } from "../../core/constants.js";

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

@@ -1,7 +1,8 @@
 function createBuildTimeAstroVersionProvider() {
+  const version = "5.15.0";
   return {
     getVersion() {
-      return "5.14.8";
+      return version;
     }
   };
 }

package/dist/cli/infra/logger-help-display.js

@@ -1,3 +1,4 @@
+import { formatVersion } from "../utils/format-version.js";
 function createLoggerHelpDisplay({
   logger,
   flags,
@@ -29,9 +30,7 @@ function createLoggerHelpDisplay({
       if (headline) {
         message.push(
           linebreak(),
-          `  ${textStyler.bgGreen(textStyler.black(` ${commandName} `))} ${textStyler.green(
-            `v${astroVersionProvider.getVersion()}`
-          )} ${headline}`
+          `${formatVersion({ name: commandName, textStyler, astroVersionProvider })} ${headline}`
         );
       }
       if (usage) {

package/dist/cli/infra/picocolors-text-styler.d.ts

@@ -0,0 +1,2 @@
+import type { TextStyler } from '../definitions.js';
+export declare function createPicocolorsTextStyler(): TextStyler;

package/dist/cli/infra/picocolors-text-styler.js

@@ -0,0 +1,7 @@
+import colors from "picocolors";
+function createPicocolorsTextStyler() {
+  return colors;
+}
+export {
+  createPicocolorsTextStyler
+};