astro 4.4.14 → 4.5.0

package/components/Code.astro

@@ -6,34 +6,35 @@ import type {
 	SpecialLanguage,
 	ThemeRegistration,
 	ThemeRegistrationRaw,
-} from 'shikiji';
-import { bundledLanguages } from 'shikiji/langs';
+} from 'shiki';
+import { bundledLanguages } from 'shiki/langs';
 import { getCachedHighlighter } from '../dist/core/shiki.js';
+import type { HTMLAttributes } from '../types';
 
-interface Props {
+interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 	/** The code to highlight. Required. */
 	code: string;
 	/**
 	 * The language of your code.
-	 * Supports all languages listed here: https://github.com/shikijs/shiki/blob/main/docs/languages.md#all-languages
-	 * Instructions for loading a custom language: https://github.com/shikijs/shiki/blob/main/docs/languages.md#supporting-your-own-languages-with-shiki
+	 * Supports all languages listed here: https://shiki.style/languages
+	 * Instructions for loading a custom language: https://shiki.style/guide/load-lang
 	 *
 	 * @default "plaintext"
 	 */
 	lang?: BuiltinLanguage | SpecialLanguage | LanguageRegistration;
 	/**
 	 * The styling theme.
-	 * Supports all themes listed here: https://github.com/shikijs/shiki/blob/main/docs/themes.md#all-themes
-	 * Instructions for loading a custom theme: https://github.com/shikijs/shiki/blob/main/docs/themes.md#loading-theme
+	 * Supports all themes listed here: https://shiki.style/themes
+	 * Instructions for loading a custom theme: https://shiki.style/guide/load-theme
 	 *
 	 * @default "github-dark"
 	 */
 	theme?: ThemePresets | ThemeRegistration | ThemeRegistrationRaw;
 	/**
 	 * Multiple themes to style with -- alternative to "theme" option.
-	 * Supports all themes found above; see https://github.com/antfu/shikiji#lightdark-dual-themes for more information.
+	 * Supports all themes found above; see https://shiki.style/guide/dual-themes for more information.
 	 */
-	experimentalThemes?: Record<string, ThemePresets | ThemeRegistration | ThemeRegistrationRaw>;
+	themes?: Record<string, ThemePresets | ThemeRegistration | ThemeRegistrationRaw>;
 	/**
 	 * Enable word wrapping.
 	 *  - true: enabled.
@@ -55,12 +56,13 @@ const {
 	code,
 	lang = 'plaintext',
 	theme = 'github-dark',
-	experimentalThemes = {},
+	themes = {},
 	wrap = false,
 	inline = false,
+	...rest
 } = Astro.props;
 
-// shiki -> shikiji compat
+// shiki 1.0 compat
 if (typeof lang === 'object') {
 	// `id` renamed to `name` (always override)
 	if ((lang as any).id) {
@@ -81,12 +83,13 @@ const highlighter = await getCachedHighlighter({
 			: lang,
 	],
 	theme,
-	experimentalThemes,
+	themes,
 	wrap,
 });
 
 const html = highlighter.highlight(code, typeof lang === 'string' ? lang : lang.name, {
 	inline,
+	attributes: rest,
 });
 ---
 

package/dist/@types/astro.d.ts

@@ -7,7 +7,7 @@ import type * as babel from '@babel/core';
 import type * as rollup from 'rollup';
 import type * as vite from 'vite';
 import type { RemotePattern } from '../assets/utils/remotePattern.js';
-import type { SerializedSSRManifest } from '../core/app/types.js';
+import type { AssetsPrefix, SerializedSSRManifest } from '../core/app/types.js';
 import type { PageBuildData } from '../core/build/types.js';
 import type { AstroConfigType } from '../core/config/index.js';
 import type { AstroTimer } from '../core/config/timer.js';
@@ -27,7 +27,7 @@ export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, Rehype
 export type { ExternalImageService, ImageService, LocalImageService, } from '../assets/services/service.js';
 export type { GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat, ImageQuality, ImageQualityPreset, ImageTransform, UnresolvedImageTransform, } from '../assets/types.js';
 export type { RemotePattern } from '../assets/utils/remotePattern.js';
-export type { SSRManifest } from '../core/app/types.js';
+export type { SSRManifest, AssetsPrefix } from '../core/app/types.js';
 export type { AstroCookieGetOptions, AstroCookieSetOptions, AstroCookies, } from '../core/cookies/index.js';
 export interface AstroBuiltinProps {
     'client:load'?: boolean;
@@ -779,17 +779,17 @@ export interface AstroUserConfig {
         /**
          * @docs
          * @name build.assetsPrefix
-         * @type {string}
+         * @type {string | Record<string, string>}
          * @default `undefined`
          * @version 2.2.0
          * @description
          * Specifies the prefix for Astro-generated asset links. This can be used if assets are served from a different domain than the current site.
          *
-         * For example, if this is set to `https://cdn.example.com`, assets will be fetched from `https://cdn.example.com/_astro/...` (regardless of the `base` option).
-         * You would need to upload the files in `./dist/_astro/` to `https://cdn.example.com/_astro/` to serve the assets.
-         * The process varies depending on how the third-party domain is hosted.
+         * This requires uploading the assets in your local `./dist/_astro` folder to a corresponding `/_astro/` folder on the remote domain.
          * To rename the `_astro` path, specify a new directory in `build.assets`.
          *
+         * To fetch all assets uploaded to the same domain (e.g. `https://cdn.example.com/_astro/...`), set `assetsPrefix` to the root domain as a string (regardless of your `base` configuration):
+         *
          * ```js
          * {
          *   build: {
@@ -797,8 +797,27 @@ export interface AstroUserConfig {
          *   }
          * }
          * ```
+         *
+         * **Added in:** `astro@4.5.0`
+         *
+         * You can also pass an object to `assetsPrefix` to specify a different domain for each file type.
+         * In this case, a `fallback` property is required and will be used by default for any other files.
+         *
+         * ```js
+         * {
+         *   build: {
+         *     assetsPrefix: {
+         *       'js': 'https://js.cdn.example.com',
+         *       'mjs': 'https://js.cdn.example.com',
+         *       'css': 'https://css.cdn.example.com',
+         *       'fallback': 'https://cdn.example.com'
+         *     }
+         *   }
+         * }
+         * ```
+         *
          */
-        assetsPrefix?: string;
+        assetsPrefix?: AssetsPrefix;
         /**
          * @docs
          * @name build.serverEntry
@@ -1177,7 +1196,7 @@ export interface AstroUserConfig {
          * @default `shiki`
          * @description
          * Which syntax highlighter to use, if any.
-         * - `shiki` - use the [Shiki](https://github.com/shikijs/shiki) highlighter
+         * - `shiki` - use the [Shiki](https://shiki.style) highlighter
          * - `prism` - use the [Prism](https://prismjs.com/) highlighter
          * - `false` - do not apply syntax highlighting.
          *
@@ -1478,25 +1497,30 @@ export interface AstroUserConfig {
     experimental?: {
         /**
          * @docs
-         * @name experimental.optimizeHoistedScript
+         * @name experimental.directRenderScript
          * @type {boolean}
          * @default `false`
-         * @version 2.10.4
+         * @version 4.5.0
          * @description
-         * Prevents unused components' scripts from being included in a page unexpectedly.
-         * The optimization is best-effort and may inversely miss including the used scripts. Make sure to double-check your built pages
-         * before publishing.
-         * Enable hoisted script analysis optimization by adding the experimental flag:
+         * Enables a more reliable strategy to prevent scripts from being executed in pages where they are not used.
+         *
+         * Scripts will directly render as declared in Astro files (including existing features like TypeScript, importing `node_modules`,
+         * and deduplicating scripts). You can also now conditionally render scripts in your Astro file.
+
+         * However, this means scripts are no longer hoisted to the `<head>` and multiple scripts on a page are no longer bundled together.
+         * If you enable this option, you should check that all your `<script>` tags behave as expected.
+         *
+         * This option will be enabled by default in Astro 5.0.
          *
          * ```js
          * {
-         * 	experimental: {
-         *		optimizeHoistedScript: true,
-         * 	},
+         *   experimental: {
+         *     directRenderScript: true,
+         *   },
          * }
          * ```
          */
-        optimizeHoistedScript?: boolean;
+        directRenderScript?: boolean;
         /**
          * @docs
          * @name experimental.contentCollectionCache
@@ -1515,6 +1539,53 @@ export interface AstroUserConfig {
          * ```
          */
         contentCollectionCache?: boolean;
+        /**
+         * @docs
+         * @name experimental.contentCollectionJsonSchema
+         * @type {boolean}
+         * @default `false`
+         * @version 4.5.0
+         * @description
+         * This feature will auto-generate a JSON schema for content collections of `type: 'data'` which can be used as the `$schema` value for TypeScript-style autocompletion/hints in tools like VSCode.
+         *
+         * To enable this feature, add the experimental flag:
+         *
+         * ```diff
+         * import { defineConfig } from 'astro/config';
+
+         * export default defineConfig({
+         * 	experimental: {
+         * +		contentCollectionJsonSchema: true
+         * 	}
+         * });
+         * ```
+         *
+         * This experimental implementation requires you to manually reference the schema in each data entry file of the collection:
+         *
+         * ```diff
+         * // src/content/test/entry.json
+         * {
+         * +  "$schema": "../../../.astro/collections/test.schema.json",
+         * 	"test": "test"
+         * }
+         * ```
+         *
+         * Alternatively, you can set this in your [VSCode `json.schemas` settings](https://code.visualstudio.com/docs/languages/json#_json-schemas-and-settings):
+         *
+         * ```diff
+         * "json.schemas": [
+         * 	{
+         * 		"fileMatch": [
+         * 			"/src/content/test/**"
+         * 		],
+         * 		"url": "../../../.astro/collections/test.schema.json"
+         * 	}
+         * ]
+         * ```
+         *
+         * Note that this initial implementation uses a library with [known issues for advanced Zod schemas](https://github.com/StefanTerdell/zod-to-json-schema#known-issues), so you may wish to consult these limitations before enabling the experimental flag.
+         */
+        contentCollectionJsonSchema?: boolean;
         /**
          * @docs
          * @name experimental.clientPrerender
@@ -2411,6 +2482,7 @@ export interface SSRResult {
     scripts: Set<SSRElement>;
     links: Set<SSRElement>;
     componentMetadata: Map<string, SSRComponentMetadata>;
+    inlinedScripts: Map<string, string>;
     createAstro(Astro: AstroGlobalPartial, props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
     resolve: (s: string) => Promise<string>;
     response: AstroGlobal['response'];
@@ -2440,6 +2512,11 @@ export interface SSRMetadata {
      * script in the page HTML before the first Solid component.
      */
     rendererSpecificHydrationScripts: Set<string>;
+    /**
+     * Used by `renderScript` to track script ids that have been rendered,
+     * so we only render each once.
+     */
+    renderedScripts: Set<string>;
     hasDirectives: Set<string>;
     hasRenderedHead: boolean;
     headInTree: boolean;

package/dist/assets/utils/getAssetsPrefix.d.ts

@@ -0,0 +1,2 @@
+import type { AssetsPrefix } from '../../core/app/types.js';
+export declare function getAssetsPrefix(fileExtension: string, assetsPrefix?: AssetsPrefix): string;

package/dist/assets/utils/getAssetsPrefix.js

@@ -0,0 +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];
+  }
+  return assetsPrefix.fallback;
+}
+export {
+  getAssetsPrefix
+};

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

