astro 3.4.3 → 3.5.0

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

@@ -1,10 +1,15 @@
 import { fileURLToPath } from "node:url";
 import { AstroErrorData, isAstroError } from "../core/errors/index.js";
+import { sequence } from "../core/middleware/index.js";
 import { loadMiddleware } from "../core/middleware/loadMiddleware.js";
-import { createRenderContext, getParamsAndProps } from "../core/render/index.js";
+import {
+  createRenderContext,
+  getParamsAndProps
+} from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
 import { isPage, resolveIdToUrl } from "../core/util.js";
+import { createI18nMiddleware } from "../i18n/middleware.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
@@ -22,7 +27,7 @@ function getCustom404Route(manifestData) {
 async function matchRoute(pathname, manifestData, pipeline) {
   const env = pipeline.getEnvironment();
   const { routeCache, logger } = env;
-  const matches = matchAllRoutes(pathname, manifestData);
+  let matches = matchAllRoutes(pathname, manifestData);
   const preloadedMatches = await getSortedPreloadedMatches({
     pipeline,
     matches,
@@ -96,67 +101,124 @@ async function handleRoute({
   manifest
 }) {
   const env = pipeline.getEnvironment();
-  const settings = pipeline.getSettings();
   const config = pipeline.getConfig();
   const moduleLoader = pipeline.getModuleLoader();
   const { logger } = env;
-  if (!matchedRoute) {
+  if (!matchedRoute && !config.experimental.i18n) {
     return handle404Response(origin, incomingRequest, incomingResponse);
   }
-  const filePath = matchedRoute.filePath;
-  const { route, preloadedComponent } = matchedRoute;
   const buildingToSSR = isServerLikeOutput(config);
-  const request = createRequest({
-    url,
-    headers: buildingToSSR ? incomingRequest.headers : new Headers(),
-    method: incomingRequest.method,
-    body,
-    logger,
-    ssr: buildingToSSR,
-    clientAddress: buildingToSSR ? incomingRequest.socket.remoteAddress : void 0,
-    locals: Reflect.get(incomingRequest, clientLocalsSymbol)
-    // Allows adapters to pass in locals in dev mode.
-  });
-  for (const [name, value] of Object.entries(config.server.headers ?? {})) {
-    if (value)
-      incomingResponse.setHeader(name, value);
-  }
-  const options = {
-    env,
-    filePath,
-    preload: preloadedComponent,
-    pathname,
-    request,
-    route
-  };
-  const middleware = await loadMiddleware(moduleLoader, settings.config.srcDir);
-  if (middleware) {
-    options.middleware = middleware;
+  let request;
+  let renderContext;
+  let mod = void 0;
+  let options = void 0;
+  let route;
+  const middleware = await loadMiddleware(moduleLoader);
+  if (!matchedRoute) {
+    if (config.experimental.i18n) {
+      const locales = config.experimental.i18n.locales;
+      const pathNameHasLocale = pathname.split("/").filter(Boolean).some((segment) => {
+        return locales.includes(segment);
+      });
+      if (!pathNameHasLocale && pathname !== "/") {
+        return handle404Response(origin, incomingRequest, incomingResponse);
+      }
+      request = createRequest({
+        url,
+        headers: buildingToSSR ? incomingRequest.headers : new Headers(),
+        logger,
+        ssr: buildingToSSR
+      });
+      route = {
+        component: "",
+        generate(_data) {
+          return "";
+        },
+        params: [],
+        pattern: new RegExp(""),
+        prerender: false,
+        segments: [],
+        type: "fallback",
+        route: ""
+      };
+      renderContext = await createRenderContext({
+        request,
+        pathname,
+        env,
+        mod,
+        route
+      });
+    } else {
+      return handle404Response(origin, incomingRequest, incomingResponse);
+    }
+  } else {
+    const filePath = matchedRoute.filePath;
+    const { preloadedComponent } = matchedRoute;
+    route = matchedRoute.route;
+    request = createRequest({
+      url,
+      headers: buildingToSSR ? incomingRequest.headers : new Headers(),
+      method: incomingRequest.method,
+      body,
+      logger,
+      ssr: buildingToSSR,
+      clientAddress: buildingToSSR ? incomingRequest.socket.remoteAddress : void 0,
+      locals: Reflect.get(incomingRequest, clientLocalsSymbol)
+      // Allows adapters to pass in locals in dev mode.
+    });
+    for (const [name, value] of Object.entries(config.server.headers ?? {})) {
+      if (value)
+        incomingResponse.setHeader(name, value);
+    }
+    options = {
+      env,
+      filePath,
+      preload: preloadedComponent,
+      pathname,
+      request,
+      route
+    };
+    if (middleware) {
+      options.middleware = middleware;
+    }
+    mod = options.preload;
+    const { scripts, links, styles, metadata } = await getScriptsAndStyles({
+      pipeline,
+      filePath: options.filePath
+    });
+    const i18n = pipeline.getConfig().experimental.i18n;
+    renderContext = await createRenderContext({
+      request: options.request,
+      pathname: options.pathname,
+      scripts,
+      links,
+      styles,
+      componentMetadata: metadata,
+      route: options.route,
+      mod,
+      env,
+      locales: i18n ? i18n.locales : void 0
+    });
   }
-  const mod = options.preload;
-  const { scripts, links, styles, metadata } = await getScriptsAndStyles({
-    pipeline,
-    filePath: options.filePath
-  });
-  const renderContext = await createRenderContext({
-    request: options.request,
-    pathname: options.pathname,
-    scripts,
-    links,
-    styles,
-    componentMetadata: metadata,
-    route: options.route,
-    mod,
-    env
-  });
-  const onRequest = options.middleware?.onRequest;
-  if (onRequest) {
+  const onRequest = middleware?.onRequest;
+  if (config.experimental.i18n) {
+    const i18Middleware = createI18nMiddleware(config.experimental.i18n, config.base);
+    if (i18Middleware) {
+      if (onRequest) {
+        pipeline.setMiddlewareFunction(sequence(i18Middleware, onRequest));
+      } else {
+        pipeline.setMiddlewareFunction(i18Middleware);
+      }
+    } else if (onRequest) {
+      pipeline.setMiddlewareFunction(onRequest);
+    }
+  } else if (onRequest) {
     pipeline.setMiddlewareFunction(onRequest);
   }
   let response = await pipeline.renderRoute(renderContext, mod);
   if (response.status === 404 && has404Route(manifestData)) {
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
-    if (fourOhFourRoute?.route !== options.route)
+    if (options && fourOhFourRoute?.route !== options.route)
       return handleRoute({
         ...options,
         matchedRoute: fourOhFourRoute,

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

@@ -71,7 +71,7 @@ function configHeadVitePlugin() {
 }
 function astroHeadBuildPlugin(internals) {
   return {
-    build: "ssr",
+    targets: ["server"],
     hooks: {
       "build:before"() {
         return {

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

@@ -60,6 +60,7 @@ function markdown({ settings, logger }) {
         const raw = safeMatter(rawFile, id);
         const fileURL = pathToFileURL(fileId);
         const renderResult = await processor.render(raw.content, {
+          // @ts-expect-error passing internal prop
           fileURL,
           frontmatter: raw.data
         }).catch((err) => {

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

@@ -29,7 +29,8 @@ function astroScriptsPlugin({ settings }) {
     },
     buildStart() {
       const hasHydrationScripts = settings.scripts.some((s) => s.stage === "before-hydration");
-      if (hasHydrationScripts && env?.command === "build" && !env?.ssrBuild) {
+      const isSsrBuild = env?.ssrBuild || env?.isSsrBuild;
+      if (hasHydrationScripts && env?.command === "build" && !isSsrBuild) {
         this.emitFile({
           type: "chunk",
           id: BEFORE_HYDRATION_SCRIPT_ID,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -78,7 +78,9 @@
       "default": "./dist/core/middleware/namespace.js"
     },
     "./transitions": "./dist/transitions/index.js",
-    "./transitions/router": "./dist/transitions/router.js"
+    "./transitions/router": "./dist/transitions/router.js",
+    "./prefetch": "./dist/prefetch/index.js",
+    "./i18n": "./dist/i18n/index.js"
   },
   "imports": {
     "#astro/*": "./dist/*.js"
@@ -107,7 +109,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.1.0",
+    "@astrojs/compiler": "^2.3.0",
     "@babel/core": "^7.22.10",
     "@babel/generator": "^7.22.10",
     "@babel/parser": "^7.22.10",
@@ -163,7 +165,7 @@
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "3.3.0",
+    "@astrojs/markdown-remark": "3.4.0",
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
@@ -198,7 +200,7 @@
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "eol": "^0.9.1",
-    "memfs": "^4.2.1",
+    "memfs": "^4.6.0",
     "mocha": "^10.2.0",
     "node-mocks-http": "^1.13.0",
     "parse-srcset": "^1.0.2",

package/tsconfigs/base.json

@@ -4,7 +4,7 @@
     // Enable top-level await, and other modern ESM features.
     "target": "ESNext",
     "module": "ESNext",
-    // Enable node-style module resolution, for things like npm package imports.
+    // Enable module resolution without file extensions on relative paths, for things like npm package imports.
     "moduleResolution": "Bundler",
     // Allow importing TypeScript files using their native extension (.ts(x)).
     "allowImportingTsExtensions": true,

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

@@ -1,2 +0,0 @@
-import { type SSROptions } from '../../render/index.js';
-export declare function call(options: SSROptions): Promise<Response>;

package/dist/core/endpoint/dev/index.js

@@ -1,17 +0,0 @@
-import { createRenderContext } from "../../render/index.js";
-import { callEndpoint } from "../index.js";
-async function call(options) {
-  const { env, preload, middleware } = options;
-  const endpointHandler = preload;
-  const ctx = await createRenderContext({
-    request: options.request,
-    pathname: options.pathname,
-    route: options.route,
-    env,
-    mod: preload
-  });
-  return await callEndpoint(endpointHandler, env, ctx, middleware?.onRequest);
-}
-export {
-  call
-};