[ci] format

packages/astro/src/core/app/index.ts

@@ -14,7 +14,12 @@ import { call as callEndpoint } from '../endpoint/index.js';
 import { consoleLogDestination } from '../logger/console.js';
 import { error } from '../logger/core.js';
 import { joinPaths, prependForwardSlash } from '../path.js';
-import { createEnvironment, Environment, createRenderContext, renderPage } from '../render/index.js';
+import {
+ createEnvironment,
+ createRenderContext,
+ Environment,
+ renderPage,
+} from '../render/index.js';
 import { RouteCache } from '../render/route-cache.js';
 import {
  createLinkStylesheetElementSet,

packages/astro/src/core/endpoint/dev/index.ts

@@ -4,14 +4,17 @@ import { createRenderContext } from '../../render/index.js';
 import { call as callEndpoint } from '../index.js';
 
 export async function call(options: SSROptions) {
- const { env, preload: [,mod] } = options;
+ const {
+ env,
+ preload: [, mod],
+ } = options;
  const endpointHandler = mod as unknown as EndpointHandler;
 
  const ctx = createRenderContext({
  request: options.request,
  origin: options.origin,
  pathname: options.pathname,
- route: options.route
+ route: options.route,
  });
 
  return await callEndpoint(endpointHandler, env, ctx);

packages/astro/src/core/endpoint/index.ts

@@ -77,7 +77,7 @@ export async function call(
  routeCache: env.routeCache,
  pathname: ctx.pathname,
  logging: env.logging,
- ssr: env.ssr
+ ssr: env.ssr,
  });
 
  if (paramsAndPropsResp === GetParamsAndPropsError.NoMatchingStaticPath) {

packages/astro/src/core/render/context.ts

@@ -1,15 +1,4 @@
-import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
-import type {
- ComponentInstance,
- Params,
- Props,
- RouteData,
- RuntimeMode,
- SSRElement,
- SSRLoadedRenderer,
-} from '../../@types/astro';
-import type { LogOptions } from '../logger/core.js';
-import type { Environment } from './environment.js';
+import type { RouteData, SSRElement } from '../../@types/astro';
 
 /**
  * The RenderContext represents the parts of rendering that are specific to one request.
@@ -29,7 +18,7 @@ export interface RenderContext {
 export type CreateRenderContextArgs = Partial<RenderContext> & {
  origin?: string;
  request: RenderContext['request'];
-}
+};
 
 export function createRenderContext(options: CreateRenderContextArgs): RenderContext {
  const request = options.request;
@@ -40,6 +29,6 @@ export function createRenderContext(options: CreateRenderContextArgs): RenderCon
  ...options,
  origin,
  pathname,
- url
+ url,
  };
 }

packages/astro/src/core/render/core.ts

@@ -1,12 +1,7 @@
-import type {
- ComponentInstance,
- Params,
- Props,
- RouteData,
-} from '../../@types/astro';
+import type { ComponentInstance, Params, Props, RouteData } from '../../@types/astro';
 import type { LogOptions } from '../logger/core.js';
-import type { Environment } from './environment.js';
 import type { RenderContext } from './context.js';
+import type { Environment } from './environment.js';
 
 import { Fragment, renderPage as runtimeRenderPage } from '../../runtime/server/index.js';
 import { attachToResponse } from '../cookies/index.js';

packages/astro/src/core/render/dev/environment.ts

@@ -1,20 +1,15 @@
-import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
 import type { ViteDevServer } from 'vite';
-import type {
- AstroSettings,
- RuntimeMode,
- SSRLoadedRenderer,
-} from '../../../@types/astro';
-import type { Environment } from '../index';
+import type { AstroSettings, RuntimeMode } from '../../../@types/astro';
 import type { LogOptions } from '../../logger/core.js';
-import { RouteCache } from '../route-cache.js';
+import type { Environment } from '../index';
 import { createEnvironment } from '../index.js';
+import { RouteCache } from '../route-cache.js';
 import { createResolve } from './resolve.js';
 
 export type DevelopmentEnvironment = Environment & {
  settings: AstroSettings;
  viteServer: ViteDevServer;
-}
+};
 
 export function createDevelopmentEnvironment(
  settings: AstroSettings,
@@ -25,7 +20,7 @@ export function createDevelopmentEnvironment(
  let env = createEnvironment({
  adapterName: settings.adapter?.name,
  logging,
- markdown:  {
+ markdown: {
  ...settings.config.markdown,
  isAstroFlavoredMd: settings.config.legacy.astroFlavoredMarkdown,
  },
@@ -42,6 +37,6 @@ export function createDevelopmentEnvironment(
  return {
  ...env,
  viteServer,
- settings
+ settings,
  };
 }

packages/astro/src/core/render/dev/index.ts

@@ -8,18 +8,18 @@ import type {
  SSRElement,
  SSRLoadedRenderer,
 } from '../../../@types/astro';
-import type { DevelopmentEnvironment } from './environment';
 import { PAGE_SCRIPT_ID } from '../../../vite-plugin-scripts/index.js';
 import { LogOptions } from '../../logger/core.js';
 import { isPage, resolveIdToUrl } from '../../util.js';
-import { renderPage as coreRenderPage, createRenderContext } from '../index.js';
+import { createRenderContext, renderPage as coreRenderPage } from '../index.js';
+import { filterFoundRenderers, loadRenderer } from '../renderer.js';
 import { RouteCache } from '../route-cache.js';
 import { collectMdMetadata } from '../util.js';
 import { getStylesForURL } from './css.js';
+import type { DevelopmentEnvironment } from './environment';
 import { getScriptsForURL } from './scripts.js';
-import { loadRenderer, filterFoundRenderers } from '../renderer.js';
 export { createDevelopmentEnvironment } from './environment.js';
-export type { DevelopmentEnvironment }; 
+export type { DevelopmentEnvironment };
 
 export interface SSROptionsOld {
  /** an instance of the AstroSettings */
@@ -73,7 +73,6 @@ export interface SSROptions {
  request: Request;
  /** optional, in case we need to render something outside of a dev server */
  route?: RouteData;
-
 }
 
 export type ComponentPreload = [SSRLoadedRenderer[], ComponentInstance];
@@ -83,7 +82,7 @@ export async function loadRenderers(
  settings: AstroSettings
 ): Promise<SSRLoadedRenderer[]> {
  const loader = (entry: string) => viteServer.ssrLoadModule(entry);
- const renderers = await Promise.all(settings.renderers.map(r => loadRenderer(r, loader)));
+ const renderers = await Promise.all(settings.renderers.map((r) => loadRenderer(r, loader)));
  return filterFoundRenderers(renderers);
 }
 
@@ -176,7 +175,7 @@ async function getScriptsAndStyles({ env, filePath }: GetScriptsAndStylesParams)
  children: content,
  });
  });
