@mediamonks/canopy-cli 0.7.10 → 0.7.12

package/dist/{deploy-BKFICJT1.mjs → deploy-B1WrPq5W.mjs}

@@ -113,6 +113,12 @@ const deployCommand = defineCommand({
 			type: "boolean",
 			default: false,
 			description: "Deploy to the project's staging channel (created on first use, database cloned from live)"
+		},
+		worker: {
+			type: "boolean",
+			default: true,
+			description: "Include the backend worker from canopy.json",
+			negativeDescription: "Deploy the frontend only — for sites whose target hosts no per-project backends"
 		}
 	},
 	run: reportErrors("deploy", async ({ args }) => {
@@ -145,7 +151,8 @@ const deployCommand = defineCommand({
 			});
 		}
 		let workerBytes = null;
-		if (config.worker) {
+		if (config.worker && !args.worker) p.log.warn(`Skipping the backend (${config.worker}) — deploying the frontend only.`);
+		if (config.worker && args.worker) {
 			const spinWorker = p.spinner();
 			spinWorker.start(`Bundling worker ${config.worker}`);
 			try {
@@ -185,7 +192,10 @@ const deployCommand = defineCommand({
 					throw err;
 				}
 			}
-			({deploy: result} = await withContext(apiRequest("POST", `/projects/${slug}/deploys/${upload.version}/complete`, { grant: upload.grant }, void 0, source), { action: `deploy "${slug}"` }));
+			({deploy: result} = await withContext(apiRequest("POST", `/projects/${slug}/deploys/${upload.version}/complete`, {
+				grant: upload.grant,
+				migrations: migrateResult?.appliedNow ?? []
+			}, void 0, source), { action: `deploy "${slug}"` }));
 		} catch (err) {
 			spin.error("Deploy failed.");
 			throw err;

package/dist/{dev-DtoZrexp.mjs → dev-BnUYGQQm.mjs}

@@ -37,7 +37,7 @@ async function workerPlugin(flags, slug) {
 		console.log(`note: canopy.json points "worker" at ${entry}, which does not exist — skipping.`);
 		return;
 	}
-	const { missingSecretNames, readDevVars, workerDevPlugin } = await import("./dev-worker-BZgtEM9V.mjs");
+	const { missingSecretNames, readDevVars, workerDevPlugin } = await import("./dev-worker-IWnHvQ1f.mjs");
 	const secrets = readDevVars(flags.dir);
 	const email = siteConfig().email;
 	const plugin = workerDevPlugin({
@@ -165,7 +165,7 @@ async function devRemote(flags, slug) {
 async function devLocal(flags, slug) {
 	let dump;
 	if (flags.pull) {
-		const { fetchProjectDump } = await import("./local-C5AhA4GM.mjs");
+		const { fetchProjectDump } = await import("./local-BGRd_FMZ.mjs");
 		console.log(`Pulling a fresh export of ${slug}${flags.staging ? " [staging]" : ""}…`);
 		dump = await fetchProjectDump(slug, flags.staging ? "staging" : "live");
 	}
@@ -180,7 +180,7 @@ async function devLocal(flags, slug) {
 		const reason = err instanceof ApiError ? err.explain().why : String(err);
 		console.log(`Note: ai/services will be unavailable — could not reach the platform (${reason}).`);
 	}
-	const { createSandbox } = await import("./local-C5AhA4GM.mjs");
+	const { createSandbox } = await import("./local-BGRd_FMZ.mjs");
 	const sandbox = await createSandbox({
 		slug,
 		persistDir: join(flags.dir, ".canopy", "local"),
@@ -233,7 +233,8 @@ async function devLocal(flags, slug) {
 	const server = await startVite(flags, { proxy: {
 		...remoteEntry && {
 			"/_api/data/v1/ai": remoteEntry,
-			"/_api/data/v1/services": remoteEntry
+			"/_api/data/v1/services": remoteEntry,
+			"/_api/data/v1/google": remoteEntry
 		},
 		"/_api": {
 			target: `http://127.0.0.1:${apiAddress.port}`,

package/dist/dev-CySBxW7I.mjs

@@ -0,0 +1,2 @@
+import { t as devCommand } from "./dev-BnUYGQQm.mjs";
+export { devCommand };

package/dist/{dev-worker-BZgtEM9V.mjs → dev-worker-IWnHvQ1f.mjs}

@@ -1,5 +1,43 @@
+import "./src-Bu4Ze32I.mjs";
 import { readFileSync } from "node:fs";
 import { relative, resolve, sep } from "node:path";
+//#region ../data-plane/src/worker-request.ts
+/**
+* How a project's backend addresses the platform — the one definition.
+*
+* Three hosts run project workers and each builds this request itself: the
+* Workers-for-Platforms shim (apps/api/src/platform/wfp-shim.ts), the Node
+* runtime (apps/project-runtime/src/canopy-fetch.ts), and `canopy dev`
+* (packages/cli/src/dev-worker.ts). They had three copies of the header
+* shaping, and the two that hold a worker token had two copies of the
+* credential rule — which is exactly how the Google project grant came to
+* work on one target and not the other.
+*
+* The shim cannot import this: it ships as a standalone module uploaded
+* beside the user bundle, so it may only import `./bundle.mjs`. It keeps a
+* transcription, and `wfp-shim.test.ts` runs it against the table in
+* `worker-request.cases.ts` alongside this implementation, so the two cannot
+* drift silently.
+*/
+/** Gateway-stamped identity, for the worker's own `env.USER` — never relayed. */
+const IDENTITY_STAMP_HEADERS = [
+	"x-canopy-user-sub",
+	"x-canopy-user-email",
+	"x-canopy-user-name"
+];
+/**
+* Strip what must never travel upstream and stamp who is calling. Common to
+* every host; says nothing about credentials.
+*/
+function stampWorkerHeaders(headers, ctx) {
+	headers.delete("host");
+	for (const stamp of IDENTITY_STAMP_HEADERS) headers.delete(stamp);
+	headers.set("x-canopy-project", ctx.projectSlug);
+	if (ctx.channel === "staging") headers.set("x-canopy-channel", "staging");
+	else headers.delete("x-canopy-channel");
+	return headers;
+}
+//#endregion
 //#region src/dev-worker.ts
 /**
 * Paths that belong to the worker rather than the SPA — the gateway's rule
@@ -79,15 +117,12 @@ function rewriteCanopyUrl(raw, base) {
 function createCanopyFetch(apiBase, slug, channel, fetchImpl = fetch) {
 	return async (input, init) => {
 		const url = rewriteCanopyUrl(typeof input === "string" ? input : input instanceof URL ? input.href : input.url, apiBase());
-		const headers = new Headers(input instanceof Request ? input.headers : init?.headers);
-		headers.delete("host");
-		headers.delete("x-canopy-user-sub");
-		headers.delete("x-canopy-user-email");
-		headers.delete("x-canopy-user-name");
+		const headers = stampWorkerHeaders(new Headers(input instanceof Request ? input.headers : init?.headers), {
+			projectSlug: slug,
+			channel
+		});
 		headers.delete("authorization");
 		headers.delete("cookie");
-		headers.set("x-canopy-project", slug);
-		if (channel === "staging") headers.set("x-canopy-channel", "staging");
 		const method = (input instanceof Request ? input.method : init?.method) ?? "GET";
 		const body = input instanceof Request ? input.body : init?.body;
 		const outbound = {

package/dist/{docs-Ck9xogEV.mjs → docs-DxB7NhZs.mjs}

@@ -1,4 +1,4 @@
-import { t as version } from "./package-DRp7sI6i.mjs";
+import { t as version } from "./package-CDLufecy.mjs";
 import { n as siteConfig } from "./site-BUlQR117.mjs";
 import { i as latestKnownVersion, r as compareSemver } from "./version-check-CcsA1QjI.mjs";
 import { n as reportErrors } from "./ui-2mrJcjYC.mjs";

package/dist/{feedback-BpiCvItH.mjs → feedback-B-GXUBPs.mjs}

@@ -1,4 +1,4 @@
-import { t as version } from "./package-DRp7sI6i.mjs";
+import { t as version } from "./package-CDLufecy.mjs";
 import { a as projectDirArgs, c as resolveProject, n as siteConfig, u as tryReadCanopyJson } from "./site-BUlQR117.mjs";
 import { c as apiRequest, l as apiUpload, n as reportErrors, s as apiDownload } from "./ui-2mrJcjYC.mjs";
 import { defineCommand } from "citty";

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as version } from "./package-DRp7sI6i.mjs";
+import { t as version } from "./package-CDLufecy.mjs";
 import { r as siteHeaderLine, t as setInvocationProfile } from "./site-BUlQR117.mjs";
 import { a as notifyOfUpdate, o as runRefresh } from "./version-check-CcsA1QjI.mjs";
 import { defineCommand, runMain } from "citty";
@@ -67,21 +67,21 @@ const main = defineCommand({
 		init: () => import("./projects-C6JQjVqg.mjs").then((m) => m.initCommand),
 		projects: () => import("./projects-C6JQjVqg.mjs").then((m) => m.projectsCommand),
 		delete: () => import("./projects-C6JQjVqg.mjs").then((m) => m.deleteCommand),
-		dev: () => import("./dev-BYxSHUH6.mjs").then((m) => m.devCommand),
-		deploy: () => import("./deploy-BKFICJT1.mjs").then((m) => m.deployCommand),
-		promote: () => import("./deploy-BKFICJT1.mjs").then((m) => m.promoteCommand),
+		dev: () => import("./dev-CySBxW7I.mjs").then((m) => m.devCommand),
+		deploy: () => import("./deploy-B1WrPq5W.mjs").then((m) => m.deployCommand),
+		promote: () => import("./deploy-B1WrPq5W.mjs").then((m) => m.promoteCommand),
 		staging: () => import("./staging-Bw1D_J8M.mjs").then((m) => m.stagingCommand),
-		rollback: () => import("./deploy-BKFICJT1.mjs").then((m) => m.rollbackCommand),
-		download: () => import("./deploy-BKFICJT1.mjs").then((m) => m.downloadCommand),
+		rollback: () => import("./deploy-B1WrPq5W.mjs").then((m) => m.rollbackCommand),
+		download: () => import("./deploy-B1WrPq5W.mjs").then((m) => m.downloadCommand),
 		token: () => import("./token-D7zrIF8G.mjs").then((m) => m.tokenCommand),
 		egress: () => import("./egress-CN_axsAN.mjs").then((m) => m.egressCommand),
-		feedback: () => import("./feedback-BpiCvItH.mjs").then((m) => m.feedbackCommand),
+		feedback: () => import("./feedback-B-GXUBPs.mjs").then((m) => m.feedbackCommand),
 		db: () => import("./db-8Etjmzxh.mjs").then((m) => m.dbCommand),
 		usage: () => import("./usage-CX1Izj_l.mjs").then((m) => m.usageCommand),
 		open: () => import("./open-DRPp4QJg.mjs").then((m) => m.openCommand),
-		docs: () => import("./docs-Ck9xogEV.mjs").then((m) => m.docsCommand),
-		skill: () => import("./skill-B2sDMAmv.mjs").then((m) => m.skillCommand),
-		upgrade: () => import("./upgrade-tOfSmAcc.mjs").then((m) => m.upgradeCommand),
+		docs: () => import("./docs-DxB7NhZs.mjs").then((m) => m.docsCommand),
+		skill: () => import("./skill-BOWfqwr2.mjs").then((m) => m.skillCommand),
+		upgrade: () => import("./upgrade-fhfrid_O.mjs").then((m) => m.upgradeCommand),
 		logs: () => import("./logs-DNiZquki.mjs").then((m) => m.logsCommand)
 	}
 });