Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/void/src/cli/deploy-managed-full.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
} from '../asset-routing.ts';
import { type VoidConfig, isNodeTarget } from '../config.ts';
import { collectRevalidate } from '../isr-config.ts';
import { voidWarn } from '../log.ts';
import { type DetectedFramework } from '../plugin-inference.ts';
import { assertNoPrerenderFailures } from '../prerender-render.ts';
import {
collectPrerenderPaths,
collectPrerenderPathsNode,
Expand Down Expand Up @@ -164,8 +164,8 @@ export async function runFullDeploy(

if (result.paths.length === 0) {
log.info('No pages to prerender');
} else if (result.failed.length > 0) {
voidWarn(`${formatCount(result.failed.length, 'page')} failed to prerender`);
} else {
assertNoPrerenderFailures(result.failed);
}
}

Expand Down
7 changes: 3 additions & 4 deletions packages/void/src/plugin-prerender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { join } from 'pathslash';
import type { Plugin } from 'vite';
import { resolveDistDir, resolveWorkerDirName } from './cli/build-output-dir.ts';
import { isNodeTarget, type VoidConfig } from './config.ts';
import { voidLog, voidWarn, setShowTimestamp } from './log.ts';
import { voidLog, setShowTimestamp } from './log.ts';
import { assertNoPrerenderFailures } from './prerender-render.ts';
import { prerenderPages, prerenderPagesNode } from './prerender.ts';
import { resolveRemoteMode } from './shared/env.ts';

Expand Down Expand Up @@ -64,9 +65,7 @@ export function prerenderPlugin(root: string, config: VoidConfig): Plugin {
return;
}

if (result.failed.length > 0) {
voidWarn(`${result.failed.length} page(s) failed to prerender`);
}
assertNoPrerenderFailures(result.failed);
},
};
}
8 changes: 8 additions & 0 deletions packages/void/src/prerender-render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ export type PrerenderResult = {
failed: Array<{ path: string; error: string }>;
};

export function assertNoPrerenderFailures(failed: PrerenderResult['failed']): void {
if (failed.length === 0) {
return;
}
const details = failed.map(({ path, error }) => ` ${path}: ${error}`).join('\n');
throw new Error(`${failed.length} page(s) failed to prerender:\n${details}`);
}

export function outputFileForPath(path: string): string {
return path === '/' ? 'index.html' : `${path.slice(1)}.html`;
}
Expand Down
17 changes: 16 additions & 1 deletion packages/void/test/unit/prerender-render.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterEach, describe, expect, it } from 'vite-plus/test';
import { serializePageData } from '../../src/pages/serialize.ts';
import { renderPrerenderPaths } from '../../src/prerender-render.ts';
import {
assertNoPrerenderFailures,
renderPrerenderPaths,
} from '../../src/prerender-render.ts';
import { createAssetFallback } from '../../src/runtime/routing-worker.ts';

const roots: Array<string> = [];
Expand Down Expand Up @@ -199,3 +202,15 @@ describe('prerender pool', () => {
});
});
});

describe('assertNoPrerenderFailures', () => {
it('does nothing when there are no failures', () => {
expect(() => assertNoPrerenderFailures([])).not.toThrow();
});

it('throws with path details when prerender failed', () => {
expect(() =>
assertNoPrerenderFailures([{ path: '/throws', error: 'HTTP 500' }]),
).toThrow('1 page(s) failed to prerender:\n /throws: HTTP 500');
});
});