Revert "Adds a new "astro:build:generated" hook for SSG builds (#4772)" (#4774)

This reverts commit 03b18e8d1b.
This commit is contained in:
Tony Sullivan 2022-09-15 21:24:23 +00:00 committed by GitHub
parent 7acded4d0e
commit 13a4b0d488
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 42 deletions

View file

@ -1,5 +0,0 @@
---
'astro': minor
---
Adds a new "astro:build:generated" hook that runs after SSG builds finish but **before** build artifacts are cleaned up. This is a very specific use case, "astro:build:done" is probably what you're looking for.

View file

@ -1159,7 +1159,6 @@ export interface AstroIntegration {
target: 'client' | 'server';
updateConfig: (newConfig: ViteConfigWithSSR) => void;
}) => void | Promise<void>;
'astro:build:generated'?: (options: { dir: URL }) => void | Promise<void>;
'astro:build:done'?: (options: {
pages: { pathname: string }[];
dir: URL;

View file

@ -19,7 +19,6 @@ import {
removeTrailingForwardSlash,
} from '../../core/path.js';
import type { RenderOptions } from '../../core/render/core';
import { runHookBuildGenerated } from '../../integrations/index.js';
import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
import { call as callEndpoint } from '../endpoint/index.js';
import { debug, info } from '../logger/core.js';
@ -112,13 +111,7 @@ export async function generatePages(opts: StaticBuildOptions, internals: BuildIn
for (const pageData of eachPageData(internals)) {
await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
}
await runHookBuildGenerated({
config: opts.astroConfig,
buildConfig: opts.buildConfig,
logging: opts.logging,
});
info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.\n`));
}

View file

@ -263,28 +263,6 @@ export async function runHookBuildSsr({
}
}
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 runHookBuildDone({
config,
buildConfig,

View file

@ -4,8 +4,6 @@ import { loadFixture } from './test-utils.js';
describe('Static build: dir takes the URL path to the output directory', () => {
/** @type {URL} */
let checkDir;
/** @type {URL} */
let checkGeneratedDir;
before(async () => {
const fixture = await loadFixture({
root: './fixtures/static-build-dir/',
@ -13,9 +11,6 @@ describe('Static build: dir takes the URL path to the output directory', () => {
{
name: '@astrojs/dir',
hooks: {
'astro:build:generated': ({ dir }) => {
checkGeneratedDir = dir;
},
'astro:build:done': ({ dir }) => {
checkDir = dir;
},
@ -30,6 +25,5 @@ describe('Static build: dir takes the URL path to the output directory', () => {
expect(removeTrailingSlash(checkDir.toString())).to.be.equal(
removeTrailingSlash(new URL('./fixtures/static-build-dir/dist', import.meta.url).toString())
);
expect(checkDir.toString()).to.be.equal(checkGeneratedDir.toString());
});
});