astro 4.1.2 → 4.2.0

package/dist/core/config/schema.js

@@ -5,6 +5,7 @@ import { pathToFileURL } from "node:url";
 import { z } from "zod";
 import { appendForwardSlash, prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
 import "mdast-util-to-hast";
+import "shikiji-core";
 const ASTRO_CONFIG_DEFAULTS = {
   root: ".",
   srcDir: "./src",
@@ -41,7 +42,9 @@ const ASTRO_CONFIG_DEFAULTS = {
   redirects: {},
   experimental: {
     optimizeHoistedScript: false,
-    contentCollectionCache: false
+    contentCollectionCache: false,
+    clientPrerender: false,
+    globalRoutePriority: false
   }
 };
 const AstroConfigSchema = z.object({
@@ -161,7 +164,8 @@ const AstroConfigSchema = z.object({
       experimentalThemes: z.record(
         z.enum(Object.keys(bundledThemes)).or(z.custom())
       ).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.experimentalThemes),
-      wrap: z.boolean().or(z.null()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.wrap)
+      wrap: z.boolean().or(z.null()).default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.wrap),
+      transformers: z.custom().array().default(ASTRO_CONFIG_DEFAULTS.markdown.shikiConfig.transformers)
     }).default({}),
     remarkPlugins: z.union([
       z.string(),
@@ -195,15 +199,27 @@ const AstroConfigSchema = z.object({
       fallback: z.record(z.string(), z.string()).optional(),
       routing: z.object({
         prefixDefaultLocale: z.boolean().default(false),
+        redirectToDefaultLocale: z.boolean().default(true),
         strategy: z.enum(["pathname"]).default("pathname")
-      }).default({}).transform((routing) => {
+      }).default({}).refine(
+        ({ prefixDefaultLocale, redirectToDefaultLocale }) => {
+          return !(prefixDefaultLocale === false && redirectToDefaultLocale === false);
+        },
+        {
+          message: "The option `i18n.redirectToDefaultLocale` is only useful when the `i18n.prefixDefaultLocale` is set to `true`. Remove the option `i18n.redirectToDefaultLocale`, or change its value to `true`."
+        }
+      ).transform((routing) => {
         let strategy;
         switch (routing.strategy) {
           case "pathname": {
             if (routing.prefixDefaultLocale === true) {
-              strategy = "prefix-always";
+              if (routing.redirectToDefaultLocale) {
+                strategy = "pathname-prefix-always";
+              } else {
+                strategy = "pathname-prefix-always-no-redirect";
+              }
             } else {
-              strategy = "prefix-other-locales";
+              strategy = "pathname-prefix-other-locales";
             }
           }
         }
@@ -252,7 +268,9 @@ const AstroConfigSchema = z.object({
   ),
   experimental: z.object({
     optimizeHoistedScript: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.optimizeHoistedScript),
-    contentCollectionCache: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentCollectionCache)
+    contentCollectionCache: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentCollectionCache),
+    clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),
+    globalRoutePriority: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.globalRoutePriority)
   }).strict(
     `Invalid or outdated experimental feature.
 Check for incorrect spelling or outdated Astro version.

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

@@ -4,8 +4,8 @@ import loadFallbackPlugin from "../../vite-plugin-load-fallback/index.js";
 import { debug } from "../logger/core.js";
 async function createViteServer(root, fs) {
   const viteServer = await createServer({
-    server: { middlewareMode: true, hmr: false, watch: { ignored: ["**"] } },
-    optimizeDeps: { disabled: true },
+    server: { middlewareMode: true, hmr: false, watch: null },
+    optimizeDeps: { noDiscovery: true },
     clearScreen: false,
     appType: "custom",
     ssr: {

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -15,8 +15,9 @@ import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.j
 import { vitePluginAstroServer } from "../vite-plugin-astro-server/index.js";
 import astroVitePlugin from "../vite-plugin-astro/index.js";
 import configAliasVitePlugin from "../vite-plugin-config-alias/index.js";
-import astroDevOverlay from "../vite-plugin-dev-overlay/vite-plugin-dev-overlay.js";
+import astroDevToolbar from "../vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.js";
 import envVitePlugin from "../vite-plugin-env/index.js";
+import vitePluginFileURL from "../vite-plugin-fileurl/index.js";
 import astroHeadPlugin from "../vite-plugin-head/index.js";
 import htmlVitePlugin from "../vite-plugin-html/index.js";
 import { astroInjectEnvTsPlugin } from "../vite-plugin-inject-env-ts/index.js";
@@ -31,7 +32,6 @@ 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 vitePluginFileURL from "../vite-plugin-fileurl/index.js";
 const ALWAYS_NOEXTERNAL = [
   // This is only because Vite's native ESM doesn't resolve "exports" correctly.
   "astro",
@@ -113,7 +113,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       astroAssetsPlugin({ settings, logger, mode }),
       astroPrefetch({ settings }),
       astroTransitions({ settings }),
-      astroDevOverlay({ settings, logger }),
+      astroDevToolbar({ settings, logger }),
       vitePluginFileURL({}),
       !!settings.config.i18n && astroInternationalization({ settings })
     ],

package/dist/core/dev/dev.js

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

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

@@ -1,5 +1,6 @@
 import type { APIContext, EndpointHandler, Locales, MiddlewareHandler, Params } from '../../@types/astro.js';
 import { type Environment, type RenderContext } from '../render/index.js';
+import type { RoutingStrategies } from '../config/schema.js';
 type CreateAPIContext = {
     request: Request;
     params: Params;
@@ -7,7 +8,7 @@ type CreateAPIContext = {
     props: Record<string, any>;
     adapterName?: string;
     locales: Locales | undefined;
-    routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined;
+    routingStrategy: RoutingStrategies | undefined;
     defaultLocale: string | undefined;
 };
 /**

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

@@ -1,7 +1,6 @@
-import { replaceCssVariables } from "@astrojs/markdown-remark";
 import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
-import { codeToHtml } from "shikiji";
+import { codeToHtml, createCssVariablesTheme } from "shikiji";
 import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from "../errors-data.js";
 import { AstroError } from "../errors.js";
 import { createSafeError } from "../utils.js";
@@ -70,7 +69,8 @@ function enhanceViteSSRError({
 }
 const ALTERNATIVE_JS_EXTS = ["cjs", "mjs"];
 const ALTERNATIVE_MD_EXTS = ["mdoc"];
-const INLINE_STYLE_SELECTOR_GLOBAL = /style="(.*?)"/g;
+let _cssVariablesTheme;
+const cssVariablesTheme = () => _cssVariablesTheme ?? (_cssVariablesTheme = createCssVariablesTheme({ variablePrefix: "--astro-code-" }));
 async function getViteErrorPayload(err) {
   let plugin = err.plugin;
   if (!plugin && err.hint) {
@@ -86,18 +86,12 @@ async function getViteErrorPayload(err) {
   if (ALTERNATIVE_MD_EXTS.includes(highlighterLang ?? "")) {
     highlighterLang = "md";
   }
-  let highlightedCode = err.fullCode ? await codeToHtml(err.fullCode, {
+  const highlightedCode = err.fullCode ? await codeToHtml(err.fullCode, {
     // @ts-expect-error always assume that shiki can accept the lang string
     lang: highlighterLang,
-    theme: "css-variables",
+    theme: cssVariablesTheme(),
     lineOptions: err.loc?.line ? [{ line: err.loc.line, classes: ["error-line"] }] : void 0
   }) : void 0;
-  if (highlightedCode) {
-    highlightedCode = highlightedCode.replace(
-      INLINE_STYLE_SELECTOR_GLOBAL,
-      (m) => replaceCssVariables(m)
-    );
-  }
   return {
     type: "error",
     err: {

package/dist/core/errors/errors-data.d.ts

@@ -893,6 +893,11 @@ export declare const MissingLocale: {
     title: string;
     message: (locale: string) => string;
 };
+export declare const MissingIndexForInternationalization: {
+    name: string;
+    title: string;
+    message: (src: string) => string;
+};
 /**
  * @docs
  * @description

package/dist/core/errors/errors-data.js

@@ -313,6 +313,12 @@ const MissingLocale = {
   title: "The provided locale does not exist.",
   message: (locale) => `The locale/path \`${locale}\` does not exist in the configured \`i18n.locales\`.`
 };
+const MissingIndexForInternationalization = {
+  name: "MissingIndexForInternationalizationError",
+  title: "Index page not found.",
+  message: (src) => `Astro couldn't find the index URL. This index page is required to create a redirect from the index URL to the index URL of the default locale. 
+Create an index page in \`${src}\``
+};
 const CantRenderPage = {
   name: "CantRenderPage",
   title: "Astro can't render the route.",
@@ -502,6 +508,7 @@ export {
   MiddlewareNoDataOrNextCalled,
   MiddlewareNotAResponse,
   MissingImageDimension,
+  MissingIndexForInternationalization,
   MissingLocale,
   MissingMediaQueryDirective,
   MissingSharp,

package/dist/core/errors/overlay.js

@@ -68,7 +68,7 @@ const style = (
     --toggle-border-color: #C3CADB;
 
   /* Syntax Highlighting */
-  --astro-code-color-text: #000000;
+  --astro-code-foreground: #000000;
   --astro-code-token-constant: #4ca48f;
   --astro-code-token-string: #9f722a;
   --astro-code-token-comment: #8490b5;
@@ -121,7 +121,7 @@ const style = (
   --toggle-border-color: #3D4663;
 
   /* Syntax Highlighting */
-  --astro-code-color-text: #ffffff;
+  --astro-code-foreground: #ffffff;
   --astro-code-token-constant: #90f4e3;
   --astro-code-token-string: #f4cf90;
   --astro-code-token-comment: #8490b5;

package/dist/core/logger/vite.d.ts

@@ -1,4 +1,3 @@
 import type { Logger as ViteLogger, LogLevel } from 'vite';
 import { type Logger as AstroLogger } from './core.js';
-export declare function isAstroSrcFile(id: string | null): boolean | undefined;
 export declare function createViteLogger(astroLogger: AstroLogger, viteLogLevel?: LogLevel): ViteLogger;

package/dist/core/logger/vite.js

@@ -74,6 +74,5 @@ function createViteLogger(astroLogger, viteLogLevel = "info") {
   return logger;
 }
 export {
-  createViteLogger,
-  isAstroSrcFile
+  createViteLogger
 };

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.1.2";
+  const version = "4.2.0";
   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.1.2"}`
+        `v${"4.2.0"}`
       )} ${headline}`
     );
   }

package/dist/core/render/context.d.ts

@@ -1,5 +1,6 @@
 import type { ComponentInstance, Locales, Params, Props, RouteData, SSRElement, SSRResult } from '../../@types/astro.js';
 import type { Environment } from './environment.js';
+import type { RoutingStrategies } from '../config/schema.js';
 /**
  * The RenderContext represents the parts of rendering that are specific to one request.
  */
@@ -17,7 +18,7 @@ export interface RenderContext {
     locals?: object;
     locales: Locales | undefined;
     defaultLocale: string | undefined;
-    routing: 'prefix-always' | 'prefix-other-locales' | undefined;
+    routing: RoutingStrategies | undefined;
 }
 export type CreateRenderContextArgs = Partial<Omit<RenderContext, 'params' | 'props' | 'locals'>> & {
     route: RouteData;
@@ -47,5 +48,5 @@ export declare function parseLocale(header: string): BrowserLocale[];
  */
 export declare function computePreferredLocale(request: Request, locales: Locales): string | undefined;
 export declare function computePreferredLocaleList(request: Request, locales: Locales): string[];
-export declare function computeCurrentLocale(request: Request, locales: Locales, routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined, defaultLocale: string | undefined): undefined | string;
+export declare function computeCurrentLocale(request: Request, locales: Locales, routingStrategy: RoutingStrategies | undefined, defaultLocale: string | undefined): undefined | string;
 export {};

package/dist/core/render/context.js

@@ -162,7 +162,7 @@ function computeCurrentLocale(request, locales, routingStrategy, defaultLocale)
       }
     }
   }
-  if (routingStrategy === "prefix-other-locales") {
+  if (routingStrategy === "pathname-prefix-other-locales") {
     return defaultLocale;
   }
   return void 0;

package/dist/core/render/result.d.ts

@@ -1,6 +1,7 @@
 import type { Locales, Params, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro.js';
 import { AstroCookies } from '../cookies/index.js';
 import type { Logger } from '../logger/core.js';
+import type { RoutingStrategies } from '../config/schema.js';
 export interface CreateResultArgs {
     /**
      * Used to provide better error messages for `Astro.clientAddress`
@@ -32,6 +33,6 @@ export interface CreateResultArgs {
     cookies?: AstroCookies;
     locales: Locales | undefined;
     defaultLocale: string | undefined;
-    routingStrategy: 'prefix-always' | 'prefix-other-locales' | undefined;
+    routingStrategy: RoutingStrategies | undefined;
 }
 export declare function createResult(args: CreateResultArgs): SSRResult;

package/dist/core/routing/manifest/create.d.ts

@@ -11,4 +11,4 @@ export interface CreateRouteManifestParams {
     fsMod?: typeof nodeFs;
 }
 /** Create manifest of all static routes */
-export declare function createRouteManifest({ settings, cwd, fsMod }: CreateRouteManifestParams, logger: Logger): ManifestData;
+export declare function createRouteManifest(params: CreateRouteManifestParams, logger: Logger): ManifestData;