astro 4.5.18 → 4.6.0

package/dist/virtual-modules/i18n.js

@@ -1,3 +1,5 @@
+import { IncorrectStrategyForI18n } from "../core/errors/errors-data.js";
+import { AstroError } from "../core/errors/index.js";
 import * as I18nInternals from "../i18n/index.js";
 import { toRoutingStrategy } from "../i18n/utils.js";
 import { normalizeTheLocale, toCodes, toPaths } from "../i18n/index.js";
@@ -5,9 +7,15 @@ const { trailingSlash, format, site, i18n, isBuild } = (
   // @ts-expect-error
   __ASTRO_INTERNAL_I18N_CONFIG__
 );
-const { defaultLocale, locales, domains } = i18n;
+const { defaultLocale, locales, domains, fallback, routing } = i18n;
 const base = import.meta.env.BASE_URL;
-const routing = toRoutingStrategy(i18n);
+const strategy = toRoutingStrategy(routing, domains);
+const noop = (method) => function() {
+  throw new AstroError({
+    ...IncorrectStrategyForI18n,
+    message: IncorrectStrategyForI18n.message(method)
+  });
+};
 const getRelativeLocaleUrl = (locale, path, options) => I18nInternals.getLocaleRelativeUrl({
   locale,
   path,
@@ -16,7 +24,7 @@ const getRelativeLocaleUrl = (locale, path, options) => I18nInternals.getLocaleR
   format,
   defaultLocale,
   locales,
-  strategy: routing,
+  strategy,
   domains,
   ...options
 });
@@ -29,7 +37,7 @@ const getAbsoluteLocaleUrl = (locale, path, options) => I18nInternals.getLocaleA
   site,
   defaultLocale,
   locales,
-  strategy: routing,
+  strategy,
   domains,
   isBuild,
   ...options
@@ -41,7 +49,7 @@ const getRelativeLocaleUrlList = (path, options) => I18nInternals.getLocaleRelat
   format,
   defaultLocale,
   locales,
-  strategy: routing,
+  strategy,
   domains,
   ...options
 });
@@ -53,13 +61,79 @@ const getAbsoluteLocaleUrlList = (path, options) => I18nInternals.getLocaleAbsol
   format,
   defaultLocale,
   locales,
-  strategy: routing,
+  strategy,
   domains,
   isBuild,
   ...options
 });
 const getPathByLocale = (locale) => I18nInternals.getPathByLocale(locale, locales);
 const getLocaleByPath = (path) => I18nInternals.getLocaleByPath(path, locales);
+const pathHasLocale = (path) => I18nInternals.pathHasLocale(path, locales);
+let redirectToDefaultLocale;
+if (i18n?.routing === "manual") {
+  redirectToDefaultLocale = I18nInternals.redirectToDefaultLocale({
+    base,
+    trailingSlash,
+    format,
+    defaultLocale,
+    locales,
+    strategy,
+    domains,
+    fallback
+  });
+} else {
+  redirectToDefaultLocale = noop("redirectToDefaultLocale");
+}
+let notFound;
+if (i18n?.routing === "manual") {
+  notFound = I18nInternals.notFound({
+    base,
+    trailingSlash,
+    format,
+    defaultLocale,
+    locales,
+    strategy,
+    domains,
+    fallback
+  });
+} else {
+  notFound = noop("notFound");
+}
+let requestHasLocale;
+if (i18n?.routing === "manual") {
+  requestHasLocale = I18nInternals.requestHasLocale(locales);
+} else {
+  requestHasLocale = noop("requestHasLocale");
+}
+let redirectToFallback;
+if (i18n?.routing === "manual") {
+  redirectToFallback = I18nInternals.redirectToFallback({
+    base,
+    trailingSlash,
+    format,
+    defaultLocale,
+    locales,
+    strategy,
+    domains,
+    fallback
+  });
+} else {
+  redirectToFallback = noop("useFallback");
+}
+let middleware;
+if (i18n?.routing === "manual") {
+  middleware = (customOptions) => {
+    const manifest = {
+      ...i18n,
+      fallback: void 0,
+      strategy: toRoutingStrategy(customOptions, {}),
+      domainLookupTable: {}
+    };
+    return I18nInternals.createMiddleware(manifest, base, trailingSlash, format);
+  };
+} else {
+  middleware = noop("middleware");
+}
 export {
   getAbsoluteLocaleUrl,
   getAbsoluteLocaleUrlList,
@@ -67,7 +141,13 @@ export {
   getPathByLocale,
   getRelativeLocaleUrl,
   getRelativeLocaleUrlList,
+  middleware,
   normalizeTheLocale,
+  notFound,
+  pathHasLocale,
+  redirectToDefaultLocale,
+  redirectToFallback,
+  requestHasLocale,
   toCodes,
   toPaths
 };

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

@@ -92,7 +92,7 @@ function createDevelopmentManifest(settings) {
   if (settings.config.i18n) {
     i18nManifest = {
       fallback: settings.config.i18n.fallback,
-      strategy: toRoutingStrategy(settings.config.i18n),
+      strategy: toRoutingStrategy(settings.config.i18n.routing, settings.config.i18n.domains),
       defaultLocale: settings.config.i18n.defaultLocale,
       locales: settings.config.i18n.locales,
       domainLookupTable: {}
@@ -114,6 +114,7 @@ function createDevelopmentManifest(settings) {
     componentMetadata: /* @__PURE__ */ new Map(),
     inlinedScripts: /* @__PURE__ */ new Map(),
     i18n: i18nManifest,
+    checkOrigin: settings.config.experimental.security?.csrfProtection?.origin ?? false,
     middleware(_, next) {
       return next();
     }

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

@@ -115,6 +115,7 @@ async function handleRoute({
   let options = void 0;
   let route;
   const middleware = (await loadMiddleware(loader)).onRequest;
+  const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
   if (!matchedRoute) {
     if (config.i18n) {
       const locales = config.i18n.locales;
@@ -176,7 +177,6 @@ async function handleRoute({
     const filePath = matchedRoute.filePath;
     const { preloadedComponent } = matchedRoute;
     route = matchedRoute.route;
-    const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
     request = createRequest({
       base: config.base,
       url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.5.18",
+  "version": "4.6.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -162,8 +162,8 @@
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4",
     "@astrojs/internal-helpers": "0.4.0",
-    "@astrojs/telemetry": "3.0.4",
-    "@astrojs/markdown-remark": "5.0.0"
+    "@astrojs/markdown-remark": "5.1.0",
+    "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
     "sharp": "^0.32.6"
@@ -212,8 +212,9 @@
     "astro-scripts": "0.0.14"
   },
   "engines": {
-    "node": ">=18.14.1",
-    "npm": ">=6.14.0"
+    "node": "^18.17.1 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "pnpm": ">=7.1.0"
   },
   "publishConfig": {
     "provenance": true