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

adds a new astro:build:generated hook for SSG builds

Browse source
This commit is contained in:
Tony Sullivan 2022-09-15 12:32:12 -05:00
parent d2bfbac91c
commit 59b5fec7be
5 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1149,6 +1149,7 @@ export interface AstroIntegration {
'astro:server:start'?: (options: { address: AddressInfo }) => void | Promise<void>; 'astro:server:start'?: (options: { address: AddressInfo }) => void | Promise<void>;
'astro:server:done'?: () => void | Promise<void>; 'astro:server:done'?: () => void | Promise<void>;
'astro:build:ssr'?: (options: { manifest: SerializedSSRManifest }) => void | Promise<void>; 'astro:build:ssr'?: (options: { manifest: SerializedSSRManifest }) => void | Promise<void>;
'astro:build:generated'?: (options: { dir: URL }) => void | Promise<void>;
'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;

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

@ -6,7 +6,7 @@ import * as vite from 'vite';
import { BuildInternals, createBuildInternals } from '../../core/build/internal.js'; import { BuildInternals, createBuildInternals } from '../../core/build/internal.js';
import { prependForwardSlash } from '../../core/path.js'; import { prependForwardSlash } from '../../core/path.js';
import { emptyDir, isModeServerWithNoAdapter, removeDir } from '../../core/util.js'; import { emptyDir, isModeServerWithNoAdapter, removeDir } from '../../core/util.js';
import { runHookBuildSetup } from '../../integrations/index.js'; import { runHookBuildGenerated, runHookBuildSetup } from '../../integrations/index.js';
import { PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js'; import { PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
import type { ViteConfigWithSSR } from '../create-vite'; import type { ViteConfigWithSSR } from '../create-vite';
import { info } from '../logger/core.js'; import { info } from '../logger/core.js';
@ -98,6 +98,7 @@ Learn more: https://docs.astro.build/en/guides/server-side-rendering/
timer.generate = performance.now(); timer.generate = performance.now();
if (astroConfig.output === 'static') { if (astroConfig.output === 'static') {
await generatePages(opts, internals); await generatePages(opts, internals);
await runHookBuildGenerated({ config: opts.astroConfig, buildConfig: opts.buildConfig, logging: opts.logging });
await cleanSsrOutput(opts); await cleanSsrOutput(opts);
} else { } else {
// Inject the manifest // Inject the manifest

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

@ -243,6 +243,28 @@ export async function runHookBuildSetup({
} }
} }
export async function runHookBuildGenerated({
config,
buildConfig,
logging,
}: {
config: AstroConfig,
buildConfig: BuildConfig,
logging: LogOptions,
}) {
const dir = config.output === 'server' ? buildConfig.client : config.outDir;
for (const integration of config.integrations) {
if (integration?.hooks?.['astro:build:generated']) {
await withTakingALongTimeMsg({
name: integration.name,
hookResult: integration.hooks['astro:build:generated']({ dir }),
logging,
})
}
}
}
export async function runHookBuildSsr({ export async function runHookBuildSsr({
config, config,
manifest, manifest,

2
packages/integrations/image/src/index.ts
View file

@ -105,7 +105,7 @@ export default function integration(options: IntegrationOptions = {}): AstroInte
} }
: {}; : {};
}, },
'astro:build:done': async ({ dir }) => { 'astro:build:generated': async ({ dir }) => {
if (resolvedOptions.serviceEntryPoint === '@astrojs/image/squoosh') { if (resolvedOptions.serviceEntryPoint === '@astrojs/image/squoosh') {
await copyWasmFiles(_config.output === 'static' ? dir : _buildConfig.server); await copyWasmFiles(_config.output === 'static' ? dir : _buildConfig.server);
} }

5
packages/integrations/image/src/vendor/squoosh/image-pool.ts vendored
View file

@ -1,4 +1,5 @@
import { cpus } from 'os' import { cpus } from 'node:os'
import { fileURLToPath } from 'node:url';
import { isMainThread } from 'node:worker_threads'; import { isMainThread } from 'node:worker_threads';
import WorkerPool from '../../utils/workerPool.js'; import WorkerPool from '../../utils/workerPool.js';
import * as impl from './impl.js'; import * as impl from './impl.js';
@ -22,7 +23,7 @@ const getWorker = execOnce(
// There will be at most 7 workers needed since each worker will take // There will be at most 7 workers needed since each worker will take
// at least 1 operation type. // at least 1 operation type.
Math.max(1, Math.min(cpus().length - 1, 7)), Math.max(1, Math.min(cpus().length - 1, 7)),
'./node_modules/@astrojs/image/dist/vendor/squoosh/image-pool.js' fileURLToPath(import.meta.url)
); );
} }
) )