astro 4.2.0 → 4.2.2

package/astro-jsx.d.ts

@@ -647,6 +647,7 @@ declare namespace astroHTML.JSX {
 		name?: string | undefined | null;
 		type?: 'submit' | 'reset' | 'button' | undefined | null;
 		value?: string | string[] | number | undefined | null;
+		popovertarget?: string | undefined | null;
 	}
 
 	interface CanvasHTMLAttributes extends HTMLAttributes {
@@ -811,6 +812,7 @@ declare namespace astroHTML.JSX {
 		type?: HTMLInputTypeAttribute | undefined | null;
 		value?: string | string[] | number | undefined | null;
 		width?: number | string | undefined | null;
+		popovertarget?: string | undefined | null;
 	}
 
 	interface KeygenHTMLAttributes extends HTMLAttributes {

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

@@ -1414,6 +1414,8 @@ export interface AstroUserConfig {
             strategy: 'pathname';
         };
     };
+    /** ⚠️ WARNING: SUBJECT TO CHANGE */
+    db?: Config.Database;
     /**
      * @docs
      * @kind heading
@@ -2435,3 +2437,8 @@ declare global {
         'astro-dev-overlay-card': DevToolbarCard;
     }
 }
+declare global {
+    namespace Config {
+        type Database = Record<string, any>;
+    }
+}

package/dist/cli/db/index.d.ts

@@ -0,0 +1,4 @@
+import type { Arguments } from 'yargs-parser';
+export declare function db({ flags }: {
+    flags: Arguments;
+}): Promise<void>;

package/dist/cli/db/index.js

@@ -0,0 +1,20 @@
+import { createLoggerFromFlags } from "../flags.js";
+import { getPackage } from "../install-package.js";
+async function db({ flags }) {
+  const logger = createLoggerFromFlags(flags);
+  const getPackageOpts = { skipAsk: flags.yes || flags.y, cwd: flags.root };
+  const dbPackage = await getPackage("@astrojs/db", logger, getPackageOpts, []);
+  if (!dbPackage) {
+    logger.error(
+      "check",
+      "The `@astrojs/db` package is required for this command to work. Please manually install it in your project and try again."
+    );
+    return;
+  }
+  const { cli } = dbPackage;
+  const [command, ...args] = flags._.slice(3).map((v) => v.toString());
+  await cli(command, args);
+}
+export {
+  db
+};

package/dist/cli/index.js

@@ -51,6 +51,7 @@ function resolveCommand(flags) {
     "preview",
     "check",
     "docs",
+    "db",
     "info"
   ]);
   if (supportedCommands.has(cmd)) {
@@ -107,6 +108,11 @@ async function runCommand(cmd, flags) {
       await add(packages, { flags });
       return;
     }
+    case "db": {
+      const { db } = await import("./db/index.js");
+      await db({ flags });
+      return;
+    }
     case "dev": {
       const { dev } = await import("./dev/index.js");
       const server = await dev({ flags });

package/dist/cli/preferences/index.js

@@ -1,14 +1,11 @@
-import { bgGreen, black, bold, dim } from "kleur/colors";
+import { bgGreen, black, bold, dim, yellow } from "kleur/colors";
 import { fileURLToPath } from "node:url";
 import dlv from "dlv";
 import { resolveConfig } from "../../core/config/config.js";
 import { createSettings } from "../../core/config/settings.js";
 import * as msg from "../../core/messages.js";
 import { DEFAULT_PREFERENCES } from "../../preferences/defaults.js";
-import {
-  coerce,
-  isValidKey
-} from "../../preferences/index.js";
+import { coerce, isValidKey } from "../../preferences/index.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { flattie } from "flattie";
 import { formatWithOptions } from "node:util";
@@ -159,23 +156,41 @@ async function resetPreference(settings, key, { location }) {
   }
   return 1;
 }
+function annotate(flat, annotation) {
+  return Object.fromEntries(
+    Object.entries(flat).map(([key, value]) => [key, { annotation, value }])
+  );
+}
+function userValues(flatDefault, flatProject, flatGlobal) {
+  const result = {};
+  for (const key of Object.keys(flatDefault)) {
+    if (key in flatProject) {
+      result[key] = {
+        value: flatProject[key],
+        annotation: ""
+      };
+      if (key in flatGlobal) {
+        result[key].annotation += ` (also modified globally)`;
+      }
+    } else if (key in flatGlobal) {
+      result[key] = { value: flatGlobal[key], annotation: "(global)" };
+    }
+  }
+  return result;
+}
 async function listPreferences(settings, { location, json }) {
   if (json) {
     const resolved = await settings.preferences.getAll();
     console.log(JSON.stringify(resolved, null, 2));
     return 0;
   }
-  const { global, project, defaults } = await settings.preferences.list({ location });
+  const { global, project, fromAstroConfig, defaults } = await settings.preferences.list({
+    location
+  });
   const flatProject = flattie(project);
   const flatGlobal = flattie(global);
-  const flatUser = Object.assign({}, flatGlobal, flatProject);
-  for (let key of Object.keys(flatUser)) {
-    if (!isValidKey(key)) {
-      delete flatUser[key];
-      continue;
-    }
-  }
   const flatDefault = flattie(defaults);
+  const flatUser = userValues(flatDefault, flatProject, flatGlobal);
   const userKeys = Object.keys(flatUser);
   if (userKeys.length > 0) {
     const badge = bgGreen(black(` Your Preferences `));
@@ -186,7 +201,7 @@ async function listPreferences(settings, { location, json }) {
     const message = dim("No preferences set");
     console.log(["", badge, "", message].join("\n"));
   }
-  const flatUnset = Object.assign({}, flatDefault);
+  const flatUnset = annotate(Object.assign({}, flatDefault), "");
   for (const key of userKeys) {
     delete flatUnset[key];
   }
@@ -200,6 +215,13 @@ async function listPreferences(settings, { location, json }) {
     const message = dim("All preferences have been set");
     console.log(["", badge, "", message].join("\n"));
   }
+  if (fromAstroConfig.devToolbar?.enabled === false && flatUser["devToolbar.enabled"]?.value !== false) {
+    console.log(
+      yellow(
+        "The dev toolbar is currently disabled. To enable it, set devToolbar: {enabled: true} in your astroConfig file."
+      )
+    );
+  }
   return 0;
 }
 function prettyPrint(value) {
@@ -223,14 +245,22 @@ const chars = {
   bottomLeft: "\u2570",
   bottomRight: "\u256F"
 };
+function annotatedFormat(mv) {
+  return mv.annotation ? `${mv.value} ${mv.annotation}` : mv.value.toString();
+}
+function formatAnnotated(mv, style = (v) => v.toString()) {
+  return mv.annotation ? `${style(mv.value)} ${dim(mv.annotation)}` : style(mv.value);
+}
 function formatTable(object, columnLabels) {
   const [colA, colB] = columnLabels;
   const colALength = [colA, ...Object.keys(object)].reduce(longest, 0) + 3;
-  const colBLength = [colB, ...Object.values(object)].reduce(longest, 0) + 3;
+  const colBLength = [colB, ...Object.values(object).map(annotatedFormat)].reduce(longest, 0) + 3;
   function formatRow(i2, a, b, style = (v) => v.toString()) {
-    return `${dim(chars.v)} ${style(a)} ${space(colALength - a.length - 2)} ${dim(chars.v)} ${style(
-      b
-    )} ${space(colBLength - b.toString().length - 3)} ${dim(chars.v)}`;
+    return `${dim(chars.v)} ${style(a)} ${space(colALength - a.length - 2)} ${dim(
+      chars.v
+    )} ${formatAnnotated(b, style)} ${space(colBLength - annotatedFormat(b).length - 3)} ${dim(
+      chars.v
+    )}`;
   }
   const top = dim(
     `${chars.topLeft}${chars.h.repeat(colALength + 1)}${chars.hBottom}${chars.h.repeat(
@@ -245,7 +275,7 @@ function formatTable(object, columnLabels) {
   const divider = dim(
     `${chars.vRightThick}${chars.hThick.repeat(colALength + 1)}${chars.hThickCross}${chars.hThick.repeat(colBLength)}${chars.vLeftThick}`
   );
-  const rows = [top, formatRow(-1, colA, colB, bold), divider];
+  const rows = [top, formatRow(-1, colA, { value: colB, annotation: "" }, bold), divider];
   let i = 0;
   for (const [key, value] of Object.entries(object)) {
     rows.push(formatRow(i, key, value, (v) => formatWithOptions({ colors: true }, v)));

package/dist/core/app/index.js

@@ -170,7 +170,8 @@ class App {
       const i18nMiddleware = createI18nMiddleware(
         this.#manifest.i18n,
         this.#manifest.base,
-        this.#manifest.trailingSlash
+        this.#manifest.trailingSlash,
+        this.#manifest.buildFormat
       );
       if (i18nMiddleware) {
         if (mod.onRequest) {

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

@@ -32,6 +32,7 @@ export type SSRManifest = {
     site?: string;
     base: string;
     trailingSlash: 'always' | 'never' | 'ignore';
+    buildFormat: 'file' | 'directory';
     compressHTML: boolean;
     assetsPrefix?: string;
     renderers: SSRLoadedRenderer[];

package/dist/core/build/generate.js

@@ -196,7 +196,8 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
   const i18nMiddleware = createI18nMiddleware(
     pipeline.getManifest().i18n,
     pipeline.getManifest().base,
-    pipeline.getManifest().trailingSlash
+    pipeline.getManifest().trailingSlash,
+    pipeline.getManifest().buildFormat
   );
   if (config.i18n && i18nMiddleware) {
     if (onRequest) {
@@ -344,9 +345,8 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
   return url;
 }
 async function generatePath(pathname, pipeline, gopts, route) {
-  const { mod, scripts: hoistedScripts, styles: _styles, pageData } = gopts;
+  const { mod, scripts: hoistedScripts, styles: _styles } = gopts;
   const manifest = pipeline.getManifest();
-  const logger = pipeline.getLogger();
   pipeline.getEnvironment().logger.debug("build", `Generating: ${pathname}`);
   const links = /* @__PURE__ */ new Set();
   const scripts = createModuleScriptsSet(
@@ -482,7 +482,8 @@ function createBuildManifest(settings, internals, renderers) {
     assetsPrefix: settings.config.build.assetsPrefix,
     site: settings.config.site ? new URL(settings.config.base, settings.config.site).toString() : settings.config.site,
     componentMetadata: internals.componentMetadata,
-    i18n: i18nManifest
+    i18n: i18nManifest,
+    buildFormat: settings.config.build.format
   };
 }
 export {

package/dist/core/build/plugins/plugin-manifest.js

@@ -202,7 +202,8 @@ function buildManifest(opts, internals, staticFiles) {
     clientDirectives: Array.from(settings.clientDirectives),
     entryModules,
     assets: staticFiles.map(prefixAssetPath),
-    i18n: i18nManifest
+    i18n: i18nManifest,
+    buildFormat: settings.config.build.format
   };
 }
 export {

package/dist/core/build/static-build.js

@@ -330,7 +330,7 @@ async function cleanServerOutput(opts, ssrOutputChunkNames, internals) {
     removeEmptyDirs(out);
   }
   if (out.toString() !== opts.settings.config.outDir.toString()) {
-    await copyFiles(out, opts.settings.config.outDir);
+    await copyFiles(out, opts.settings.config.outDir, true);
     await fs.promises.rm(out, { recursive: true });
     return;
   }

package/dist/core/compile/index.d.ts

@@ -1,3 +1,3 @@
-export { cachedCompilation, getCachedCompileResult, invalidateCompilation, isCached, } from './cache.js';
+export { compile } from './compile.js';
 export type { CompileProps, CompileResult } from './compile.js';
 export type { TransformStyle } from './types.js';

package/dist/core/compile/index.js

@@ -1,12 +1,4 @@
-import {
-  cachedCompilation,
-  getCachedCompileResult,
-  invalidateCompilation,
-  isCached
-} from "./cache.js";
+import { compile } from "./compile.js";
 export {
-  cachedCompilation,
-  getCachedCompileResult,
-  invalidateCompilation,
-  isCached
+  compile
 };

package/dist/core/config/schema.d.ts

@@ -32,6 +32,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         name: string;
         hooks?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     }>>;
+    db: z.ZodOptional<z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>>;
     integrations: z.ZodEffects<z.ZodDefault<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
@@ -417,6 +418,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             [k: string]: unknown;
         };
     } | undefined;