- 
+
  return { scripts, styles, links };
 }
 
@@ -189,7 +188,7 @@ export async function renderPage(options: SSROptions): Promise<Response> {
 
  const { scripts, links, styles } = await getScriptsAndStyles({
  env: options.env,
- filePath: options.filePath
+ filePath: options.filePath,
  });
 
  const ctx = createRenderContext({
@@ -199,7 +198,7 @@ export async function renderPage(options: SSROptions): Promise<Response> {
  scripts,
  links,
  styles,
- route: options.route
+ route: options.route,
  });
 
  return await coreRenderPage(mod, ctx, options.env); // NOTE: without "await", errors won’t get caught below

packages/astro/src/core/render/dev/resolve.ts

@@ -1,20 +1,20 @@
 import type { ViteDevServer } from 'vite';
-import { isPage, resolveIdToUrl } from '../../util.js';
+import { resolveIdToUrl } from '../../util.js';
 
 export function createResolve(viteServer: ViteDevServer) {
-  // Resolves specifiers in the inline hydrated scripts, such as:
-  // - @astrojs/preact/client.js
-  // - @/components/Foo.vue
-  // - /Users/macos/project/src/Foo.vue
-  // - C:/Windows/project/src/Foo.vue (normalized slash)
-  return async function(s: string) {
-  const url = await resolveIdToUrl(viteServer, s);
-  // Vite does not resolve .jsx -> .tsx when coming from hydration script import,
-  // clip it so Vite is able to resolve implicitly.
-  if (url.startsWith('/@fs') && url.endsWith('.jsx')) {
-  return url.slice(0, -4);
-  } else {
-  return url;
-  }
-  };
+ // Resolves specifiers in the inline hydrated scripts, such as:
+ // - @astrojs/preact/client.js
+ // - @/components/Foo.vue
+ // - /Users/macos/project/src/Foo.vue
+ // - C:/Windows/project/src/Foo.vue (normalized slash)
+ return async function (s: string) {
+ const url = await resolveIdToUrl(viteServer, s);
+ // Vite does not resolve .jsx -> .tsx when coming from hydration script import,
+ // clip it so Vite is able to resolve implicitly.
+ if (url.startsWith('/@fs') && url.endsWith('.jsx')) {
+ return url.slice(0, -4);
+ } else {
+ return url;
+ }
+ };
 }

packages/astro/src/core/render/environment.ts

@@ -1,8 +1,5 @@
 import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
-import type {
- RuntimeMode,
- SSRLoadedRenderer,
-} from '../../@types/astro';
+import type { RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
 import type { LogOptions } from '../logger/core.js';
 import { RouteCache } from './route-cache.js';
 
@@ -34,7 +31,7 @@ export function createEnvironment(options: CreateEnvironmentArgs): Environment {
 
 export type CreateBasicEnvironmentArgs = Partial<Environment> & {
  logging: CreateEnvironmentArgs['logging'];
-}
+};
 
 export function createBasicEnvironment(options: CreateBasicEnvironmentArgs): Environment {
  const mode = options.mode ?? 'development';
@@ -46,7 +43,6 @@ export function createBasicEnvironment(options: CreateBasicEnvironmentArgs): Env
  resolve: options.resolve ?? ((s: string) => Promise.resolve(s)),
  routeCache: new RouteCache(options.logging, mode),
  ssr: options.ssr ?? true,
- streaming: options.streaming ?? true
+ streaming: options.streaming ?? true,
  });
 }
-

packages/astro/src/core/render/index.ts

@@ -1,22 +1,6 @@
-export type {
- Environment
-} from './environment';
-export type {
- RenderContext
-} from './context';
-
-export {
- createBasicEnvironment,
- createEnvironment
-} from './environment.js';
-export {
- createRenderContext
-} from './context.js';
-export {
- getParamsAndProps,
- GetParamsAndPropsError,
- renderPage,
-} from './core.js';
-export {
- loadRenderer
-} from './renderer.js';
+export type { RenderContext } from './context';
+export { createRenderContext } from './context.js';
+export { getParamsAndProps, GetParamsAndPropsError, renderPage } from './core.js';
+export type { Environment } from './environment';
+export { createBasicEnvironment, createEnvironment } from './environment.js';
+export { loadRenderer } from './renderer.js';

packages/astro/src/core/render/renderer.ts

@@ -6,23 +6,31 @@ export type RendererServerEntrypointModule = {
 export type MaybeRendererServerEntrypointModule = Partial<RendererServerEntrypointModule>;
 export type RendererLoader = (entryPoint: string) => Promise<MaybeRendererServerEntrypointModule>;
 
-export async function loadRenderer(renderer: AstroRenderer, loader: RendererLoader): Promise<SSRLoadedRenderer | undefined> {
+export async function loadRenderer(
+ renderer: AstroRenderer,
+ loader: RendererLoader
+): Promise<SSRLoadedRenderer | undefined> {
  const mod = await loader(renderer.serverEntrypoint);
- if(typeof mod.default !== 'undefined') {
+ if (typeof mod.default !== 'undefined') {
  return createLoadedRenderer(renderer, mod as RendererServerEntrypointModule);
  }
  return undefined;
 }
 
-export function filterFoundRenderers(renderers: Array<SSRLoadedRenderer | undefined>): SSRLoadedRenderer[] {
+export function filterFoundRenderers(
+ renderers: Array<SSRLoadedRenderer | undefined>
+): SSRLoadedRenderer[] {
  return renderers.filter((renderer): renderer is SSRLoadedRenderer => {
  return !!renderer;
  });
 }
 
-export function createLoadedRenderer(renderer: AstroRenderer, mod: RendererServerEntrypointModule): SSRLoadedRenderer {
+export function createLoadedRenderer(
+ renderer: AstroRenderer,
+ mod: RendererServerEntrypointModule
+): SSRLoadedRenderer {
  return {
  ...renderer,
- ssr: mod.default
+ ssr: mod.default,
  };
 }

packages/astro/src/jsx/component.ts

@@ -1,5 +1,5 @@
-import renderer from './renderer.js';
 import { __astro_tag_component__ } from '../runtime/server/index.js';
+import renderer from './renderer.js';
 
 const ASTRO_JSX_RENDERER_NAME = renderer.name;
 

packages/astro/src/jsx/index.ts

@@ -1,6 +1,2 @@
-export {
- default as renderer
-} from './renderer.js';
-export {
- createAstroJSXComponent
-} from './component.js';
+export { createAstroJSXComponent } from './component.js';
+export { default as renderer } from './renderer.js';

packages/astro/src/runtime/server/index.ts

@@ -1,6 +1,7 @@
 export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
+export { renderJSX } from './jsx.js';
 export type { Metadata } from './metadata';
 export { createMetadata } from './metadata.js';
 export {
@@ -21,7 +22,6 @@ export {
  stringifyChunk,
  voidElementNames,
 } from './render/index.js';
-export { renderJSX } from './jsx.js';
 export type { AstroComponentFactory, RenderInstruction } from './render/index.js';
 import type { AstroComponentFactory } from './render/index.js';