@@ -1,3 +1,4 @@
+import { extname } from "node:path";
 import MagicString from "magic-string";
 import { normalizePath } from "vite";
 import { extendManualChunks } from "../core/build/plugins/util.js";
@@ -11,6 +12,7 @@ import {
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { emitESMImage } from "./utils/emitAsset.js";
+import { getAssetsPrefix } from "./utils/getAssetsPrefix.js";
 import { isESMImportedImage } from "./utils/imageKind.js";
 import { getProxyCode } from "./utils/proxy.js";
 import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
@@ -73,7 +75,10 @@ function assets({
           if (!globalThis.astroAsset.staticImages) {
             globalThis.astroAsset.staticImages = /* @__PURE__ */ new Map();
           }
-          const finalOriginalImagePath = (isESMImportedImage(options.src) ? options.src.src : options.src).replace(settings.config.build.assetsPrefix || "", "");
+          const ESMImportedImageSrc = isESMImportedImage(options.src) ? options.src.src : options.src;
+          const fileExtension = extname(ESMImportedImageSrc);
+          const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix);
+          const finalOriginalImagePath = ESMImportedImageSrc.replace(pf, "");
           const hash = hashTransform(
             options,
             settings.config.image.service.entrypoint,
@@ -101,7 +106,7 @@ function assets({
             });
           }
           if (settings.config.build.assetsPrefix) {
-            return encodeURI(joinPaths(settings.config.build.assetsPrefix, finalFilePath));
+            return encodeURI(joinPaths(pf, finalFilePath));
           } else {
             return encodeURI(prependForwardSlash(joinPaths(settings.config.base, finalFilePath)));
           }
@@ -116,7 +121,9 @@ function assets({
           s = s || (s = new MagicString(code));
           const [full, hash, postfix = ""] = match;
           const file = this.getFileName(hash);
-          const prefix = settings.config.build.assetsPrefix ? appendForwardSlash(settings.config.build.assetsPrefix) : resolvedConfig.base;
+          const fileExtension = extname(file);
+          const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix);
+          const prefix = pf ? appendForwardSlash(pf) : resolvedConfig.base;
           const outputFilepath = prefix + normalizePath(file + postfix);
           s.overwrite(match.index, match.index + full.length, outputFilepath);
         }

package/dist/cli/add/index.js

@@ -34,10 +34,11 @@ const ALIASES = /* @__PURE__ */ new Map([
   ["solid", "solid-js"],
   ["tailwindcss", "tailwind"]
 ]);
-const ASTRO_CONFIG_STUB = `import { defineConfig } from 'astro/config';
-
-export default defineConfig({});`;
-const TAILWIND_CONFIG_STUB = `/** @type {import('tailwindcss').Config} */
+const STUBS = {
+  ASTRO_CONFIG: `import { defineConfig } from 'astro/config';
+// https://astro.build/config
+export default defineConfig({});`,
+  TAILWIND_CONFIG: `/** @type {import('tailwindcss').Config} */
 export default {
 	content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
 	theme: {
@@ -45,16 +46,31 @@ export default {
 	},
 	plugins: [],
 }
-`;
-const SVELTE_CONFIG_STUB = `import { vitePreprocess } from '@astrojs/svelte';
+`,
+  SVELTE_CONFIG: `import { vitePreprocess } from '@astrojs/svelte';
 
 export default {
 	preprocess: vitePreprocess(),
-};
-`;
-const LIT_NPMRC_STUB = `# Lit libraries are required to be hoisted due to dependency issues.
+}
+`,
+  LIT_NPMRC: `# Lit libraries are required to be hoisted due to dependency issues.
 public-hoist-pattern[]=*lit*
-`;
+`,
+  DB_CONFIG: `import { defineDb } from 'astro:db';
+
+// https://astro.build/db/config
+export default defineDb({
+  tables: {}
+});
+`,
+  DB_SEED: `import { db } from 'astro:db';
+
+// https://astro.build/db/seed
+export default async function seed() {
+	// TODO
+}
+`
+};
 const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   netlify: "@astrojs/netlify",
   vercel: "@astrojs/vercel/serverless",
@@ -147,7 +163,7 @@ async function add(names, { flags }) {
             "./tailwind.config.js"
           ],
           defaultConfigFile: "./tailwind.config.mjs",
-          defaultConfigContent: TAILWIND_CONFIG_STUB
+          defaultConfigContent: STUBS.TAILWIND_CONFIG
         });
       }
       if (integrations.find((integration) => integration.id === "svelte")) {
@@ -158,9 +174,38 @@ async function add(names, { flags }) {
           integrationName: "Svelte",
           possibleConfigFiles: ["./svelte.config.js", "./svelte.config.cjs", "./svelte.config.mjs"],
           defaultConfigFile: "./svelte.config.js",
-          defaultConfigContent: SVELTE_CONFIG_STUB
+          defaultConfigContent: STUBS.SVELTE_CONFIG
         });
       }