+    db?: z.objectOutputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     prefetch?: boolean | {
         prefetchAll?: boolean | undefined;
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
@@ -446,6 +448,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         name: string;
         hooks?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     } | undefined;
+    db?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     integrations?: unknown;
     build?: {
         format?: "file" | "directory" | undefined;
@@ -605,6 +608,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         name: string;
         hooks?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     }>>;
+    db: z.ZodOptional<z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>>;
     integrations: z.ZodEffects<z.ZodDefault<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
@@ -935,6 +939,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             [k: string]: unknown;
         };
     } | undefined;
+    db?: z.objectOutputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     prefetch?: boolean | {
         prefetchAll?: boolean | undefined;
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
@@ -976,6 +981,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         name: string;
         hooks?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     } | undefined;
+    db?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     integrations?: unknown;
     prefetch?: boolean | {
         prefetchAll?: boolean | undefined;
@@ -1122,6 +1128,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             [k: string]: unknown;
         };
     } | undefined;
+    db?: z.objectOutputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     prefetch?: boolean | {
         prefetchAll?: boolean | undefined;
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
@@ -1163,6 +1170,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         name: string;
         hooks?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     } | undefined;
+    db?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     integrations?: unknown;
     prefetch?: boolean | {
         prefetchAll?: boolean | undefined;
@@ -1309,6 +1317,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             [k: string]: unknown;
         };
     } | undefined;
