astro 2.6.6 → 2.7.1

package/README.md

@@ -8,10 +8,8 @@
   <br/><br/>
 </p>
 
-
 ## Install
 
-
 ```bash
 # Recommended!
 npm create astro@latest
@@ -20,7 +18,7 @@ npm create astro@latest
 npm install --save-dev astro
 ```
 
-Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.  
+Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.
 
 Looking for quick examples? [Open a starter project](https://astro.new/) right in your browser.
 
@@ -31,9 +29,10 @@ Visit our [official documentation](https://docs.astro.build/).
 ## Support
 
 Having trouble? Get help in the official [Astro Discord](https://astro.build/chat).
+
 ## Contributing
 
-**New contributors welcome!** Check out our [Contributors Guide](/CONTRIBUTING.md) for help getting started. 
+**New contributors welcome!** Check out our [Contributors Guide](/CONTRIBUTING.md) for help getting started.
 
 Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll help you get your first contribution in no time!
 
@@ -42,5 +41,3 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
 Astro is generously supported by [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), and several other amazing organizations [listed here.](https://astro.build/)
 
 [❤️ Sponsor Astro! ❤️](https://github.com/withastro/.github/blob/main/FUNDING.md)
-
-

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

@@ -75,20 +75,6 @@ export interface CLIFlags {
     experimentalAssets?: boolean;
     experimentalRedirects?: boolean;
 }
-export interface BuildConfig {
-    /**
-     * @deprecated Use config.build.client instead.
-     */
-    client: URL;
-    /**
-     * @deprecated Use config.build.server instead.
-     */
-    server: URL;
-    /**
-     * @deprecated Use config.build.serverEntry instead.
-     */
-    serverEntry: string;
-}
 /**
  * Astro global available in all contexts in .astro files
  *
@@ -773,6 +759,29 @@ export interface AstroUserConfig {
          * ```
          */
         inlineStylesheets?: 'always' | 'auto' | 'never';
+        /**
+         * @docs
+         * @name build.split
+         * @type {boolean}
+         * @default {false}
+         * @version 2.7.0
+         * @description
+         * Defines how the SSR code should be bundled when built.
+         *
+         * When `split` is `true`, Astro will emit a file for each page.
+         * Each file emitted will render only one page. The pages will be emitted
+         * inside a `dist/pages/` directory, and the emitted files will keep the same file paths
+         * of the `src/pages` directory.
+         *
+         * ```js
+         * {
+         *   build: {
+         *     split: true
+         *   }
+         * }
+         * ```
+         */
+        split?: boolean;
     };
     /**
      * @docs
@@ -793,7 +802,7 @@ export interface AstroUserConfig {
      * ```js
      * {
      *   // Example: Use the function syntax to customize based on command
-     *   server: (command) => ({ port: command === 'dev' ? 3000 : 4000 })
+     *   server: ({ command }) => ({ port: command === 'dev' ? 3000 : 4000 })
      * }
      * ```
      */
@@ -1173,6 +1182,7 @@ export type InjectedScriptStage = 'before-hydration' | 'head-inline' | 'page' |
 export interface InjectedRoute {
     pattern: string;
     entryPoint: string;
+    prerender?: boolean;
 }
 export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
     integrations: AstroIntegration[];
@@ -1649,6 +1659,11 @@ export interface AstroIntegration {
         'astro:server:done'?: () => void | Promise<void>;
         'astro:build:ssr'?: (options: {
             manifest: SerializedSSRManifest;
+            /**
+             * This maps a {@link RouteData} to an {@link URL}, this URL represents
+             * the physical file you should import.
+             */
+            entryPoints: Map<RouteData, URL>;
         }) => void | Promise<void>;
         'astro:build:start'?: () => void | Promise<void>;
         'astro:build:setup'?: (options: {

package/dist/assets/utils/emitAsset.js

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import slash from "slash";
-import { prependForwardSlash } from "../../core/path.js";
+import { prependForwardSlash, slash } from "../../core/path.js";
 import { imageMetadata } from "./metadata.js";
 async function emitESMImage(id, watchMode, fileEmitter) {
   if (!id) {

package/dist/content/utils.d.ts

@@ -9,7 +9,7 @@ import { CONTENT_FLAGS } from './consts.js';
 /**
  * Amap from a collection + slug to the local file path.
  * This is used internally to resolve entry imports when using `getEntry()`.
- * @see `src/content/virtual-mod.mjs`
+ * @see `content-module.template.mjs`
  */
 export type ContentLookupMap = {
     [collectionName: string]: {
@@ -164,7 +164,6 @@ export type ContentPaths = {
     cacheDir: URL;
     typesTemplate: URL;
     virtualModTemplate: URL;
-    virtualAssetsModTemplate: URL;
     config: {
         exists: boolean;
         url: URL;

package/dist/content/utils.js

@@ -288,14 +288,13 @@ function contentObservable(initialCtx) {
 }
 function getContentPaths({ srcDir, root }, fs = fsMod) {
   const configStats = search(fs, srcDir);
-  const templateDir = new URL("../../src/content/template/", import.meta.url);
+  const pkgBase = new URL("../../", import.meta.url);
   return {
     cacheDir: new URL(".astro/", root),
     contentDir: new URL("./content/", srcDir),
     assetsDir: new URL("./assets/", srcDir),
-    typesTemplate: new URL("types.d.ts", templateDir),
-    virtualModTemplate: new URL("virtual-mod.mjs", templateDir),
-    virtualAssetsModTemplate: new URL("virtual-mod-assets.mjs", templateDir),
+    typesTemplate: new URL("content-types.template.d.ts", pkgBase),
+    virtualModTemplate: new URL("content-module.template.mjs", pkgBase),
     config: configStats
   };
 }

package/dist/content/vite-plugin-content-imports.js

@@ -277,7 +277,6 @@ function stringifyEntryData(data) {
       });
     } else {
       throw new AstroError({
-        code: 99999,
         message: "Unexpected error processing content collection data."
       });
     }

package/dist/content/vite-plugin-content-virtual-mod.d.ts

@@ -10,7 +10,7 @@ export declare function astroContentVirtualModPlugin({ settings, }: AstroContent
 /**
  * Generate a map from a collection + slug to the local file path.
  * This is used internally to resolve entry imports when using `getEntry()`.
- * @see `src/content/virtual-mod.mjs`
+ * @see `content-module.template.mjs`
  */
 export declare function getStringifiedLookupMap({ contentPaths, contentEntryConfigByExt, dataEntryExts, root, fs, }: {
     contentEntryConfigByExt: Map<string, ContentEntryType>;

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -4,6 +4,7 @@ import { extname } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import pLimit from "p-limit";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
+import { appendForwardSlash } from "../core/path.js";
 import { rootRelativePath } from "../core/util.js";
 import { VIRTUAL_MODULE_ID } from "./consts.js";
 import {
@@ -164,7 +165,12 @@ const UnexpectedLookupMapError = new AstroError({
 });
 function globWithUnderscoresIgnored(relContentDir, exts) {
   const extGlob = getExtGlob(exts);
-  return [`${relContentDir}/**/*${extGlob}`, `!**/_*/**${extGlob}`, `!**/_*${extGlob}`];
+  const contentDir = appendForwardSlash(relContentDir);
+  return [
+    `${contentDir}**/*${extGlob}`,
+    `!${contentDir}_*/**${extGlob}`,
+    `!${contentDir}_*${extGlob}`
+  ];
 }
 export {
   astroContentVirtualModPlugin,

package/dist/core/add/babel.d.ts

@@ -1,11 +1,17 @@
 import parser from '@babel/parser';
 import * as t from '@babel/types';
 export declare const visit: {
-    <S>(parent: t.Node | t.Node[] | null | undefined, opts: import("@babel/traverse").TraverseOptions<S>, scope: import("@babel/traverse").Scope | undefined, state: S, parentPath?: import("@babel/traverse").NodePath<t.Node> | undefined): void;
-    (parent: t.Node | t.Node[] | null | undefined, opts?: import("@babel/traverse").TraverseOptions<t.Node> | undefined, scope?: import("@babel/traverse").Scope | undefined, state?: any, parentPath?: import("@babel/traverse").NodePath<t.Node> | undefined): void;
+    <S>(parent: t.Node, opts: import("@babel/traverse").TraverseOptions<S>, scope: import("@babel/traverse").Scope | undefined, state: S, parentPath?: import("@babel/traverse").NodePath<t.Node> | undefined): void;
+    (parent: t.Node, opts?: import("@babel/traverse").TraverseOptions<t.Node> | undefined, scope?: import("@babel/traverse").Scope | undefined, state?: any, parentPath?: import("@babel/traverse").NodePath<t.Node> | undefined): void;
     visitors: typeof import("@babel/traverse").visitors;
     verify: typeof import("@babel/traverse").visitors.verify;
     explode: typeof import("@babel/traverse").visitors.explode;
+    cheap: (node: t.Node, enter: (node: t.Node) => void) => void;
+    node: (node: t.Node, opts: import("@babel/traverse").TraverseOptions<t.Node>, scope?: import("@babel/traverse").Scope | undefined, state?: any, path?: import("@babel/traverse").NodePath<t.Node> | undefined, skipKeys?: Record<string, boolean> | undefined) => void;
+    clearNode: (node: t.Node, opts?: t.RemovePropertiesOptions | undefined) => void;
+    removeProperties: (tree: t.Node, opts?: t.RemovePropertiesOptions | undefined) => t.Node;
+    hasType: (tree: t.Node, type: "JSXAttribute" | "JSXSpreadAttribute" | "JSXIdentifier" | "JSXNamespacedName" | "Identifier" | "JSXElement" | "JSXOpeningElement" | "JSXMemberExpression" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayExpression" | "ArrayPattern" | "ArrayTypeAnnotation" | "ArrowFunctionExpression" | "AssignmentExpression" | "AssignmentPattern" | "AwaitExpression" | "BigIntLiteral" | "BinaryExpression" | "BindExpression" | "BlockStatement" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "BreakStatement" | "CallExpression" | "CatchClause" | "ClassAccessorProperty" | "ClassBody" | "ClassDeclaration" | "ClassExpression" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "ConditionalExpression" | "ContinueStatement" | "DebuggerStatement" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "DoWhileStatement" | "EmptyStatement" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportAllDeclaration" | "ExportDefaultDeclaration" | "ExportDefaultSpecifier" | "ExportNamedDeclaration" | "ExportNamespaceSpecifier" | "ExportSpecifier" | "ExpressionStatement" | "File" | "ForInStatement" | "ForOfStatement" | "ForStatement" | "FunctionDeclaration" | "FunctionExpression" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "IfStatement" | "Import" | "ImportAttribute" | "ImportDeclaration" | "ImportDefaultSpecifier" | "ImportNamespaceSpecifier" | "ImportSpecifier" | "IndexedAccessType" | "InferredPredicate" | "InterfaceDeclaration" | "InterfaceExtends" | "InterfaceTypeAnnotation" | "InterpreterDirective" | "IntersectionTypeAnnotation" | "JSXClosingElement" | "JSXClosingFragment" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXFragment" | "JSXOpeningFragment" | "JSXSpreadChild" | "JSXText" | "LabeledStatement" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "MixedTypeAnnotation" | "ModuleExpression" | "NewExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectExpression" | "ObjectMethod" | "ObjectPattern" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "Program" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "RestElement" | "RestProperty" | "ReturnStatement" | "SequenceExpression" | "SpreadElement" | "SpreadProperty" | "StaticBlock" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "Super" | "SwitchCase" | "SwitchStatement" | "SymbolTypeAnnotation" | "TSAnyKeyword" | "TSArrayType" | "TSAsExpression" | "TSBigIntKeyword" | "TSBooleanKeyword" | "TSCallSignatureDeclaration" | "TSConditionalType" | "TSConstructSignatureDeclaration" | "TSConstructorType" | "TSDeclareFunction" | "TSDeclareMethod" | "TSEnumDeclaration" | "TSEnumMember" | "TSExportAssignment" | "TSExpressionWithTypeArguments" | "TSExternalModuleReference" | "TSFunctionType" | "TSImportEqualsDeclaration" | "TSImportType" | "TSIndexSignature" | "TSIndexedAccessType" | "TSInferType" | "TSInstantiationExpression" | "TSInterfaceBody" | "TSInterfaceDeclaration" | "TSIntersectionType" | "TSIntrinsicKeyword" | "TSLiteralType" | "TSMappedType" | "TSMethodSignature" | "TSModuleBlock" | "TSModuleDeclaration" | "TSNamedTupleMember" | "TSNamespaceExportDeclaration" | "TSNeverKeyword" | "TSNonNullExpression" | "TSNullKeyword" | "TSNumberKeyword" | "TSObjectKeyword" | "TSOptionalType" | "TSParameterProperty" | "TSParenthesizedType" | "TSPropertySignature" | "TSQualifiedName" | "TSRestType" | "TSSatisfiesExpression" | "TSStringKeyword" | "TSSymbolKeyword" | "TSThisType" | "TSTupleType" | "TSTypeAliasDeclaration" | "TSTypeAnnotation" | "TSTypeAssertion" | "TSTypeLiteral" | "TSTypeOperator" | "TSTypeParameter" | "TSTypeParameterDeclaration" | "TSTypeParameterInstantiation" | "TSTypePredicate" | "TSTypeQuery" | "TSTypeReference" | "TSUndefinedKeyword" | "TSUnionType" | "TSUnknownKeyword" | "TSVoidKeyword" | "TaggedTemplateExpression" | "TemplateElement" | "TemplateLiteral" | "ThisExpression" | "ThisTypeAnnotation" | "ThrowStatement" | "TopicReference" | "TryStatement" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnaryExpression" | "UnionTypeAnnotation" | "UpdateExpression" | "V8IntrinsicIdentifier" | "VariableDeclaration" | "VariableDeclarator" | "Variance" | "VoidTypeAnnotation" | "WhileStatement" | "WithStatement" | "YieldExpression", denylistTypes?: string[] | undefined) => boolean;
+    cache: typeof import("@babel/traverse").cache;
 };
 export { t };
 export declare function generate(ast: t.File): Promise<string>;

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

@@ -1,14 +1,13 @@
-import type { RouteData } from '../../@types/astro';
-import type { SSRManifest as Manifest } from './types';
+import type { RouteData, SSRManifest } from '../../@types/astro';
 export { deserializeManifest } from './common.js';
 export interface MatchOptions {
     matchNotFound?: boolean | undefined;
 }
 export declare class App {
     #private;
-    constructor(manifest: Manifest, streaming?: boolean);
+    constructor(manifest: SSRManifest, streaming?: boolean);
     removeBase(pathname: string): string;
     match(request: Request, { matchNotFound }?: MatchOptions): RouteData | undefined;
-    render(request: Request, routeData?: RouteData): Promise<Response>;
+    render(request: Request, routeData?: RouteData, locals?: object): Promise<Response>;
     setCookieHeaders(response: Response): Generator<string, string[], unknown>;
 }

package/dist/core/app/index.js

@@ -95,7 +95,7 @@ class App {
       return void 0;
     }
   }
-  async render(request, routeData) {
+  async render(request, routeData, locals) {
     let defaultStatus = 200;
     if (!routeData) {
       routeData = this.match(request);
@@ -110,7 +110,7 @@ class App {
         });
       }
     }
-    Reflect.set(request, clientLocalsSymbol, {});
+    Reflect.set(request, clientLocalsSymbol, locals ?? {});
     if (routeData.route === "/404") {
       defaultStatus = 404;
     }
@@ -147,18 +147,26 @@ class App {
     if (route.type === "redirect") {
       return RedirectSinglePageBuiltModule;
     } else {
-      const importComponentInstance = this.#manifest.pageMap.get(route.component);
-      if (!importComponentInstance) {
+      if (this.#manifest.pageMap) {
+        const importComponentInstance = this.#manifest.pageMap.get(route.component);
+        if (!importComponentInstance) {
+          throw new Error(
+            `Unexpectedly unable to find a component instance for route ${route.route}`
+          );
+        }
+        const pageModule = await importComponentInstance();
+        return pageModule;
+      } else if (this.#manifest.pageModule) {
+        const importComponentInstance = this.#manifest.pageModule;
+        return importComponentInstance;
+      } else {
         throw new Error(
-          `Unexpectedly unable to find a component instance for route ${route.route}`
+          "Astro couldn't find the correct page to render, probably because it wasn't correctly mapped for SSR usage. This is an internal error, please file an issue."
         );
       }
-      const built = await importComponentInstance();
-      return built;
     }
   }
   async #renderPage(request, routeData, page, status = 200) {
-    var _a;
     const url = new URL(request.url);
     const pathname = prependForwardSlash(this.removeBase(url.pathname));
     const info = this.#routeDataToRouteInfo.get(routeData);
@@ -199,15 +207,14 @@ class App {
         site: this.#env.site,
         adapterName: this.#env.adapterName
       });
-      const onRequest = (_a = page.middleware) == null ? void 0 : _a.onRequest;
       let response;
-      if (onRequest) {
+      if (page.onRequest) {
         response = await callMiddleware(
           this.#env.logging,
-          onRequest,
+          page.onRequest,
           apiContext,
           () => {
-            return renderPage({ mod, renderContext, env: this.#env, apiContext });
+            return renderPage({ mod, renderContext, env: this.#env, cookies: apiContext.cookies });
           }
         );
       } else {
@@ -215,7 +222,7 @@ class App {
           mod,
           renderContext,
           env: this.#env,
-          apiContext
+          cookies: apiContext.cookies
         });
       }
       Reflect.set(request, responseSentSymbol, true);
@@ -242,7 +249,7 @@ class App {
       env: this.#env,
       mod: handler
     });
-    const result = await callEndpoint(handler, this.#env, ctx, this.#logging, page.middleware);
+    const result = await callEndpoint(handler, this.#env, ctx, this.#logging, page.onRequest);
     if (result.type === "response") {
       if (result.response.headers.get("X-Astro-Response") === "Not-Found") {
         const fourOhFourRequest = new Request(new URL("/404", request.url));

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

@@ -11,7 +11,7 @@ declare class NodeIncomingMessage extends IncomingMessage {
 }
 export declare class NodeApp extends App {
     match(req: NodeIncomingMessage | Request, opts?: MatchOptions): RouteData | undefined;
-    render(req: NodeIncomingMessage | Request, routeData?: RouteData): Promise<Response>;
+    render(req: NodeIncomingMessage | Request, routeData?: RouteData, locals?: object): Promise<Response>;
 }
 export declare function loadManifest(rootFolder: URL): Promise<SSRManifest>;
 export declare function loadApp(rootFolder: URL): Promise<NodeApp>;

package/dist/core/app/node.js

@@ -28,17 +28,19 @@ class NodeApp extends App {
   match(req, opts = {}) {
     return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req), opts);
   }
-  render(req, routeData) {
+  render(req, routeData, locals) {
     if (typeof req.body === "string" && req.body.length > 0) {
       return super.render(
         req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(req.body)),
-        routeData
+        routeData,
+        locals
       );
     }
     if (typeof req.body === "object" && req.body !== null && Object.keys(req.body).length > 0) {
       return super.render(
         req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(JSON.stringify(req.body))),
-        routeData
+        routeData,
+        locals
       );
     }
     if ("on" in req) {
@@ -57,13 +59,15 @@ class NodeApp extends App {
       return reqBodyComplete.then(() => {
         return super.render(
           req instanceof Request ? req : createRequestFromNodeRequest(req, body),
-          routeData
+          routeData,
+          locals
         );
       });
     }
     return super.render(
       req instanceof Request ? req : createRequestFromNodeRequest(req),
-      routeData
+      routeData,
+      locals
     );
   }
 }

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

@@ -25,15 +25,14 @@ export interface RouteInfo {
 export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
     routeData: SerializedRouteData;
 };
-type ImportComponentInstance = () => Promise<SinglePageBuiltModule>;
-export interface SSRManifest {
+export type ImportComponentInstance = () => Promise<SinglePageBuiltModule>;
+export type SSRManifest = {
     adapterName: string;
     routes: RouteInfo[];
     site?: string;
     base?: string;
     assetsPrefix?: string;
     markdown: MarkdownRenderingOptions;
-    pageMap: Map<ComponentPath, ImportComponentInstance>;
     renderers: SSRLoadedRenderer[];
     /**
      * Map of directive name (e.g. `load`) to the directive script code
@@ -42,7 +41,9 @@ export interface SSRManifest {
     entryModules: Record<string, string>;
     assets: Set<string>;
     componentMetadata: SSRResult['componentMetadata'];
-}
+    pageModule?: SinglePageBuiltModule;
+    pageMap?: Map<ComponentPath, ImportComponentInstance>;
+};
 export type SerializedSSRManifest = Omit<SSRManifest, 'routes' | 'assets' | 'componentMetadata' | 'clientDirectives'> & {
     routes: SerializedRouteInfo[];
     assets: string[];
@@ -50,4 +51,3 @@ export type SerializedSSRManifest = Omit<SSRManifest, 'routes' | 'assets' | 'com
     clientDirectives: [string, string][];
 };
 export type AdapterCreateExports<T = any> = (manifest: SSRManifest, args?: T) => Record<string, any>;
-export {};

package/dist/core/build/generate.js

@@ -91,8 +91,7 @@ function chunkIsPage(settings, output, internals) {
 async function generatePages(opts, internals) {
   const timer = performance.now();
   const ssr = isServerLikeOutput(opts.settings.config);
-  const serverEntry = opts.buildConfig.serverEntry;
-  const outFolder = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir);
+  const outFolder = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
   if (ssr && !hasPrerenderedPages(internals))
     return;
   const verb = ssr ? "prerendering" : "generating";
@@ -132,7 +131,6 @@ ${bgGreen(black(` generating optimized images `))}`);
   }
   await runHookBuildGenerated({
     config: opts.settings.config,
-    buildConfig: opts.buildConfig,
     logging: opts.logging
   });
   info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.
@@ -161,7 +159,7 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
   const scripts = (pageInfo == null ? void 0 : pageInfo.hoistedScript) ?? null;
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
   const pageModulePromise = ssrEntry.page;
-  const middleware = ssrEntry.middleware;
+  const onRequest = ssrEntry.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.`
@@ -190,7 +188,7 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
   const paths = await getPathsForRoute(pageData, pageModule, opts, builtPaths);
   for (let i = 0; i < paths.length; i++) {
     const path = paths[i];
-    await generatePath(path, opts, generationOptions, middleware);
+    await generatePath(path, opts, generationOptions, onRequest);
     const timeEnd = performance.now();
     const timeChange = getTimeStat(timeStart, timeEnd);
     const timeIncrease = `(+${timeChange})`;
@@ -312,7 +310,7 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
   const url = new URL(buildPathname, origin);
   return url;
 }
-async function generatePath(pathname, opts, gopts, middleware) {
+async function generatePath(pathname, opts, gopts, onRequest) {
   const { settings, logging, origin, routeCache } = opts;
   const {
     mod,
@@ -416,7 +414,7 @@ async function generatePath(pathname, opts, gopts, middleware) {
       env,
       renderContext,
       logging,
-      middleware
+      onRequest
     );
     if (result.type === "response") {
       throwIfRedirectNotAllowed(result.response, opts.settings.config);
@@ -438,7 +436,6 @@ async function generatePath(pathname, opts, gopts, middleware) {
         site: env.site,
         adapterName: env.adapterName
       });
-      const onRequest = middleware == null ? void 0 : middleware.onRequest;
       if (onRequest) {
         response = await callMiddleware(
           env.logging,
@@ -449,8 +446,8 @@ async function generatePath(pathname, opts, gopts, middleware) {
               mod,
               renderContext,
               env,
-              apiContext,
-              isCompressHTML: settings.config.compressHTML
+              isCompressHTML: settings.config.compressHTML,
+              cookies: apiContext.cookies
             });
           }
         );
@@ -459,8 +456,8 @@ async function generatePath(pathname, opts, gopts, middleware) {
           mod,
           renderContext,
           env,
-          apiContext,
-          isCompressHTML: settings.config.compressHTML
+          isCompressHTML: settings.config.compressHTML,
+          cookies: apiContext.cookies
         });
       }
     } catch (err) {

package/dist/core/build/index.js

@@ -81,11 +81,6 @@ class AstroBuilder {
   }
   /** Run the build logic. build() is marked private because usage should go through ".run()" */
   async build({ viteConfig }) {
-    const buildConfig = {
-      client: this.settings.config.build.client,
-      server: this.settings.config.build.server,
-      serverEntry: this.settings.config.build.serverEntry
-    };
     await runHookBuildStart({ config: this.settings.config, logging: this.logging });
     this.validateConfig();
     info(this.logging, "build", `output target: ${colors.green(this.settings.config.output)}`);
@@ -117,8 +112,7 @@ class AstroBuilder {
       pageNames,
       routeCache: this.routeCache,
       teardownCompiler: this.teardownCompiler,
-      viteConfig,
-      buildConfig
+      viteConfig
     };
     const { internals } = await viteBuild(opts);
     await staticBuild(opts, internals);
@@ -134,7 +128,6 @@ class AstroBuilder {
     debug("build", timerMessage("Additional assets copied", this.timer.assetsStart));
     await runHookBuildDone({
       config: this.settings.config,
-      buildConfig,
       pages: pageNames,
       routes: Object.values(allPages).map((pd) => pd.route),
       logging: this.logging

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

@@ -1,5 +1,5 @@
 import type { Rollup } from 'vite';
-import type { SSRResult } from '../../@types/astro';
+import type { RouteData, SSRResult } from '../../@types/astro';
 import type { PageOptions } from '../../vite-plugin-astro/types';
 import type { PageBuildData, StylesheetAsset, ViteID } from './types';
 export interface BuildInternals {
@@ -61,6 +61,8 @@ export interface BuildInternals {
     discoveredScripts: Set<string>;
     staticFiles: Set<string>;
     ssrEntryChunk?: Rollup.OutputChunk;
+    entryPoints: Map<RouteData, URL>;
+    ssrSplitEntryChunks: Map<string, Rollup.OutputChunk>;
     componentMetadata: SSRResult['componentMetadata'];
 }
 /**

package/dist/core/build/internal.js

@@ -1,10 +1,7 @@
 import { prependForwardSlash, removeFileExtension } from "../path.js";
 import { viteID } from "../util.js";
-import {
-  ASTRO_PAGE_EXTENSION_POST_PATTERN,
-  ASTRO_PAGE_MODULE_ID,
-  getVirtualModulePageIdFromPath
-} from "./plugins/plugin-pages.js";
+import { ASTRO_PAGE_MODULE_ID, getVirtualModulePageIdFromPath } from "./plugins/plugin-pages.js";
+import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
 function createBuildInternals() {
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToPagesMap = /* @__PURE__ */ new Map();
@@ -22,7 +19,9 @@ function createBuildInternals() {
     discoveredClientOnlyComponents: /* @__PURE__ */ new Map(),
     discoveredScripts: /* @__PURE__ */ new Set(),
     staticFiles: /* @__PURE__ */ new Set(),
-    componentMetadata: /* @__PURE__ */ new Map()
+    componentMetadata: /* @__PURE__ */ new Map(),
+    ssrSplitEntryChunks: /* @__PURE__ */ new Map(),
+    entryPoints: /* @__PURE__ */ new Map()
   };
 }
 function trackPageData(internals, component, pageData, componentModuleId, componentURL) {

package/dist/core/build/plugins/index.js

@@ -10,7 +10,7 @@ import { pluginMiddleware } from "./plugin-middleware.js";
 import { pluginPages } from "./plugin-pages.js";
 import { pluginPrerender } from "./plugin-prerender.js";
 import { pluginRenderers } from "./plugin-renderers.js";
-import { pluginSSR } from "./plugin-ssr.js";
+import { pluginSSR, pluginSSRSplit } from "./plugin-ssr.js";
 function registerAllPlugins({ internals, options, register }) {
   register(pluginComponentEntry(internals));
   register(pluginAliasResolve(internals));
@@ -25,6 +25,7 @@ function registerAllPlugins({ internals, options, register }) {
   register(astroConfigBuildPlugin(options, internals));
   register(pluginHoistedScripts(options, internals));
   register(pluginSSR(options, internals));
+  register(pluginSSRSplit(options, internals));
 }
 export {
   registerAllPlugins

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

@@ -1,8 +1,13 @@
 import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../../constants.js";
+import { addRollupInput } from "../add-rollup-input.js";
 const MIDDLEWARE_MODULE_ID = "@astro-middleware";
+const EMPTY_MIDDLEWARE = "\0empty-middleware";
 function vitePluginMiddleware(opts, _internals) {
   return {
     name: "@astro/plugin-middleware",
+    options(options) {
+      return addRollupInput(options, [MIDDLEWARE_MODULE_ID]);
+    },
     async resolveId(id) {
       if (id === MIDDLEWARE_MODULE_ID) {
         const middlewareId = await this.resolve(
@@ -10,8 +15,18 @@ function vitePluginMiddleware(opts, _internals) {
         );
         if (middlewareId) {
           return middlewareId.id;
+        } else {
+          return EMPTY_MIDDLEWARE;
         }
       }
+      if (id === EMPTY_MIDDLEWARE) {
+        return EMPTY_MIDDLEWARE;
+      }
+    },
+    load(id) {
+      if (id === EMPTY_MIDDLEWARE) {
+        return "export const onRequest = undefined";
+      }
     }
   };
 }

package/dist/core/build/plugins/plugin-pages.d.ts

@@ -2,8 +2,7 @@ import { type BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
 import type { StaticBuildOptions } from '../types';
 export declare const ASTRO_PAGE_MODULE_ID = "@astro-page:";
-export declare const ASTRO_PAGE_RESOLVED_MODULE_ID = "\0@astro-page:";
-export declare const ASTRO_PAGE_EXTENSION_POST_PATTERN = "@_@";
+export declare const ASTRO_PAGE_RESOLVED_MODULE_ID: string;
 /**
  * 1. We add a fixed prefix, which is used as virtual module naming convention;
  * 2. We replace the dot that belongs extension with an arbitrary string.