astro 4.4.14 → 4.5.0

package/dist/core/config/schema.js

@@ -1,11 +1,11 @@
 import { markdownConfigDefaults } from "@astrojs/markdown-remark";
-import { bundledThemes } from "shikiji";
+import { bundledThemes } from "shiki";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { z } from "zod";
 import { appendForwardSlash, prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
+import "@shikijs/core";
 import "mdast-util-to-hast";
-import "shikiji-core";
 const ASTRO_CONFIG_DEFAULTS = {
   root: ".",
   srcDir: "./src",
@@ -41,8 +41,9 @@ const ASTRO_CONFIG_DEFAULTS = {
   legacy: {},
   redirects: {},
   experimental: {
-    optimizeHoistedScript: false,
+    directRenderScript: false,
     contentCollectionCache: false,
+    contentCollectionJsonSchema: false,
     clientPrerender: false,
     globalRoutePriority: false,
     i18nDomains: false
@@ -72,7 +73,19 @@ const AstroConfigSchema = z.object({
     client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => new URL(val)),
     server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => new URL(val)),
     assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
-    assetsPrefix: z.string().optional(),
+    assetsPrefix: z.string().optional().or(z.object({ fallback: z.string() }).and(z.record(z.string())).optional()).refine(
+      (value) => {
+        if (value && typeof value !== "string") {
+          if (!value.fallback) {
+            return false;
+          }
+        }
+        return true;
+      },
+      {
+        message: "The `fallback` is mandatory when defining the option as an object."
+      }
+    ),
     serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
     redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
     inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)
@@ -162,11 +175,18 @@ const AstroConfigSchema = z.object({
         return langs;
       }).default([]),
       theme: z.enum(Object.keys(bundledThemes)).or(z.custom()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.theme),
-      experimentalThemes: z.record(
+      themes: z.record(
         z.enum(Object.keys(bundledThemes)).or(z.custom())
-      ).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.experimentalThemes),
+      ).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.themes),
       wrap: z.boolean().or(z.null()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.wrap),
-      transformers: z.custom().array().default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.transformers)
+      transformers: z.custom().array().transform((transformers) => {
+        for (const transformer of transformers) {
+          if (transformer.token && !("span" in transformer)) {
+            transformer.span = transformer.token;
+          }
+        }
+        return transformers;
+      }).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.transformers)
     }).default({}),
     remarkPlugins: z.union([
       z.string(),
@@ -295,8 +315,9 @@ const AstroConfigSchema = z.object({
     })
   ),
   experimental: z.object({
-    optimizeHoistedScript: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.optimizeHoistedScript),
+    directRenderScript: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.directRenderScript),
     contentCollectionCache: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentCollectionCache),
+    contentCollectionJsonSchema: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentCollectionJsonSchema),
     clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),
     globalRoutePriority: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.globalRoutePriority),
     i18nDomains: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.i18nDomains)
@@ -320,7 +341,19 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
       client: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.client).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
       server: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.server).transform((val) => resolveDirAsUrl(val, fileProtocolRoot)),
       assets: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.assets),
-      assetsPrefix: z.string().optional(),
+      assetsPrefix: z.string().optional().or(z.object({ fallback: z.string() }).and(z.record(z.string())).optional()).refine(
+        (value) => {
+          if (value && typeof value !== "string") {
+            if (!value.fallback) {
+              return false;
+            }
+          }
+          return true;
+        },
+        {
+          message: "The `fallback` is mandatory when defining the option as an object."
+        }
+      ),
       serverEntry: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.build.serverEntry),
       redirects: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.build.redirects),
       inlineStylesheets: z.enum(["always", "auto", "never"]).optional().default(ASTRO_CONFIG_DEFAULTS.build.inlineStylesheets)

package/dist/core/config/vite-load.js

