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: 6 additions & 0 deletions .server-changes/vercel-auto-promote-toggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
area: webapp
type: feature
---

Vercel integration option to disable auto promotions
23 changes: 23 additions & 0 deletions apps/webapp/app/components/integrations/VercelBuildSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ type BuildSettingsFieldsProps = {
envVarsConfigLink?: string;
/** Slugs that should be forced off and disabled, with tooltip reason. */
disabledEnvSlugs?: Partial<Record<EnvSlug, string>>;
autoPromote?: boolean;
onAutoPromoteChange?: (value: boolean) => void;
};

export function BuildSettingsFields({
Expand All @@ -33,6 +35,8 @@ export function BuildSettingsFields({
onAtomicBuildsChange,
envVarsConfigLink,
disabledEnvSlugs,
autoPromote,
onAutoPromoteChange,
}: BuildSettingsFieldsProps) {
const isSlugDisabled = (slug: EnvSlug) => !!disabledEnvSlugs?.[slug];
const enabledSlugs = availableEnvSlugs.filter((s) => !isSlugDisabled(s));
Expand Down Expand Up @@ -202,6 +206,25 @@ export function BuildSettingsFields({
.
</Hint>
</div>

{/* Auto promotion — only visible when atomic deployments are on */}
{atomicBuilds.includes("prod") && onAutoPromoteChange !== undefined && (
<div>
<div className="flex items-center justify-between">
<Label>Auto promotion</Label>
<Switch
variant="small"
checked={autoPromote ?? true}
onCheckedChange={onAutoPromoteChange}
/>
</div>
<Hint className="pr-6">
When enabled, the integration automatically promotes the Vercel deployment after
the Trigger.dev build completes. Turn off to manually promote from your Vercel
dashboard — Trigger.dev will then promote automatically once you do.
</Hint>
</div>
)}
</>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const UpdateVercelConfigFormSchema = z.object({
pullEnvVarsBeforeBuild: envSlugArrayField,
discoverEnvVars: envSlugArrayField,
vercelStagingEnvironment: z.string().nullable().optional(),
autoPromote: z.string().optional().transform((val) => val !== "false"),
});

const DisconnectVercelFormSchema = z.object({
Expand Down Expand Up @@ -241,6 +242,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
pullEnvVarsBeforeBuild,
discoverEnvVars,
vercelStagingEnvironment,
autoPromote,
} = submission.value;

const parsedStagingEnv = parseVercelStagingEnvironment(vercelStagingEnvironment);
Expand All @@ -256,6 +258,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
pullEnvVarsBeforeBuild,
discoverEnvVars,
vercelStagingEnvironment: parsedStagingEnv,
autoPromote,
});

if (result) {
Expand Down Expand Up @@ -593,12 +596,14 @@ function ConnectedVercelProjectForm({
discoverEnvVars: connectedProject.integrationData.config.discoverEnvVars ?? [],
vercelStagingEnvironment:
connectedProject.integrationData.config.vercelStagingEnvironment ?? null,
autoPromote: connectedProject.integrationData.config.autoPromote ?? true,
});

const originalAtomicBuilds = connectedProject.integrationData.config.atomicBuilds ?? [];
const originalPullEnvVars = connectedProject.integrationData.config.pullEnvVarsBeforeBuild ?? [];
const originalDiscoverEnvVars = connectedProject.integrationData.config.discoverEnvVars ?? [];
const originalStagingEnv = connectedProject.integrationData.config.vercelStagingEnvironment ?? null;
const originalAutoPromote = connectedProject.integrationData.config.autoPromote ?? true;

useEffect(() => {
const atomicBuildsChanged =
Expand All @@ -611,9 +616,23 @@ function ConnectedVercelProjectForm({
JSON.stringify([...configValues.discoverEnvVars].sort()) !==
JSON.stringify([...originalDiscoverEnvVars].sort());
const stagingEnvChanged = configValues.vercelStagingEnvironment?.environmentId !== originalStagingEnv?.environmentId;

setHasConfigChanges(atomicBuildsChanged || pullEnvVarsChanged || discoverEnvVarsChanged || stagingEnvChanged);
}, [configValues, originalAtomicBuilds, originalPullEnvVars, originalDiscoverEnvVars, originalStagingEnv]);
const autoPromoteChanged = configValues.autoPromote !== originalAutoPromote;

setHasConfigChanges(
atomicBuildsChanged ||
pullEnvVarsChanged ||
discoverEnvVarsChanged ||
stagingEnvChanged ||
autoPromoteChanged
);
}, [
configValues,
originalAtomicBuilds,
originalPullEnvVars,
originalDiscoverEnvVars,
originalStagingEnv,
originalAutoPromote,
]);

const [configForm, fields] = useForm({
id: "update-vercel-config",
Expand Down Expand Up @@ -718,6 +737,11 @@ function ConnectedVercelProjectForm({
name="vercelStagingEnvironment"
value={configValues.vercelStagingEnvironment ? JSON.stringify(configValues.vercelStagingEnvironment) : ""}
/>
<input
type="hidden"
name="autoPromote"
value={String(configValues.autoPromote)}
/>

<Fieldset>
<InputGroup fullWidth>
Expand Down Expand Up @@ -791,6 +815,10 @@ function ConnectedVercelProjectForm({
}
envVarsConfigLink={`/orgs/${organizationSlug}/projects/${projectSlug}/env/${environmentSlug}/environment-variables`}
disabledEnvSlugs={disabledEnvSlugsForBuildSettings}
autoPromote={configValues.autoPromote}
onAutoPromoteChange={(value) =>
setConfigValues((prev) => ({ ...prev, autoPromote: value }))
}
/>

{/* Warning: autoAssignCustomDomains must be disabled for atomic deployments */}
Expand Down
2 changes: 2 additions & 0 deletions apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const VercelIntegrationConfigSchema = z.object({
displayName: z.string(),
}).nullable().optional(),
discoverEnvVars: z.array(EnvSlugSchema).nullable().optional(),
autoPromote: z.boolean().optional().default(true),
});

export type VercelIntegrationConfig = z.infer<typeof VercelIntegrationConfigSchema>;
Expand Down Expand Up @@ -89,6 +90,7 @@ export function createDefaultVercelIntegrationData(
pullEnvVarsBeforeBuild: ["prod", "preview"],
discoverEnvVars: ["prod", "preview"],
vercelStagingEnvironment: null,
autoPromote: true,
},
syncEnvVarsMapping: {},
vercelProjectId,
Expand Down
Loading