diff options
Diffstat (limited to 'packages/astro/src/vite-plugin-astro-server/index.ts')
| -rw-r--r-- | packages/astro/src/vite-plugin-astro-server/index.ts | 84 |
1 files changed, 31 insertions, 53 deletions
diff --git a/packages/astro/src/vite-plugin-astro-server/index.ts b/packages/astro/src/vite-plugin-astro-server/index.ts index deaade4b5..54bd42909 100644 --- a/packages/astro/src/vite-plugin-astro-server/index.ts +++ b/packages/astro/src/vite-plugin-astro-server/index.ts @@ -2,7 +2,7 @@ import type http from 'http'; import mime from 'mime'; import type * as vite from 'vite'; import type { AstroSettings, ManifestData } from '../@types/astro'; -import type { SSROptions } from '../core/render/dev/index'; +import { DevelopmentEnvironment, SSROptions } from '../core/render/dev/index'; import { Readable } from 'stream'; import { getSetCookiesFromResponse } from '../core/cookies/index.js'; @@ -16,9 +16,8 @@ import { import { error, info, LogOptions, warn } from '../core/logger/core.js'; import * as msg from '../core/messages.js'; import { appendForwardSlash } from '../core/path.js'; -import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/core.js'; -import { preload, ssr } from '../core/render/dev/index.js'; -import { RouteCache } from '../core/render/route-cache.js'; +import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/index.js'; +import { createDevelopmentEnvironment, preload, renderPage } from '../core/render/dev/index.js'; import { createRequest } from '../core/request.js'; import { createRouteManifest, matchAllRoutes } from '../core/routing/index.js'; import { resolvePages } from '../core/util.js'; @@ -100,7 +99,6 @@ async function writeSSRResult(webResponse: Response, res: http.ServerResponse) { async function handle404Response( origin: string, - settings: AstroSettings, req: http.IncomingMessage, res: http.ServerResponse ) { @@ -187,17 +185,15 @@ export function baseMiddleware( async function matchRoute( pathname: string, - routeCache: RouteCache, - viteServer: vite.ViteDevServer, - logging: LogOptions, + env: DevelopmentEnvironment, manifest: ManifestData, - settings: AstroSettings ) { + const { logging, settings, routeCache } = env; const matches = matchAllRoutes(pathname, manifest); for await (const maybeRoute of matches) { const filePath = new URL(`./${maybeRoute.component}`, settings.config.root); - const preloadedComponent = await preload({ settings, filePath, viteServer }); + const preloadedComponent = await preload({ env, filePath }); const [, mod] = preloadedComponent; // attempt to get static paths // if this fails, we have a bad URL match! @@ -233,7 +229,7 @@ async function matchRoute( if (custom404) { const filePath = new URL(`./${custom404.component}`, settings.config.root); - const preloadedComponent = await preload({ settings, filePath, viteServer }); + const preloadedComponent = await preload({ env, filePath }); const [, mod] = preloadedComponent; return { @@ -249,14 +245,12 @@ async function matchRoute( /** The main logic to route dev server requests to pages in Astro. */ async function handleRequest( - routeCache: RouteCache, - viteServer: vite.ViteDevServer, - logging: LogOptions, + env: DevelopmentEnvironment, manifest: ManifestData, - settings: AstroSettings, req: http.IncomingMessage, res: http.ServerResponse ) { + const { settings, viteServer } = env; const { config } = settings; const origin = `${viteServer.config.server.https ? 'https' : 'http'}://${req.headers.host}`; const buildingToSSR = config.output === 'server'; @@ -296,11 +290,8 @@ async function handleRequest( try { const matchedRoute = await matchRoute( pathname, - routeCache, - viteServer, - logging, + env, manifest, - settings ); filePath = matchedRoute?.filePath; @@ -310,18 +301,15 @@ async function handleRequest( pathname, body, origin, - routeCache, - viteServer, + env, manifest, - logging, - settings, req, res ); } catch (_err) { const err = fixViteErrorMessage(_err, viteServer, filePath); const errorWithMetadata = collectErrorMetadata(err); - error(logging, null, msg.formatErrorMessage(errorWithMetadata)); + error(env.logging, null, msg.formatErrorMessage(errorWithMetadata)); handle500Response(viteServer, origin, req, res, errorWithMetadata); } } @@ -332,16 +320,14 @@ async function handleRoute( pathname: string, body: ArrayBuffer | undefined, origin: string, - routeCache: RouteCache, - viteServer: vite.ViteDevServer, + env: DevelopmentEnvironment, manifest: ManifestData, - logging: LogOptions, - settings: AstroSettings, req: http.IncomingMessage, res: http.ServerResponse ): Promise<void> { + const { logging, settings } = env; if (!matchedRoute) { - return handle404Response(origin, settings, req, res); + return handle404Response(origin, req, res); } const { config } = settings; @@ -365,23 +351,20 @@ async function handleRoute( const paramsAndPropsRes = await getParamsAndProps({ mod, route, - routeCache, + routeCache: env.routeCache, pathname: pathname, logging, ssr: config.output === 'server', }); const options: SSROptions = { - settings, - filePath, - logging, - mode: 'development', - origin, - pathname: pathname, - route, - routeCache, - viteServer, - request, + env, + filePath, + origin, + preload: preloadedComponent, + pathname, + request, + route }; // Route successfully matched! Render it. @@ -391,11 +374,8 @@ async function handleRoute( if (result.response.headers.get('X-Astro-Response') === 'Not-Found') { const fourOhFourRoute = await matchRoute( '/404', - routeCache, - viteServer, - logging, - manifest, - settings + env, + manifest ); return handleRoute( fourOhFourRoute, @@ -403,11 +383,8 @@ async function handleRoute( '/404', body, origin, - routeCache, - viteServer, + env, manifest, - logging, - settings, req, res ); @@ -427,7 +404,7 @@ async function handleRoute( res.end(result.body); } } else { - const result = await ssr(preloadedComponent, options); + const result = await renderPage(options); return await writeSSRResult(result, res); } } @@ -436,11 +413,12 @@ export default function createPlugin({ settings, logging }: AstroPluginOptions): return { name: 'astro:server', configureServer(viteServer) { - let routeCache = new RouteCache(logging, 'development'); + let env = createDevelopmentEnvironment(settings, logging, viteServer); let manifest: ManifestData = createRouteManifest({ settings }, logging); + /** rebuild the route cache + manifest, as needed. */ function rebuildManifest(needsManifestRebuild: boolean, file: string) { - routeCache.clearAll(); + env.routeCache.clearAll(); if (needsManifestRebuild) { manifest = createRouteManifest({ settings }, logging); } @@ -461,7 +439,7 @@ export default function createPlugin({ settings, logging }: AstroPluginOptions): if (!req.url || !req.method) { throw new Error('Incomplete request'); } - handleRequest(routeCache, viteServer, logging, manifest, settings, req, res); + handleRequest(env, manifest, req, res); }); }; }, |