astro 4.10.0 → 4.10.2

package/client.d.ts

@@ -164,10 +164,6 @@ declare module 'astro:components' {
 	export * from 'astro/components';
 }
 
-declare module 'astro:env/setup' {
-	export * from 'astro/virtual-modules/env-setup.js';
-}
-
 type MD = import('./dist/@types/astro.js').MarkdownInstance<Record<string, any>>;
 interface ExportedMarkdownModuleEntities {
 	frontmatter: MD['frontmatter'];

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

@@ -1967,7 +1967,7 @@ export interface AstroUserConfig {
          *
          * There are currently three data types supported: strings, numbers and booleans.
          *
-         * There are three kinds of environment variables, determined by the combination of `context` (client or server) and `access` (private or public) settings defined in your [`env.schema`](#experimentalenvschema):
+         * There are three kinds of environment variables, determined by the combination of `context` (client or server) and `access` (secret or public) settings defined in your [`env.schema`](#experimentalenvschema):
          *
          * - **Public client variables**: These variables end up in both your final client and server bundles, and can be accessed from both client and server through the `astro:env/client` module:
          *

package/dist/config/index.d.ts

@@ -1,7 +1,7 @@
-import type { UserConfig } from 'vite';
+import type { UserConfig as ViteUserConfig } from 'vite';
 import type { AstroInlineConfig, AstroUserConfig } from '../@types/astro.js';
 export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
-export declare function getViteConfig(inlineConfig: UserConfig, inlineAstroConfig?: AstroInlineConfig): ({ mode, command }: {
+export declare function getViteConfig(userViteConfig: ViteUserConfig, inlineAstroConfig?: AstroInlineConfig): ({ mode, command }: {
     mode: string;
     command: 'serve' | 'build';
 }) => Promise<Record<string, any>>;

package/dist/config/index.js

@@ -2,7 +2,7 @@ import { Logger } from "../core/logger/core.js";
 function defineConfig(config) {
   return config;
 }
-function getViteConfig(inlineConfig, inlineAstroConfig = {}) {
+function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
   return async ({ mode, command }) => {
     const cmd = command === "serve" ? "dev" : command;
     const [
@@ -26,8 +26,8 @@ function getViteConfig(inlineConfig, inlineAstroConfig = {}) {
       dest: nodeLogDestination,
       level: "info"
     });
-    const { astroConfig: config, userConfig } = await resolveConfig(inlineAstroConfig, cmd);
-    let settings = await createSettings(config, inlineConfig.root);
+    const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
+    let settings = await createSettings(config, userViteConfig.root);
     settings = await runHookConfigSetup({ settings, command: cmd, logger });
     const viteConfig = await createVite(
       {
@@ -40,7 +40,7 @@ function getViteConfig(inlineConfig, inlineAstroConfig = {}) {
       { settings, logger, mode }
     );
     await runHookConfigDone({ settings, logger });
-    return mergeConfig(viteConfig, userConfig);
+    return mergeConfig(viteConfig, userViteConfig);
   };
 }
 export {

package/dist/container/pipeline.d.ts

@@ -5,7 +5,7 @@ export declare class ContainerPipeline extends Pipeline {
     static create({ logger, manifest, renderers, resolve, serverLike, streaming, }: Pick<ContainerPipeline, 'logger' | 'manifest' | 'renderers' | 'resolve' | 'serverLike' | 'streaming'>): ContainerPipeline;
     componentMetadata(_routeData: RouteData): Promise<SSRResult['componentMetadata']> | void;
     headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
-    tryRewrite(rewritePayload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance, URL]>;
     insertRoute(route: RouteData, componentInstance: ComponentInstance): void;
     getComponentByRoute(_routeData: RouteData): Promise<ComponentInstance>;
     rewriteKnownRoute(pathname: string, _sourceRoute: RouteData): ComponentInstance;

package/dist/container/pipeline.js

@@ -5,7 +5,7 @@ import {
   createModuleScriptElement,
   createStylesheetElementSet
 } from "../core/render/ssr-element.js";
-import { default404Page } from "../core/routing/astro-designed-error-pages.js";
+import { DEFAULT_404_ROUTE, default404Page } from "../core/routing/astro-designed-error-pages.js";
 class ContainerPipeline extends Pipeline {
   /**
    * Internal cache to store components instances by `RouteData`.
@@ -51,29 +51,28 @@ class ContainerPipeline extends Pipeline {
     }
     return { links, styles, scripts };
   }
-  async tryRewrite(rewritePayload) {
+  async tryRewrite(payload, request) {
     let foundRoute;
+    let finalUrl = void 0;
     for (const route of this.manifest.routes) {
-      const routeData = route.routeData;
-      if (rewritePayload instanceof URL) {
-        if (routeData.pattern.test(rewritePayload.pathname)) {
-          foundRoute = routeData;
-          break;
-        }
-      } else if (rewritePayload instanceof Request) {
-        const url = new URL(rewritePayload.url);
-        if (routeData.pattern.test(url.pathname)) {
-          foundRoute = routeData;
-          break;
-        }
-      } else if (routeData.pattern.test(decodeURI(rewritePayload))) {
-        foundRoute = routeData;
+      if (payload instanceof URL) {
+        finalUrl = payload;
+      } else if (payload instanceof Request) {
+        finalUrl = new URL(payload.url);
+      } else {
+        finalUrl = new URL(payload, new URL(request.url).origin);
+      }
+      if (route.routeData.pattern.test(decodeURI(finalUrl.pathname))) {
+        foundRoute = route.routeData;
+        break;
+      } else if (finalUrl.pathname === "/404") {
+        foundRoute = DEFAULT_404_ROUTE;
         break;
       }
     }
-    if (foundRoute) {
+    if (foundRoute && finalUrl) {
       const componentInstance = await this.getComponentByRoute(foundRoute);
-      return [foundRoute, componentInstance];
+      return [foundRoute, componentInstance, finalUrl];
     } else {
       throw new AstroError(RouteNotFound);
     }

package/dist/content/runtime.js

@@ -55,7 +55,7 @@ function createGetCollection({
     );
     let entries = [];
     if (!import.meta.env?.DEV && cacheEntriesByCollection.has(collection)) {
-      entries = [...cacheEntriesByCollection.get(collection)];
+      entries = cacheEntriesByCollection.get(collection);
     } else {
       const limit = pLimit(10);
       entries = await Promise.all(
@@ -88,7 +88,7 @@ function createGetCollection({
     if (typeof filter === "function") {
       return entries.filter(filter);
     } else {
-      return entries;
+      return entries.slice();
     }
   };
 }

package/dist/content/types-generator.js

@@ -72,16 +72,14 @@ async function createContentTypesGenerator({
       if (!isCollectionEvent) return { shouldGenerateTypes: false };
       switch (event.name) {
         case "addDir":
-          collectionEntryMap[JSON.stringify(collection2)] = {
+          collectionEntryMap[collectionKey2] = {
             type: "unknown",
             entries: {}
           };
           logger.debug("content", `${cyan(collection2)} collection added`);
           break;
         case "unlinkDir":
-          if (collectionKey2 in collectionEntryMap) {
-            delete collectionEntryMap[JSON.stringify(collection2)];
-          }
+          delete collectionEntryMap[collectionKey2];
           break;
       }
       return { shouldGenerateTypes: true };

package/dist/core/app/index.js

@@ -13,7 +13,6 @@ import { AstroIntegrationLogger, Logger } from "../logger/core.js";
 import { sequence } from "../middleware/index.js";
 import {
   appendForwardSlash,
-  collapseDuplicateSlashes,
   joinPaths,
   prependForwardSlash,
   removeTrailingForwardSlash
@@ -204,9 +203,6 @@ class App {
     if (clientAddress) {
       Reflect.set(request, clientAddressSymbol, clientAddress);
     }
-    if (request.url !== collapseDuplicateSlashes(request.url)) {
-      request = new Request(collapseDuplicateSlashes(request.url), request);
-    }
     if (!routeData) {
       routeData = this.match(request);
       this.#logger.debug("router", "Astro matched the following route for " + request.url);

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

@@ -7,7 +7,7 @@ export declare class AppPipeline extends Pipeline {
     headElements(routeData: RouteData): Pick<SSRResult, 'scripts' | 'styles' | 'links'>;
     componentMetadata(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     getModuleForRoute(route: RouteData): Promise<SinglePageBuiltModule>;
     rewriteKnownRoute(pathname: string, _sourceRoute: RouteData): ComponentInstance;
 }

package/dist/core/app/pipeline.js

@@ -64,8 +64,8 @@ class AppPipeline extends Pipeline {
   }
   async tryRewrite(payload, request, sourceRoute) {
     let foundRoute;
+    let finalUrl = void 0;
     for (const route of this.#manifestData.routes) {
-      let finalUrl = void 0;
       if (payload instanceof URL) {
         finalUrl = payload;
       } else if (payload instanceof Request) {
@@ -81,13 +81,13 @@ class AppPipeline extends Pipeline {
         break;
       }
     }
-    if (foundRoute) {
+    if (foundRoute && finalUrl) {
       if (foundRoute.pathname === "/404") {
         const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       } else {
         const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       }
     }
     throw new AstroError({

package/dist/core/base-pipeline.d.ts

@@ -67,7 +67,7 @@ export declare abstract class Pipeline {
      * @param {Request} request The original request
      * @param {RouteData} sourceRoute The original `RouteData`
      */
-    abstract tryRewrite(rewritePayload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance]>;
+    abstract tryRewrite(rewritePayload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     /**
      * Tells the pipeline how to retrieve a component give a `RouteData`
      * @param routeData

package/dist/core/build/generate.js

@@ -26,6 +26,7 @@ import { RenderContext } from "../render-context.js";
 import { callGetStaticPaths } from "../render/route-cache.js";
 import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
+import { stringifyParams } from "../routing/params.js";
 import { getOutputFilename, isServerLikeOutput } from "../util.js";
 import { getOutDirWithinCwd, getOutFile, getOutFolder } from "./common.js";
 import { cssOrder, mergeInlineCss } from "./internal.js";
@@ -212,7 +213,7 @@ async function getPathsForRoute(route, mod, pipeline, builtPaths) {
     );
     paths = staticPaths.map((staticPath) => {
       try {
-        return route.generate(staticPath.params);
+        return stringifyParams(staticPath.params, route);
       } catch (e) {
         if (e instanceof TypeError) {
           throw getInvalidRouteSegmentError(e, route, staticPath);

package/dist/core/build/pipeline.d.ts

@@ -38,7 +38,7 @@ export declare class BuildPipeline extends Pipeline {
      */
     retrieveRoutesToGenerate(): Map<PageBuildData, string>;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     retrieveSsrEntry(route: RouteData, filePath: string): Promise<SinglePageBuiltModule>;
     rewriteKnownRoute(_pathname: string, sourceRoute: RouteData): ComponentInstance;
 }

package/dist/core/build/pipeline.js

@@ -209,8 +209,8 @@ class BuildPipeline extends Pipeline {
   }
   async tryRewrite(payload, request, sourceRoute) {
     let foundRoute;
+    let finalUrl = void 0;
     for (const route of this.options.manifest.routes) {
-      let finalUrl = void 0;
       if (payload instanceof URL) {
         finalUrl = payload;
       } else if (payload instanceof Request) {
@@ -226,13 +226,13 @@ class BuildPipeline extends Pipeline {
         break;
       }
     }
-    if (foundRoute) {
+    if (foundRoute && finalUrl) {
       if (foundRoute.pathname === "/404") {
         const componentInstance = await this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       } else {
         const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance];
+        return [foundRoute, componentInstance, finalUrl];
       }
     } else {
       throw new AstroError({