+      if (integrations.find((integration) => integration.id === "db")) {
+        if (!existsSync(new URL("./db/", root))) {
+          logger.info(
+            "SKIP_FORMAT",
+            `
+  ${magenta(
+              `Astro will scaffold ${green("./db/config.ts")}${magenta(" and ")}${green(
+                "./db/seed.ts"
+              )}${magenta(" files.")}`
+            )}
+`
+          );
+          if (await askToContinue({ flags })) {
+            await fs.mkdir(new URL("./db", root));
+            await Promise.all([
+              fs.writeFile(new URL("./db/config.ts", root), STUBS.DB_CONFIG, { encoding: "utf-8" }),
+              fs.writeFile(new URL("./db/seed.ts", root), STUBS.DB_SEED, { encoding: "utf-8" })
+            ]);
+          } else {
+            logger.info(
+              "SKIP_FORMAT",
+              `
+  Astro DB requires additional configuration. Please refer to https://astro.build/db/config`
+            );
+          }
+        } else {
+          logger.debug("add", `Using existing db configuration`);
+        }
+      }
       if (integrations.find((integration) => integration.id === "lit") && (await preferredPM(fileURLToPath(root)))?.name === "pnpm") {
         await setupIntegrationConfig({
           root,
@@ -169,14 +214,14 @@ async function add(names, { flags }) {
           integrationName: "Lit",
           possibleConfigFiles: ["./.npmrc"],
           defaultConfigFile: "./.npmrc",
-          defaultConfigContent: LIT_NPMRC_STUB
+          defaultConfigContent: STUBS.LIT_NPMRC
         });
       }
       break;
     }
     case 2 /* cancelled */: {
       logger.info(
-        null,
+        "SKIP_FORMAT",
         msg.cancelled(
           `Dependencies ${bold("NOT")} installed.`,
           `Be sure to install them manually before continuing!`
@@ -201,7 +246,7 @@ async function add(names, { flags }) {
   } 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), ASTRO_CONFIG_STUB, { encoding: "utf-8" });
+    await fs.writeFile(fileURLToPath(configURL), STUBS.ASTRO_CONFIG, { encoding: "utf-8" });
   }
   let ast = null;
   try {
@@ -224,7 +269,7 @@ async function add(names, { flags }) {
           await setAdapter(ast, integration, officialExportName);
         } else {
           logger.info(
-            null,
+            "SKIP_FORMAT",
             `
   ${magenta(
               `Check our deployment docs for ${bold(
@@ -259,7 +304,10 @@ async function add(names, { flags }) {
   }
   switch (configResult) {
     case 2 /* cancelled */: {
-      logger.info(null, msg.cancelled(`Your configuration has ${bold("NOT")} been updated.`));
+      logger.info(
+        "SKIP_FORMAT",
+        msg.cancelled(`Your configuration has ${bold("NOT")} been updated.`)
+      );
       break;
     }
     case 0 /* none */: {
@@ -271,17 +319,17 @@ async function add(names, { flags }) {
           (integration) => !deps.includes(integration.packageName)
         );
         if (missingDeps.length === 0) {
-          logger.info(null, msg.success(`Configuration up-to-date.`));
+          logger.info("SKIP_FORMAT", msg.success(`Configuration up-to-date.`));
           break;
         }
       }
-      logger.info(null, msg.success(`Configuration up-to-date.`));
+      logger.info("SKIP_FORMAT", msg.success(`Configuration up-to-date.`));
       break;
     }
     default: {
       const list = integrations.map((integration) => `  - ${integration.packageName}`).join("\n");
       logger.info(
-        null,
+        "SKIP_FORMAT",
         msg.success(
           `Added the following integration${integrations.length === 1 ? "" : "s"} to your project:
 ${list}`
@@ -296,7 +344,7 @@ ${list}`
     }
     case 2 /* cancelled */: {
       logger.info(
-        null,
+        "SKIP_FORMAT",
         msg.cancelled(`Your TypeScript configuration has ${bold("NOT")} been updated.`)
       );
       break;
@@ -307,7 +355,7 @@ ${list}`
       );
     }
     default:
-      logger.info(null, msg.success(`Successfully updated TypeScript settings`));
+      logger.info("SKIP_FORMAT", msg.success(`Successfully updated TypeScript settings`));
   }
 }
 function isAdapter(integration) {
@@ -488,14 +536,14 @@ ${boxen(diff, {
   })}
 `;
   logger.info(
-    null,
+    "SKIP_FORMAT",
     `
   ${magenta("Astro will make the following changes to your config file:")}
 ${message}`
   );
   if (logAdapterInstructions) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       magenta(
         `  For complete deployment options, visit
   ${bold(
@@ -597,7 +645,7 @@ ${boxen(coloredOutput, {
     })}
 `;
     logger.info(
-      null,
+      "SKIP_FORMAT",
       `
   ${magenta("Astro will run the following command:")}
   ${dim(
@@ -801,7 +849,7 @@ ${boxen(diff, {
   })}
 `;
   logger.info(
-    null,
+    "SKIP_FORMAT",
     `
   ${magenta(`Astro will make the following changes to your ${configFileName}:`)}
 ${message}`
@@ -810,7 +858,7 @@ ${message}`
   const hasConflictingIntegrations = integrations.filter((integration) => presets.has(integration)).length > 1 && integrations.filter((integration) => conflictingIntegrations.includes(integration)).length > 0;
   if (hasConflictingIntegrations) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       red(
         `  ${bold(
           "Caution:"
@@ -895,7 +943,7 @@ async function setupIntegrationConfig(opts) {
   }
   if (!alreadyConfigured) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       `
   ${magenta(`Astro will generate a minimal ${bold(opts.defaultConfigFile)} file.`)}
 `

package/dist/cli/install-package.js

@@ -25,7 +25,7 @@ async function getPackage(packageName, logger, options, otherDeps = []) {
     return packageImport;
   } catch (e) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       `To continue, Astro requires the following dependency to be installed: ${bold(packageName)}.`
     );
     const result = await installPackage([packageName, ...otherDeps], options, logger);
@@ -87,7 +87,7 @@ ${boxen(coloredOutput, {
   })}
 `;
   logger.info(
-    null,
+    "SKIP_FORMAT",
     `
   ${magenta("Astro will run the following command:")}
   ${dim(