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
5 changes: 5 additions & 0 deletions .bumpy/fix-wrangler-keep-vars-flag.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@varlock/cloudflare-integration": patch
---

Fix varlock-wrangler: skip unsupported --keep-vars flag for `versions upload`, and propagate wrangler exit code correctly for deploy/types commands.
12 changes: 10 additions & 2 deletions packages/integrations/cloudflare/src/varlock-wrangler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,13 @@ function formatEnvFileContent(graph: ReturnType<typeof loadSerializedGraph>) {

// --- command detection ---

function isVersionsUploadCommand(args: Array<string>) {
return args[0] === 'versions' && args[1] === 'upload';
}

function isDeployCommand(args: Array<string>) {
if (args[0] === 'deploy') return true;
if (args[0] === 'versions' && args[1] === 'upload') return true;
if (isVersionsUploadCommand(args)) return true;
return false;
}

Expand Down Expand Up @@ -314,13 +318,16 @@ async function handleDeploy(args: Array<string>) {
let exitCode = process.exitCode ?? 0;
try {
debug('deploy: spawning wrangler');
exitCode = await spawnWrangler([...args, ...varFlags, '--secrets-file', tmp.filePath, '--keep-vars=false']);
const wranglerArgs = [...args, ...varFlags, '--secrets-file', tmp.filePath];
if (!isVersionsUploadCommand(args)) wranglerArgs.push('--keep-vars=false');
exitCode = await spawnWrangler(wranglerArgs);
debug('deploy: wrangler exited with code', exitCode);
} finally {
debug('deploy: cleaning up');
handle.stop();
tmp.cleanup();
}
process.exitCode = exitCode;
}

async function handleTypes(args: Array<string>) {
Expand Down Expand Up @@ -356,6 +363,7 @@ async function handleTypes(args: Array<string>) {
handle.stop();
tmp.cleanup();
}
process.exitCode = exitCode;
}

async function handleDev(args: Array<string>) {
Expand Down
Loading