michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: expose pages (#3286)

Browse source 
* feat: expose pages

* chore: changeset

* fix: build
This commit is contained in:
Pascal Schilp 2022-05-04 14:27:51 +02:00 • committed by GitHub
parent 8de641cb7f
commit e5f6de4edb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/mean-donkeys-sin.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Adds pages param to the astro:build:setup integration hook

4
packages/astro/src/@types/astro.ts
View file

@ -14,6 +14,7 @@ import type { AstroConfigSchema } from '../core/config';
import type { AstroComponentFactory, Metadata } from '../runtime/server'; import type { AstroComponentFactory, Metadata } from '../runtime/server';
import type { ViteConfigWithSSR } from '../core/create-vite'; import type { ViteConfigWithSSR } from '../core/create-vite';
import type { SerializedSSRManifest } from '../core/app/types'; import type { SerializedSSRManifest } from '../core/app/types';
import type { PageBuildData } from '../core/build/types';
export type { SSRManifest } from '../core/app/types'; export type { SSRManifest } from '../core/app/types';
export interface AstroBuiltinProps { export interface AstroBuiltinProps {
@ -912,8 +913,9 @@ export interface AstroIntegration {
'astro:build:start'?: (options: { buildConfig: BuildConfig }) => void | Promise<void>; 'astro:build:start'?: (options: { buildConfig: BuildConfig }) => void | Promise<void>;
'astro:build:setup'?: (options: { 'astro:build:setup'?: (options: {
vite: ViteConfigWithSSR; vite: ViteConfigWithSSR;
pages: Map<string, PageBuildData>;
target: 'client' | 'server'; target: 'client' | 'server';
}) => void; }) => void | Promise<void>;
'astro:build:done'?: (options: { 'astro:build:done'?: (options: {
pages: { pathname: string }[]; pages: { pathname: string }[];
dir: URL; dir: URL;

4
packages/astro/src/core/build/static-build.ts
View file

@ -167,7 +167,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
resolve: viteConfig.resolve, resolve: viteConfig.resolve,
} as ViteConfigWithSSR; } 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? // TODO: use vite.mergeConfig() here?
return await vite.build(viteBuildConfig); return await vite.build(viteBuildConfig);
@ -232,7 +232,7 @@ async function clientBuild(
base: astroConfig.base, base: astroConfig.base,
} as ViteConfigWithSSR; } 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); const buildResult = await vite.build(viteBuildConfig);
info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.\n`)); info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.\n`));

5
packages/astro/src/integrations/index.ts
View file

@ -1,6 +1,7 @@
import type { AddressInfo } from 'net'; import type { AddressInfo } from 'net';
import type { ViteDevServer } from 'vite'; import type { ViteDevServer } from 'vite';
import type { SerializedSSRManifest } from '../core/app/types'; import type { SerializedSSRManifest } from '../core/app/types';
import type { PageBuildData } from '../core/build/types';
import { AstroConfig, AstroRenderer, BuildConfig, RouteData } from '../@types/astro.js'; import { AstroConfig, AstroRenderer, BuildConfig, RouteData } from '../@types/astro.js';
import { mergeConfig } from '../core/config.js'; import { mergeConfig } from '../core/config.js';
import ssgAdapter from '../adapter-ssg/index.js'; import ssgAdapter from '../adapter-ssg/index.js';
@ -123,15 +124,17 @@ export async function runHookBuildStart({
export async function runHookBuildSetup({ export async function runHookBuildSetup({
config, config,
vite, vite,
pages,
target, target,
}: { }: {
config: AstroConfig; config: AstroConfig;
vite: ViteConfigWithSSR; vite: ViteConfigWithSSR;
pages: Map<string, PageBuildData>;
target: 'server' | 'client'; target: 'server' | 'client';
}) { }) {
for (const integration of config.integrations) { for (const integration of config.integrations) {
if (integration.hooks['astro:build:setup']) { if (integration.hooks['astro:build:setup']) {
await integration.hooks['astro:build:setup']({ vite, target }); await integration.hooks['astro:build:setup']({ vite, pages, target });
} }
} }
} }