Skip to content

Vite plugin v2 - Stabilise the prerenderWorker plugin option #15505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesopstad wants to merge 1 commit into from
+27 −33
Open

Vite plugin v2 - Stabilise the prerenderWorker plugin option #15505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 13 additions & 15 deletions packages/vite-plugin-cloudflare/playground/prerendering/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,20 @@ export function createConfig(assetsOnly: boolean) {
persistState: false,
viteEnvironment: { name: "ssr" },
assetsOnly: () => assetsOnly,
experimental: {
prerenderWorker: {
config(_, { entryWorkerConfig }) {
return {
...entryWorkerConfig,
name: "prerender",
entrypoint: "./src/prerender.ts",
env: {
...entryWorkerConfig.env,
AUXILIARY_WORKER: {
type: "worker",
worker: "auxiliary-worker",
},
prerenderWorker: {
config(_, { entryWorkerConfig }) {
return {
...entryWorkerConfig,
name: "prerender",
entrypoint: "./src/prerender.ts",
env: {
...entryWorkerConfig.env,
AUXILIARY_WORKER: {
type: "worker",
worker: "auxiliary-worker",
},
};
},
},
};
},
},
}),
Expand Down
26 changes: 11 additions & 15 deletions packages/vite-plugin-cloudflare/src/__tests__/resolve-plugin-config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,10 @@ describe("resolvePluginConfig", () => {
writeSource("src/prerender.ts");
const result = (await resolvePluginConfig(
{
experimental: {
prerenderWorker: {
config: (config, { entryWorkerConfig }) => ({
name: `${config.name}-${entryWorkerConfig.compatibilityDate}`,
}),
},
prerenderWorker: {
config: (config, { entryWorkerConfig }) => ({
name: `${config.name}-${entryWorkerConfig.compatibilityDate}`,
}),
},
},
{ root },
Expand All @@ -414,15 +412,13 @@ describe("resolvePluginConfig", () => {
writeSource("src/prerender.ts");
const result = (await resolvePluginConfig(
{
experimental: {
prerenderWorker: {
config(_, { entryWorkerConfig }) {
return {
...entryWorkerConfig,
name: "prerender-worker",
entrypoint: "./src/prerender.ts",
};
},
prerenderWorker: {
config(_, { entryWorkerConfig }) {
return {
...entryWorkerConfig,
name: "prerender-worker",
entrypoint: "./src/prerender.ts",
};
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions packages/vite-plugin-cloudflare/src/plugin-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ interface ResolvedTypeGenerationOptions {
interface Experimental {
/** Experimental support for handling the _headers and _redirects files during Vite dev mode. */
headersAndRedirectsDevModeSupport?: boolean;
/** Experimental support for a dedicated prerender Worker. */
prerenderWorker?: PrerenderWorkerConfig;
}

function normalizeTypes(
Expand Down Expand Up @@ -125,6 +123,8 @@ export interface PluginConfig extends EntryWorkerConfig {
* an override here. The key is used as the Vite environment name by default.
*/
auxiliaryWorkers?: Record<string, AuxiliaryWorkerConfig>;
/** Configuration for a dedicated prerender Worker. */
prerenderWorker?: PrerenderWorkerConfig;
persistState?: PersistState;
inspectorPort?: number | false;
remoteBindings?: boolean;
Expand Down Expand Up @@ -432,7 +432,7 @@ export async function resolvePluginConfig(
const environmentNameToWorkerMap = new Map<string, Worker>();
const environmentNameToChildEnvironmentNamesMap = new Map<string, string[]>();

const prerenderWorkerConfig = pluginConfig.experimental?.prerenderWorker;
const prerenderWorkerConfig = pluginConfig.prerenderWorker;
const exportedPrerenderWorkerConfig = parsedConfig.prerender;
const prerenderWorkerBaseConfig =
exportedPrerenderWorkerConfig?.type === "worker"
Expand Down
Loading