Skip to content

Commit

Permalink
feat: expose pages (withastro#3286)
Browse files Browse the repository at this point in the history
* feat: expose pages

* chore: changeset

* fix: build
  • Loading branch information
thepassle authored and nonphoto committed May 6, 2022
1 parent 44e25df commit a1ab13d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .changeset/mean-donkeys-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Adds pages param to the astro:build:setup integration hook
4 changes: 3 additions & 1 deletion packages/astro/src/@types/astro.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import type { AstroConfigSchema } from '../core/config';
import type { AstroComponentFactory, Metadata } from '../runtime/server';
import type { ViteConfigWithSSR } from '../core/create-vite';
import type { SerializedSSRManifest } from '../core/app/types';
import type { PageBuildData } from '../core/build/types';
export type { SSRManifest } from '../core/app/types';

export interface AstroBuiltinProps {
Expand Down Expand Up @@ -912,8 +913,9 @@ export interface AstroIntegration {
'astro:build:start'?: (options: { buildConfig: BuildConfig }) => void | Promise<void>;
'astro:build:setup'?: (options: {
vite: ViteConfigWithSSR;
pages: Map<string, PageBuildData>;
target: 'client' | 'server';
}) => void;
}) => void | Promise<void>;
'astro:build:done'?: (options: {
pages: { pathname: string }[];
dir: URL;
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/src/core/build/static-build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
resolve: viteConfig.resolve,
} as ViteConfigWithSSR;

await runHookBuildSetup({ config: astroConfig, vite: viteBuildConfig, target: 'server' });
await runHookBuildSetup({ config: astroConfig, pages: internals.pagesByComponent, vite: viteBuildConfig, target: 'server' });

// TODO: use vite.mergeConfig() here?
return await vite.build(viteBuildConfig);
Expand Down Expand Up @@ -232,7 +232,7 @@ async function clientBuild(
base: astroConfig.base,
} as ViteConfigWithSSR;

await runHookBuildSetup({ config: astroConfig, vite: viteBuildConfig, target: 'client' });
await runHookBuildSetup({ config: astroConfig, pages: internals.pagesByComponent, vite: viteBuildConfig, target: 'client' });

const buildResult = await vite.build(viteBuildConfig);
info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.\n`));
Expand Down
5 changes: 4 additions & 1 deletion packages/astro/src/integrations/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { AddressInfo } from 'net';
import type { ViteDevServer } from 'vite';
import type { SerializedSSRManifest } from '../core/app/types';
import type { PageBuildData } from '../core/build/types';
import { AstroConfig, AstroRenderer, BuildConfig, RouteData } from '../@types/astro.js';
import { mergeConfig } from '../core/config.js';
import ssgAdapter from '../adapter-ssg/index.js';
Expand Down Expand Up @@ -123,15 +124,17 @@ export async function runHookBuildStart({
export async function runHookBuildSetup({
config,
vite,
pages,
target,
}: {
config: AstroConfig;
vite: ViteConfigWithSSR;
pages: Map<string, PageBuildData>;
target: 'server' | 'client';
}) {
for (const integration of config.integrations) {
if (integration.hooks['astro:build:setup']) {
await integration.hooks['astro:build:setup']({ vite, target });
await integration.hooks['astro:build:setup']({ vite, pages, target });
}
}
}
Expand Down

0 comments on commit a1ab13d

Please sign in to comment.