astro 3.0.2 → 3.0.4

package/dist/core/app/index.js

@@ -33,8 +33,6 @@ class App {
   });
   #baseWithoutTrailingSlash;
   #pipeline;
-  #onRequest;
-  #middlewareLoaded;
   #adapterLogger;
   constructor(manifest, streaming = true) {
     this.#manifest = manifest;
@@ -44,7 +42,6 @@ class App {
     this.#routeDataToRouteInfo = new Map(manifest.routes.map((route) => [route.routeData, route]));
     this.#baseWithoutTrailingSlash = removeTrailingForwardSlash(this.#manifest.base);
     this.#pipeline = new SSRRoutePipeline(this.#createEnvironment(streaming));
-    this.#middlewareLoaded = false;
     this.#adapterLogger = new AstroIntegrationLogger(
       this.#logger.options,
       this.#manifest.adapterName
@@ -109,19 +106,7 @@ class App {
       return void 0;
     return routeData;
   }
-  async #getOnRequest() {
-    if (this.#manifest.middlewareEntryPoint && !this.#middlewareLoaded) {
-      try {
-        const middleware = await import(this.#manifest.middlewareEntryPoint);
-        this.#pipeline.setMiddlewareFunction(middleware.onRequest);
-      } catch (e) {
-        this.#logger.warn("SSR", "Couldn't load the middleware entry point");
-      }
-    }
-    this.#middlewareLoaded = true;
-  }
   async render(request, routeData, locals) {
-    await this.#getOnRequest();
     if (request.url !== collapseDuplicateSlashes(request.url)) {
       request = new Request(collapseDuplicateSlashes(request.url), request);
     }
@@ -145,6 +130,9 @@ class App {
     );
     let response;
     try {
+      if (mod.onRequest) {
+        this.#pipeline.setMiddlewareFunction(mod.onRequest);
+      }
       response = await this.#pipeline.renderRoute(renderContext, pageModule);
     } catch (err) {
       if (err instanceof EndpointNotFoundError) {
@@ -246,6 +234,9 @@ class App {
           status
         );
         const page = await mod.page();
+        if (mod.onRequest) {
+          this.#pipeline.setMiddlewareFunction(mod.onRequest);
+        }
         const response2 = await this.#pipeline.renderRoute(newRenderContext, page);
         return this.#mergeResponses(response2, originalResponse);
       } catch {

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

@@ -42,7 +42,6 @@ export type SSRManifest = {
     componentMetadata: SSRResult['componentMetadata'];
     pageModule?: SinglePageBuiltModule;
     pageMap?: Map<ComponentPath, ImportComponentInstance>;
-    middlewareEntryPoint: string | undefined;
 };
 export type SerializedSSRManifest = Omit<SSRManifest, 'routes' | 'assets' | 'componentMetadata' | 'clientDirectives'> & {
     routes: SerializedRouteInfo[];

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

@@ -15,7 +15,6 @@ export declare class BuildPipeline extends Pipeline {
     getStaticBuildOptions(): Readonly<StaticBuildOptions>;
     getConfig(): AstroConfig;
     getManifest(): SSRManifest;
-    retrieveMiddlewareFunction(): Promise<void>;
     getLogger(): Logger;
     /**
      * The SSR build emits two important files:

package/dist/core/build/buildPipeline.js

@@ -57,12 +57,6 @@ class BuildPipeline extends Pipeline {
   getManifest() {
     return this.#manifest;
   }
-  async retrieveMiddlewareFunction() {
-    if (this.#internals.middlewareEntryPoint) {
-      const middleware = await import(this.#internals.middlewareEntryPoint.toString());
-      this.setMiddlewareFunction(middleware.onRequest);
-    }
-  }
   getLogger() {
     return this.getEnvironment().logger;
   }

package/dist/core/build/generate.js

@@ -95,7 +95,6 @@ async function generatePages(opts, internals) {
     );
   }
   const pipeline = new BuildPipeline(opts, internals, manifest);
-  await pipeline.retrieveMiddlewareFunction();
   const outFolder = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
   const logger = pipeline.getLogger();
   if (ssr && !hasPrerenderedPages(internals)) {
@@ -180,6 +179,10 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
   const scripts = pageInfo?.hoistedScript ?? null;
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
   const pageModulePromise = ssrEntry.page;
+  const onRequest = ssrEntry.onRequest;
+  if (onRequest) {
+    pipeline.setMiddlewareFunction(onRequest);
+  }
   if (!pageModulePromise) {
     throw new Error(
       `Unable to find the module for ${pageData.component}. This is unexpected and likely a bug in Astro, please report.`
@@ -439,8 +442,7 @@ function createBuildManifest(settings, internals, renderers) {
     base: settings.config.base,
     assetsPrefix: settings.config.build.assetsPrefix,
     site: settings.config.site ? new URL(settings.config.base, settings.config.site).toString() : settings.config.site,
-    componentMetadata: internals.componentMetadata,
-    middlewareEntryPoint: internals.middlewareEntryPoint ? internals.middlewareEntryPoint.toString() : void 0
+    componentMetadata: internals.componentMetadata
   };
 }
 export {

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

@@ -182,10 +182,6 @@ function buildManifest(opts, internals, staticFiles) {
   if (!(BEFORE_HYDRATION_SCRIPT_ID in entryModules)) {
     entryModules[BEFORE_HYDRATION_SCRIPT_ID] = "";
   }
-  const isEdgeMiddleware = (
-    // TODO: remove in Astro 4.0
-    settings.config.build.excludeMiddleware || settings.adapter?.adapterFeatures?.edgeMiddleware
-  );
   const ssrManifest = {
     adapterName: opts.settings.adapter?.name ?? "",
     routes,
@@ -197,8 +193,7 @@ function buildManifest(opts, internals, staticFiles) {
     renderers: [],
     clientDirectives: Array.from(settings.clientDirectives),
     entryModules,
-    assets: staticFiles.map(prefixAssetPath),
-    middlewareEntryPoint: !isEdgeMiddleware ? internals.middlewareEntryPoint?.toString() : void 0
+    assets: staticFiles.map(prefixAssetPath)
   };
   return ssrManifest;
 }

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

@@ -1,5 +1,5 @@
 import type { InlineConfig, default as vite } from 'vite';
-import type { AstroConfig, AstroSettings, ComponentInstance, ManifestData, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
+import type { AstroConfig, AstroSettings, ComponentInstance, ManifestData, MiddlewareHandler, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
 import type { Logger } from '../logger/core';
 import type { RouteCache } from '../render/route-cache';
 export type ComponentPath = string;
@@ -48,6 +48,7 @@ export interface SinglePageBuiltModule {
     /**
      * The `onRequest` hook exported by the middleware
      */
+    onRequest?: MiddlewareHandler<unknown>;
     renderers: SSRLoadedRenderer[];
 }
 export type ViteBuildReturn = Awaited<ReturnType<typeof vite.build>>;

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.0.2";
+  const currentVersion = "3.0.4";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.0.2";
+  const version = "3.0.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -235,7 +235,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"3.0.2"}`
+        `v${"3.0.4"}`
       )} ${headline}`
     );
   }

package/dist/core/redirects/component.js

@@ -7,6 +7,7 @@ const RedirectComponentInstance = {
 };
 const RedirectSinglePageBuiltModule = {
   page: () => Promise.resolve(RedirectComponentInstance),
+  onRequest: (_, next) => next(),
   renderers: []
 };
 export {

package/dist/integrations/index.js

@@ -40,6 +40,7 @@ async function runHookConfigSetup({
   let updatedConfig = { ...settings.config };
   let updatedSettings = { ...settings, config: updatedConfig };
   let addedClientDirectives = /* @__PURE__ */ new Map();
+  let astroJSXRenderer = null;
   for (const integration of settings.config.integrations) {
     if (integration.hooks?.["astro:config:setup"]) {
       let addPageExtension2 = function(...input) {
@@ -63,7 +64,11 @@ async function runHookConfigSetup({
           if (!renderer.serverEntrypoint) {
             throw new Error(`Renderer ${bold(renderer.name)} does not provide a serverEntrypoint.`);
           }
-          updatedSettings.renderers.push(renderer);
+          if (renderer.name === "astro:jsx") {
+            astroJSXRenderer = renderer;
+          } else {
+            updatedSettings.renderers.push(renderer);
+          }
         },
         injectScript: (stage, content) => {
           updatedSettings.scripts.push({ stage, content });
@@ -112,6 +117,9 @@ async function runHookConfigSetup({
       }
     }
   }
+  if (astroJSXRenderer) {
+    updatedSettings.renderers.push(astroJSXRenderer);
+  }
   updatedSettings.config = updatedConfig;
   return updatedSettings;
 }

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

@@ -70,8 +70,7 @@ function createDevelopmentManifest(settings) {
     base: settings.config.base,
     assetsPrefix: settings.config.build.assetsPrefix,
     site: settings.config.site ? new URL(settings.config.base, settings.config.site).toString() : settings.config.site,
-    componentMetadata: /* @__PURE__ */ new Map(),
-    middlewareEntryPoint: void 0
+    componentMetadata: /* @__PURE__ */ new Map()
   };
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",