@@ -4,6 +4,7 @@ import loadFallbackPlugin from "../../vite-plugin-load-fallback/index.js";
 import { debug } from "../logger/core.js";
 async function createViteServer(root, fs) {
   const viteServer = await createServer({
+    configFile: false,
     server: { middlewareMode: true, hmr: false, watch: null },
     optimizeDeps: { noDiscovery: true },
     clearScreen: false,

package/dist/core/constants.d.ts

@@ -1,6 +1,7 @@
 export declare const ASTRO_VERSION: string;
 export declare const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 export declare const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
+export declare const DEFAULT_404_COMPONENT = "astro-default-404";
 /**
  * A response with one of these status codes will be rewritten
  * with the result of rendering the respective error page.

package/dist/core/constants.js

@@ -1,6 +1,7 @@
-const ASTRO_VERSION = "4.4.14";
+const ASTRO_VERSION = "4.5.0";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
+const DEFAULT_404_COMPONENT = "astro-default-404";
 const REROUTABLE_STATUS_CODES = [404, 500];
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 const clientLocalsSymbol = Symbol.for("astro.locals");
@@ -16,6 +17,7 @@ const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
 const MIDDLEWARE_PATH_SEGMENT_NAME = "middleware";
 export {
   ASTRO_VERSION,
+  DEFAULT_404_COMPONENT,
   MIDDLEWARE_PATH_SEGMENT_NAME,
   REROUTABLE_STATUS_CODES,
   REROUTE_DIRECTIVE_HEADER,

package/dist/core/create-vite.js

@@ -3,6 +3,7 @@ import { fileURLToPath } from "node:url";
 import glob from "fast-glob";
 import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
+import { getAssetsPrefix } from "../assets/utils/getAssetsPrefix.js";
 import astroAssetsPlugin from "../assets/vite-plugin-assets.js";
 import {
   astroContentAssetPropagationPlugin,
@@ -33,6 +34,7 @@ import { vitePluginSSRManifest } from "../vite-plugin-ssr-manifest/index.js";
 import { createViteLogger } from "./logger/vite.js";
 import { vitePluginMiddleware } from "./middleware/vite-plugin.js";
 import { joinPaths } from "./path.js";
+import { isObject } from "./util.js";
 const ALWAYS_NOEXTERNAL = [
   // This is only because Vite's native ESM doesn't resolve "exports" correctly.
   "astro",
@@ -183,9 +185,9 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
   const assetsPrefix = settings.config.build.assetsPrefix;
   if (assetsPrefix) {
     commonConfig.experimental = {
-      renderBuiltUrl(filename, { type }) {
+      renderBuiltUrl(filename, { type, hostType }) {
         if (type === "asset") {
-          return joinPaths(assetsPrefix, filename);
+          return joinPaths(getAssetsPrefix(`.${hostType}`, assetsPrefix), filename);
         }
       }
     };
@@ -260,7 +262,7 @@ function isCommonNotAstro(dep) {
   );
 }
 function stringifyForDefine(value) {
-  return typeof value === "string" ? JSON.stringify(value) : "undefined";
+  return typeof value === "string" || isObject(value) ? JSON.stringify(value) : "undefined";
 }
 export {
   createVite

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.4.14";
+  const currentVersion = "4.5.0";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/dev/vite.js

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
-import { codeToHtml, createCssVariablesTheme } from "shikiji";
+import { codeToHtml, createCssVariablesTheme } from "shiki";
 import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from "../errors-data.js";
 import { AstroError } from "../errors.js";
 import { createSafeError } from "../utils.js";

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.4.14";
+  const version = "4.5.0";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.4.14"}`
+        `v${"4.5.0"}`
       )} ${headline}`
     );
   }

package/dist/core/render/params-and-props.js

@@ -1,3 +1,4 @@
+import { DEFAULT_404_COMPONENT } from "../constants.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { routeIsFallback } from "../redirects/helpers.js";
 import { routeIsRedirect } from "../redirects/index.js";
@@ -7,7 +8,7 @@ async function getProps(opts) {
   if (!route || route.pathname) {
     return {};
   }
-  if (routeIsRedirect(route) || routeIsFallback(route)) {
+  if (routeIsRedirect(route) || routeIsFallback(route) || route.component === DEFAULT_404_COMPONENT) {
     return {};
   }
   const params = getParams(route, pathname);

package/dist/core/render/ssr-element.d.ts

@@ -1,15 +1,15 @@
-import type { SSRElement } from '../../@types/astro.js';
+import type { AssetsPrefix, SSRElement } from '../../@types/astro.js';
 import type { StylesheetAsset } from '../app/types.js';
-export declare function createAssetLink(href: string, base?: string, assetsPrefix?: string): string;
-export declare function createStylesheetElement(stylesheet: StylesheetAsset, base?: string, assetsPrefix?: string): SSRElement;
-export declare function createStylesheetElementSet(stylesheets: StylesheetAsset[], base?: string, assetsPrefix?: string): Set<SSRElement>;
+export declare function createAssetLink(href: string, base?: string, assetsPrefix?: AssetsPrefix): string;
+export declare function createStylesheetElement(stylesheet: StylesheetAsset, base?: string, assetsPrefix?: AssetsPrefix): SSRElement;
+export declare function createStylesheetElementSet(stylesheets: StylesheetAsset[], base?: string, assetsPrefix?: AssetsPrefix): Set<SSRElement>;
 export declare function createModuleScriptElement(script: {
     type: 'inline' | 'external';
     value: string;
-}, base?: string, assetsPrefix?: string): SSRElement;
-export declare function createModuleScriptElementWithSrc(src: string, base?: string, assetsPrefix?: string): SSRElement;
-export declare function createModuleScriptElementWithSrcSet(srces: string[], site?: string, assetsPrefix?: string): Set<SSRElement>;
+}, base?: string, assetsPrefix?: AssetsPrefix): SSRElement;
+export declare function createModuleScriptElementWithSrc(src: string, base?: string, assetsPrefix?: AssetsPrefix): SSRElement;
+export declare function createModuleScriptElementWithSrcSet(srces: string[], site?: string, assetsPrefix?: AssetsPrefix): Set<SSRElement>;
 export declare function createModuleScriptsSet(scripts: {
     type: 'inline' | 'external';
     value: string;
-}[], base?: string, assetsPrefix?: string): Set<SSRElement>;
+}[], base?: string, assetsPrefix?: AssetsPrefix): Set<SSRElement>;

package/dist/core/render/ssr-element.js

@@ -1,7 +1,9 @@
-import { joinPaths, prependForwardSlash, slash } from "../../core/path.js";
+import { getAssetsPrefix } from "../../assets/utils/getAssetsPrefix.js";
+import { fileExtension, joinPaths, prependForwardSlash, slash } from "../../core/path.js";
 function createAssetLink(href, base, assetsPrefix) {
   if (assetsPrefix) {
-    return joinPaths(assetsPrefix, slash(href));
+    const pf = getAssetsPrefix(fileExtension(href), assetsPrefix);
+    return joinPaths(pf, slash(href));
   } else if (base) {
     return prependForwardSlash(joinPaths(base, slash(href)));
   } else {

package/dist/core/render-context.js

@@ -142,7 +142,7 @@ class RenderContext {
   }
   async createResult(mod) {
     const { cookies, pathname, pipeline, routeData, status } = this;
-    const { clientDirectives, compressHTML, manifest, renderers, resolve } = pipeline;
+    const { clientDirectives, inlinedScripts, compressHTML, manifest, renderers, resolve } = pipeline;
     const { links, scripts, styles } = await pipeline.headElements(routeData);
     const componentMetadata = await pipeline.componentMetadata(routeData) ?? manifest.componentMetadata;
     const headers = new Headers({ "Content-Type": "text/html" });
@@ -160,6 +160,7 @@ class RenderContext {
     };
     const result = {
       clientDirectives,
+      inlinedScripts,
       componentMetadata,
       compressHTML,
       cookies,
@@ -177,6 +178,7 @@ class RenderContext {
         hasHydrationScript: false,
         rendererSpecificHydrationScripts: /* @__PURE__ */ new Set(),
         hasRenderedHead: false,
+        renderedScripts: /* @__PURE__ */ new Set(),
         hasDirectives: /* @__PURE__ */ new Set(),
         headInTree: false,
         extraHead: [],

package/dist/core/routing/astro-designed-error-pages.d.ts

@@ -0,0 +1,2 @@
+import type { ManifestData } from '../../@types/astro.js';
+export declare function ensure404Route(manifest: ManifestData): ManifestData;

package/dist/core/routing/astro-designed-error-pages.js

@@ -0,0 +1,21 @@
+import { DEFAULT_404_COMPONENT } from "../constants.js";
+function ensure404Route(manifest) {
+  if (!manifest.routes.some((route) => route.route === "/404")) {
+    manifest.routes.push({
+      component: DEFAULT_404_COMPONENT,
+      generate: () => "",
+      params: [],
+      pattern: /\/404/,
+      prerender: false,
+      segments: [],
+      type: "page",
+      route: "/404",
+      fallbackRoutes: [],
+      isIndex: false
+    });
+  }
+  return manifest;
+}
+export {
+  ensure404Route
+};

package/dist/runtime/client/dev-toolbar/apps/audit/index.d.ts

@@ -1,18 +1,11 @@
-type DynamicString = string | ((element: Element) => string);
-export interface AuditRule {
-    code: string;
-    title: DynamicString;
-    message: DynamicString;
-}
-export interface ResolvedAuditRule {
-    code: string;
-    title: string;
-    message: string;
-}
-export interface AuditRuleWithSelector extends AuditRule {
-    selector: string;
-    match?: (element: Element) => boolean | null | undefined | void | Promise<boolean> | Promise<void> | Promise<null> | Promise<undefined>;
-}
+import type { DevToolbarHighlight } from '../../ui-library/highlight.js';
+import { type AuditRule } from './rules/index.js';
+export type Audit = {
+    auditedElement: HTMLElement;
+    rule: AuditRule;
+    highlight: DevToolbarHighlight | null;
+    card: HTMLElement | null;
+};
 declare const _default: {
     id: string;
     name: string;