@quickback-dev/cli 0.66.8 → 0.66.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/build.d.ts.map +1 -1
- package/dist/commands/build.js +11 -1
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/build.test.js +53 -2
- package/dist/commands/build.test.js.map +1 -1
- package/dist/commands/canary.d.ts +17 -5
- package/dist/commands/canary.d.ts.map +1 -1
- package/dist/commands/canary.js +34 -24
- package/dist/commands/canary.js.map +1 -1
- package/dist/commands/canary.test.d.ts +2 -0
- package/dist/commands/canary.test.d.ts.map +1 -0
- package/dist/commands/canary.test.js +100 -0
- package/dist/commands/canary.test.js.map +1 -0
- package/dist/commands/deploy.d.ts +14 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +49 -19
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/deploy.test.d.ts +2 -0
- package/dist/commands/deploy.test.d.ts.map +1 -0
- package/dist/commands/deploy.test.js +139 -0
- package/dist/commands/deploy.test.js.map +1 -0
- package/dist/index.js +3 -3
- package/dist/lib/compile-next-steps.d.ts.map +1 -1
- package/dist/lib/compile-next-steps.js +12 -5
- package/dist/lib/compile-next-steps.js.map +1 -1
- package/dist/lib/deployment-target.d.ts +29 -0
- package/dist/lib/deployment-target.d.ts.map +1 -0
- package/dist/lib/deployment-target.js +46 -0
- package/dist/lib/deployment-target.js.map +1 -0
- package/dist/lib/deployment-target.test.d.ts +2 -0
- package/dist/lib/deployment-target.test.d.ts.map +1 -0
- package/dist/lib/deployment-target.test.js +27 -0
- package/dist/lib/deployment-target.test.js.map +1 -0
- package/dist/lib/neon-canary.d.ts +4 -0
- package/dist/lib/neon-canary.d.ts.map +1 -1
- package/dist/lib/neon-canary.js +24 -4
- package/dist/lib/neon-canary.js.map +1 -1
- package/dist/lib/neon-canary.test.js +39 -3
- package/dist/lib/neon-canary.test.js.map +1 -1
- package/dist/lib/neon-target.d.ts +5 -48
- package/dist/lib/neon-target.d.ts.map +1 -1
- package/dist/lib/neon-target.js +18 -42
- package/dist/lib/neon-target.js.map +1 -1
- package/dist/lib/neon-target.test.js +26 -4
- package/dist/lib/neon-target.test.js.map +1 -1
- package/dist/lib/shell.d.ts +10 -0
- package/dist/lib/shell.d.ts.map +1 -1
- package/dist/lib/shell.js +20 -0
- package/dist/lib/shell.js.map +1 -1
- package/dist/lib/shell.test.js +35 -1
- package/dist/lib/shell.test.js.map +1 -1
- package/dist/lib/wrangler-resources.d.ts +1 -1
- package/dist/lib/wrangler-resources.d.ts.map +1 -1
- package/dist/lib/wrangler-resources.js +20 -9
- package/dist/lib/wrangler-resources.js.map +1 -1
- package/dist/lib/wrangler-resources.test.js +20 -0
- package/dist/lib/wrangler-resources.test.js.map +1 -1
- package/dist/schema-engine/index.js +3 -0
- package/dist/schema-engine/index.js.map +2 -2
- package/dist/schema-engine/provider-dialects.d.ts +1 -1
- package/dist/schema-engine/provider-dialects.d.ts.map +1 -1
- package/dist/skill/docs/configure/providers.md +18 -3
- package/dist/skill/docs/platform/database/index.md +7 -2
- package/dist/skill/docs/platform/database/neon.md +37 -2
- package/dist/skill/docs/platform/database/planetscale-postgres.md +205 -0
- package/dist/skill/docs/start/deploy.md +30 -0
- package/dist/skill/docs/tooling/cli.md +41 -0
- package/package.json +1 -1
- package/src/skill/docs/configure/providers.md +18 -3
- package/src/skill/docs/platform/database/index.md +7 -2
- package/src/skill/docs/platform/database/neon.md +37 -2
- package/src/skill/docs/platform/database/planetscale-postgres.md +205 -0
- package/src/skill/docs/start/deploy.md +30 -0
- package/src/skill/docs/tooling/cli.md +41 -0
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { afterEach, expect, test } from 'bun:test';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { canary } from './canary.js';
|
|
6
|
+
const roots = [];
|
|
7
|
+
afterEach(async () => { for (const root of roots.splice(0))
|
|
8
|
+
await fs.rm(root, { recursive: true, force: true }); });
|
|
9
|
+
async function fixture() {
|
|
10
|
+
const root = await fs.mkdtemp(join(tmpdir(), 'quickback-canary-'));
|
|
11
|
+
roots.push(root);
|
|
12
|
+
await fs.mkdir(join(root, 'quickback', 'drizzle', 'meta'), { recursive: true });
|
|
13
|
+
await fs.writeFile(join(root, 'quickback', 'drizzle', 'meta', '_journal.json'), '{"entries":[]}');
|
|
14
|
+
const sqlPath = join(root, 'quickback', 'drizzle', '0000.sql');
|
|
15
|
+
await fs.writeFile(sqlPath, 'SELECT 1;');
|
|
16
|
+
const config = { preset: 'cloudflare', name: 'app', neon: { role: 'quickback_admin', database: 'appdb' },
|
|
17
|
+
providers: { database: { name: 'neon' } },
|
|
18
|
+
environments: { dev: { name: 'app-dev', branch: 'development-branch', worker: { env: 'preview-blue' } } },
|
|
19
|
+
};
|
|
20
|
+
const calls = [];
|
|
21
|
+
const connections = [];
|
|
22
|
+
const runs = [];
|
|
23
|
+
const client = {
|
|
24
|
+
getProjectId: () => 'project',
|
|
25
|
+
getBranchByName: async (name) => { calls.push(`get:${name}`); return { id: 'parent' }; },
|
|
26
|
+
createBranch: async () => { calls.push('create'); return { branchId: 'rehearsal', connectionUris: [{ connection_uri: 'postgresql://wrong_owner:example@wrong.test/wrong' }] }; },
|
|
27
|
+
getConnectionString: async (params) => {
|
|
28
|
+
connections.push(params);
|
|
29
|
+
return `postgresql://${params.role}:test-only@${params.branchId}.example.test/${params.database}`;
|
|
30
|
+
},
|
|
31
|
+
schemaDiff: async () => { calls.push('diff'); return 'SELECT 1;'; },
|
|
32
|
+
deleteBranch: async () => { calls.push('delete'); },
|
|
33
|
+
};
|
|
34
|
+
const deps = {
|
|
35
|
+
findConfigPath: async () => join(root, 'quickback', 'quickback.config.ts'),
|
|
36
|
+
loadConfig: async () => config,
|
|
37
|
+
processEnv: { NEON_API_KEY: 'test-only', NEON_PROJECT_ID: 'project' },
|
|
38
|
+
createClient: () => { calls.push('client'); return client; },
|
|
39
|
+
runCommand: async (command, args, options) => { runs.push({ command, args, env: options?.env }); },
|
|
40
|
+
};
|
|
41
|
+
return { root, sqlPath, config, client, calls, connections, runs, deps };
|
|
42
|
+
}
|
|
43
|
+
test('required apply uses logical branch and equivalent migration role/database for both phases', async () => {
|
|
44
|
+
const f = await fixture();
|
|
45
|
+
await canary(['dev', '--required', '--apply'], f.deps);
|
|
46
|
+
expect(f.calls).toEqual(['client', 'get:development-branch', 'create', 'diff', 'delete']);
|
|
47
|
+
expect(f.connections).toEqual([
|
|
48
|
+
{ branchId: 'rehearsal', role: 'quickback_admin', database: 'appdb' },
|
|
49
|
+
{ branchId: 'parent', role: 'quickback_admin', database: 'appdb' },
|
|
50
|
+
]);
|
|
51
|
+
expect(f.runs.map(({ command, args }) => [command, ...args])).toEqual([['npx', 'drizzle-kit', 'migrate'], ['npx', 'drizzle-kit', 'migrate']]);
|
|
52
|
+
expect(f.runs[0].env?.DATABASE_MIGRATION_URL).toContain('@rehearsal.');
|
|
53
|
+
expect(f.runs[1].env?.DATABASE_MIGRATION_URL).toContain('@parent.');
|
|
54
|
+
expect(f.runs[1].env?.DATABASE_URL).toBe(f.runs[1].env?.DATABASE_MIGRATION_URL);
|
|
55
|
+
});
|
|
56
|
+
test('optional missing credentials skips, required fails, neither reaches Neon', async () => {
|
|
57
|
+
const f = await fixture();
|
|
58
|
+
f.deps.processEnv = {};
|
|
59
|
+
await canary(['dev'], f.deps);
|
|
60
|
+
await expect(canary(['dev', '--required'], f.deps)).rejects.toThrow(/required/);
|
|
61
|
+
expect(f.calls).toEqual([]);
|
|
62
|
+
expect(f.runs).toEqual([]);
|
|
63
|
+
});
|
|
64
|
+
test('required invocation without a target fails', async () => {
|
|
65
|
+
const f = await fixture();
|
|
66
|
+
await expect(canary(['--required'], f.deps)).rejects.toThrow(/needs a logical target/);
|
|
67
|
+
expect(f.calls).toEqual([]);
|
|
68
|
+
});
|
|
69
|
+
test('optional genuinely unmapped Neon skips but named typo fails', async () => {
|
|
70
|
+
const f = await fixture();
|
|
71
|
+
await expect(canary(['unknown'], f.deps)).rejects.toThrow(/Unknown deployment target/);
|
|
72
|
+
delete f.config.environments;
|
|
73
|
+
await canary(['dev'], f.deps);
|
|
74
|
+
await expect(canary(['dev', '--required'], f.deps)).rejects.toThrow(/branch mapping/);
|
|
75
|
+
expect(f.calls).toEqual([]);
|
|
76
|
+
});
|
|
77
|
+
test('PlanetScale-like provider with NEON variables never invokes Neon', async () => {
|
|
78
|
+
const f = await fixture();
|
|
79
|
+
f.config.providers.database.name = 'planetscale-postgres';
|
|
80
|
+
await expect(canary(['dev'], f.deps)).rejects.toThrow(/requires.*neon/);
|
|
81
|
+
expect(f.calls).toEqual([]);
|
|
82
|
+
expect(f.runs).toEqual([]);
|
|
83
|
+
});
|
|
84
|
+
test('changed SQL after rehearsal rejects real migration and still cleans up', async () => {
|
|
85
|
+
const f = await fixture();
|
|
86
|
+
const run = f.deps.runCommand;
|
|
87
|
+
f.deps.runCommand = async (...args) => { await run(...args); await fs.writeFile(f.sqlPath, 'SELECT 2;'); };
|
|
88
|
+
await expect(canary(['dev', '--apply', '--required'], f.deps)).rejects.toThrow(/SQL changed/);
|
|
89
|
+
expect(f.runs).toHaveLength(1);
|
|
90
|
+
expect(f.calls.at(-1)).toBe('delete');
|
|
91
|
+
});
|
|
92
|
+
test('cleanup failure produces nonzero status', async () => {
|
|
93
|
+
const f = await fixture();
|
|
94
|
+
f.client.deleteBranch = async () => { throw new Error('delete failed'); };
|
|
95
|
+
const statuses = [];
|
|
96
|
+
f.deps.setExitCode = (code) => { statuses.push(code); };
|
|
97
|
+
await canary(['dev', '--required'], f.deps);
|
|
98
|
+
expect(statuses).toEqual([2]);
|
|
99
|
+
});
|
|
100
|
+
//# sourceMappingURL=canary.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canary.test.js","sourceRoot":"","sources":["../../src/commands/canary.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,5 +25,18 @@
|
|
|
25
25
|
* --force overwrite config ids that differ from Cloudflare's
|
|
26
26
|
* --verbose detailed build failure output
|
|
27
27
|
*/
|
|
28
|
-
|
|
28
|
+
import { findConfigPath, loadConfig } from '../lib/file-loader.js';
|
|
29
|
+
import { runCommandArgs } from '../lib/shell.js';
|
|
30
|
+
import { type CaptureRunner } from '../lib/wrangler-resources.js';
|
|
31
|
+
export interface DeployDependencies {
|
|
32
|
+
findConfigPath?: typeof findConfigPath;
|
|
33
|
+
loadConfig?: typeof loadConfig;
|
|
34
|
+
wranglerRunner?: CaptureRunner;
|
|
35
|
+
runCommand?: typeof runCommandArgs;
|
|
36
|
+
build?: (options: {
|
|
37
|
+
syncConfig: boolean;
|
|
38
|
+
verbose: boolean;
|
|
39
|
+
}) => Promise<unknown>;
|
|
40
|
+
}
|
|
41
|
+
export declare function deploy(args: string[], deps?: DeployDependencies): Promise<void>;
|
|
29
42
|
//# sourceMappingURL=deploy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAOH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAqB,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAML,KAAK,aAAa,EAGnB,MAAM,8BAA8B,CAAC;AAwDtC,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,cAAc,CAAC;IACnC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAClF;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,kBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoQzF"}
|
package/dist/commands/deploy.js
CHANGED
|
@@ -30,10 +30,11 @@ import fs from 'fs/promises';
|
|
|
30
30
|
import pc from 'picocolors';
|
|
31
31
|
import ora from 'ora';
|
|
32
32
|
import { findConfigPath, loadConfig } from '../lib/file-loader.js';
|
|
33
|
-
import {
|
|
33
|
+
import { runCommandArgs, runCommandCapture } from '../lib/shell.js';
|
|
34
34
|
import { WranglerClient, WranglerError, buildProvisionPlan, configKeyForD1, parseWranglerToml, } from '../lib/wrangler-resources.js';
|
|
35
35
|
import { spliceProviderIds } from '../lib/config-id-splice.js';
|
|
36
36
|
import { pathExists } from '../lib/async-utils.js';
|
|
37
|
+
import { resolveDeploymentTarget } from '../lib/deployment-target.js';
|
|
37
38
|
function printDeployHelp() {
|
|
38
39
|
console.log(`
|
|
39
40
|
${pc.bold('quickback deploy')} — provision Cloudflare resources + deploy
|
|
@@ -50,6 +51,7 @@ Safe to run every time you want to ship — when nothing is missing it
|
|
|
50
51
|
goes straight to build → migrations → deploy.
|
|
51
52
|
|
|
52
53
|
${pc.bold('OPTIONS')}
|
|
54
|
+
${pc.cyan('--env <target>')} Select a logical named target (required for named projects)
|
|
53
55
|
${pc.cyan('--dry-run')} Print the provisioning plan without creating anything
|
|
54
56
|
${pc.cyan('--skip-deploy')} Provision + sync ids + rebuild, but skip migrations and deploy
|
|
55
57
|
${pc.cyan('--force')} Overwrite config ids that differ from what Cloudflare reports
|
|
@@ -74,7 +76,9 @@ ${pc.bold('AUTH')}
|
|
|
74
76
|
}
|
|
75
77
|
/** Default runner: `npx wrangler <args>` with captured output. */
|
|
76
78
|
const npxWranglerRunner = (args, opts) => runCommandCapture('npx', ['wrangler', ...args], { cwd: opts?.cwd });
|
|
77
|
-
export async function deploy(args) {
|
|
79
|
+
export async function deploy(args, deps = {}) {
|
|
80
|
+
const run = deps.runCommand ?? runCommandArgs;
|
|
81
|
+
const buildProject = deps.build ?? (async (options) => (await import('./build.js')).build(options));
|
|
78
82
|
if (args.includes('--help') || args.includes('-h')) {
|
|
79
83
|
printDeployHelp();
|
|
80
84
|
return;
|
|
@@ -85,9 +89,21 @@ export async function deploy(args) {
|
|
|
85
89
|
force: args.includes('--force'),
|
|
86
90
|
verbose: args.includes('--verbose'),
|
|
87
91
|
};
|
|
92
|
+
let logicalEnv;
|
|
93
|
+
for (let index = 0; index < args.length; index++) {
|
|
94
|
+
const arg = args[index];
|
|
95
|
+
if (arg === '--env' || arg === '-e') {
|
|
96
|
+
if (logicalEnv || !args[index + 1] || args[index + 1].startsWith('-'))
|
|
97
|
+
throw new Error('Provide one --env <logical-target>.');
|
|
98
|
+
logicalEnv = args[++index];
|
|
99
|
+
}
|
|
100
|
+
else if (!['--dry-run', '--skip-deploy', '--force', '--verbose'].includes(arg)) {
|
|
101
|
+
throw new Error(`Unknown deploy argument: ${arg}`);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
88
104
|
console.log(pc.bold('Quickback Deploy'));
|
|
89
105
|
// ── Locate project ────────────────────────────────────────────────────
|
|
90
|
-
const configPath = await findConfigPath();
|
|
106
|
+
const configPath = await (deps.findConfigPath ?? findConfigPath)();
|
|
91
107
|
if (!configPath) {
|
|
92
108
|
console.error(pc.red('\n✖ quickback.config.ts not found'));
|
|
93
109
|
console.log(pc.gray('Run from a Quickback project directory (or `quickback start` to create one).'));
|
|
@@ -95,14 +111,20 @@ export async function deploy(args) {
|
|
|
95
111
|
}
|
|
96
112
|
const quickbackDir = dirname(configPath);
|
|
97
113
|
const projectRoot = configPath.includes('/quickback/') ? dirname(quickbackDir) : process.cwd();
|
|
98
|
-
const config = await loadConfig(configPath);
|
|
114
|
+
const config = await (deps.loadConfig ?? loadConfig)(configPath);
|
|
99
115
|
const outputDir = config.build?.outputDir
|
|
100
116
|
? join(quickbackDir, config.build.outputDir)
|
|
101
117
|
: projectRoot;
|
|
102
118
|
const wranglerTomlPath = join(outputDir, 'wrangler.toml');
|
|
103
119
|
const databaseProvider = config?.providers?.database?.name;
|
|
120
|
+
// Postgres providers share one gap: this command applies D1 migrations, not
|
|
121
|
+
// Postgres ones. Naming only `neon` here left a PlanetScale Postgres deploy
|
|
122
|
+
// silently unwarned.
|
|
123
|
+
const isPostgresProvider = databaseProvider === 'neon' || databaseProvider === 'planetscale-postgres';
|
|
124
|
+
const target = resolveDeploymentTarget(config, logicalEnv);
|
|
125
|
+
const envArgs = target.wranglerEnv ? ['--env', target.wranglerEnv] : [];
|
|
104
126
|
// ── Preflight: wrangler available ─────────────────────────────────────
|
|
105
|
-
const client = new WranglerClient(npxWranglerRunner, outputDir);
|
|
127
|
+
const client = new WranglerClient(deps.wranglerRunner ?? npxWranglerRunner, outputDir);
|
|
106
128
|
const spinner = ora('Checking wrangler...').start();
|
|
107
129
|
const version = await client.version().catch(() => null);
|
|
108
130
|
if (!version) {
|
|
@@ -121,25 +143,34 @@ export async function deploy(args) {
|
|
|
121
143
|
return;
|
|
122
144
|
}
|
|
123
145
|
console.log(pc.gray('\nNo wrangler.toml found — building first...\n'));
|
|
124
|
-
|
|
125
|
-
await build({ syncConfig: true, verbose: flags.verbose });
|
|
146
|
+
await buildProject({ syncConfig: true, verbose: flags.verbose });
|
|
126
147
|
console.log('');
|
|
127
148
|
}
|
|
128
149
|
// ── Plan from the generated wrangler.toml ─────────────────────────────
|
|
129
|
-
let resources = parseWranglerToml(await fs.readFile(wranglerTomlPath, 'utf-8'));
|
|
150
|
+
let resources = parseWranglerToml(await fs.readFile(wranglerTomlPath, 'utf-8'), target.wranglerEnv);
|
|
130
151
|
let plan = buildProvisionPlan(resources);
|
|
131
152
|
const workerName = resources.workerName || config.name;
|
|
153
|
+
if (target.wranglerEnv && workerName !== target.workerName) {
|
|
154
|
+
throw new Error('Generated Worker name does not match the selected config target. Run quickback build before deploying.');
|
|
155
|
+
}
|
|
156
|
+
if (target.logicalEnv)
|
|
157
|
+
console.log(pc.gray(`Target: ${target.logicalEnv} → Worker ${workerName} (Wrangler --env ${target.wranglerEnv})`));
|
|
132
158
|
printPlan(plan, workerName);
|
|
159
|
+
for (const binding of resources.hyperdrive)
|
|
160
|
+
console.log(pc.gray(` Hyperdrive ${binding.binding}: ${binding.id}`));
|
|
133
161
|
if (plan.hyperdriveUnresolved.length > 0) {
|
|
134
162
|
console.log(pc.yellow(' ⚠ Hyperdrive binding has a placeholder id — Hyperdrive configs need a'));
|
|
135
163
|
console.log(pc.yellow(' connection string and cannot be auto-created. Create one with'));
|
|
136
164
|
console.log(pc.yellow(' `wrangler hyperdrive create <name> --connection-string=... --caching-disabled`'));
|
|
137
|
-
console.log(pc.yellow(
|
|
165
|
+
console.log(pc.yellow(` and set ${target.logicalEnv ? `environments.${target.logicalEnv}.worker.bindings.hyperdrive.id (or its legacy nested placement)` : 'providers.database.config.hyperdrive.id'} in quickback.config.ts.`));
|
|
138
166
|
}
|
|
139
167
|
if (flags.dryRun) {
|
|
140
168
|
console.log(pc.gray('\nDry run — nothing was created.'));
|
|
141
169
|
return;
|
|
142
170
|
}
|
|
171
|
+
if (target.wranglerEnv && (plan.d1ToProvision.length || plan.kvToProvision.length || plan.hyperdriveUnresolved.length)) {
|
|
172
|
+
throw new Error(`Target "${target.logicalEnv}" needs real resource IDs. Provision its resources manually, set environments.${target.logicalEnv}.worker.bindings (or the legacy nested placement), then run quickback build. Named deployment does not write global provider IDs.`);
|
|
173
|
+
}
|
|
143
174
|
// ── Preflight: wrangler authenticated (needed for provisioning AND deploy) ──
|
|
144
175
|
const auth = await client.whoami();
|
|
145
176
|
if (!auth.ok) {
|
|
@@ -246,10 +277,9 @@ export async function deploy(args) {
|
|
|
246
277
|
console.log(pc.gray(`\n Synced ${result.applied.length} resource id(s) into ${pc.cyan(relative(projectRoot, configPath) || configPath)} (${keys})`));
|
|
247
278
|
// Rebuild so wrangler.toml regenerates with the real ids.
|
|
248
279
|
console.log(pc.gray('\nRebuilding with real resource ids...\n'));
|
|
249
|
-
|
|
250
|
-
await build({ syncConfig: true, verbose: flags.verbose });
|
|
280
|
+
await buildProject({ syncConfig: true, verbose: flags.verbose });
|
|
251
281
|
console.log('');
|
|
252
|
-
resources = parseWranglerToml(await fs.readFile(wranglerTomlPath, 'utf-8'));
|
|
282
|
+
resources = parseWranglerToml(await fs.readFile(wranglerTomlPath, 'utf-8'), target.wranglerEnv);
|
|
253
283
|
plan = buildProvisionPlan(resources);
|
|
254
284
|
if (plan.d1ToProvision.length > 0 || plan.kvToProvision.length > 0) {
|
|
255
285
|
console.log(pc.yellow(' ⚠ wrangler.toml still contains placeholder ids after rebuild — deploy may fail.'));
|
|
@@ -258,7 +288,7 @@ export async function deploy(args) {
|
|
|
258
288
|
}
|
|
259
289
|
if (flags.skipDeploy) {
|
|
260
290
|
console.log(pc.green('\n✔ Provisioning complete (deploy skipped).'));
|
|
261
|
-
console.log(pc.gray(
|
|
291
|
+
console.log(pc.gray(` Ship it with quickback deploy${target.logicalEnv ? ` --env ${target.logicalEnv}` : ''}.`));
|
|
262
292
|
return;
|
|
263
293
|
}
|
|
264
294
|
// ── Apply D1 migrations remotely ───────────────────────────────────────
|
|
@@ -276,18 +306,18 @@ export async function deploy(args) {
|
|
|
276
306
|
if (migratable.length > 0) {
|
|
277
307
|
console.log(pc.bold('\nApplying D1 migrations (remote)...'));
|
|
278
308
|
for (const db of migratable) {
|
|
279
|
-
console.log(pc.gray(`\n→ npx wrangler d1 migrations apply ${db.databaseName} --remote`));
|
|
280
|
-
await
|
|
309
|
+
console.log(pc.gray(`\n→ npx wrangler d1 migrations apply ${db.databaseName} --remote ${envArgs.join(' ')}`));
|
|
310
|
+
await run('npx', ['wrangler', 'd1', 'migrations', 'apply', db.databaseName, '--remote', ...envArgs], { cwd: outputDir });
|
|
281
311
|
}
|
|
282
312
|
}
|
|
283
|
-
if (
|
|
284
|
-
console.log(pc.yellow(
|
|
313
|
+
if (isPostgresProvider) {
|
|
314
|
+
console.log(pc.yellow(`\n⚠ ${databaseProvider} database — this command does not apply Postgres migrations.`));
|
|
285
315
|
console.log(pc.gray(' Run `npm run db:migrate` (requires DATABASE_MIGRATION_URL) before traffic hits the worker.'));
|
|
286
316
|
}
|
|
287
317
|
// ── Deploy ─────────────────────────────────────────────────────────────
|
|
288
318
|
console.log(pc.bold('\nDeploying...'));
|
|
289
|
-
console.log(pc.gray(`\n→ npx wrangler deploy\n`));
|
|
290
|
-
await
|
|
319
|
+
console.log(pc.gray(`\n→ npx wrangler deploy ${envArgs.join(' ')}\n`));
|
|
320
|
+
await run('npx', ['wrangler', 'deploy', ...envArgs], { cwd: outputDir });
|
|
291
321
|
console.log(pc.green(`\n✔ Deployed ${pc.cyan(workerName)}`));
|
|
292
322
|
}
|
|
293
323
|
function printPlan(plan, workerName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deploy.test.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { afterEach, expect, test } from 'bun:test';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { deploy } from './deploy.js';
|
|
6
|
+
const roots = [];
|
|
7
|
+
afterEach(async () => { for (const root of roots.splice(0))
|
|
8
|
+
await fs.rm(root, { recursive: true, force: true }); });
|
|
9
|
+
async function fixture(named = true, placeholder = false) {
|
|
10
|
+
const root = await fs.mkdtemp(join(tmpdir(), 'quickback-target-'));
|
|
11
|
+
roots.push(root);
|
|
12
|
+
await fs.mkdir(join(root, 'quickback', 'drizzle'), { recursive: true });
|
|
13
|
+
await fs.writeFile(join(root, 'quickback', 'drizzle', '0000.sql'), 'CREATE TABLE example (id TEXT);');
|
|
14
|
+
const config = { preset: 'cloudflare', name: 'base', providers: { database: { name: 'cloudflare-d1' } },
|
|
15
|
+
...(named ? { environments: {
|
|
16
|
+
dev: { name: 'existing-dev-worker', worker: { env: 'preview-blue' } },
|
|
17
|
+
prod: { name: 'existing-production-worker', worker: { env: 'live' } },
|
|
18
|
+
} } : {}),
|
|
19
|
+
};
|
|
20
|
+
const toml = `name = "base"
|
|
21
|
+
[[d1_databases]]
|
|
22
|
+
binding = "DB"
|
|
23
|
+
database_name = "global-db"
|
|
24
|
+
database_id = "global-id"
|
|
25
|
+
migrations_dir = "quickback/drizzle"
|
|
26
|
+
[env.preview-blue]
|
|
27
|
+
name = "existing-dev-worker"
|
|
28
|
+
[[env.preview-blue.d1_databases]]
|
|
29
|
+
binding = "DB"
|
|
30
|
+
database_name = "dev-db"
|
|
31
|
+
database_id = "${placeholder ? 'local' : 'dev-id'}"
|
|
32
|
+
migrations_dir = "quickback/drizzle"
|
|
33
|
+
[env.live]
|
|
34
|
+
name = "existing-production-worker"
|
|
35
|
+
[[env.live.d1_databases]]
|
|
36
|
+
binding = "DB"
|
|
37
|
+
database_name = "prod-db"
|
|
38
|
+
database_id = "prod-id"
|
|
39
|
+
migrations_dir = "quickback/drizzle"
|
|
40
|
+
`;
|
|
41
|
+
await fs.writeFile(join(root, 'wrangler.toml'), toml);
|
|
42
|
+
const capture = [];
|
|
43
|
+
const writes = [];
|
|
44
|
+
const deps = {
|
|
45
|
+
findConfigPath: async () => join(root, 'quickback', 'quickback.config.ts'),
|
|
46
|
+
loadConfig: async () => config,
|
|
47
|
+
wranglerRunner: async (args) => {
|
|
48
|
+
capture.push(args);
|
|
49
|
+
return { code: 0, stdout: args[0] === '--version' ? '4.118.0' : 'You are logged in with an OAuth Token, associated with the email test@example.test!', stderr: '' };
|
|
50
|
+
},
|
|
51
|
+
runCommand: async (command, args) => { writes.push([command, ...args]); },
|
|
52
|
+
build: async () => { },
|
|
53
|
+
};
|
|
54
|
+
return { root, config, capture, writes, deps };
|
|
55
|
+
}
|
|
56
|
+
test('deploy --env logical selects hyphenated Wrangler env for migration and upload', async () => {
|
|
57
|
+
const f = await fixture();
|
|
58
|
+
await deploy(['--env', 'dev'], f.deps);
|
|
59
|
+
expect(f.writes).toEqual([
|
|
60
|
+
['npx', 'wrangler', 'd1', 'migrations', 'apply', 'dev-db', '--remote', '--env', 'preview-blue'],
|
|
61
|
+
['npx', 'wrangler', 'deploy', '--env', 'preview-blue'],
|
|
62
|
+
]);
|
|
63
|
+
});
|
|
64
|
+
test('unnamed D1 behavior remains top-level migrations then bare deploy', async () => {
|
|
65
|
+
const f = await fixture(false);
|
|
66
|
+
await deploy([], f.deps);
|
|
67
|
+
expect(f.writes).toEqual([
|
|
68
|
+
['npx', 'wrangler', 'd1', 'migrations', 'apply', 'global-db', '--remote'],
|
|
69
|
+
['npx', 'wrangler', 'deploy'],
|
|
70
|
+
]);
|
|
71
|
+
});
|
|
72
|
+
test('missing, unknown and duplicate named targets reject before external commands', async () => {
|
|
73
|
+
const f = await fixture();
|
|
74
|
+
await expect(deploy([], f.deps)).rejects.toThrow(/explicit target/);
|
|
75
|
+
await expect(deploy(['--env', 'live'], f.deps)).rejects.toThrow(/Unknown/);
|
|
76
|
+
f.config.providers.database.environments = f.config.environments;
|
|
77
|
+
await expect(deploy(['--env', 'dev'], f.deps)).rejects.toThrow(/not both/);
|
|
78
|
+
expect(f.capture).toEqual([]);
|
|
79
|
+
expect(f.writes).toEqual([]);
|
|
80
|
+
});
|
|
81
|
+
test('named placeholders reject before provisioning, even with force', async () => {
|
|
82
|
+
const f = await fixture(true, true);
|
|
83
|
+
await expect(deploy(['--env', 'dev', '--force'], f.deps)).rejects.toThrow(/Named deployment does not write global/);
|
|
84
|
+
expect(f.capture).toEqual([['--version']]);
|
|
85
|
+
expect(f.writes).toEqual([]);
|
|
86
|
+
});
|
|
87
|
+
test('dry-run reports without mutations and skip-deploy skips migration/upload', async () => {
|
|
88
|
+
const f = await fixture();
|
|
89
|
+
await deploy(['--env', 'dev', '--dry-run'], f.deps);
|
|
90
|
+
expect(f.capture).toEqual([['--version']]);
|
|
91
|
+
expect(f.writes).toEqual([]);
|
|
92
|
+
await deploy(['--env', 'dev', '--skip-deploy'], f.deps);
|
|
93
|
+
expect(f.writes).toEqual([]);
|
|
94
|
+
});
|
|
95
|
+
test('stale generated Worker identity stops before provisioning', async () => {
|
|
96
|
+
const f = await fixture();
|
|
97
|
+
f.config.environments.dev.name = 'changed-name';
|
|
98
|
+
await expect(deploy(['--env', 'dev'], f.deps)).rejects.toThrow(/does not match/);
|
|
99
|
+
expect(f.capture).toEqual([['--version']]);
|
|
100
|
+
expect(f.writes).toEqual([]);
|
|
101
|
+
});
|
|
102
|
+
test('migration failure never uploads the Worker', async () => {
|
|
103
|
+
const f = await fixture();
|
|
104
|
+
f.deps.runCommand = async (command, args) => { f.writes.push([command, ...args]); throw new Error('migration failed'); };
|
|
105
|
+
await expect(deploy(['--env', 'dev'], f.deps)).rejects.toThrow(/migration failed/);
|
|
106
|
+
expect(f.writes).toHaveLength(1);
|
|
107
|
+
expect(f.writes[0]).toContain('migrations');
|
|
108
|
+
});
|
|
109
|
+
test('legacy nested placement routes to the same explicit Worker', async () => {
|
|
110
|
+
const f = await fixture();
|
|
111
|
+
f.config.providers.database.environments = f.config.environments;
|
|
112
|
+
delete f.config.environments;
|
|
113
|
+
await deploy(['--env', 'dev'], f.deps);
|
|
114
|
+
expect(f.writes.at(-1)).toEqual(['npx', 'wrangler', 'deploy', '--env', 'preview-blue']);
|
|
115
|
+
});
|
|
116
|
+
test('only selected R2 bucket can be provisioned', async () => {
|
|
117
|
+
const f = await fixture();
|
|
118
|
+
await fs.appendFile(join(f.root, 'wrangler.toml'), `
|
|
119
|
+
[[env.preview-blue.r2_buckets]]
|
|
120
|
+
binding = "FILES"
|
|
121
|
+
bucket_name = "dev-files"
|
|
122
|
+
[[env.live.r2_buckets]]
|
|
123
|
+
binding = "FILES"
|
|
124
|
+
bucket_name = "prod-files"
|
|
125
|
+
`);
|
|
126
|
+
const runner = f.deps.wranglerRunner;
|
|
127
|
+
f.deps.wranglerRunner = async (args, options) => {
|
|
128
|
+
if (args[0] === 'r2') {
|
|
129
|
+
f.capture.push(args);
|
|
130
|
+
return { code: 0, stdout: args.includes('list') ? '[]' : '', stderr: '' };
|
|
131
|
+
}
|
|
132
|
+
return runner(args, options);
|
|
133
|
+
};
|
|
134
|
+
await deploy(['--env', 'dev', '--skip-deploy'], f.deps);
|
|
135
|
+
expect(f.capture.some((args) => args.includes('dev-files') && args.includes('create'))).toBe(true);
|
|
136
|
+
expect(f.capture.flat()).not.toContain('prod-files');
|
|
137
|
+
expect(f.writes).toEqual([]);
|
|
138
|
+
});
|
|
139
|
+
//# sourceMappingURL=deploy.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deploy.test.js","sourceRoot":"","sources":["../../src/commands/deploy.test.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import pc from "picocolors";
|
|
12
12
|
// Version injected at build time by scripts/inject-version.ts
|
|
13
|
-
const CLI_VERSION = "0.66.
|
|
13
|
+
const CLI_VERSION = "0.66.9";
|
|
14
14
|
function getPackageVersion() {
|
|
15
15
|
return CLI_VERSION;
|
|
16
16
|
}
|
|
@@ -53,10 +53,10 @@ ${pc.bold("COMMANDS")}
|
|
|
53
53
|
${pc.cyan("check")} [--watch] Typecheck the authored quickback/ tree (no build; CI-friendly)
|
|
54
54
|
${pc.cyan("migrate")} <codemod> Authored-source codemods (visible-columns, helper-imports)
|
|
55
55
|
${pc.cyan("schema")} <subcommand> Check or synchronize managed schema columns
|
|
56
|
-
${pc.cyan("deploy")}
|
|
56
|
+
${pc.cyan("deploy")} [--env <target>] Provision Cloudflare resources + deploy (D1/KV/R2, id sync, migrations)
|
|
57
57
|
${pc.cyan("dev")} Run wrangler dev (prints named-subdomain URLs)
|
|
58
58
|
${pc.cyan("migrations")} <subcommand> Inspect/repair drizzle migration state (try: doctor)
|
|
59
|
-
${pc.cyan("canary")} <env> [--
|
|
59
|
+
${pc.cyan("canary")} <env> [--required] Verify Neon migrations; --apply also migrates the parent
|
|
60
60
|
${pc.cyan("docs")} [topic] Show built-in documentation
|
|
61
61
|
${pc.cyan("claude")} <command> Manage Claude Code skill
|
|
62
62
|
${pc.cyan("cursor")} <command> Manage Cursor IDE rules
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-next-steps.d.ts","sourceRoot":"","sources":["../../src/lib/compile-next-steps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"compile-next-steps.d.ts","sourceRoot":"","sources":["../../src/lib/compile-next-steps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAwCrD,mEAAmE;AACnE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,CA4DlE"}
|
|
@@ -11,12 +11,19 @@ function knownUnnamedRuntimeSecrets(config) {
|
|
|
11
11
|
}
|
|
12
12
|
return [...secrets];
|
|
13
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Registered Postgres providers. `planetscale-postgres` is Hyperdrive-only:
|
|
16
|
+
* an omitted connectionMode is Hyperdrive, never Neon's HTTP lane.
|
|
17
|
+
*/
|
|
18
|
+
const POSTGRES_PROVIDERS = ['neon', 'planetscale-postgres'];
|
|
14
19
|
/** Configuration-aware footer shown after a successful compile. */
|
|
15
20
|
export function getCompileNextSteps(config) {
|
|
16
21
|
const database = config.providers?.database;
|
|
17
|
-
if (database?.name
|
|
22
|
+
if (!database?.name || !POSTGRES_PROVIDERS.includes(database.name))
|
|
18
23
|
return ['npm run dev'];
|
|
19
|
-
|
|
24
|
+
const hyperdrive = database.name === 'planetscale-postgres' || database.config?.connectionMode === 'hyperdrive';
|
|
25
|
+
const host = database.name === 'planetscale-postgres' ? 'PlanetScale Postgres' : 'Neon';
|
|
26
|
+
if (!hyperdrive) {
|
|
20
27
|
return [
|
|
21
28
|
'1. cp .env.neon.example .env # drizzle-kit credentials (DATABASE_URL / DATABASE_MIGRATION_URL)',
|
|
22
29
|
'2. npm run db:migrate # apply schema + RLS migrations to Neon',
|
|
@@ -44,21 +51,21 @@ export function getCompileNextSteps(config) {
|
|
|
44
51
|
})
|
|
45
52
|
.join('; ');
|
|
46
53
|
return [
|
|
47
|
-
|
|
54
|
+
`1. Set DATABASE_MIGRATION_URL in .env or CI for the intended ${host} branch # migrations only; never a Worker secret`,
|
|
48
55
|
`2. npm run db:migrate # run against each target branch: ${migrationTargets}`,
|
|
49
56
|
`3. npm run dev # Wrangler --env ${devWranglerTarget}; uses that target's Hyperdrive localConnectionString`,
|
|
50
57
|
`4. npx wrangler secret put <NAME> --env <target> # ${secretInventory}`,
|
|
51
58
|
`5. npx wrangler deploy --env <target> # explicit targets: ${wranglerTargets}`,
|
|
52
59
|
];
|
|
53
60
|
}
|
|
54
|
-
const hasLocalConnection = !!database.config
|
|
61
|
+
const hasLocalConnection = !!database.config?.hyperdrive?.localConnectionString;
|
|
55
62
|
const secrets = knownUnnamedRuntimeSecrets(config);
|
|
56
63
|
const secretHint = secrets.length > 0
|
|
57
64
|
? secrets.join(', ')
|
|
58
65
|
: 'the generated required-secret inventory';
|
|
59
66
|
return [
|
|
60
67
|
'1. Set DATABASE_MIGRATION_URL in .env or CI # migrations only; never a Worker secret',
|
|
61
|
-
|
|
68
|
+
`2. npm run db:migrate # apply schema + RLS migrations to ${host}`,
|
|
62
69
|
hasLocalConnection
|
|
63
70
|
? '3. npm run dev # uses the configured Hyperdrive localConnectionString'
|
|
64
71
|
: '3. Configure providers.database.config.hyperdrive.localConnectionString, then run npm run dev',
|