+    db?: z.objectOutputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     prefetch?: boolean | {
         prefetchAll?: boolean | undefined;
         defaultStrategy?: "tap" | "hover" | "viewport" | "load" | undefined;
@@ -1350,6 +1359,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         name: string;
         hooks?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     } | undefined;
+    db?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
     integrations?: unknown;
     prefetch?: boolean | {
         prefetchAll?: boolean | undefined;

package/dist/core/config/schema.js

@@ -60,6 +60,7 @@ const AstroConfigSchema = z.object({
   output: z.union([z.literal("static"), z.literal("server"), z.literal("hybrid")]).optional().default("static"),
   scopedStyleStrategy: z.union([z.literal("where"), z.literal("class"), z.literal("attribute")]).optional().default("attribute"),
   adapter: z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) }).optional(),
+  db: z.object({}).passthrough().default({}).optional(),
   integrations: z.preprocess(
     // preprocess
     (val) => Array.isArray(val) ? val.flat(Infinity).filter(Boolean) : val,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.2.0";
+const ASTRO_VERSION = "4.2.2";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

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

package/dist/core/logger/node.js

@@ -1,7 +1,7 @@
 import debugPackage from "debug";
 import { getEventPrefix, levels } from "./core.js";
 const nodeLogDestination = {
-  write(event, newLine = true) {
+  write(event) {
     let dest = process.stderr;
     if (levels[event.level] < levels["error"]) {
       dest = process.stdout;

package/dist/core/messages.js

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

package/dist/core/routing/manifest/create.js

@@ -83,9 +83,26 @@ function validateSegment(segment, file = "") {
     throw new Error(`Invalid route ${file} \u2014 rest parameter must be a standalone segment`);
   }
 }
+function isSemanticallyEqualSegment(segmentA, segmentB) {
+  if (segmentA.length !== segmentB.length) {
+    return false;
+  }
+  for (const [index, partA] of segmentA.entries()) {
+    const partB = segmentB[index];
+    if (partA.dynamic !== partB.dynamic || partA.spread !== partB.spread) {
+      return false;
+    }
+    if (!partA.dynamic && partA.content !== partB.content) {
+      return false;
+    }
+  }
+  return true;
+}
 function routeComparator(a, b) {
-  if (a.segments.length !== b.segments.length) {
-    return a.segments.length > b.segments.length ? -1 : 1;
+  const aLength = a.isIndex ? a.segments.length + 1 : a.segments.length;
+  const bLength = b.isIndex ? b.segments.length + 1 : b.segments.length;
+  if (aLength !== bLength) {
+    return aLength > bLength ? -1 : 1;
   }
   const aIsStatic = a.segments.every(
     (segment) => segment.every((part) => !part.dynamic && !part.spread)
@@ -203,6 +220,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
         const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
         routes.push({
           route,
+          isIndex: item.isIndex,
           type: item.isPage ? "page" : "endpoint",
           pattern,
           segments,
@@ -257,6 +275,8 @@ function createInjectedRoutes({ settings, cwd }) {
     const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
     routes[priority].push({
       type,
+      // For backwards compatibility, an injected route is never considered an index route.
+      isIndex: false,
       route,
       pattern,
       segments,
@@ -302,6 +322,8 @@ function createRedirectRoutes({ settings }, routeMap, logger) {
     }
     routes[priority].push({
       type: "redirect",
+      // For backwards compatibility, a redirect is never considered an index route.
+      isIndex: false,
       route,
       pattern,
       segments,
@@ -320,21 +342,6 @@ function createRedirectRoutes({ settings }, routeMap, logger) {
 function isStaticSegment(segment) {
   return segment.every((part) => !part.dynamic && !part.spread);
 }
-function isSemanticallyEqualSegment(segmentA, segmentB) {
-  if (segmentA.length !== segmentB.length) {
-    return false;
-  }
-  for (const [index, partA] of segmentA.entries()) {
-    const partB = segmentB[index];
-    if (partA.dynamic !== partB.dynamic || partA.spread !== partB.spread) {
-      return false;
-    }
-    if (!partA.dynamic && partA.content !== partB.content) {
-      return false;
-    }
-  }
-  return true;
-}
 function detectRouteCollision(a, b, config, logger) {
   if (a.type === "fallback" || b.type === "fallback") {
     return;

package/dist/i18n/index.js

@@ -23,7 +23,7 @@ function getLocaleRelativeUrl({
   }
   const pathsToJoin = [base, prependWith];
   const normalizedLocale = normalizeLocale ? normalizeTheLocale(codeToUse) : codeToUse;
-  if (routing === "pathname-prefix-always") {
+  if (routing === "pathname-prefix-always" || routing === "pathname-prefix-always-no-redirect") {
     pathsToJoin.push(normalizedLocale);
   } else if (locale !== defaultLocale) {
     pathsToJoin.push(normalizedLocale);
@@ -58,7 +58,7 @@ function getLocaleRelativeUrlList({
   return locales.map((locale) => {
     const pathsToJoin = [base, prependWith];
     const normalizedLocale = normalizeLocale ? normalizeTheLocale(locale) : locale;
-    if (routing === "pathname-prefix-always") {
+    if (routing === "pathname-prefix-always" || routing === "pathname-prefix-always-no-redirect") {
       pathsToJoin.push(normalizedLocale);
     } else if (locale !== defaultLocale) {
       pathsToJoin.push(normalizedLocale);

package/dist/i18n/middleware.d.ts

@@ -1,6 +1,6 @@
 import type { MiddlewareHandler, SSRManifest } from '../@types/astro.js';
 import type { PipelineHookFunction } from '../core/pipeline.js';
-export declare function createI18nMiddleware(i18n: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash']): MiddlewareHandler | undefined;
+export declare function createI18nMiddleware(i18n: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], buildFormat: SSRManifest['buildFormat']): MiddlewareHandler | undefined;
 /**
  * This pipeline hook attaches a `RouteData` object to the `Request`
  */

package/dist/i18n/middleware.js

@@ -17,7 +17,7 @@ function pathnameHasLocale(pathname, locales) {
   }
   return false;
 }
-function createI18nMiddleware(i18n, base, trailingSlash) {
+function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
   if (!i18n) {
     return void 0;
   }
@@ -60,7 +60,7 @@ function createI18nMiddleware(i18n, base, trailingSlash) {
         }
         case "pathname-prefix-always": {
           if (url.pathname === base + "/" || url.pathname === base) {
-            if (trailingSlash === "always") {
+            if (shouldAppendForwardSlash(trailingSlash, buildFormat)) {
               return context.redirect(`${appendForwardSlash(joinPaths(base, i18n.defaultLocale))}`);
             } else {
               return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);

package/dist/preferences/index.d.ts

@@ -13,6 +13,7 @@ type DeepPartial<T> = T extends object ? {
 } : T;
 export type PreferenceKey = DotKeys<Preferences>;
 export interface PreferenceList extends Record<PreferenceLocation, DeepPartial<Preferences>> {
+    fromAstroConfig: DeepPartial<Preferences>;
     defaults: Preferences;
 }
 export interface AstroPreferences {

package/dist/preferences/index.js

@@ -49,8 +49,14 @@ function createPreferences(config) {
       return {
         global: stores["global"].getAll(),
         project: stores["project"].getAll(),
+        fromAstroConfig: mapFrom(DEFAULT_PREFERENCES, config),
         defaults: DEFAULT_PREFERENCES
       };
+      function mapFrom(defaults, astroConfig) {
+        return Object.fromEntries(
+          Object.entries(defaults).map(([key, _]) => [key, astroConfig[key]])
+        );
+      }
     }
   };
 }

package/dist/runtime/server/index.js

@@ -35,9 +35,12 @@ import { markHTMLString as markHTMLString2 } from "./escape.js";
 import { addAttribute as addAttribute2, Renderer as Renderer2 } from "./render/index.js";
 function mergeSlots(...slotted) {
   const slots = {};
-  for (const slot of slotted) {
+  for (let slot of slotted) {
     if (!slot)
       continue;
+    if (Array.isArray(slot)) {
+      slot = mergeSlots(...slot);
+    }
     if (typeof slot === "object") {
       Object.assign(slots, slot);
     } else if (typeof slot === "function") {

package/dist/runtime/server/render/util.js

@@ -12,7 +12,7 @@ const toIdent = (k) => k.trim().replace(/(?:(?!^)\b\w|\s+|[^\w]+)/g, (match, ind
 });
 const toAttributeString = (value, shouldEscape = true) => shouldEscape ? String(value).replace(/&/g, "&").replace(/"/g, """) : value;
 const kebab = (k) => k.toLowerCase() === k ? k : k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
-const toStyleString = (obj) => Object.entries(obj).filter(([k, v]) => typeof v === "string" && v.trim() || typeof v === "number").map(([k, v]) => {
+const toStyleString = (obj) => Object.entries(obj).filter(([_, v]) => typeof v === "string" && v.trim() || typeof v === "number").map(([k, v]) => {
   if (k[0] !== "-" && k[1] !== "-")
     return `${kebab(k)}:${v}`;
   return `${k}:${v}`;

package/dist/vite-plugin-astro/compile.d.ts

@@ -1,12 +1,14 @@
 import { type ESBuildTransformResult } from 'vite';
 import { type CompileProps, type CompileResult } from '../core/compile/index.js';
 import type { Logger } from '../core/logger/core.js';
-interface CachedFullCompilation {
+import type { CompileMetadata } from './types.js';
+interface CompileAstroOption {
     compileProps: CompileProps;
+    astroFileToCompileMetadata: Map<string, CompileMetadata>;
     logger: Logger;
 }
-interface FullCompileResult extends Omit<CompileResult, 'map'> {
+export interface CompileAstroResult extends Omit<CompileResult, 'map'> {
     map: ESBuildTransformResult['map'];
 }
-export declare function cachedFullCompilation({ compileProps, logger, }: CachedFullCompilation): Promise<FullCompileResult>;
+export declare function compileAstro({ compileProps, astroFileToCompileMetadata, logger, }: CompileAstroOption): Promise<CompileAstroResult>;
 export {};

package/dist/vite-plugin-astro/compile.js

@@ -1,15 +1,16 @@
 import { transformWithEsbuild } from "vite";
-import { cachedCompilation } from "../core/compile/index.js";
+import { compile } from "../core/compile/index.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
 const FRONTMATTER_PARSE_REGEXP = /^\-\-\-(.*)^\-\-\-/ms;
-async function cachedFullCompilation({
+async function compileAstro({
   compileProps,
+  astroFileToCompileMetadata,
   logger
 }) {
   let transformResult;
   let esbuildResult;
   try {
-    transformResult = await cachedCompilation(compileProps);
+    transformResult = await compile(compileProps);
     esbuildResult = await transformWithEsbuild(transformResult.code, compileProps.filename, {
       loader: "ts",
       target: "esnext",
@@ -50,6 +51,11 @@ const $$url = ${JSON.stringify(
       i++;
     }
   }
+  astroFileToCompileMetadata.set(compileProps.filename, {
+    originalCode: compileProps.source,
+    css: transformResult.css,
+    scripts: transformResult.scripts
+  });
   return {
     ...transformResult,
     code: esbuildResult.code + SUFFIX,
@@ -86,5 +92,5 @@ async function enhanceCompileError({
   throw err;
 }
 export {
-  cachedFullCompilation
+  compileAstro
 };

package/dist/vite-plugin-astro/hmr.d.ts

@@ -1,12 +1,11 @@
 import type { HmrContext } from 'vite';
-import type { AstroConfig } from '../@types/astro.js';
-import type { cachedCompilation } from '../core/compile/index.js';
 import type { Logger } from '../core/logger/core.js';
+import type { CompileAstroResult } from './compile.js';
+import type { CompileMetadata } from './types.js';
 export interface HandleHotUpdateOptions {
-    config: AstroConfig;
     logger: Logger;
+    compile: (code: string, filename: string) => Promise<CompileAstroResult>;
     astroFileToCssAstroDeps: Map<string, Set<string>>;
-    compile: () => ReturnType<typeof cachedCompilation>;
-    source: string;
+    astroFileToCompileMetadata: Map<string, CompileMetadata>;
 }
-export declare function handleHotUpdate(ctx: HmrContext, { config, logger, astroFileToCssAstroDeps, compile, source }: HandleHotUpdateOptions): Promise<import("vite").ModuleNode[] | undefined>;
+export declare function handleHotUpdate(ctx: HmrContext, { logger, compile, astroFileToCssAstroDeps, astroFileToCompileMetadata }: HandleHotUpdateOptions): Promise<import("vite").ModuleNode[] | undefined>;

package/dist/vite-plugin-astro/hmr.js

@@ -1,22 +1,11 @@
 import path from "node:path";
 import { appendForwardSlash } from "@astrojs/internal-helpers/path";
-import { invalidateCompilation, isCached } from "../core/compile/index.js";
-async function handleHotUpdate(ctx, { config, logger, astroFileToCssAstroDeps, compile, source }) {
-  let isStyleOnlyChange = false;
-  if (ctx.file.endsWith(".astro") && isCached(config, ctx.file)) {
-    const oldResult = await compile();
-    if (oldResult.source === source)
-      return [];
-    invalidateCompilation(config, ctx.file);
-    const newResult = await compile();
-    if (isStyleOnlyChanged(oldResult, newResult)) {
-      isStyleOnlyChange = true;
-    }
-  } else {
-    invalidateCompilation(config, ctx.file);
-  }
-  if (isStyleOnlyChange) {
+async function handleHotUpdate(ctx, { logger, compile, astroFileToCssAstroDeps, astroFileToCompileMetadata }) {
+  const oldCode = astroFileToCompileMetadata.get(ctx.file)?.originalCode;
+  const newCode = await ctx.read();
+  if (oldCode && isStyleOnlyChanged(oldCode, newCode)) {
     logger.debug("watch", "style-only change");
+    await compile(newCode, ctx.file);
     return ctx.modules.filter((mod) => mod.id?.includes("astro&type=style"));
   }
   for (const [astroFile, cssAstroDeps] of astroFileToCssAstroDeps) {
@@ -32,15 +21,29 @@ async function handleHotUpdate(ctx, { config, logger, astroFileToCssAstroDeps, c
     }
   }
 }
-function isStyleOnlyChanged(oldResult, newResult) {
-  return normalizeCode(oldResult.code) === normalizeCode(newResult.code) && // If style tags are added/removed, we need to regenerate the main Astro file
-  // so that its CSS imports are also added/removed
-  oldResult.css.length === newResult.css.length && !isArrayEqual(oldResult.css, newResult.css);
-}
-const astroStyleImportRE = /import\s*"[^"]+astro&type=style[^"]+";/g;
-const sourceMappingUrlRE = /\/\/# sourceMappingURL=[^ ]+$/gm;
-function normalizeCode(code) {
-  return code.replace(astroStyleImportRE, "").replace(sourceMappingUrlRE, "").trim();
+const frontmatterRE = /^\-\-\-.*?^\-\-\-/ms;
+const scriptRE = /<script(?:\s.*?)?>.*?<\/script>/gs;
+const styleRE = /<style(?:\s.*?)?>.*?<\/style>/gs;
+function isStyleOnlyChanged(oldCode, newCode) {
+  if (oldCode === newCode)
+    return false;
+  let oldFrontmatter = "";
+  let newFrontmatter = "";
+  oldCode = oldCode.replace(frontmatterRE, (m) => (oldFrontmatter = m, ""));
+  newCode = newCode.replace(frontmatterRE, (m) => (newFrontmatter = m, ""));
+  if (oldFrontmatter !== newFrontmatter)
+    return false;
+  const oldScripts = [];
+  const newScripts = [];
+  oldCode = oldCode.replace(scriptRE, (m) => (oldScripts.push(m), ""));
+  newCode = newCode.replace(scriptRE, (m) => (newScripts.push(m), ""));
+  if (!isArrayEqual(oldScripts, newScripts))
+    return false;
+  const oldStyles = [];
+  const newStyles = [];
+  oldCode.match(styleRE)?.forEach((m) => oldStyles.push(m));
+  newCode.match(styleRE)?.forEach((m) => newStyles.push(m));
+  return oldStyles.length === newStyles.length && !isArrayEqual(oldStyles, newStyles);
 }
 function isArrayEqual(a, b) {
   if (a.length !== b.length) {

package/dist/vite-plugin-astro/index.js

@@ -1,34 +1,51 @@
 import { normalizePath } from "vite";
-import {
-  cachedCompilation,
-  getCachedCompileResult,
-  invalidateCompilation
-} from "../core/compile/index.js";
-import { isRelativePath } from "../core/path.js";
 import { normalizeFilename } from "../vite-plugin-utils/index.js";
-import { cachedFullCompilation } from "./compile.js";
+import { compileAstro } from "./compile.js";
 import { handleHotUpdate } from "./hmr.js";
 import { parseAstroRequest } from "./query.js";
 import { getAstroMetadata } from "./metadata.js";
+const astroFileToCompileMetadataWeakMap = /* @__PURE__ */ new WeakMap();
 function astro({ settings, logger }) {
   const { config } = settings;
-  let resolvedConfig;
   let server;
+  let compile;
   let astroFileToCssAstroDeps = /* @__PURE__ */ new Map();
+  let astroFileToCompileMetadata = /* @__PURE__ */ new Map();
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb) && srcRootWeb !== "/";
   const prePlugin = {
     name: "astro:build",
     enforce: "pre",
     // run transforms before other plugins can
-    configResolved(_resolvedConfig) {
-      resolvedConfig = _resolvedConfig;
+    configResolved(viteConfig) {
+      compile = (code, filename) => {
+        return compileAstro({
+          compileProps: {
+            astroConfig: config,
+            viteConfig,
+            preferences: settings.preferences,
+            filename,
+            source: code
+          },
+          astroFileToCompileMetadata,
+          logger
+        });
+      };
     },
     configureServer(_server) {
       server = _server;
+      server.watcher.on("unlink", (filename) => {
+        astroFileToCompileMetadata.delete(filename);
+      });
     },
     buildStart() {
       astroFileToCssAstroDeps = /* @__PURE__ */ new Map();
+      astroFileToCompileMetadata = /* @__PURE__ */ new Map();
+      if (astroFileToCompileMetadataWeakMap.has(config)) {
+        astroFileToCompileMetadata = astroFileToCompileMetadataWeakMap.get(config);
+      } else {
+        astroFileToCompileMetadataWeakMap.set(config, astroFileToCompileMetadata);
+      }
     },
     async load(id, opts) {
       const parsedId = parseAstroRequest(id);
@@ -37,33 +54,22 @@ function astro({ settings, logger }) {
         return null;
       }
       const filename = normalizePath(normalizeFilename(parsedId.filename, config.root));
-      let compileResult = getCachedCompileResult(config, filename);
-      if (!compileResult) {
-        if (server) {
-          await server.transformRequest("/@fs" + filename);
-          compileResult = getCachedCompileResult(config, filename);
-        }
-        if (!compileResult) {
-          throw new Error("No cached compile result found for " + id);
-        }
+      const compileMetadata = astroFileToCompileMetadata.get(filename);
+      if (!compileMetadata) {
+        throw new Error(
+          `No cached compile metadata found for "${id}". The main Astro module "${filename}" should have compiled and filled the metadata first, before its virtual modules can be requested.`
+        );
       }
       switch (query.type) {
         case "style": {
           if (typeof query.index === "undefined") {
             throw new Error(`Requests for Astro CSS must include an index.`);
           }
-          const code = compileResult.css[query.index];
+          const code = compileMetadata.css[query.index];
           if (!code) {
             throw new Error(`No Astro CSS at index ${query.index}`);
           }
-          return {
-            code,
-            meta: {
-              vite: {
-                isSelfAccepting: true
-              }
-            }
-          };
+          return { code };
         }
         case "script": {
           if (typeof query.index === "undefined") {
@@ -74,7 +80,7 @@ function astro({ settings, logger }) {
               code: `/* client hoisted script, empty in SSR: ${id} */`
             };
           }
-          const hoistedScript = compileResult.scripts[query.index];
+          const hoistedScript = compileMetadata.scripts[query.index];
           if (!hoistedScript) {
             throw new Error(`No hoisted script at index ${query.index}`);
           }
@@ -122,18 +128,8 @@ File: ${id}`
       if (!id.endsWith(".astro") || parsedId.query.astro) {
         return;
       }
-      if (isRelativePath(parsedId.filename)) {
-        return;
-      }
-      const compileProps = {
-        astroConfig: config,
-        viteConfig: resolvedConfig,
-        preferences: settings.preferences,
-        filename: normalizePath(parsedId.filename),
-        source
-      };
-      invalidateCompilation(config, compileProps.filename);
-      const transformResult = await cachedFullCompilation({ compileProps, logger });
+      const filename = normalizePath(parsedId.filename);
+      const transformResult = await compile(source, filename);
       const astroDeps = /* @__PURE__ */ new Set();
       for (const dep of transformResult.cssDeps) {
         if (dep.endsWith(".astro")) {
@@ -143,7 +139,7 @@ File: ${id}`
       }
       astroFileToCssAstroDeps.set(id, astroDeps);
       if (server) {
-        const mods = server.moduleGraph.getModulesByFile(compileProps.filename);
+        const mods = server.moduleGraph.getModulesByFile(filename);
         if (mods) {
           const seen = new Set(mods);
           for (const mod of mods) {
@@ -174,24 +170,14 @@ File: ${id}`
         }
       };
     },
-    async handleHotUpdate(context) {
-      if (context.server.config.isProduction)
+    async handleHotUpdate(ctx) {
+      if (!ctx.file.endsWith(".astro"))
         return;
-      const filename = context.file;
-      const source = await context.read();
-      const compile = () => cachedCompilation({
-        astroConfig: config,
-        viteConfig: resolvedConfig,
-        preferences: settings.preferences,
-        filename,
-        source
-      });
-      return handleHotUpdate(context, {
-        config,
+      return handleHotUpdate(ctx, {
         logger,
-        astroFileToCssAstroDeps,
         compile,
-        source
+        astroFileToCssAstroDeps,
+        astroFileToCompileMetadata
       });
     }
   };

package/dist/vite-plugin-astro/types.d.ts

@@ -1,4 +1,4 @@
-import type { TransformResult } from '@astrojs/compiler';
+import type { HoistedScript, TransformResult } from '@astrojs/compiler';
 import type { PropagationHint } from '../@types/astro.js';
 export interface PageOptions {
     prerender?: boolean;
@@ -13,3 +13,11 @@ export interface PluginMetadata {
         pageOptions: PageOptions;
     };
 }
+export interface CompileMetadata {
+    /** Used for HMR to compare code changes */
+    originalCode: string;
+    /** For Astro CSS virtual module */
+    css: string[];
+    /** For Astro hoisted scripts virtual module */
+    scripts: HoistedScript[];
+}

package/dist/vite-plugin-astro-server/plugin.js

@@ -96,6 +96,7 @@ function createDevelopmentManifest(settings) {
   }
   return {
     trailingSlash: settings.config.trailingSlash,
+    buildFormat: settings.config.build.format,
     compressHTML: settings.config.compressHTML,
     assets: /* @__PURE__ */ new Set(),
     entryModules: {},

package/dist/vite-plugin-astro-server/route.js

@@ -231,7 +231,12 @@ async function handleRoute({
   }
   const onRequest = middleware?.onRequest;
   if (config.i18n) {
-    const i18Middleware = createI18nMiddleware(config.i18n, config.base, config.trailingSlash);
+    const i18Middleware = createI18nMiddleware(
+      config.i18n,
+      config.base,
+      config.trailingSlash,
+      config.build.format
+    );
     if (i18Middleware) {
       if (onRequest) {
         pipeline.setMiddlewareFunction(sequence(i18Middleware, onRequest));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -101,7 +101,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.3.4",
+    "@astrojs/compiler": "^2.5.0",
     "@babel/core": "^7.23.3",
     "@babel/generator": "^7.23.3",
     "@babel/parser": "^7.23.3",
@@ -162,7 +162,7 @@
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "4.1.0",
+    "@astrojs/markdown-remark": "4.2.0",
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {

package/dist/core/compile/cache.d.ts

@@ -1,6 +0,0 @@
-import type { AstroConfig } from '../../@types/astro.js';
-import { type CompileProps, type CompileResult } from './compile.js';
-export declare function isCached(config: AstroConfig, filename: string): boolean;
-export declare function getCachedCompileResult(config: AstroConfig, filename: string): CompileResult | null;
-export declare function invalidateCompilation(config: AstroConfig, filename: string): void;
-export declare function cachedCompilation(props: CompileProps): Promise<CompileResult>;

package/dist/core/compile/cache.js

@@ -1,38 +0,0 @@
-import { compile } from "./compile.js";
-const configCache = /* @__PURE__ */ new WeakMap();
-function isCached(config, filename) {
-  return configCache.has(config) && configCache.get(config).has(filename);
-}
-function getCachedCompileResult(config, filename) {
-  if (!isCached(config, filename))
-    return null;
-  return configCache.get(config).get(filename);
-}
-function invalidateCompilation(config, filename) {
-  if (configCache.has(config)) {
-    const cache = configCache.get(config);
-    cache.delete(filename);
-  }
-}
-async function cachedCompilation(props) {
-  const { astroConfig, filename } = props;
-  let cache;
-  if (!configCache.has(astroConfig)) {
-    cache = /* @__PURE__ */ new Map();
-    configCache.set(astroConfig, cache);
-  } else {
-    cache = configCache.get(astroConfig);
-  }
-  if (cache.has(filename)) {
-    return cache.get(filename);
-  }
-  const compileResult = await compile(props);
-  cache.set(filename, compileResult);
-  return compileResult;
-}
-export {
-  cachedCompilation,
-  getCachedCompileResult,
-  invalidateCompilation,
-  isCached
-};