diff --git a/.changeset/workers-sdk-config-rc.md b/.changeset/workers-sdk-config-rc.md new file mode 100644 index 0000000000..e241f3f76e --- /dev/null +++ b/.changeset/workers-sdk-config-rc.md @@ -0,0 +1,20 @@ +--- +"cf": minor +--- + +Support the Cloudflare config 1.0 release candidate and Build Output v1 + +cf now reads and writes Build Output under `.cloudflare/output/v1/`. The root +`config.json` keeps account settings under `settings` and records cf as its +`producer`. Output in the older v0 format is rejected, so rebuild projects +before deploying them with this release. + +Container `max_instances` defaults to 20 when the config leaves it unset, +matching Wrangler. + +`cf dev`, `cf build`, `cf deploy` and `cf previews deploy` now require +`@cloudflare/vite-plugin` 2.0.0-rc.0 or newer, and `cf init` scaffolds new +projects with `@cloudflare/vite-plugin@^2.0.0-rc.0`. + +Use the published Workers SDK packages, including Wrangler 4.163.0 or newer +for the Wrangler delegate to produce compatible Build Output. diff --git a/docs/architecture.md b/docs/architecture.md index 3e58aac7b2..7b47c4132e 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -256,7 +256,7 @@ the complete generated and hand-written `_meta/commands.json` catalogue (see | `local.ts` | Dependency-free `--local` lazy runtime loading | | `local-runtime.ts` | Local request rewriting, runtime lifecycle, and explorer dispatch; dynamically imported | | `delegate.ts` | local-install delegation (Wrangler-2 style): global cf re-execs a project-pinned local cf. `CF_DELEGATION` sentinel + `CF_DELEGATION_PID` (global cf's process ID; telemetry counts a run as delegated only when it matches the direct parent, or is absent from an older global cf) + `CF_DELEGATING_CLI_VERSION` (global version, read by telemetry) + realpath self-check + ephemeral-npx/dlx guard | -| `build-output.ts` | combines `readBuildOutput()`'s root config and `workers.default` from `.cloudflare/output/v0/workers/default/worker.config.json` and converts them into the deploy-helpers/Wrangler config shape (`convertToWranglerConfig` + `normalizeAndValidateConfig`) before deployment; owns `BuildOutputConfigError`, re-exports the package's `BuildOutputError` | +| `build-output.ts` | combines `readBuildOutput()`'s root config and `workers.default` from `.cloudflare/output/v1/workers/default/worker.config.json` and converts them into the deploy-helpers/Wrangler config shape (`convertToWranglerConfig` + `normalizeAndValidateConfig`) before deployment; owns `BuildOutputConfigError`, re-exports the package's `BuildOutputError` | | `deploy-context.ts` | builds the `DeployHelpersContext` (fetch/logger/confirm/prompt closures) bridging cf auth/UX to deploy-helpers' module globals | | `deploy-input.ts` | assembles `DeployProps` / `WorkerBuildResult` from build output (module-type mapping, routes, assets) | | `dialog.ts` | cf prompt/dialog adapter shared by hand-written orchestration | @@ -414,7 +414,7 @@ What cf DOES read: the project's Miniflare resources for `--local`, matching the Cloudflare Vite plugin's default for `cf dev`. `--persist-to` overrides it and is required outside a project. -- **Build Output under `.cloudflare/output/v0/`** for `cf build`, `cf deploy`, `cf previews deploy`, `cf workers versions create`, `cf workers check`, and `cf workers triggers deploy`. A required top-level `config.json` carries account settings and `buildContext`; Worker directories contain `worker.config.json` and at least one of `bundle/` or `assets/`; Container directories contain `container.config.json`. The output Worker config has output-only manifest fields and no source entrypoint. `@cloudflare/build-output-utils` accepts additional Worker directories; `cf deploy`, `cf previews deploy`, `cf workers versions create`, `cf workers triggers deploy`, and `cf workers check` select one by configured name with `--worker `, otherwise cf consumes the required `workers.default`. Always use `readBuildOutput()` rather than composing paths by hand. When `CLOUDFLARE_CI_OVERRIDE_WORKER_NAME` is set, `cf deploy`, `cf previews deploy`, `cf workers versions create`, and `cf workers triggers deploy` deploy the selected Worker under that name and warn if it differs from the configured one. Workers Builds sets it to the connected Worker, as `WRANGLER_CI_OVERRIDE_NAME` does for Wrangler. Only the deployed name changes; bindings that name the configured Worker keep their targets. `cf deploy` and `cf workers versions create` also check the deployed Worker's tag against `CLOUDFLARE_CI_MATCH_WORKER_TAG`, the equivalent of `WRANGLER_CI_MATCH_TAG`. +- **Build Output under `.cloudflare/output/v1/`** for `cf build`, `cf deploy`, `cf previews deploy`, `cf workers versions create`, `cf workers check`, and `cf workers triggers deploy`. A required top-level `config.json` carries `buildContext`, optional account `settings` (`accountId`, `complianceRegion`), and an optional `producer` (cf records its own name and version); readers reject output in the older v0 format; Worker directories contain `worker.config.json` and at least one of `bundle/` or `assets/`; Container directories contain `container.config.json`. The output Worker config has output-only manifest fields and no source entrypoint. `@cloudflare/build-output-utils` accepts additional Worker directories; `cf deploy`, `cf previews deploy`, `cf workers versions create`, `cf workers triggers deploy`, and `cf workers check` select one by configured name with `--worker `, otherwise cf consumes the required `workers.default`. Always use `readBuildOutput()` rather than composing paths by hand. When `CLOUDFLARE_CI_OVERRIDE_WORKER_NAME` is set, `cf deploy`, `cf previews deploy`, `cf workers versions create`, and `cf workers triggers deploy` deploy the selected Worker under that name and warn if it differs from the configured one. Workers Builds sets it to the connected Worker, as `WRANGLER_CI_OVERRIDE_NAME` does for Wrangler. Only the deployed name changes; bindings that name the configured Worker keep their targets. `cf deploy` and `cf workers versions create` also check the deployed Worker's tag against `CLOUDFLARE_CI_MATCH_WORKER_TAG`, the equivalent of `WRANGLER_CI_MATCH_TAG`. What cf does NOT read: @@ -615,7 +615,7 @@ merely because a spec happens to be thin. Generalising the runtime-schema pattern into a forge annotation is deliberately deferred until there are four or more such examples. That threshold does not combine unrelated Build Output or migration workflows. -`cf init [directory]` is the single explicit setup entry point; there is no separate `cf setup` or `cf workers setup`. It currently behaves exactly like `cf init workers [directory]`, the first product initializer, which `cf init --help` lists as `[default]`; other products can later add `cf init ` subcommands, and bare `cf init` is expected to become a selection menu of what to create. When the directory is omitted, cf asks for it (defaulting to the current directory); non-interactive runs must pass one, such as `.`. cf shows the absolute target directory (hidden by `--quiet`) before the package-manager choice or autoconfig, and every successful run ends with a `Next steps` list led by `cf dev` (`npx cf dev` when cf itself ran through `npx` or `pnpm dlx`). A missing directory, an empty directory, or one containing only `.git` receives the hello-world Worker scaffold (`cloudflare.config.ts` with a `WORLD` text binding, `vite.config.ts`, `vitest.config.ts`, `src/index.ts`, `test/index.test.ts`, `tsconfig.json`, `package.json`, `.gitignore`, plus `pnpm-workspace.yaml` for pnpm or `.yarnrc.yml` for Yarn) built on the `@cloudflare/vite-plugin` v2 beta without Wrangler; dependencies are installed by default with a prompted or `--package-manager` choice. After a successful install, cf generates `.cloudflare/types/index.d.ts` through `commands/workers/types/generate.ts`, the generator behind `cf workers types`; a failure there is a warning, not an error. The template's `typecheck` script runs `cf workers types && vp check --no-fmt --no-lint`, and its `tsconfig.json` includes `.cloudflare/types`. Any other non-empty directory is handed to autoconfig after cf changes into it, because autoconfig's package installs use the process working directory. `cf dev` and `cf build` still run autoconfig implicitly. Tunnel log streaming is the process-backed `cf tunnels tail` command; the generated tail-create API command only creates a tail descriptor. +`cf init [directory]` is the single explicit setup entry point; there is no separate `cf setup` or `cf workers setup`. It currently behaves exactly like `cf init workers [directory]`, the first product initializer, which `cf init --help` lists as `[default]`; other products can later add `cf init ` subcommands, and bare `cf init` is expected to become a selection menu of what to create. When the directory is omitted, cf asks for it (defaulting to the current directory); non-interactive runs must pass one, such as `.`. cf shows the absolute target directory (hidden by `--quiet`) before the package-manager choice or autoconfig, and every successful run ends with a `Next steps` list led by `cf dev` (`npx cf dev` when cf itself ran through `npx` or `pnpm dlx`). A missing directory, an empty directory, or one containing only `.git` receives the hello-world Worker scaffold (`cloudflare.config.ts` with a `WORLD` text binding, `vite.config.ts`, `vitest.config.ts`, `src/index.ts`, `test/index.test.ts`, `tsconfig.json`, `package.json`, `.gitignore`, plus `pnpm-workspace.yaml` for pnpm or `.yarnrc.yml` for Yarn) built on the `@cloudflare/vite-plugin` v2 release candidate (`^2.0.0-rc.0`) without Wrangler; dependencies are installed by default with a prompted or `--package-manager` choice. After a successful install, cf generates `.cloudflare/types/index.d.ts` through `commands/workers/types/generate.ts`, the generator behind `cf workers types`; a failure there is a warning, not an error. The template's `typecheck` script runs `cf workers types && vp check --no-fmt --no-lint`, and its `tsconfig.json` includes `.cloudflare/types`. Any other non-empty directory is handed to autoconfig after cf changes into it, because autoconfig's package installs use the process working directory. `cf dev` and `cf build` still run autoconfig implicitly. Tunnel log streaming is the process-backed `cf tunnels tail` command; the generated tail-create API command only creates a tail descriptor. Hand-written commands with no generated parent (`auth/`, `build/`, `cli/`, `completions/`, `dev/`, `deploy/`, `init/`, `previews/`, plus top-level diff --git a/fixtures/vite-container-project/package.json b/fixtures/vite-container-project/package.json index 0959a91118..c5e647bea7 100644 --- a/fixtures/vite-container-project/package.json +++ b/fixtures/vite-container-project/package.json @@ -7,10 +7,10 @@ "check:type": "vp run task:check:type" }, "devDependencies": { - "@cloudflare/vite-plugin": "2.0.0-beta.v.17", - "@cloudflare/workers-types": "5.20261115.1", + "@cloudflare/vite-plugin": "2.0.0-rc.0", + "@cloudflare/workers-types": "5.20261116.1", "cf": "workspace:*", "vite": "catalog:", - "wrangler": "4.162.0" + "wrangler": "4.163.0" } } diff --git a/fixtures/vite-plugin-project/package.json b/fixtures/vite-plugin-project/package.json index fa235fe255..33e239f27e 100644 --- a/fixtures/vite-plugin-project/package.json +++ b/fixtures/vite-plugin-project/package.json @@ -6,10 +6,10 @@ "dev": "vp dev" }, "devDependencies": { - "@cloudflare/vite-plugin": "2.0.0-beta.v.17", - "@cloudflare/workers-types": "5.20261115.1", + "@cloudflare/vite-plugin": "2.0.0-rc.0", + "@cloudflare/workers-types": "5.20261116.1", "cf": "workspace:*", "vite": "catalog:", - "wrangler": "4.162.0" + "wrangler": "4.163.0" } } diff --git a/fixtures/wrangler-bundler-project/package.json b/fixtures/wrangler-bundler-project/package.json index 8c19e7cdd6..bbce0cb2af 100644 --- a/fixtures/wrangler-bundler-project/package.json +++ b/fixtures/wrangler-bundler-project/package.json @@ -5,6 +5,6 @@ "type": "module", "dependencies": { "cf": "workspace:*", - "wrangler": "4.162.0" + "wrangler": "4.163.0" } } diff --git a/packages/cli/README.md b/packages/cli/README.md index 6d10376287..414e025c21 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -44,8 +44,8 @@ named profiles. `cf auth login` and `cf auth logout` manage the default profile. commands and Cloudflare dev-server implementations through `CLOUDFLARE_AUTH_PROFILE`, overriding any inherited value. The development server needs `@cloudflare/workers-auth` 0.17.0 or newer to use the selected -credentials. Cloudflare delegates require Wrangler 4.161.0 or newer, or Vite -plugin v2 starting at 2.0.0-beta.v.13; older delegates fail with an upgrade hint. +credentials. Cloudflare delegates require Wrangler 4.163.0 or newer, or Vite +plugin v2 starting at 2.0.0-rc.0; older delegates fail with an upgrade hint. Use `cf auth login --use-keyring` to encrypt OAuth credentials with a key stored in your OS keychain. The choice is saved across invocations and applies to all diff --git a/packages/cli/package.json b/packages/cli/package.json index ec7e1d9de6..2c495f4967 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -69,25 +69,25 @@ "test:imports": "vp run task:test:imports" }, "dependencies": { - "@cloudflare/build-output-utils": "0.9.14", - "@cloudflare/config": "0.32.1", - "@cloudflare/runtime-types": "0.1.28", + "@cloudflare/build-output-utils": "1.0.0-rc.0", + "@cloudflare/config": "1.0.0-rc.0", + "@cloudflare/runtime-types": "0.1.29", "blake3-wasm": "2.1.5", - "miniflare": "5.20261113.0-beta" + "miniflare": "5.20261116.0-beta" }, "devDependencies": { "@bomb.sh/tab": "0.0.22", "@bytecodealliance/jco": "1.41.0", "@clack/core": "1.5.1", "@clack/prompts": "^1.8.1", - "@cloudflare/autoconfig": "0.12.1", - "@cloudflare/cli-shared-helpers": "0.3.8", - "@cloudflare/codemods": "0.7.8", - "@cloudflare/containers-shared": "0.26.1", - "@cloudflare/deploy-helpers": "0.27.0", + "@cloudflare/autoconfig": "0.13.0", + "@cloudflare/cli-shared-helpers": "0.3.9", + "@cloudflare/codemods": "0.8.0", + "@cloudflare/containers-shared": "0.26.2", + "@cloudflare/deploy-helpers": "0.27.1", "@cloudflare/forge": "https://pkg.pr.new/cloudflare/forge/@cloudflare/forge@00ee1dcab3a0511bd91829922aef27edb0d422e2", - "@cloudflare/workers-auth": "0.18.2", - "@cloudflare/workers-utils": "0.54.0", + "@cloudflare/workers-auth": "0.18.3", + "@cloudflare/workers-utils": "0.54.1", "@types/node": "26.6.6", "@types/semver": "7.8.0", "@types/shell-quote": "^1.7.5", diff --git a/packages/cli/src/__tests__/commands/build/index.test.ts b/packages/cli/src/__tests__/commands/build/index.test.ts index 047637d981..729c7ac228 100644 --- a/packages/cli/src/__tests__/commands/build/index.test.ts +++ b/packages/cli/src/__tests__/commands/build/index.test.ts @@ -46,7 +46,7 @@ describe("cf build", () => { const result = await runCf(["build"]); expect(result.exitCode).toBe(1); - expect(std.err).toMatch(/wrangler@4\.161\.0 or newer/); + expect(std.err).toMatch(/wrangler@4\.163\.0 or newer/); expect(unframe(std.err)).not.toMatch(/wrangler .* is not installed/); }); @@ -54,19 +54,19 @@ describe("cf build", () => { await seed({ "package.json": JSON.stringify({ devDependencies: { - "@cloudflare/vite-plugin": "beta", + "@cloudflare/vite-plugin": "^2.0.0-rc.0", wrangler: "^4.0.0", }, }), "node_modules/@cloudflare/vite-plugin/package.json": JSON.stringify({ name: "@cloudflare/vite-plugin", - version: "2.0.0-beta.v.13", + version: "2.0.0-rc.0", }), "node_modules/@cloudflare/vite-plugin/bin/cf-vite": buildScript("vite-worker"), "node_modules/wrangler/package.json": JSON.stringify({ name: "wrangler", - version: "4.161.0", + version: "4.163.0", }), "node_modules/wrangler/bin/cf-wrangler.js": nodeScript( 'require("node:fs").writeFileSync("wrangler-argv.out", process.argv.slice(2).join("\\n") + "\\n"); process.exit(99);' @@ -88,7 +88,7 @@ describe("cf build", () => { }), "node_modules/wrangler/package.json": JSON.stringify({ name: "wrangler", - version: "4.161.0", + version: "4.163.0", }), "node_modules/wrangler/bin/cf-wrangler.js": buildScript("wrangler-worker"), @@ -108,7 +108,7 @@ describe("cf build", () => { }), "node_modules/wrangler/package.json": JSON.stringify({ name: "wrangler", - version: "4.161.0", + version: "4.163.0", }), "node_modules/wrangler/bin/cf-wrangler.js": buildScript("wrangler-worker"), @@ -145,7 +145,7 @@ describe("cf build", () => { }), "node_modules/wrangler/package.json": JSON.stringify({ name: "wrangler", - version: "4.161.0", + version: "4.163.0", }), "node_modules/wrangler/bin/cf-wrangler.js": buildScript("mode-worker"), }); @@ -355,7 +355,7 @@ describe("cf build", () => { }), "node_modules/wrangler/package.json": JSON.stringify({ name: "wrangler", - version: "4.161.0", + version: "4.163.0", }), "node_modules/wrangler/bin/cf-wrangler.js": nodeScript( 'require("node:fs").writeFileSync("argv.out", process.argv.slice(2).join("\\n") + "\\n"); process.exit(17);' @@ -376,7 +376,7 @@ describe("cf build", () => { }), "node_modules/wrangler/package.json": JSON.stringify({ name: "wrangler", - version: "4.161.0", + version: "4.163.0", }), "node_modules/wrangler/bin/cf-wrangler.js": nodeScript( 'require("node:fs").writeFileSync("argv.out", process.argv.slice(2).join("\\n") + "\\n");' @@ -389,13 +389,13 @@ describe("cf build", () => { }); function buildScript(workerName: string, extra = ""): string { - const workerDir = ".cloudflare/output/v0/workers/default"; + const workerDir = ".cloudflare/output/v1/workers/default"; return nodeScript( [ 'const fs = require("node:fs");', 'fs.writeFileSync("argv.out", process.argv.slice(2).join("\\n") + "\\n");', `fs.mkdirSync(${JSON.stringify(`${workerDir}/bundle`)}, { recursive: true });`, - `fs.writeFileSync(".cloudflare/output/v0/config.json", ${JSON.stringify(buildOutputRootConfig())});`, + `fs.writeFileSync(".cloudflare/output/v1/config.json", ${JSON.stringify(buildOutputRootConfig())});`, `fs.writeFileSync(${JSON.stringify(`${workerDir}/worker.config.json`)}, ${JSON.stringify(workerConfig({ name: workerName }))});`, `fs.writeFileSync(${JSON.stringify(`${workerDir}/bundle/index.js`)}, "export default {}");`, extra, diff --git a/packages/cli/src/__tests__/commands/deploy/assets.test.ts b/packages/cli/src/__tests__/commands/deploy/assets.test.ts index 8369a16a34..567881dde9 100644 --- a/packages/cli/src/__tests__/commands/deploy/assets.test.ts +++ b/packages/cli/src/__tests__/commands/deploy/assets.test.ts @@ -10,6 +10,7 @@ import { import { http, HttpResponse } from "msw/http"; import { beforeEach, describe, expect, it, vi } from "vite-plus/test"; import { prepareStaticAssetsBuildOutput } from "../../../commands/deploy/static-assets.js"; +import { VERSION } from "../../../version.js"; import { createMockDeployContext } from "../../helpers/mock-deploy-context.js"; import { createFetchResult, msw, setupMsw } from "../../helpers/msw.js"; import { runCf } from "../../helpers/run-cf.js"; @@ -65,7 +66,7 @@ describe("cf deploy — assets", () => { "package.json": JSON.stringify({ name: "static-site" }), "public/index.html": "direct", "public/nested/style.css": "body { color: blue; }", - ".cloudflare/output/v0/workers/default/bundle/stale.js": + ".cloudflare/output/v1/workers/default/bundle/stale.js": "export default {};", }); @@ -85,7 +86,7 @@ describe("cf deploy — assets", () => { "/nested/style.css", ]); - const outputRoot = resolve(".cloudflare/output/v0"); + const outputRoot = resolve(".cloudflare/output/v1"); const rootConfig = JSON.parse( readFileSync(resolve(outputRoot, "config.json"), "utf8") ) as Record; @@ -96,6 +97,7 @@ describe("cf deploy — assets", () => { ) ) as Record; expect(rootConfig).toEqual({ + producer: { name: "cf", version: VERSION }, buildContext: { isPreview: false, mode: "production" }, }); expect(generatedWorkerConfig).toMatchObject({ name: "static-site" }); @@ -120,7 +122,7 @@ describe("cf deploy — assets", () => { await seed({ "index.html": "root asset", ".cloudflare/project-state.json": "not an asset", - ".cloudflare/output/v0/workers/default/bundle/stale.js": + ".cloudflare/output/v1/workers/default/bundle/stale.js": "export default {};", }); @@ -135,7 +137,7 @@ describe("cf deploy — assets", () => { ).toBe(false); expect( existsSync( - resolve(".cloudflare/output/v0/workers/default/assets/.cloudflare") + resolve(".cloudflare/output/v1/workers/default/assets/.cloudflare") ) ).toBe(false); }); @@ -151,7 +153,7 @@ describe("cf deploy — assets", () => { ).resolves.toBe(true); expect( - JSON.parse(readFileSync(".cloudflare/output/v0/config.json", "utf8")) + JSON.parse(readFileSync(".cloudflare/output/v1/config.json", "utf8")) ).toMatchObject({ buildContext: { isPreview: true, mode: "staging" }, }); @@ -197,7 +199,7 @@ describe("cf deploy — assets", () => { expect( JSON.parse( readFileSync( - ".cloudflare/output/v0/workers/default/worker.config.json", + ".cloudflare/output/v1/workers/default/worker.config.json", "utf8" ) ) @@ -207,8 +209,8 @@ describe("cf deploy — assets", () => { assets: { htmlHandling: "none" }, }); expect( - JSON.parse(readFileSync(".cloudflare/output/v0/config.json", "utf8")) - ).toMatchObject({ accountId: ACCOUNT_ID }); + JSON.parse(readFileSync(".cloudflare/output/v1/config.json", "utf8")) + ).toMatchObject({ settings: { accountId: ACCOUNT_ID } }); expect(buildDelegateWasCalled()).toBe(false); }); @@ -222,13 +224,13 @@ describe("cf deploy — assets", () => { }] };`, "public/index.html": "hello", - ".cloudflare/output/v0/config.json": "existing output", + ".cloudflare/output/v1/config.json": "existing output", }); await expect(runCf(["deploy", "public"])).rejects.toThrow( "configures Containers, so this is not an assets-only project" ); - expect(readFileSync(".cloudflare/output/v0/config.json", "utf8")).toBe( + expect(readFileSync(".cloudflare/output/v1/config.json", "utf8")).toBe( "existing output" ); expect(buildDelegateWasCalled()).toBe(false); @@ -245,13 +247,13 @@ describe("cf deploy — assets", () => { } };`, "public/index.html": "hello", - ".cloudflare/output/v0/config.json": "existing output", + ".cloudflare/output/v1/config.json": "existing output", }); await expect(runCf(["deploy", "public"])).rejects.toThrow( "configures a Worker entrypoint, so this is not an assets-only project" ); - expect(readFileSync(".cloudflare/output/v0/config.json", "utf8")).toBe( + expect(readFileSync(".cloudflare/output/v1/config.json", "utf8")).toBe( "existing output" ); expect(buildDelegateWasCalled()).toBe(false); @@ -259,13 +261,13 @@ describe("cf deploy — assets", () => { it("validates the static directory before replacing Build Output", async () => { await seed({ - ".cloudflare/output/v0/config.json": "existing output", + ".cloudflare/output/v1/config.json": "existing output", }); await expect(runCf(["deploy", "missing"])).rejects.toThrow( "Static assets directory not found: missing" ); - expect(readFileSync(".cloudflare/output/v0/config.json", "utf8")).toBe( + expect(readFileSync(".cloudflare/output/v1/config.json", "utf8")).toBe( "existing output" ); expect(buildDelegateWasCalled()).toBe(false); @@ -273,13 +275,13 @@ describe("cf deploy — assets", () => { it("rejects an empty static directory before replacing Build Output", async () => { await seed({ - ".cloudflare/output/v0/config.json": "existing output", + ".cloudflare/output/v1/config.json": "existing output", }); await expect(runCf(["deploy", ""])).rejects.toThrow( "The static assets directory argument cannot be empty." ); - expect(readFileSync(".cloudflare/output/v0/config.json", "utf8")).toBe( + expect(readFileSync(".cloudflare/output/v1/config.json", "utf8")).toBe( "existing output" ); expect(buildDelegateWasCalled()).toBe(false); @@ -304,13 +306,13 @@ describe("cf deploy — assets", () => { it("rejects a static directory containing Build Output", async () => { await seed({ ".cloudflare/index.html": "asset", - ".cloudflare/output/v0/config.json": "existing output", + ".cloudflare/output/v1/config.json": "existing output", }); await expect(runCf(["deploy", ".cloudflare"])).rejects.toThrow( "The static assets directory cannot contain .cloudflare/output. Choose the specific directory containing the built assets." ); - expect(readFileSync(".cloudflare/output/v0/config.json", "utf8")).toBe( + expect(readFileSync(".cloudflare/output/v1/config.json", "utf8")).toBe( "existing output" ); expect(buildDelegateWasCalled()).toBe(false); @@ -342,16 +344,16 @@ describe("cf deploy — assets", () => { const assets = mockAssetUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ mainModule: undefined, modules: undefined, }), - ".cloudflare/output/v0/workers/default/bundle/placeholder": "", - ".cloudflare/output/v0/workers/default/assets/index.html": + ".cloudflare/output/v1/workers/default/bundle/placeholder": "", + ".cloudflare/output/v1/workers/default/assets/index.html": "hello", - ".cloudflare/output/v0/workers/default/assets/style.css": + ".cloudflare/output/v1/workers/default/assets/style.css": "body { color: red; }", }); @@ -392,15 +394,15 @@ describe("cf deploy — assets", () => { const cssContent = "body {}"; await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ mainModule: undefined, modules: undefined, }), - ".cloudflare/output/v0/workers/default/bundle/placeholder": "", - ".cloudflare/output/v0/workers/default/assets/page.html": htmlContent, - ".cloudflare/output/v0/workers/default/assets/sub/style.css": + ".cloudflare/output/v1/workers/default/bundle/placeholder": "", + ".cloudflare/output/v1/workers/default/assets/page.html": htmlContent, + ".cloudflare/output/v1/workers/default/assets/sub/style.css": cssContent, }); @@ -428,18 +430,18 @@ describe("cf deploy — assets", () => { const headersContent = "/*\n X-Custom: value"; await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ mainModule: undefined, modules: undefined, }), - ".cloudflare/output/v0/workers/default/bundle/placeholder": "", - ".cloudflare/output/v0/workers/default/assets/index.html": + ".cloudflare/output/v1/workers/default/bundle/placeholder": "", + ".cloudflare/output/v1/workers/default/assets/index.html": "", - ".cloudflare/output/v0/workers/default/assets/_redirects": + ".cloudflare/output/v1/workers/default/assets/_redirects": redirectsContent, - ".cloudflare/output/v0/workers/default/assets/_headers": headersContent, + ".cloudflare/output/v1/workers/default/assets/_headers": headersContent, }); await runCf(["deploy"]); @@ -487,14 +489,14 @@ describe("cf deploy — assets", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ mainModule: undefined, modules: undefined, }), - ".cloudflare/output/v0/workers/default/bundle/placeholder": "", - ".cloudflare/output/v0/workers/default/assets/file.txt": + ".cloudflare/output/v1/workers/default/bundle/placeholder": "", + ".cloudflare/output/v1/workers/default/assets/file.txt": "Hello, world!", }); @@ -522,14 +524,14 @@ describe("cf deploy — assets", () => { const assets = mockAssetUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", - ".cloudflare/output/v0/workers/default/assets/index.html": + ".cloudflare/output/v1/workers/default/assets/index.html": "app", - ".cloudflare/output/v0/workers/default/assets/app.js": + ".cloudflare/output/v1/workers/default/assets/app.js": "console.log('app');", }); @@ -556,17 +558,17 @@ describe("cf deploy — assets", () => { mockAssetUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ assets: { htmlHandling: "none", notFoundHandling: "404-page", }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", - ".cloudflare/output/v0/workers/default/assets/index.html": + ".cloudflare/output/v1/workers/default/assets/index.html": "", }); diff --git a/packages/cli/src/__tests__/commands/deploy/containers.test.ts b/packages/cli/src/__tests__/commands/deploy/containers.test.ts index 06effb4c33..2391fccd1f 100644 --- a/packages/cli/src/__tests__/commands/deploy/containers.test.ts +++ b/packages/cli/src/__tests__/commands/deploy/containers.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from "vite-plus/test"; import { createContainerDeployConfig } from "../../../commands/deploy/containers.js"; import { BuildOutputConfigError } from "../../../lib/build-output-error.js"; import type { BuildOutputContainers } from "@cloudflare/build-output-utils"; -import type { ParsedOutputContainerConfig } from "@cloudflare/config"; +import type { ParsedBuildOutputContainerConfig } from "@cloudflare/config"; import type { Config, Exports } from "@cloudflare/workers-utils"; const config = { @@ -11,7 +11,7 @@ const config = { } as Config; function outputContainers( - ...containers: ParsedOutputContainerConfig[] + ...containers: ParsedBuildOutputContainerConfig[] ): BuildOutputContainers { return containers.map((container, index) => ({ configPath: `/output/container-${index}/container.config.json`, @@ -104,7 +104,7 @@ describe("Build Output Containers", () => { name: "api", image: { reference: "registry.example/api:latest" }, maxInstances: 1, - } satisfies ParsedOutputContainerConfig; + } satisfies ParsedBuildOutputContainerConfig; expect(() => createContainerDeployConfig( @@ -193,7 +193,6 @@ describe("Build Output Containers", () => { const containers = outputContainers({ name: "api", image: { reference: "registry.example/api:latest" }, - maxInstances: 20, }); const gradual = createContainerDeployConfig(containers, config, { accountId: "account-id", @@ -204,6 +203,7 @@ describe("Build Output Containers", () => { }); expect(gradual.standard.normalized[0]).toMatchObject({ + max_instances: 20, instance_type: "lite", scheduling_policy: "default", rollout_step_percentage: [10, 100], @@ -211,6 +211,7 @@ describe("Build Output Containers", () => { rollout_active_grace_period: 0, constraints: { tiers: [1, 2] }, }); + expect(gradual.source?.[0]?.max_instances).toBe(20); expect(skipped.standard.normalized[0]?.rollout_kind).toBe("none"); }); diff --git a/packages/cli/src/__tests__/commands/deploy/deploy-props.test.ts b/packages/cli/src/__tests__/commands/deploy/deploy-props.test.ts index c6418b2df1..beb74f4746 100644 --- a/packages/cli/src/__tests__/commands/deploy/deploy-props.test.ts +++ b/packages/cli/src/__tests__/commands/deploy/deploy-props.test.ts @@ -45,10 +45,10 @@ describe("cf deploy — upload metadata", () => { name: "example-dependency", version: "1.2.3", }), - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); } @@ -95,10 +95,10 @@ describe("cf deploy — upload metadata", () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -129,13 +129,13 @@ describe("cf deploy — upload metadata", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ env: { MY_SECRET: { type: "secret" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); diff --git a/packages/cli/src/__tests__/commands/deploy/errors.test.ts b/packages/cli/src/__tests__/commands/deploy/errors.test.ts index 079d0d6864..69998fd512 100644 --- a/packages/cli/src/__tests__/commands/deploy/errors.test.ts +++ b/packages/cli/src/__tests__/commands/deploy/errors.test.ts @@ -52,10 +52,10 @@ describe("cf deploy — error handling", () => { mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -89,10 +89,10 @@ describe("cf deploy — error handling", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -101,6 +101,6 @@ describe("cf deploy — error handling", () => { it("fails when no build output exists", async () => { // Don't seed any build output - await expect(runCf(["deploy"])).rejects.toThrow(/No root config found/i); + await expect(runCf(["deploy"])).rejects.toThrow(/No Build Output found/i); }); }); diff --git a/packages/cli/src/__tests__/commands/deploy/helpers.ts b/packages/cli/src/__tests__/commands/deploy/helpers.ts index 7acdf6cac0..2fdc82499f 100644 --- a/packages/cli/src/__tests__/commands/deploy/helpers.ts +++ b/packages/cli/src/__tests__/commands/deploy/helpers.ts @@ -43,11 +43,11 @@ export async function seedBuildDelegate(): Promise { const { seed } = await import("@cloudflare/workers-utils/test-helpers"); await seed({ "package.json": JSON.stringify({ - devDependencies: { wrangler: "^4.161.0" }, + devDependencies: { wrangler: "^4.163.0" }, }), "node_modules/wrangler/package.json": JSON.stringify({ name: "wrangler", - version: "4.161.0", + version: "4.163.0", }), "node_modules/wrangler/bin/cf-wrangler.js": nodeScript( [ diff --git a/packages/cli/src/__tests__/commands/deploy/index.test.ts b/packages/cli/src/__tests__/commands/deploy/index.test.ts index 32ada231d1..fbe08a643d 100644 --- a/packages/cli/src/__tests__/commands/deploy/index.test.ts +++ b/packages/cli/src/__tests__/commands/deploy/index.test.ts @@ -73,10 +73,10 @@ describe("cf deploy", () => { const requests = recordRequests(); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ env: { MY_BINDING: binding } }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", }); @@ -96,14 +96,14 @@ describe("cf deploy", () => { const requests = recordRequests(); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ env: { MY_DB: { type: "d1", name: "my-db", id: "d1-db-id-123" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", }); @@ -144,10 +144,10 @@ describe("cf deploy", () => { "CLOUDFLARE_API_TOKEN=file-token", `CLOUDFLARE_ACCOUNT_ID=${ACCOUNT_ID}`, ].join("\n"), - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -163,10 +163,10 @@ describe("cf deploy", () => { it("deploys a single ESM module", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -185,10 +185,10 @@ describe("cf deploy", () => { async (initialExitCode) => { const upload = mockWorkerUpload({}, { deploymentId: null }); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -255,8 +255,8 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -266,9 +266,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { reference: "registry.cloudflare.com/api:latest" }, @@ -342,10 +342,12 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ - complianceRegion: "fedramp-high", + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ + settings: { + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -355,9 +357,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-wrangler" }, @@ -440,8 +442,8 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -451,9 +453,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-vite" }, @@ -532,8 +534,8 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -543,9 +545,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-vite" }, @@ -585,8 +587,8 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -596,9 +598,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-vite" }, @@ -624,8 +626,8 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -635,9 +637,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-vite" }, @@ -662,12 +664,12 @@ describe("cf deploy", () => { it("runs build before deploying and forwards mode", async () => { mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -686,12 +688,12 @@ describe("cf deploy", () => { }) ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "production" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -708,13 +710,15 @@ describe("cf deploy", () => { mockWorkerUpload(); await seed({ "cloudflare.config.ts": `export default () => { throw new Error("Project config should not be reevaluated"); };`, - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ - accountId: "built-account", - complianceRegion: "fedramp-high", + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ + settings: { + accountId: "built-account", + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -733,13 +737,15 @@ describe("cf deploy", () => { const upload = mockWorkerUpload(); await seed({ "cloudflare.config.ts": `export default () => { throw new Error("Project config should not be reevaluated"); };`, - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ - complianceRegion: "fedramp-high", + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, + settings: { + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -755,12 +761,12 @@ describe("cf deploy", () => { it("rejects Preview Build Output", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -772,17 +778,17 @@ describe("cf deploy", () => { it("deploys the Worker selected by --worker", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", - ".cloudflare/output/v0/workers/api/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/api/worker.config.json": workerConfig({ name: "api", mainModule: "api.js", modules: { "api.js": { type: "esm" } }, }), - ".cloudflare/output/v0/workers/api/bundle/api.js": + ".cloudflare/output/v1/workers/api/bundle/api.js": "export default { fetch() { return new Response('api'); } }", }); @@ -804,10 +810,10 @@ describe("cf deploy", () => { const warn = vi.spyOn(clack.log, "warn"); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "config-worker" }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -840,10 +846,10 @@ describe("cf deploy", () => { mockExistingWorker(); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "config-worker" }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -869,10 +875,10 @@ describe("cf deploy", () => { const upload = mockWorkerUpload(); mockExistingWorker(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -888,10 +894,10 @@ describe("cf deploy", () => { const warn = vi.spyOn(clack.log, "warn"); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -915,17 +921,17 @@ describe("cf deploy", () => { vi.stubEnv("CLOUDFLARE_CI_OVERRIDE_WORKER_NAME", "dashboard-api"); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", - ".cloudflare/output/v0/workers/api/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/api/worker.config.json": workerConfig({ name: "api", mainModule: "api.js", modules: { "api.js": { type: "esm" } }, }), - ".cloudflare/output/v0/workers/api/bundle/api.js": + ".cloudflare/output/v1/workers/api/bundle/api.js": "export default { fetch() { return new Response('api'); } }", }); @@ -989,25 +995,25 @@ describe("cf deploy", () => { container, }); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { WebContainer: containerExport("web-container") }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class WebContainer {}; export default {};", - ".cloudflare/output/v0/workers/api/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/api/worker.config.json": workerConfig({ name: "api", exports: { ApiContainer: containerExport("api-container") }, }), - ".cloudflare/output/v0/workers/api/bundle/index.js": + ".cloudflare/output/v1/workers/api/bundle/index.js": "export class ApiContainer {}; export default {};", - ".cloudflare/output/v0/containers/web/container.config.json": + ".cloudflare/output/v1/containers/web/container.config.json": JSON.stringify({ name: "web-container", image: { reference: "registry.cloudflare.com/web:latest" }, }), - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { reference: "registry.cloudflare.com/api:latest" }, @@ -1049,10 +1055,10 @@ describe("cf deploy", () => { }) ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1067,10 +1073,10 @@ describe("cf deploy", () => { it("deploys to a dispatch namespace", async () => { const upload = mockWorkerUpload({}, { dispatchNamespace: "test-ns" }); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1088,10 +1094,10 @@ describe("cf deploy", () => { it("uploads secrets from a secrets file", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", "secrets.json": JSON.stringify({ API_TOKEN: "secret-value" }), }); @@ -1131,22 +1137,22 @@ describe("cf deploy", () => { }; await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ modules, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", - ".cloudflare/output/v0/workers/default/bundle/lib.cjs": + ".cloudflare/output/v1/workers/default/bundle/lib.cjs": "module.exports = {}", - ".cloudflare/output/v0/workers/default/bundle/data.bin": "\x00\x01\x02", - ".cloudflare/output/v0/workers/default/bundle/text.txt": "hello", - ".cloudflare/output/v0/workers/default/bundle/helper.wasm": + ".cloudflare/output/v1/workers/default/bundle/data.bin": "\x00\x01\x02", + ".cloudflare/output/v1/workers/default/bundle/text.txt": "hello", + ".cloudflare/output/v1/workers/default/bundle/helper.wasm": "wasm-bytes", - ".cloudflare/output/v0/workers/default/bundle/config.json": + ".cloudflare/output/v1/workers/default/bundle/config.json": '{"key":"value"}', - ".cloudflare/output/v0/workers/default/bundle/app.py": "pass", + ".cloudflare/output/v1/workers/default/bundle/app.py": "pass", }); const { exitCode } = await runCf(["deploy"]); @@ -1249,8 +1255,8 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ compatibilityFlags: ["nodejs_compat"], env: { @@ -1298,7 +1304,7 @@ describe("cf deploy", () => { placement: { mode: "smart" }, limits: { cpuMs: 50 }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1352,10 +1358,10 @@ describe("cf deploy", () => { const upload = mockWorkerUpload(); mockExistingWorker({ lastDeployedFrom: "api" }); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1409,8 +1415,8 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -1420,9 +1426,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-vite" }, @@ -1505,10 +1511,10 @@ describe("cf deploy", () => { try { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1529,10 +1535,10 @@ describe("cf deploy", () => { vi.stubEnv("CLOUDFLARE_ACCOUNT_ID", undefined); const requests = recordRequests(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1546,8 +1552,8 @@ describe("cf deploy", () => { it("does not remove local Container images", async () => { vi.stubEnv("WRANGLER_DOCKER_BIN", await seedDockerMock()); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { @@ -1557,9 +1563,9 @@ describe("cf deploy", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-vite" }, @@ -1575,10 +1581,10 @@ describe("cf deploy", () => { it("still runs the build step", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1590,10 +1596,10 @@ describe("cf deploy", () => { it("skips build with --prebuilt --dry-run", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1619,12 +1625,12 @@ describe("cf deploy", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1641,10 +1647,10 @@ describe("cf deploy", () => { it("sends tag and message annotations in the version upload", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1669,10 +1675,10 @@ describe("cf deploy", () => { mockWorkerUpload(); const deployment = captureDeployment(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1693,10 +1699,10 @@ describe("cf deploy", () => { it("does not set annotations when neither flag is provided", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -1710,10 +1716,10 @@ describe("cf deploy", () => { mockExistingWorker({ lastDeployedFrom: "cf_cli" }); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); diff --git a/packages/cli/src/__tests__/commands/deploy/routes.test.ts b/packages/cli/src/__tests__/commands/deploy/routes.test.ts index 6249223318..f4a172cdc4 100644 --- a/packages/cli/src/__tests__/commands/deploy/routes.test.ts +++ b/packages/cli/src/__tests__/commands/deploy/routes.test.ts @@ -41,11 +41,11 @@ describe("cf deploy — routes", () => { const routes = captureRoutes(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "fetch", pattern: "example.com/*" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -63,14 +63,14 @@ describe("cf deploy — routes", () => { const routes = captureRoutes(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [ { type: "fetch", pattern: "api.example.com/*" }, { type: "fetch", pattern: "app.example.com/*" }, ], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -91,11 +91,11 @@ describe("cf deploy — routes", () => { const domains = captureCustomDomains(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ domains: ["custom.example.com"], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -129,15 +129,15 @@ describe("cf deploy — routes", () => { mockWorkerUpload(); const domains = captureCustomDomains(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ domains: [ "example.com", { hostname: "custom.example.com", ...traffic }, ], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -169,11 +169,11 @@ describe("cf deploy — routes", () => { const upload = mockWorkerUpload(); const domains = captureCustomDomains(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ domains: [domain], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -191,12 +191,12 @@ describe("cf deploy — routes", () => { const domains = captureCustomDomains(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ domains: ["custom.example.com"], triggers: [{ type: "fetch", pattern: "api.example.com/*" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -224,14 +224,14 @@ describe("cf deploy — routes", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [ { type: "fetch", pattern: "example.com/*" }, { type: "scheduled", schedule: "0 * * * *" }, ], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); diff --git a/packages/cli/src/__tests__/commands/deploy/subdomain.test.ts b/packages/cli/src/__tests__/commands/deploy/subdomain.test.ts index 0d3cc91f59..97719279ba 100644 --- a/packages/cli/src/__tests__/commands/deploy/subdomain.test.ts +++ b/packages/cli/src/__tests__/commands/deploy/subdomain.test.ts @@ -39,10 +39,10 @@ describe("cf deploy — workers.dev subdomain", () => { const subdomain = captureSubdomain(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -61,12 +61,12 @@ describe("cf deploy — workers.dev subdomain", () => { const subdomain = captureSubdomain(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ workersDev: false, triggers: [{ type: "fetch", pattern: "example.com/*" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -84,11 +84,11 @@ describe("cf deploy — workers.dev subdomain", () => { const subdomain = captureSubdomain(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "fetch", pattern: "example.com/*" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -108,10 +108,10 @@ describe("cf deploy — workers.dev subdomain", () => { }); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -130,10 +130,10 @@ describe("cf deploy — workers.dev subdomain", () => { captureSubdomain(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); diff --git a/packages/cli/src/__tests__/commands/dev/index.test.ts b/packages/cli/src/__tests__/commands/dev/index.test.ts index c1cfdbed9b..78c69f64c3 100644 --- a/packages/cli/src/__tests__/commands/dev/index.test.ts +++ b/packages/cli/src/__tests__/commands/dev/index.test.ts @@ -73,7 +73,7 @@ describe("cf dev", () => { it("errors when two ecosystems each declare an impl", async () => { await seed({ "package.json": JSON.stringify({ - devDependencies: { "@cloudflare/vite-plugin": "beta" }, + devDependencies: { "@cloudflare/vite-plugin": "^2.0.0-rc.0" }, }), "pyproject.toml": [ "[project]", @@ -97,7 +97,7 @@ describe("cf dev", () => { await seed({ "package.json": JSON.stringify({ devDependencies: { - "@cloudflare/vite-plugin": "beta", + "@cloudflare/vite-plugin": "^2.0.0-rc.0", wrangler: "^4.0.0", }, }), @@ -116,7 +116,7 @@ describe("cf dev", () => { it("surfaces an install hint specific to the declared impl", async () => { await seed({ "package.json": JSON.stringify({ - devDependencies: { "@cloudflare/vite-plugin": "beta" }, + devDependencies: { "@cloudflare/vite-plugin": "^2.0.0-rc.0" }, }), // No node_modules: declared but not installed. }); @@ -127,25 +127,27 @@ describe("cf dev", () => { /@cloudflare\/vite-plugin .* is not installed/ ); expect(std.err).toMatch( - /npm install --save-dev @cloudflare\/vite-plugin@beta/ + /npm install --save-dev "@cloudflare\/vite-plugin@\^2\.0\.0-rc\.0"/ ); }); it("surfaces the vite version requirement when the delegate is missing", async () => { await seed({ "package.json": JSON.stringify({ - devDependencies: { "@cloudflare/vite-plugin": "beta" }, + devDependencies: { "@cloudflare/vite-plugin": "^2.0.0-rc.0" }, }), "node_modules/@cloudflare/vite-plugin/package.json": JSON.stringify({ name: "@cloudflare/vite-plugin", - version: "2.0.0-beta.v.13", + version: "2.0.0-rc.0", }), }); const result = await runCf(["dev"]); expect(result.exitCode).toBe(1); expect(unframe(std.err)).toMatch(/does not include the cf delegate/); - expect(std.err).toMatch(/@cloudflare\/vite-plugin v2 beta/); + expect(std.err).toMatch( + /@cloudflare\/vite-plugin v2 \(2\.0\.0-rc\.0 or newer\)/ + ); expect(unframe(std.err)).toContain("cf dev"); expect(unframe(std.err)).toContain("cf build"); expect(unframe(std.err)).toContain("cf deploy"); @@ -169,7 +171,7 @@ describe("cf dev", () => { const result = await runCf(["dev"]); expect(result.exitCode).toBe(1); expect(unframe(std.err)).toMatch(/does not include the cf delegate/); - expect(std.err).toMatch(/wrangler@4\.161\.0 or newer/); + expect(std.err).toMatch(/wrangler@4\.163\.0 or newer/); expect(unframe(std.err)).not.toMatch(/wrangler .* is not installed/); }); @@ -197,15 +199,15 @@ describe("cf dev", () => { describe.each([ { name: "@cloudflare/vite-plugin", - version: "2.0.0-beta.v.12", - minimum: "2.0.0-beta.v.13", + version: "2.0.0-beta.v.17", + minimum: "2.0.0-rc.0", bin: "bin/cf-vite", - install: "npm install --save-dev @cloudflare/vite-plugin@beta", + install: 'npm install --save-dev "@cloudflare/vite-plugin@^2.0.0-rc.0"', }, { name: "wrangler", version: "4.160.1", - minimum: "4.161.0", + minimum: "4.163.0", bin: "bin/cf-wrangler.js", install: "npm install --save-dev wrangler@latest", }, @@ -253,10 +255,10 @@ describe("cf dev", () => { describe.each([ { name: "@cloudflare/vite-plugin", - version: "2.0.0-beta.v.13", + version: "2.0.0-rc.0", bin: "bin/cf-vite", }, - { name: "wrangler", version: "4.161.0", bin: "bin/cf-wrangler.js" }, + { name: "wrangler", version: "4.163.0", bin: "bin/cf-wrangler.js" }, ])("$name auth profiles", ({ name, version, bin }) => { it.each([ { profile: "work", inherited: "personal", expected: "work" }, @@ -314,7 +316,9 @@ describe("cf dev", () => { const result = await runCf(["dev"]); expect(result.exitCode).toBe(1); - expect(std.err).toMatch(/@cloudflare\/vite-plugin v2 beta/); + expect(std.err).toMatch( + /@cloudflare\/vite-plugin v2 \(2\.0\.0-rc\.0 or newer\)/ + ); expect(std.err).toMatch(/@cloudflare\/vite-plugin@1\.61\.0 is installed/); expect(unframe(std.err)).toContain("cf dev"); expect(unframe(std.err)).toContain("cf build"); @@ -391,7 +395,7 @@ describe("cf dev", () => { name: "vite-project", devDependencies: { vite: "^7.0.0", - "@cloudflare/vite-plugin": "beta", + "@cloudflare/vite-plugin": "^2.0.0-rc.0", }, }), "package-lock.json": "{}", @@ -824,11 +828,11 @@ describe("cf dev", () => { // Lay down a fake implementation at the conventional delegate path. await seed({ "package.json": JSON.stringify({ - devDependencies: { "@cloudflare/vite-plugin": "beta" }, + devDependencies: { "@cloudflare/vite-plugin": "^2.0.0-rc.0" }, }), "node_modules/@cloudflare/vite-plugin/package.json": JSON.stringify({ name: "@cloudflare/vite-plugin", - version: "2.0.0-beta.v.13", + version: "2.0.0-rc.0", }), "node_modules/@cloudflare/vite-plugin/bin/cf-vite": nodeScript("process.exit(0);"), @@ -861,7 +865,9 @@ describe("cf dev", () => { const result = await runCf(["dev"]); expect(result.exitCode).toBe(1); - expect(std.err).toMatch(/@cloudflare\/vite-plugin v2 beta/); + expect(std.err).toMatch( + /@cloudflare\/vite-plugin v2 \(2\.0\.0-rc\.0 or newer\)/ + ); expect(std.err).toMatch( /@cloudflare\/vite-plugin@3\.0\.0-beta\.1 is installed/ ); @@ -870,11 +876,11 @@ describe("cf dev", () => { it("propagates a non-zero impl exit code", async () => { await seed({ "package.json": JSON.stringify({ - devDependencies: { "@cloudflare/vite-plugin": "beta" }, + devDependencies: { "@cloudflare/vite-plugin": "^2.0.0-rc.0" }, }), "node_modules/@cloudflare/vite-plugin/package.json": JSON.stringify({ name: "@cloudflare/vite-plugin", - version: "2.0.0-beta.v.13", + version: "2.0.0-rc.0", }), "node_modules/@cloudflare/vite-plugin/bin/cf-vite": nodeScript("process.exit(17);"), @@ -891,11 +897,11 @@ describe("cf dev", () => { // The delegate inherits stdout, so write argv to a file for inspection. await seed({ "package.json": JSON.stringify({ - devDependencies: { "@cloudflare/vite-plugin": "beta" }, + devDependencies: { "@cloudflare/vite-plugin": "^2.0.0-rc.0" }, }), "node_modules/@cloudflare/vite-plugin/package.json": JSON.stringify({ name: "@cloudflare/vite-plugin", - version: "2.0.0-beta.v.13", + version: "2.0.0-rc.0", }), "node_modules/@cloudflare/vite-plugin/bin/cf-vite": nodeScript( 'require("node:fs").writeFileSync("argv.out", process.argv.slice(2).join("\\n") + "\\n");' diff --git a/packages/cli/src/__tests__/commands/init.test.ts b/packages/cli/src/__tests__/commands/init.test.ts index 4ef2f01faa..47bc3a842c 100644 --- a/packages/cli/src/__tests__/commands/init.test.ts +++ b/packages/cli/src/__tests__/commands/init.test.ts @@ -196,13 +196,13 @@ describe("cf init", () => { } ); - it("uses the Vite plugin beta dist-tag without Wrangler", async () => { + it("uses the Vite plugin release candidate range without Wrangler", async () => { await runCf(["init", "my-app", "--no-install"]); const packageJson = readJson("my-app/package.json"); expect(packageJson.devDependencies).not.toHaveProperty("wrangler"); expect(WORKER_TEMPLATE_DEV_DEPENDENCIES["@cloudflare/vite-plugin"]).toBe( - "beta" + "^2.0.0-rc.0" ); }); diff --git a/packages/cli/src/__tests__/commands/previews-deploy-containers.test.ts b/packages/cli/src/__tests__/commands/previews-deploy-containers.test.ts index d10203d815..08ed65b104 100644 --- a/packages/cli/src/__tests__/commands/previews-deploy-containers.test.ts +++ b/packages/cli/src/__tests__/commands/previews-deploy-containers.test.ts @@ -118,10 +118,10 @@ describe("cf previews deploy Containers", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { type: "durable-object", @@ -134,21 +134,21 @@ describe("cf previews deploy Containers", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { reference: "registry.cloudflare.com/api:latest" }, maxInstances: 2, }), - ".cloudflare/output/v0/containers/other/container.config.json": + ".cloudflare/output/v1/containers/other/container.config.json": JSON.stringify({ name: "other-worker-container", image: { reference: "registry.cloudflare.com/other:latest" }, maxInstances: 1, }), - ".cloudflare/output/v0/containers/deleted/container.config.json": + ".cloudflare/output/v1/containers/deleted/container.config.json": JSON.stringify({ name: "deleted-container", image: { reference: "registry.cloudflare.com/deleted:latest" }, @@ -257,10 +257,10 @@ describe("cf previews deploy Containers", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { type: "durable-object", @@ -269,9 +269,9 @@ describe("cf previews deploy Containers", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-wrangler" }, @@ -361,10 +361,10 @@ describe("cf previews deploy Containers", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { type: "durable-object", @@ -373,9 +373,9 @@ describe("cf previews deploy Containers", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { reference: "registry.cloudflare.com/api:latest" }, @@ -403,10 +403,10 @@ describe("cf previews deploy Containers", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { type: "durable-object", @@ -415,9 +415,9 @@ describe("cf previews deploy Containers", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", schedulingPolicy: "durable-object", diff --git a/packages/cli/src/__tests__/commands/previews-deploy-domains.test.ts b/packages/cli/src/__tests__/commands/previews-deploy-domains.test.ts index 4e68122102..58e9a7d13f 100644 --- a/packages/cli/src/__tests__/commands/previews-deploy-domains.test.ts +++ b/packages/cli/src/__tests__/commands/previews-deploy-domains.test.ts @@ -1,5 +1,5 @@ import { writeWorkerConfig } from "@cloudflare/build-output-utils"; -import { InputWorkerSchema } from "@cloudflare/config"; +import { WorkerConfigSchema } from "@cloudflare/config"; import { mockConsoleMethods, runInTempDir, @@ -64,15 +64,15 @@ describe("cf previews deploy — custom domains", () => { }) ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); await writeWorkerConfig({ root: process.cwd(), - config: InputWorkerSchema.parse({ + config: WorkerConfigSchema.parse({ name: "test-worker", compatibilityDate: "2025-01-01", domains: [ diff --git a/packages/cli/src/__tests__/commands/previews-deploy.test.ts b/packages/cli/src/__tests__/commands/previews-deploy.test.ts index 1dfaa7d2bb..c17ca3b3b9 100644 --- a/packages/cli/src/__tests__/commands/previews-deploy.test.ts +++ b/packages/cli/src/__tests__/commands/previews-deploy.test.ts @@ -204,7 +204,7 @@ describe("cf previews deploy", () => { it("uploads prebuilt Preview output with a recorded mode without --mode", async () => { const rootConfig = { - accountId: "built-preview-account", + settings: { accountId: "built-preview-account" }, buildContext: { isPreview: true, mode: "staging" }, }; const worker = { diff --git a/packages/cli/src/__tests__/commands/secrets-file.test.ts b/packages/cli/src/__tests__/commands/secrets-file.test.ts index 54d9a5ab30..f5de92df14 100644 --- a/packages/cli/src/__tests__/commands/secrets-file.test.ts +++ b/packages/cli/src/__tests__/commands/secrets-file.test.ts @@ -39,10 +39,10 @@ describe.each([ mockDefaultHandlers(); mockExistingWorker({ lastDeployedFrom: "cf_cli" }); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); }); diff --git a/packages/cli/src/__tests__/commands/triggers-deploy.test.ts b/packages/cli/src/__tests__/commands/triggers-deploy.test.ts index 7fb99a681c..86dc39bda0 100644 --- a/packages/cli/src/__tests__/commands/triggers-deploy.test.ts +++ b/packages/cli/src/__tests__/commands/triggers-deploy.test.ts @@ -50,12 +50,12 @@ describe("cf workers triggers deploy", () => { async ({ flags }) => { const requests = recordRequests(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -128,13 +128,13 @@ describe("cf workers triggers deploy", () => { ) ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -172,11 +172,11 @@ describe("cf workers triggers deploy", () => { "CLOUDFLARE_API_TOKEN=file-token", `CLOUDFLARE_ACCOUNT_ID=${ACCOUNT_ID}`, ].join("\n"), - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -205,14 +205,16 @@ describe("cf workers triggers deploy", () => { ); await seed({ "cloudflare.config.ts": `export default () => { throw new Error("Project config should not be reevaluated"); };`, - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ - accountId: "built-account", - complianceRegion: "fedramp-high", + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ + settings: { + accountId: "built-account", + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -243,14 +245,16 @@ describe("cf workers triggers deploy", () => { vi.stubEnv("CLOUDFLARE_ACCOUNT_ID", "env-account"); await seed({ "cloudflare.config.ts": `export default () => { throw new Error("Project config should not be reevaluated"); };`, - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ - complianceRegion: "fedramp-high", + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, + settings: { + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -281,17 +285,17 @@ describe("cf workers triggers deploy", () => { ) ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", - ".cloudflare/output/v0/workers/api/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/api/worker.config.json": workerConfig({ name: "api", triggers: [{ type: "scheduled", schedule: "0 * * * *" }], }), - ".cloudflare/output/v0/workers/api/bundle/index.js": + ".cloudflare/output/v1/workers/api/bundle/index.js": "export default { fetch() { return new Response('api'); } }", }); @@ -324,12 +328,12 @@ describe("cf workers triggers deploy", () => { ) ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "config-worker", triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -354,13 +358,13 @@ describe("cf workers triggers deploy", () => { ) ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "production" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -375,12 +379,12 @@ describe("cf workers triggers deploy", () => { it("rejects Preview Build Output", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {};", }); @@ -397,11 +401,11 @@ describe("cf workers triggers deploy", () => { vi.stubEnv("CLOUDFLARE_ACCOUNT_ID", undefined); const requests = recordRequests(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ triggers: [{ type: "scheduled", schedule: "*/5 * * * *" }], }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); diff --git a/packages/cli/src/__tests__/commands/versions-upload.test.ts b/packages/cli/src/__tests__/commands/versions-upload.test.ts index a168b8074b..88966247ed 100644 --- a/packages/cli/src/__tests__/commands/versions-upload.test.ts +++ b/packages/cli/src/__tests__/commands/versions-upload.test.ts @@ -65,10 +65,10 @@ describe("cf workers versions create", () => { async ({ flags }) => { const requests = recordRequests(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -117,7 +117,7 @@ describe("cf workers versions create", () => { expect(upload.metadata?.main_module).toBeUndefined(); expect(Object.keys(assets.manifest ?? {})).toEqual(["/index.html"]); expect( - JSON.parse(readFileSync(".cloudflare/output/v0/config.json", "utf8")) + JSON.parse(readFileSync(".cloudflare/output/v1/config.json", "utf8")) ).toMatchObject({ buildContext: { isPreview: false } }); }); @@ -125,8 +125,8 @@ describe("cf workers versions create", () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ compatibilityFlags: ["nodejs_compat"], env: { MY_KV: { type: "kv", id: "kv-ns-id-123" }, @@ -134,7 +134,7 @@ describe("cf workers versions create", () => { MY_SECRET: { type: "secret" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -173,12 +173,12 @@ describe("cf workers versions create", () => { it("runs build and forwards --mode", async () => { mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -197,12 +197,12 @@ describe("cf workers versions create", () => { it("validates mode when uploading prebuilt output", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "production" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -226,12 +226,12 @@ describe("cf workers versions create", () => { it("uploads prebuilt output with a recorded mode without --mode", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -250,12 +250,12 @@ describe("cf workers versions create", () => { it("points Preview Build Output to a mode-aware Preview deploy", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: true, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -272,10 +272,10 @@ describe("cf workers versions create", () => { it("passes --preview-alias through to the version upload", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -298,13 +298,15 @@ describe("cf workers versions create", () => { const requests = recordRequests(); mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ - accountId: "built-account", - complianceRegion: "fedramp-high", + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ + settings: { + accountId: "built-account", + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -327,10 +329,10 @@ describe("cf workers versions create", () => { vi.stubEnv("CLOUDFLARE_ACCOUNT_ID", undefined); const requests = recordRequests(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -350,17 +352,17 @@ describe("cf workers versions create", () => { it("uploads a version of the Worker selected by --worker", async () => { const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", - ".cloudflare/output/v0/workers/api/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/api/worker.config.json": workerConfig({ name: "api", mainModule: "api.js", modules: { "api.js": { type: "esm" } }, }), - ".cloudflare/output/v0/workers/api/bundle/api.js": + ".cloudflare/output/v1/workers/api/bundle/api.js": "export default { fetch() { return new Response('api'); } }", }); @@ -383,11 +385,11 @@ describe("cf workers versions create", () => { vi.stubEnv("CLOUDFLARE_CI_OVERRIDE_WORKER_NAME", "dashboard-worker"); const upload = mockWorkerUpload(); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "config-worker", }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); @@ -432,8 +434,8 @@ describe("cf workers versions create", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { SessionDO: { type: "durable-object", @@ -442,9 +444,9 @@ describe("cf workers versions create", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class SessionDO {}; export default {};", - ".cloudflare/output/v0/containers/sessions/container.config.json": + ".cloudflare/output/v1/containers/sessions/container.config.json": JSON.stringify({ name: "sessions", schedulingPolicy: "durable-object", @@ -507,8 +509,8 @@ describe("cf workers versions create", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { SessionDO: { type: "durable-object", @@ -517,9 +519,9 @@ describe("cf workers versions create", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class SessionDO {}; export default {};", - ".cloudflare/output/v0/containers/sessions/container.config.json": + ".cloudflare/output/v1/containers/sessions/container.config.json": JSON.stringify({ name: "sessions", schedulingPolicy: "durable-object", @@ -597,8 +599,8 @@ describe("cf workers versions create", () => { ); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { SessionDO: { type: "durable-object", @@ -607,9 +609,9 @@ describe("cf workers versions create", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class SessionDO {}; export default {};", - ".cloudflare/output/v0/containers/sessions/container.config.json": + ".cloudflare/output/v1/containers/sessions/container.config.json": JSON.stringify({ name: "sessions", schedulingPolicy: "durable-object", @@ -633,8 +635,8 @@ describe("cf workers versions create", () => { const upload = mockWorkerUpload(); vi.stubEnv("WRANGLER_DOCKER_BIN", await seedDockerMock()); await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ exports: { ContainerDO: { type: "durable-object", @@ -643,9 +645,9 @@ describe("cf workers versions create", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export class ContainerDO {}; export default {};", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-vite" }, diff --git a/packages/cli/src/__tests__/commands/workers-check.test.ts b/packages/cli/src/__tests__/commands/workers-check.test.ts index f6e0e52410..270b8412f5 100644 --- a/packages/cli/src/__tests__/commands/workers-check.test.ts +++ b/packages/cli/src/__tests__/commands/workers-check.test.ts @@ -80,7 +80,7 @@ describe("cf workers check", () => { } process.stderr.write( `\nWorkers check diagnostics: ${JSON.stringify({ - buildOutputWritten: existsSync(".cloudflare/output/v0/config.json"), + buildOutputWritten: existsSync(".cloudflare/output/v1/config.json"), profilingStarted: vi.mocked(startupProfile.analyseBundle).mock.calls.length > 0, profileWritten: existsSync("worker-startup.cpuprofile"), @@ -105,19 +105,19 @@ describe("cf workers check", () => { const helper = 'export const message = "ok";'; await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ modules: { "index.js": { type: "esm" }, "message.js": { type: "esm" }, "index.js.map": { type: "sourcemap" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": entry, - ".cloudflare/output/v0/workers/default/bundle/message.js": helper, - ".cloudflare/output/v0/workers/default/bundle/index.js.map": + ".cloudflare/output/v1/workers/default/bundle/index.js": entry, + ".cloudflare/output/v1/workers/default/bundle/message.js": helper, + ".cloudflare/output/v1/workers/default/bundle/index.js.map": JSON.stringify({ version: 3, file: "index.js", @@ -207,17 +207,17 @@ describe("cf workers check", () => { it("preserves a nested entrypoint path when resolving relative modules", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ mainModule: "worker/index.js", modules: { "worker/index.js": { type: "esm" }, "worker/helper.js": { type: "esm" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/worker/index.js": + ".cloudflare/output/v1/workers/default/bundle/worker/index.js": 'import { message } from "./helper.js"; export default { fetch() { return new Response(message); } };', - ".cloudflare/output/v0/workers/default/bundle/worker/helper.js": + ".cloudflare/output/v1/workers/default/bundle/worker/helper.js": 'export const message = "ok";', }); @@ -237,8 +237,8 @@ describe("cf workers check", () => { it("makes Build Output bindings available during module evaluation", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ env: { STARTUP_TEXT: { type: "text", value: "available" }, STARTUP_JSON: { @@ -248,7 +248,7 @@ describe("cf workers check", () => { STARTUP_KV: { type: "kv", id: "startup-kv" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": /* javascript */ ` + ".cloudflare/output/v1/workers/default/bundle/index.js": /* javascript */ ` import { env } from "cloudflare:workers"; if (env.STARTUP_TEXT !== "available") { throw new Error("Expected STARTUP_TEXT during module evaluation"); @@ -306,12 +306,12 @@ describe("cf workers check", () => { it("uses existing build output and writes a custom outfile", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "console.log('startup log'); export default { fetch() { return new Response('ok'); } };", }); @@ -340,12 +340,12 @@ describe("cf workers check", () => { it("checks prebuilt output with a recorded mode without --mode", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig({ buildContext: { isPreview: false, mode: "staging" }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } };", }); @@ -358,17 +358,17 @@ describe("cf workers check", () => { it("profiles the Worker selected by --worker", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig(), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } };", - ".cloudflare/output/v0/workers/api/worker.config.json": workerConfig({ + ".cloudflare/output/v1/workers/api/worker.config.json": workerConfig({ name: "api", mainModule: "api.js", modules: { "api.js": { type: "esm" } }, }), - ".cloudflare/output/v0/workers/api/bundle/api.js": + ".cloudflare/output/v1/workers/api/bundle/api.js": "export default { fetch() { return new Response('api'); } };", }); @@ -387,12 +387,12 @@ describe("cf workers check", () => { it("rejects assets-only build output", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ mainModule: undefined, modules: undefined, }), - ".cloudflare/output/v0/workers/default/assets/index.html": + ".cloudflare/output/v1/workers/default/assets/index.html": "

Hello

", }); @@ -404,17 +404,17 @@ describe("cf workers check", () => { it("rejects service-worker format build output", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ mainModule: "index.cjs", modules: { "index.cjs": { type: "cjs" }, "helper.cjs": { type: "cjs" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.cjs": + ".cloudflare/output/v1/workers/default/bundle/index.cjs": 'const { message } = require("./helper.cjs"); addEventListener("fetch", (event) => event.respondWith(new Response(message)));', - ".cloudflare/output/v0/workers/default/bundle/helper.cjs": + ".cloudflare/output/v1/workers/default/bundle/helper.cjs": 'module.exports = { message: "ok" };', }); diff --git a/packages/cli/src/__tests__/lib/build-output.test.ts b/packages/cli/src/__tests__/lib/build-output.test.ts index 61d04e6493..fb4404d7e7 100644 --- a/packages/cli/src/__tests__/lib/build-output.test.ts +++ b/packages/cli/src/__tests__/lib/build-output.test.ts @@ -21,19 +21,19 @@ describe("build output", () => { it("reads the default Worker from the Build Output Specification tree", async () => { await seed({ - ".cloudflare/output/v0/config.json": rootConfig, - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": rootConfig, + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", compatibilityDate: "2026-04-25", }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", - ".cloudflare/output/v0/workers/additional/worker.config.json": + ".cloudflare/output/v1/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/workers/additional/worker.config.json": JSON.stringify({ name: "additional-worker", compatibilityDate: "2026-04-25", }), - ".cloudflare/output/v0/workers/additional/bundle/index.js": "", + ".cloudflare/output/v1/workers/additional/bundle/index.js": "", }); const { @@ -47,8 +47,8 @@ describe("build output", () => { it("converts the Worker config to wrangler config", async () => { await seed({ - ".cloudflare/output/v0/config.json": rootConfig, - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": rootConfig, + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", compatibilityDate: "2026-04-25", @@ -59,7 +59,7 @@ describe("build output", () => { modules: { "index.js": { type: "esm" } }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/workers/default/bundle/index.js": "", }); const { @@ -74,14 +74,14 @@ describe("build output", () => { compatibility_flags: ["nodejs_compat"], }); expect(wranglerConfig.main).toBe( - resolve(".cloudflare/output/v0/workers/default/bundle/index.js") + resolve(".cloudflare/output/v1/workers/default/bundle/index.js") ); }); it("keeps Build Output Containers separate from Worker validation", async () => { await seed({ - ".cloudflare/output/v0/config.json": rootConfig, - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": rootConfig, + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", compatibilityDate: "2026-04-25", @@ -93,8 +93,8 @@ describe("build output", () => { }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", - ".cloudflare/output/v0/containers/api/container.config.json": + ".cloudflare/output/v1/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/containers/api/container.config.json": JSON.stringify({ name: "api-container", image: { localReference: "api-container:built-by-wrangler" }, @@ -117,17 +117,19 @@ describe("build output", () => { it("reads output mode without including it in converted config", async () => { await seed({ - ".cloudflare/output/v0/config.json": JSON.stringify({ - accountId: "account-1", - complianceRegion: "fedramp-high", + ".cloudflare/output/v1/config.json": JSON.stringify({ buildContext: { isPreview: false, mode: "staging" }, + settings: { + accountId: "account-1", + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", compatibilityDate: "2026-04-25", }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/workers/default/bundle/index.js": "", }); const { @@ -211,14 +213,14 @@ describe("build output", () => { describe("worker selection", () => { async function seedWorkers(workers: Record) { await seed({ - ".cloudflare/output/v0/config.json": rootConfig, + ".cloudflare/output/v1/config.json": rootConfig, ...Object.fromEntries( Object.entries(workers).flatMap(([directory, name]) => [ [ - `.cloudflare/output/v0/workers/${directory}/worker.config.json`, + `.cloudflare/output/v1/workers/${directory}/worker.config.json`, JSON.stringify({ name, compatibilityDate: "2026-04-25" }), ], - [`.cloudflare/output/v0/workers/${directory}/bundle/index.js`, ""], + [`.cloudflare/output/v1/workers/${directory}/bundle/index.js`, ""], ]) ), }); @@ -313,8 +315,8 @@ describe("build output", () => { it("normalizes wrangler config with built and user path", async () => { await seed({ - ".cloudflare/output/v0/config.json": rootConfig, - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": rootConfig, + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", compatibilityDate: "2026-04-25", @@ -324,7 +326,7 @@ describe("build output", () => { modules: { "index.js": { type: "esm" } }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/workers/default/bundle/index.js": "", }); const { @@ -341,13 +343,13 @@ describe("build output", () => { it("rejects a schema-invalid Worker config while reading", async () => { await seed({ - ".cloudflare/output/v0/config.json": rootConfig, - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": rootConfig, + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", main: "bundle/index.js", }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/workers/default/bundle/index.js": "", }); await expect(readBuildOutput(process.cwd())).rejects.toThrow( @@ -357,8 +359,8 @@ describe("build output", () => { it("converts normalization diagnostics errors to config errors", async () => { await seed({ - ".cloudflare/output/v0/config.json": rootConfig, - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": rootConfig, + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "bad name!", compatibilityDate: "2026-04-25", @@ -368,7 +370,7 @@ describe("build output", () => { modules: { "index.js": { type: "esm" } }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/workers/default/bundle/index.js": "", }); const { diff --git a/packages/cli/src/__tests__/lib/context.test.ts b/packages/cli/src/__tests__/lib/context.test.ts index 535e9615e1..17c1089a8c 100644 --- a/packages/cli/src/__tests__/lib/context.test.ts +++ b/packages/cli/src/__tests__/lib/context.test.ts @@ -12,7 +12,7 @@ import { import { MissingCredentialsError } from "../../lib/errors.js"; import { setTemporaryAccountRequested } from "../../lib/oauth/index.js"; import { clearLoadedProjectSettings } from "../../lib/project-settings.js"; -import type { ParsedInputSettingsConfig } from "@cloudflare/config"; +import type { ParsedSettings } from "@cloudflare/config"; const getOrSelectAccountIdMock = vi.hoisted(() => vi.fn()); const requireAuthMock = vi.hoisted(() => vi.fn()); @@ -34,7 +34,7 @@ vi.mock("@cloudflare/workers-auth/cf", () => ({ validateScopeKeys: vi.fn(), })); -function writeProjectSettings(settings: ParsedInputSettingsConfig): void { +function writeProjectSettings(settings: ParsedSettings): void { writeFileSync( join(process.cwd(), "cloudflare.config.ts"), `export default ${JSON.stringify(settings)};` diff --git a/packages/cli/src/__tests__/lib/deploy-input.test.ts b/packages/cli/src/__tests__/lib/deploy-input.test.ts index b584195c4a..89a0514a83 100644 --- a/packages/cli/src/__tests__/lib/deploy-input.test.ts +++ b/packages/cli/src/__tests__/lib/deploy-input.test.ts @@ -22,17 +22,17 @@ describe("transforms Build Output Specification into deploy input", () => { it("reads modules and maps types", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", modules: { "index.js": { type: "esm" }, "helper.wasm": { type: "wasm" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", - ".cloudflare/output/v0/workers/default/bundle/helper.wasm": "wasm-bytes", + ".cloudflare/output/v1/workers/default/bundle/helper.wasm": "wasm-bytes", }); const { @@ -43,7 +43,7 @@ describe("transforms Build Output Specification into deploy input", () => { const result = assembleBuildResult(worker, builtConfig, process.cwd()); expect(result.resolvedEntryPointPath).toBe( - resolve(".cloudflare/output/v0/workers/default/bundle/index.js") + resolve(".cloudflare/output/v1/workers/default/bundle/index.js") ); expect(result.bundleType).toBe("esm"); expect(result.content).toBe("export default {}"); @@ -55,8 +55,8 @@ describe("transforms Build Output Specification into deploy input", () => { it("resolves and deploys modules from a partial manifest", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", compatibilityDate: "2026-04-25", @@ -66,12 +66,12 @@ describe("transforms Build Output Specification into deploy input", () => { modules: { "helper.wasm": { type: "wasm" } }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", - ".cloudflare/output/v0/workers/default/bundle/chunk.mjs": + ".cloudflare/output/v1/workers/default/bundle/chunk.mjs": "export const value = 1", - ".cloudflare/output/v0/workers/default/bundle/chunk.mjs.map": "{}", - ".cloudflare/output/v0/workers/default/bundle/helper.wasm": "wasm-bytes", + ".cloudflare/output/v1/workers/default/bundle/chunk.mjs.map": "{}", + ".cloudflare/output/v1/workers/default/bundle/helper.wasm": "wasm-bytes", }); const { @@ -98,17 +98,17 @@ describe("transforms Build Output Specification into deploy input", () => { it("includes sourcemaps declared in the manifest", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", modules: { "index.js": { type: "esm" }, "index.js.map": { type: "sourcemap" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", - ".cloudflare/output/v0/workers/default/bundle/index.js.map": + ".cloudflare/output/v1/workers/default/bundle/index.js.map": '{"version":3}', }); @@ -133,10 +133,10 @@ describe("transforms Build Output Specification into deploy input", () => { map: Record, mapKey = "index.js.map" ) { - const bundle = ".cloudflare/output/v0/workers/default/bundle"; + const bundle = ".cloudflare/output/v1/workers/default/bundle"; await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "my-worker", compatibilityDate: "2026-04-25", @@ -253,7 +253,7 @@ describe("transforms Build Output Specification into deploy input", () => { mappings: "", }); expect(result.sources).toEqual([ - ".cloudflare/output/v0/workers/default/bundle/index.src.js", + ".cloudflare/output/v1/workers/default/bundle/index.src.js", ]); }); @@ -299,17 +299,17 @@ describe("transforms Build Output Specification into deploy input", () => { it("uploads a source map it cannot parse unchanged", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", modules: { "index.js": { type: "esm" }, "index.js.map": { type: "sourcemap" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", - ".cloudflare/output/v0/workers/default/bundle/index.js.map": + ".cloudflare/output/v1/workers/default/bundle/index.js.map": '{"sources": ["../src/index.ts"', }); @@ -326,15 +326,15 @@ describe("transforms Build Output Specification into deploy input", () => { it("throws when a manifest sourcemap is missing", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", modules: { "index.js": { type: "esm" }, "index.js.map": { type: "sourcemap" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", }); @@ -353,13 +353,13 @@ describe("transforms Build Output Specification into deploy input", () => { it("returns empty result for assets-only (no mainModule)", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", mainModule: undefined, modules: undefined, }), - ".cloudflare/output/v0/workers/default/assets/index.html": "", + ".cloudflare/output/v1/workers/default/assets/index.html": "", }); const { @@ -375,13 +375,13 @@ describe("transforms Build Output Specification into deploy input", () => { it("rejects module path traversal", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", mainModule: "../../../etc/passwd", modules: { "../../../etc/passwd": { type: "esm" } }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": "", + ".cloudflare/output/v1/workers/default/bundle/index.js": "", }); const { @@ -403,17 +403,17 @@ describe("transforms Build Output Specification into deploy input", () => { // shares the "bundle" prefix. Without the trailing-separator check // this would pass a naive startsWith guard. await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", modules: { "index.js": { type: "esm" }, "../bundle-evil/payload.js": { type: "esm" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", - ".cloudflare/output/v0/workers/default/bundle-evil/payload.js": "evil()", + ".cloudflare/output/v1/workers/default/bundle-evil/payload.js": "evil()", }); const { @@ -441,19 +441,19 @@ describe("transforms Build Output Specification into deploy input", () => { }; await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", modules, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {}", - ".cloudflare/output/v0/workers/default/bundle/lib.cjs": + ".cloudflare/output/v1/workers/default/bundle/lib.cjs": "module.exports = {}", - ".cloudflare/output/v0/workers/default/bundle/app.py": "pass", - ".cloudflare/output/v0/workers/default/bundle/dep.txt": "hello", - ".cloudflare/output/v0/workers/default/bundle/blob.bin": "\x00", - ".cloudflare/output/v0/workers/default/bundle/config.json": '{"a":1}', + ".cloudflare/output/v1/workers/default/bundle/app.py": "pass", + ".cloudflare/output/v1/workers/default/bundle/dep.txt": "hello", + ".cloudflare/output/v1/workers/default/bundle/blob.bin": "\x00", + ".cloudflare/output/v1/workers/default/bundle/config.json": '{"a":1}', }); const { @@ -478,8 +478,8 @@ describe("transforms Build Output Specification into deploy input", () => { // Python Workers import vendored packages from `python_modules/` and use // module names as file paths, so a `./` prefix makes `import workers` fail. await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", compatibilityFlags: ["python_workers"], mainModule: "entry.py", @@ -491,14 +491,14 @@ describe("transforms Build Output Specification into deploy input", () => { "python_modules/workers/workflows.js": { type: "esm" }, }, }), - ".cloudflare/output/v0/workers/default/bundle/entry.py": + ".cloudflare/output/v1/workers/default/bundle/entry.py": "from workers import WorkerEntrypoint", - ".cloudflare/output/v0/workers/default/bundle/helpers.py": "pass", - ".cloudflare/output/v0/workers/default/bundle/python_modules/workers/__init__.py": + ".cloudflare/output/v1/workers/default/bundle/helpers.py": "pass", + ".cloudflare/output/v1/workers/default/bundle/python_modules/workers/__init__.py": "", - ".cloudflare/output/v0/workers/default/bundle/python_modules/_workers_sdk_patch_loader.pth": + ".cloudflare/output/v1/workers/default/bundle/python_modules/_workers_sdk_patch_loader.pth": "", - ".cloudflare/output/v0/workers/default/bundle/python_modules/workers/workflows.js": + ".cloudflare/output/v1/workers/default/bundle/python_modules/workers/workflows.js": "export {}", }); @@ -520,14 +520,14 @@ describe("transforms Build Output Specification into deploy input", () => { it("throws when run_worker_first is set without a user Worker", async () => { await seed({ - ".cloudflare/output/v0/config.json": buildOutputRootConfig(), - ".cloudflare/output/v0/workers/default/worker.config.json": workerConfig({ + ".cloudflare/output/v1/config.json": buildOutputRootConfig(), + ".cloudflare/output/v1/workers/default/worker.config.json": workerConfig({ name: "my-worker", mainModule: undefined, modules: undefined, assets: { runWorkerFirst: true }, }), - ".cloudflare/output/v0/workers/default/assets/index.html": "", + ".cloudflare/output/v1/workers/default/assets/index.html": "", }); const { diff --git a/packages/cli/src/__tests__/temporary-accounts.test.ts b/packages/cli/src/__tests__/temporary-accounts.test.ts index d70923ed87..794542b93a 100644 --- a/packages/cli/src/__tests__/temporary-accounts.test.ts +++ b/packages/cli/src/__tests__/temporary-accounts.test.ts @@ -581,11 +581,13 @@ describe("--temporary-account", () => { rmSync(cachePath()); const requests = captureProvisioningRequests(); await seed({ - ".cloudflare/output/v0/config.json": JSON.stringify({ + ".cloudflare/output/v1/config.json": JSON.stringify({ buildContext: { isPreview }, - complianceRegion: "fedramp-high", + settings: { + complianceRegion: "fedramp-high", + }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "test-name", compatibilityDate: "2025-01-01", @@ -595,7 +597,7 @@ describe("--temporary-account", () => { modules: { "index.js": { type: "esm" } }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default {};", }); diff --git a/packages/cli/src/commands/deploy/containers.ts b/packages/cli/src/commands/deploy/containers.ts index 231ac01714..bd29a5e6cc 100644 --- a/packages/cli/src/commands/deploy/containers.ts +++ b/packages/cli/src/commands/deploy/containers.ts @@ -6,7 +6,7 @@ import { import { isLiveDurableObjectExport } from "@cloudflare/workers-utils"; import { BuildOutputConfigError } from "../../lib/build-output-error.js"; import type { BuildOutputContainers } from "@cloudflare/build-output-utils"; -import type { ParsedOutputContainerConfig } from "@cloudflare/config"; +import type { ParsedBuildOutputContainerConfig } from "@cloudflare/config"; import type { BuiltContainerImage, ContainerNormalizedConfig, @@ -28,14 +28,18 @@ import type { type OutputImage = { reference: string } | { localReference: string }; +// `@cloudflare/config` leaves `maxInstances` unset when it isn't configured. +// Match Wrangler's deploy default. +const DEFAULT_MAX_INSTANCES = 20; + type StandardOutputContainerConfig = Exclude< - ParsedOutputContainerConfig, + ParsedBuildOutputContainerConfig, { schedulingPolicy: "durable-object" } >; interface ContainerWithClass { className: string; - config: ParsedOutputContainerConfig; + config: ParsedBuildOutputContainerConfig; } interface ContainerDeployOptions { @@ -128,7 +132,7 @@ function toContainerApp( return { ...toCommonContainerApp(config, className), image: imageReference(config.image), - max_instances: config.maxInstances, + max_instances: config.maxInstances ?? DEFAULT_MAX_INSTANCES, ...(config.instanceType !== undefined && { instance_type: config.instanceType, }), @@ -188,7 +192,7 @@ function withClassNames( } function toCommonContainerApp( - config: ParsedOutputContainerConfig, + config: ParsedBuildOutputContainerConfig, className: string ): ContainerApp { return { @@ -217,11 +221,12 @@ function normalizeStandardContainer( options: ContainerDeployOptions ): ContainerNormalizedConfig { const { container, className } = containerWithClass; - const rolloutStepFallback = container.maxInstances < 2 ? 100 : [10, 100]; + const maxInstances = container.maxInstances ?? DEFAULT_MAX_INSTANCES; + const rolloutStepFallback = maxInstances < 2 ? 100 : [10, 100]; const shared: SharedContainerConfig = { name: container.name, class_name: className, - max_instances: container.maxInstances, + max_instances: maxInstances, scheduling_policy: (container.schedulingPolicy ?? SchedulingPolicy.DEFAULT) as SchedulingPolicy, rollout_step_percentage: @@ -293,7 +298,7 @@ function normalizeInstanceType( } function normalizeObservability( - container: ParsedOutputContainerConfig["observability"], + container: ParsedBuildOutputContainerConfig["observability"], root: Observability | undefined ): SharedContainerConfig["observability"] { let logsEnabled = @@ -320,7 +325,7 @@ function normalizeObservability( } function toContainerObservability( - observability: ParsedOutputContainerConfig["observability"] + observability: ParsedBuildOutputContainerConfig["observability"] ): ContainerObservability | undefined { if (observability === undefined) { return undefined; diff --git a/packages/cli/src/commands/deploy/shared.ts b/packages/cli/src/commands/deploy/shared.ts index b218ddb1c8..33966a9427 100644 --- a/packages/cli/src/commands/deploy/shared.ts +++ b/packages/cli/src/commands/deploy/shared.ts @@ -134,7 +134,7 @@ async function uploadBuildOutput(argv: UploadArgs, ctx: UploadCommand) { } validateBuildOutputMode(argv.mode, rootConfig.buildContext.mode); validateBuildOutputAccount( - rootConfig.accountId, + rootConfig.settings?.accountId, argv["temporary-account"] === true ); const { worker, workerNameOverridden } = applyCIWorkerNameOverride( @@ -152,7 +152,7 @@ async function uploadBuildOutput(argv: UploadArgs, ctx: UploadCommand) { const complianceRegion = getCloudflareComplianceRegion(wranglerConfig); const { authToken, accountId } = await resolveBuildOutputAuth({ - accountId: rootConfig.accountId, + accountId: rootConfig.settings?.accountId, complianceRegion, dryRun: argv["dry-run"], }); diff --git a/packages/cli/src/commands/deploy/static-assets.ts b/packages/cli/src/commands/deploy/static-assets.ts index 77fbc06eb4..589a30a951 100644 --- a/packages/cli/src/commands/deploy/static-assets.ts +++ b/packages/cli/src/commands/deploy/static-assets.ts @@ -8,9 +8,9 @@ import { writeWorkerConfig, } from "@cloudflare/build-output-utils"; import { - InputSettingsSchema, - InputWorkerSchema, loadAndParseConfig, + SettingsSchema, + WorkerConfigSchema, } from "@cloudflare/config"; import { DEFAULT_COMPAT_DATE, @@ -22,14 +22,12 @@ import { formatConfigIssues, } from "../../lib/project-settings.js"; import { log } from "../../lib/ui/log.js"; -import type { - ParsedInputSettingsConfig, - ParsedInputWorkerConfig, -} from "@cloudflare/config"; +import { VERSION } from "../../version.js"; +import type { ParsedSettings, ParsedWorkerConfig } from "@cloudflare/config"; interface StaticAssetsProjectConfig { - settings: ParsedInputSettingsConfig | undefined; - worker: ParsedInputWorkerConfig; + settings: ParsedSettings | undefined; + worker: ParsedWorkerConfig; } interface StaticAssetsCommandArgs { @@ -102,9 +100,11 @@ export async function prepareStaticAssetsBuildOutput( } await cleanBuildOutputDir(root); - await writeRootConfig(root, projectConfig.settings, { - isPreview: context.isPreview, - mode: argv.mode, + await writeRootConfig({ + root, + settings: projectConfig.settings, + buildContext: { isPreview: context.isPreview, mode: argv.mode }, + producer: { name: "cf", version: VERSION }, }); await writeWorkerConfig({ root, config: projectConfig.worker }); await writeAssets({ root, sourceDirectory }); @@ -144,20 +144,20 @@ async function loadStaticAssetsProjectConfig( `${CLOUDFLARE_CONFIG_FILENAME} configures a Worker entrypoint, so this is not an assets-only project. Omit the directory so cf can build and include its server-side code.` ); } - if (containers.length > 0) { + if (containers !== undefined && containers.length > 0) { throw new Error( `${CLOUDFLARE_CONFIG_FILENAME} configures Containers, so this is not an assets-only project. Omit the directory so cf can build and include its server-side code.` ); } return { - settings: InputSettingsSchema.parse(loaded.result.data), + settings: SettingsSchema.parse(loaded.result.data), worker: worker ?? createDefaultWorkerConfig(root), }; } -function createDefaultWorkerConfig(root: string): ParsedInputWorkerConfig { - return InputWorkerSchema.parse({ +function createDefaultWorkerConfig(root: string): ParsedWorkerConfig { + return WorkerConfigSchema.parse({ name: getWorkerNameFromProject(root), compatibilityDate: DEFAULT_COMPAT_DATE, }); diff --git a/packages/cli/src/commands/dev/known-impls.ts b/packages/cli/src/commands/dev/known-impls.ts index 117d963e1a..29aae46d44 100644 --- a/packages/cli/src/commands/dev/known-impls.ts +++ b/packages/cli/src/commands/dev/known-impls.ts @@ -118,22 +118,24 @@ export const KNOWN_IMPLS: readonly KnownImpl[] = [ ecosystem: "npm", pkg: "@cloudflare/vite-plugin", versionConstraint: { - range: ">=2.0.0-beta.v.13 <3.0.0-0", - display: "@cloudflare/vite-plugin v2 beta (2.0.0-beta.v.13 or newer)", + range: ">=2.0.0-rc.0 <3.0.0-0", + display: "@cloudflare/vite-plugin v2 (2.0.0-rc.0 or newer)", }, description: "Vite-based dev server (recommended for JavaScript/TypeScript)", manifest: "package.json", binary: npmBinaryResolver("cf-vite"), - installCommands: ["npm install --save-dev @cloudflare/vite-plugin@beta"], + installCommands: [ + 'npm install --save-dev "@cloudflare/vite-plugin@^2.0.0-rc.0"', + ], }, { ecosystem: "npm", pkg: "wrangler", fallback: true, versionConstraint: { - range: ">=4.161.0", - display: "wrangler@4.161.0 or newer", + range: ">=4.163.0", + display: "wrangler@4.163.0 or newer", }, description: "Wrangler-based dev server (legacy Worker projects)", manifest: "package.json", diff --git a/packages/cli/src/commands/init/template.ts b/packages/cli/src/commands/init/template.ts index 75f0836920..31f8fbe51e 100644 --- a/packages/cli/src/commands/init/template.ts +++ b/packages/cli/src/commands/init/template.ts @@ -4,8 +4,8 @@ import type { PackageManager } from "./workers.js"; // to avoid duplicate Vite instances and split test runner state. // https://viteplus.dev/guide/local-cli#manual-installation export const WORKER_TEMPLATE_DEV_DEPENDENCIES = { - "@cloudflare/vite-plugin": "beta", - "@cloudflare/vitest-plugin": "^1.5.0", + "@cloudflare/vite-plugin": "^2.0.0-rc.0", + "@cloudflare/vitest-plugin": "^1.8.3", typescript: "^7.0.2", vite: "npm:@voidzero-dev/vite-plus-core@1.4.0", "vite-plus": "1.4.0", diff --git a/packages/cli/src/commands/previews/deploy.ts b/packages/cli/src/commands/previews/deploy.ts index e5beb1fa80..2dfa0a539c 100644 --- a/packages/cli/src/commands/previews/deploy.ts +++ b/packages/cli/src/commands/previews/deploy.ts @@ -112,7 +112,7 @@ async function deployPreviewBuildOutput( assertPreviewBuildOutputRootConfig(output.rootConfig); validateBuildOutputMode(argv.mode, output.rootConfig.buildContext.mode); validateBuildOutputAccount( - output.rootConfig.accountId, + output.rootConfig.settings?.accountId, argv["temporary-account"] ); const { worker } = applyCIWorkerNameOverride( @@ -125,7 +125,7 @@ async function deployPreviewBuildOutput( const complianceRegion = getCloudflareComplianceRegion(wranglerConfig); const { authToken, accountId } = await resolveBuildOutputAuth({ - accountId: output.rootConfig.accountId, + accountId: output.rootConfig.settings?.accountId, complianceRegion, isPreview: true, }); diff --git a/packages/cli/src/commands/workers/triggers/deploy.ts b/packages/cli/src/commands/workers/triggers/deploy.ts index b81d9479a2..784669caea 100644 --- a/packages/cli/src/commands/workers/triggers/deploy.ts +++ b/packages/cli/src/commands/workers/triggers/deploy.ts @@ -88,7 +88,7 @@ async function deployTriggers(argv: TriggersDeployArgs): Promise { } validateBuildOutputMode(argv.mode, rootConfig.buildContext.mode); validateBuildOutputAccount( - rootConfig.accountId, + rootConfig.settings?.accountId, argv["temporary-account"] === true ); const { worker } = applyCIWorkerNameOverride( @@ -98,7 +98,7 @@ async function deployTriggers(argv: TriggersDeployArgs): Promise { const complianceRegion = getCloudflareComplianceRegion(wranglerConfig); const { authToken, accountId } = await resolveBuildOutputAuth({ - accountId: rootConfig.accountId, + accountId: rootConfig.settings?.accountId, complianceRegion, dryRun: argv["dry-run"], }); diff --git a/packages/cli/src/lib/autoconfig.ts b/packages/cli/src/lib/autoconfig.ts index b1d3a3fd19..279da0e74e 100644 --- a/packages/cli/src/lib/autoconfig.ts +++ b/packages/cli/src/lib/autoconfig.ts @@ -78,6 +78,11 @@ export async function analyzeProject( target: "cf", context, }); + // Keep using the installed cf delegate when native Vite detection + // cannot resolve a command for the project. + if (details.commandError && !details.devCommand && !details.buildCommand) { + return; + } return maybeApplyVinextCommandOverrides(details); } catch (error) { if (error instanceof AutoConfigDetectionError) { diff --git a/packages/cli/src/lib/build-output.ts b/packages/cli/src/lib/build-output.ts index 2ac0240a92..2e0f5e2194 100644 --- a/packages/cli/src/lib/build-output.ts +++ b/packages/cli/src/lib/build-output.ts @@ -7,7 +7,7 @@ import type { BuildOutputWorker, BuildOutputWorkers, } from "@cloudflare/build-output-utils"; -import type { ParsedOutputRootConfig } from "@cloudflare/config"; +import type { ParsedBuildOutputRootConfig } from "@cloudflare/config"; import type { ContainerlessConfig } from "@cloudflare/deploy-helpers"; import type { Config, RawConfig } from "@cloudflare/workers-utils"; @@ -159,13 +159,12 @@ export function applyCIMatchWorkerTag(): () => void { */ export function parseWorkerConfig( worker: BuildOutputWorker, - rootConfig: ParsedOutputRootConfig + rootConfig: ParsedBuildOutputRootConfig ): ParsedWorkerConfig { const builtConfig = worker.config; - const { buildContext: _buildContext, ...settings } = rootConfig; const { manifest: _manifest, ...workerConfig } = builtConfig; const wranglerRawConfig = convertToWranglerConfig({ - ...settings, + ...rootConfig.settings, worker: workerConfig, // Build Output Containers are converted separately for deployment because // their image references are already resolved output values. @@ -173,7 +172,7 @@ export function parseWorkerConfig( }); // The output config stores the entrypoint inside manifest.mainModule, but - // convertToWranglerConfig reads `entrypoint` (InputWorkerSchema only), so + // convertToWranglerConfig reads `entrypoint` (WorkerConfigSchema only), so // set `main` from the manifest against the on-disk bundle directory. if (builtConfig.manifest?.mainModule && worker.bundleDir) { wranglerRawConfig.main = path.join( diff --git a/packages/cli/src/lib/project-settings.ts b/packages/cli/src/lib/project-settings.ts index 168e792140..a2dec9875c 100644 --- a/packages/cli/src/lib/project-settings.ts +++ b/packages/cli/src/lib/project-settings.ts @@ -1,6 +1,6 @@ import { statSync } from "node:fs"; import { dirname, join, resolve } from "node:path"; -import type { ParsedInputSettingsConfig } from "@cloudflare/config"; +import type { ParsedSettings } from "@cloudflare/config"; export const CLOUDFLARE_CONFIG_FILENAME = "cloudflare.config.ts"; @@ -20,7 +20,7 @@ export function formatConfigIssues( export interface LoadedProjectSettings { path: string; - settings: ParsedInputSettingsConfig | undefined; + settings: ParsedSettings | undefined; } let loadedSettings: diff --git a/packages/wrangler-tests/package.json b/packages/wrangler-tests/package.json index 239212a6d8..0390634c7d 100644 --- a/packages/wrangler-tests/package.json +++ b/packages/wrangler-tests/package.json @@ -9,7 +9,7 @@ "test:watch": "vp run task:test:watch" }, "devDependencies": { - "@cloudflare/workers-utils": "0.54.0", + "@cloudflare/workers-utils": "0.54.1", "@types/node": "26.6.6", "@types/prompts": "^2.4.9", "@types/shell-quote": "^1.7.5", @@ -18,7 +18,7 @@ "chalk": "^6.0.1", "ci-info": "^4.4.0", "get-port": "^7.2.0", - "miniflare": "5.20261113.0-beta", + "miniflare": "5.20261116.0-beta", "msw": "3.0.4", "prompts": "^2.4.2", "shell-quote": "^1.12.0", diff --git a/packages/wrangler-tests/src/__tests__/deploy/core.test.ts b/packages/wrangler-tests/src/__tests__/deploy/core.test.ts index 998e355181..5a2db3449e 100644 --- a/packages/wrangler-tests/src/__tests__/deploy/core.test.ts +++ b/packages/wrangler-tests/src/__tests__/deploy/core.test.ts @@ -384,11 +384,11 @@ describe("deploy", () => { async function seedBuildOutput(accountId?: string): Promise { await seed({ - ".cloudflare/output/v0/config.json": JSON.stringify({ + ".cloudflare/output/v1/config.json": JSON.stringify({ buildContext: { isPreview: false }, - accountId, + ...(accountId ? { settings: { accountId } } : {}), }), - ".cloudflare/output/v0/workers/default/worker.config.json": JSON.stringify({ + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify({ name: "test-name", compatibilityDate: "2025-01-01", manifest: { @@ -397,7 +397,7 @@ async function seedBuildOutput(accountId?: string): Promise { modules: { "index.js": { type: "esm" } }, }, }), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); } diff --git a/packages/wrangler-tests/src/__tests__/versions/versions.upload.test.ts b/packages/wrangler-tests/src/__tests__/versions/versions.upload.test.ts index 2d35a25bd6..c6462f9119 100644 --- a/packages/wrangler-tests/src/__tests__/versions/versions.upload.test.ts +++ b/packages/wrangler-tests/src/__tests__/versions/versions.upload.test.ts @@ -241,12 +241,12 @@ async function seedBuildOutput({ name }: { name: string | undefined }) { }; await seed({ - ".cloudflare/output/v0/config.json": JSON.stringify({ + ".cloudflare/output/v1/config.json": JSON.stringify({ buildContext: { isPreview: false }, }), - ".cloudflare/output/v0/workers/default/worker.config.json": + ".cloudflare/output/v1/workers/default/worker.config.json": JSON.stringify(config), - ".cloudflare/output/v0/workers/default/bundle/index.js": + ".cloudflare/output/v1/workers/default/bundle/index.js": "export default { fetch() { return new Response('ok'); } }", }); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67213abe18..5cebf1e039 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -213,11 +213,11 @@ importers: fixtures/vite-container-project: devDependencies: '@cloudflare/vite-plugin': - specifier: 2.0.0-beta.v.17 - version: 2.0.0-beta.v.17(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(workerd@1.20261113.1) + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(workerd@1.20261116.1) '@cloudflare/workers-types': - specifier: 5.20261115.1 - version: 5.20261115.1 + specifier: 5.20261116.1 + version: 5.20261116.1 cf: specifier: workspace:* version: link:../../packages/cli @@ -225,17 +225,17 @@ importers: specifier: 'catalog:' version: '@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)' wrangler: - specifier: 4.162.0 - version: 4.162.0(@cloudflare/workers-types@5.20261115.1)(@types/node@26.6.6) + specifier: 4.163.0 + version: 4.163.0(@cloudflare/workers-types@5.20261116.1)(@types/node@26.6.6) fixtures/vite-plugin-project: devDependencies: '@cloudflare/vite-plugin': - specifier: 2.0.0-beta.v.17 - version: 2.0.0-beta.v.17(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(workerd@1.20261113.1) + specifier: 2.0.0-rc.0 + version: 2.0.0-rc.0(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(workerd@1.20261116.1) '@cloudflare/workers-types': - specifier: 5.20261115.1 - version: 5.20261115.1 + specifier: 5.20261116.1 + version: 5.20261116.1 cf: specifier: workspace:* version: link:../../packages/cli @@ -243,8 +243,8 @@ importers: specifier: 'catalog:' version: '@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)' wrangler: - specifier: 4.162.0 - version: 4.162.0(@cloudflare/workers-types@5.20261115.1)(@types/node@26.6.6) + specifier: 4.163.0 + version: 4.163.0(@cloudflare/workers-types@5.20261116.1)(@types/node@26.6.6) fixtures/wrangler-bundler-project: dependencies: @@ -252,26 +252,26 @@ importers: specifier: workspace:* version: link:../../packages/cli wrangler: - specifier: 4.162.0 - version: 4.162.0(@cloudflare/workers-types@5.20261115.1)(@types/node@26.6.6) + specifier: 4.163.0 + version: 4.163.0(@cloudflare/workers-types@5.20261116.1)(@types/node@26.6.6) packages/cli: dependencies: '@cloudflare/build-output-utils': - specifier: 0.9.14 - version: 0.9.14 + specifier: 1.0.0-rc.0 + version: 1.0.0-rc.0 '@cloudflare/config': - specifier: 0.32.1 - version: 0.32.1 + specifier: 1.0.0-rc.0 + version: 1.0.0-rc.0 '@cloudflare/runtime-types': - specifier: 0.1.28 - version: 0.1.28(@types/node@26.6.6) + specifier: 0.1.29 + version: 0.1.29(@types/node@26.6.6) blake3-wasm: specifier: 2.1.5 version: 2.1.5 miniflare: - specifier: 5.20261113.0-beta - version: 5.20261113.0-beta(@types/node@26.6.6) + specifier: 5.20261116.0-beta + version: 5.20261116.0-beta(@types/node@26.6.6) devDependencies: '@bomb.sh/tab': specifier: 0.0.22 @@ -286,29 +286,29 @@ importers: specifier: ^1.8.1 version: 1.8.1 '@cloudflare/autoconfig': - specifier: 0.12.1 - version: 0.12.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + specifier: 0.13.0 + version: 0.13.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) '@cloudflare/cli-shared-helpers': - specifier: 0.3.8 - version: 0.3.8(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + specifier: 0.3.9 + version: 0.3.9(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) '@cloudflare/codemods': - specifier: 0.7.8 - version: 0.7.8 + specifier: 0.8.0 + version: 0.8.0 '@cloudflare/containers-shared': - specifier: 0.26.1 - version: 0.26.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + specifier: 0.26.2 + version: 0.26.2(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) '@cloudflare/deploy-helpers': - specifier: 0.27.0 - version: 0.27.0(@types/node@26.6.6)(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + specifier: 0.27.1 + version: 0.27.1(@types/node@26.6.6)(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) '@cloudflare/forge': specifier: https://pkg.pr.new/cloudflare/forge/@cloudflare/forge@00ee1dcab3a0511bd91829922aef27edb0d422e2 version: https://pkg.pr.new/cloudflare/forge/@cloudflare/forge@00ee1dcab3a0511bd91829922aef27edb0d422e2(@bytecodealliance/jco@1.41.0) '@cloudflare/workers-auth': - specifier: 0.18.2 - version: 0.18.2(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + specifier: 0.18.3 + version: 0.18.3(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) '@cloudflare/workers-utils': - specifier: 0.54.0 - version: 0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + specifier: 0.54.1 + version: 0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) '@types/node': specifier: 26.6.6 version: 26.6.6 @@ -370,8 +370,8 @@ importers: packages/wrangler-tests: devDependencies: '@cloudflare/workers-utils': - specifier: 0.54.0 - version: 0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + specifier: 0.54.1 + version: 0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) '@types/node': specifier: 26.6.6 version: 26.6.6 @@ -397,8 +397,8 @@ importers: specifier: ^7.2.0 version: 7.2.0 miniflare: - specifier: 5.20261113.0-beta - version: 5.20261113.0-beta(@types/node@26.6.6) + specifier: 5.20261116.0-beta + version: 5.20261116.0-beta(@types/node@26.6.6) msw: specifier: 3.0.4 version: 3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3) @@ -704,28 +704,28 @@ packages: resolution: {integrity: sha512-dlT1m5e/0yUL0kRNcQn7yGLVThkgbB0Ga/1AmfDDC/8ik6AIiSf2QLQO2zPYvefsHP0aFgxO93cVLCCfDp7kzQ==} engines: {node: '>= 20.12.0'} - '@cloudflare/autoconfig@0.12.1': - resolution: {integrity: sha512-BTe2KuAL/E5i4QH9UQGVZTVEuKhx/LgifqbMj8pM58WkUbnJOCXtoE6sYoipJfMgzsvEcPrMRueSRg+fmYAyMQ==} + '@cloudflare/autoconfig@0.13.0': + resolution: {integrity: sha512-qi9esUaW6hqGqDcfYygSl2K7MuMHeg6cXuU77CmlEnLxeSQ50NnZKVmzZDNbINRaW1HSm6rqRBM5dwpT2KJi8w==} - '@cloudflare/build-output-utils@0.9.14': - resolution: {integrity: sha512-rr28N/PxViQ/g3lKmmh4hFbSCD+e+gu5fDzo8Mve9/mO8+JCB9z2TFggTtpWn52qPRxBvyplT0rsXNdkNXPAGQ==} + '@cloudflare/build-output-utils@1.0.0-rc.0': + resolution: {integrity: sha512-uh8jVF6gcKPk/BV9c8+mN9aQmY1HxzfXiP4oJ5uDdSzICGqDwH0g3yKCrAmM3cUhIyJL3qaGE9cSJMEoXUSvWQ==} - '@cloudflare/cli-shared-helpers@0.3.8': - resolution: {integrity: sha512-fF93zK4D03oH9XEySG/6L52EgGVI5PehKbu2u0Whag7ho7sYem3j/TiaesLaDGi6qjKVhn4wro7ZDTTz7wVFZQ==} + '@cloudflare/cli-shared-helpers@0.3.9': + resolution: {integrity: sha512-2+poe0mKVKVg37fErSFAGkANySna74n1EXzvE8wvlB1TX0OhVjZ2uGUCCIZx7GisdV4aiawCC8wKUmooxvLItA==} - '@cloudflare/codemods@0.7.8': - resolution: {integrity: sha512-JoCmpsoyv2UimDw2BE54spPO50urvGPQAd5b9mreDJt6xKlDtZ/OhtMpGXRdYI+o0WhU0NrTSoenAtCuK7q3Xw==} + '@cloudflare/codemods@0.8.0': + resolution: {integrity: sha512-agLQfXsMXmt35g0rt/Qr0chnoTgGtIBjsoYGy1csraCv3zk3vI1bl/VJXZ/EpkHpVlR5oHISmHTHUU4HTxEeYA==} hasBin: true - '@cloudflare/config@0.32.1': - resolution: {integrity: sha512-ksIV3OtDJi6CbCWzQjmutFpMGKeALkueX21TyyQOs8NxS2v+DlBYoiYEKVeZOJ4eTDsTLoWyXcyJzOySgImTtg==} + '@cloudflare/config@1.0.0-rc.0': + resolution: {integrity: sha512-SGSm45fvwDtINUJbAZ+DOta+vVspxK4J0LLma7aiSG1i5RhWU3cjFpWqIhen331EebZ2+xnVuBqOPebxctchEQ==} - '@cloudflare/containers-shared@0.26.1': - resolution: {integrity: sha512-fDhL3Ym8Mkh37OhMvlthDzvYEceWeBVHESP2Bw8aTH/n5O8hJuxBZILW50dtN/eO85mJ5vdBEfg0A+qk92dN3Q==} + '@cloudflare/containers-shared@0.26.2': + resolution: {integrity: sha512-MFCLoT/rg9SePnZVdRZr18Iud76vJphaOLPTQmmlPMzfGuyUfCzJu6Qn9nVTI1GasDLeCvrgxwBnmRD4ozy8Fw==} engines: {node: '>=22.0.0'} - '@cloudflare/deploy-helpers@0.27.0': - resolution: {integrity: sha512-KORUm33nVChuY2E874Mmwx6hc7Ll7dTKK6ViCh4L6+cGRFZHJB6jZCeJnNZLoCemSZ2+5vZOkJJNuRVFCiN5qg==} + '@cloudflare/deploy-helpers@0.27.1': + resolution: {integrity: sha512-kLnJ6jgTTKiytTxEau5LyGt79igqMjmoysCp6nZdSCxAz2t8nT9CwlDTtv/HaeymBou2+YDS6rIC4cUL0/6bug==} '@cloudflare/forge@https://pkg.pr.new/cloudflare/forge/@cloudflare/forge@00ee1dcab3a0511bd91829922aef27edb0d422e2': resolution: {integrity: sha512-l/2RZSxVNwyp7YHR81D7u21RdIHOXK95cvqjtvQrcgSEt+HMr9BIMIILbhvq2Xca0hUpzcBFSTvQzAbpIX+xnw==, tarball: https://pkg.pr.new/cloudflare/forge/@cloudflare/forge@00ee1dcab3a0511bd91829922aef27edb0d422e2} @@ -742,8 +742,8 @@ packages: resolution: {integrity: sha512-jxQYkj8dSIzc0cD6cMMNdOc1UVjqSqu8BZdor5s8cGjW2I8BjODt/kWPVdY+u9zj3ms75Q5qaZgnxUad83+eAg==} engines: {node: '>=22.0.0'} - '@cloudflare/runtime-types@0.1.28': - resolution: {integrity: sha512-+sRtGyQ28MutTWT6AQW/SUu/WrUVup+gmg22XYYrYZRQ/tg13PWuflDVB6+cLkuZ7LJL9M6kjTEVOOfWUWCt9w==} + '@cloudflare/runtime-types@0.1.29': + resolution: {integrity: sha512-WLINHFlq4IhpHalY/mPH2NYMTqRyjOkhGfunQFxQznCNBV+WSd5DQk0Y0USMsUvqrTC/uE5WkPjpIn2hUXl7Zg==} '@cloudflare/unenv-preset@2.16.2': resolution: {integrity: sha512-JBP1+Z7ZSNG/d4mRP+y8VC5dka3tZVMLEZRvS+rzQ4DGV1EoxRFQckcJTTkXbHSQiTj0DtNI01Zwb/V2fX0mvQ==} @@ -754,44 +754,44 @@ packages: workerd: optional: true - '@cloudflare/vite-plugin@2.0.0-beta.v.17': - resolution: {integrity: sha512-EecBri+vFHlI2SoK+vbq/2ALODKfQf17I/nY2NO4VdgPJwr1EoJTjf8nMnhZLCdfukcTvzmjJf9Ixev8CbfrfA==} + '@cloudflare/vite-plugin@2.0.0-rc.0': + resolution: {integrity: sha512-2yF651HkXzrpnSddUsVKSeWDXRP1iDs3FET5D6aGj4vnGuO4pMVNYRCYD1VktshW7EsShZv9wQJxKIQUrH6CUA==} hasBin: true peerDependencies: vite: ^7.0.0 || ^8.0.0 - '@cloudflare/workerd-darwin-64@1.20261113.1': - resolution: {integrity: sha512-UcShHyWJVZNbuI8jL3F5QZXMrJm7oScge33D5p3hAyhIIkoVj72+bior+VcUcr1SBWkh5w3Umnrx179WE7Wvpw==} + '@cloudflare/workerd-darwin-64@1.20261116.1': + resolution: {integrity: sha512-+zzaR7CQXcT10Tbor784vI80+rO0NEy/jkTL7ZJP6PYmwjdDj2udk+sN9Ui1nqDs+frYYUtB+7nI7kycONFb0Q==} engines: {node: '>=16'} cpu: [x64] os: [darwin] - '@cloudflare/workerd-darwin-arm64@1.20261113.1': - resolution: {integrity: sha512-bKfFcpueb9GOg0NZSR4x7dpEJZMsQOwCk0XzsAoXoBfG4osFRQcFxtAhrXvB1y445zXFLhrEkDJ/+LvGAMkPSg==} + '@cloudflare/workerd-darwin-arm64@1.20261116.1': + resolution: {integrity: sha512-jOZBuQL3FdFC9FcVzfSDEWu1/jx3/asrQAU7TydMop8kdZWhqT4dslE3rC6cMait6w32XaglzEtV6OM1Ove9ZA==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] - '@cloudflare/workerd-linux-64@1.20261113.1': - resolution: {integrity: sha512-3VCnXzi7apwPSMwkiTIeEc5z/UWWGQXBZZNHCBBCXPlavWCR06SQ77tO0rEoKonfjBGW0MQaHNZ7U1pCPe4v3g==} + '@cloudflare/workerd-linux-64@1.20261116.1': + resolution: {integrity: sha512-/HnEV29Ykg3t9X6llrnlOJ9+N+cXFNsuPTTdRiE1L/hXIkI39o1RZVjEgj3GtyWtpuhsJ1mNLrNshrEjCvzk0w==} engines: {node: '>=16'} cpu: [x64] os: [linux] - '@cloudflare/workerd-linux-arm64@1.20261113.1': - resolution: {integrity: sha512-phnb1686FTIVSr4qxQFOt7MyiWMotqsVUyZVnQl579/bCrqWaYUcRnikN5f6bBpDbxCk1OvOvYz0ykjT1lvYpg==} + '@cloudflare/workerd-linux-arm64@1.20261116.1': + resolution: {integrity: sha512-hH73ERVfyoQ19DzbjPv/Gp4klU6F7gpx99JIlkmelC3vfsXPpsJdJsNAJA8LIxILa+gfH7tfxSSciCzr+0vqOQ==} engines: {node: '>=16'} cpu: [arm64] os: [linux] - '@cloudflare/workerd-windows-64@1.20261113.1': - resolution: {integrity: sha512-WtQakCAIzUQJ6dQDPn7kIGlFJ9yjB0ooNx2WFqEHLYNAT7TLCNyaORem2WVM38TceVR8flCP5UWgYm6ht3dlIw==} + '@cloudflare/workerd-windows-64@1.20261116.1': + resolution: {integrity: sha512-eUxFymDyGt3jYjE3/OsNZlSYM5jjCKx8h4nlGRdljtK1fRUT+llI8COE/1gaqMppS6x8qN6tc8vcyRXT4pxqxw==} engines: {node: '>=16'} cpu: [x64] os: [win32] - '@cloudflare/workers-auth@0.18.2': - resolution: {integrity: sha512-PMOAM9IbpzitCl27RCid1KgKUOzTT9sYLCWSzlDx7zxu4pNUbj2b3gTvZcS5kfBiuGJ9RkiP8UxTN5G5XgFEYQ==} + '@cloudflare/workers-auth@0.18.3': + resolution: {integrity: sha512-6ijo7uatNUURJVcLNw6GwBqzBvcBgKDS7UjtpNxhEBYAUwRPlPup1ScUm9dPSm7dw7bPIwQlJbkUN4HPXZyLAA==} peerDependencies: msw: 2.14.6 vitest: 5.1.0 @@ -801,11 +801,11 @@ packages: vitest: optional: true - '@cloudflare/workers-types@5.20261115.1': - resolution: {integrity: sha512-p0i+8isig1e9qK3KJDGxy6Ng3RTONO6DMFrMrLmpt9/KJRAY5gEfgIm9bGrsQhz9p1PkMGwOx9OHA3I8al/5cw==} + '@cloudflare/workers-types@5.20261116.1': + resolution: {integrity: sha512-bym4dNT9Hnm+goedLTTTH85T6S4wOJJaOpKgk9MlEGU18/JKsChN+wHvSWUAIy5YVSm6LnuaUu3d3N4K0m8Dtg==} - '@cloudflare/workers-utils@0.54.0': - resolution: {integrity: sha512-cbN8f5AL0eBAzNGbMJeR9pCPvTKRD0D/zOLN2kJUHky6byOgt/q8BCb9igKKuEqNHltj5S7cl31QU6AQcCfCJw==} + '@cloudflare/workers-utils@0.54.1': + resolution: {integrity: sha512-RJWQJdFwAxwrtmGZV8n6FdnqqBpxrHMPsOGeNx2BN9tp2Rf2/QA6S8H8lLHjXHYm3U+bSwZ2Z9UeGf6hnwD5TQ==} peerDependencies: vitest: 5.1.0 peerDependenciesMeta: @@ -3213,8 +3213,8 @@ packages: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} - miniflare@5.20261113.0-beta: - resolution: {integrity: sha512-Kg+SarKNSn0lkhR88OHI29rIXJvmKs/c9hmxFXvEqK1J9aHu+AFl6CdaBq/k3iOTyMbm2p4h1HGLs7vXaLYMWA==} + miniflare@5.20261116.0-beta: + resolution: {integrity: sha512-vQozfXz0eh4VlXJPsn/sxV3siRHmhl5kghZplFsTAt7+8gSPmjbZkYQEA4VudmcN9HTbI8pOqPynckIaIenwPg==} engines: {node: '>=22.12.0'} peerDependencies: kerberos: ^2.0.0 @@ -3820,17 +3820,17 @@ packages: engines: {node: '>=20.11'} hasBin: true - workerd@1.20261113.1: - resolution: {integrity: sha512-FJP8Bm1jiiJTE2xpSIhT9JkMaKzU54y9Jk0q7n3BLWyWdUNsn35QGCqARcqXGwO3FGkvahhYqUEG2bJzlgcfhw==} + workerd@1.20261116.1: + resolution: {integrity: sha512-w3uPBuALjYs4n/p6x5SodorOe5y1bsBZ3RYeH1g0W5l73vT+yPGI7/WtxfzXbxZqpeCZ0/RfEwgD8Pc43uzu+w==} engines: {node: '>=16'} hasBin: true - wrangler@4.162.0: - resolution: {integrity: sha512-jUnlzHKlWdW4MFXPgeYbe0+c4oTy/AAZfL/IUz921+dZBY5nJ48xjpvwff5djUR1MXoJRevzntAP/U97TUhPEw==} + wrangler@4.163.0: + resolution: {integrity: sha512-EBM/QOpQsce6LenEDv1nXsK+AX9BYfAhE5yHosriPhFZPj47Z0usk6oGYWgPpLPa5qYDzhm9EDzaDD/WI5lzOA==} engines: {node: '>=22.12.0'} hasBin: true peerDependencies: - '@cloudflare/workers-types': ^5.20261113.1 + '@cloudflare/workers-types': ^5.20261116.1 peerDependenciesMeta: '@cloudflare/workers-types': optional: true @@ -4237,23 +4237,23 @@ snapshots: fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 - '@cloudflare/autoconfig@0.12.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': + '@cloudflare/autoconfig@0.13.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': dependencies: - '@cloudflare/cli-shared-helpers': 0.3.8(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) - '@cloudflare/config': 0.32.1 - '@cloudflare/workers-utils': 0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/cli-shared-helpers': 0.3.9(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/config': 1.0.0-rc.0 + '@cloudflare/workers-utils': 0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) transitivePeerDependencies: - msw - vitest - '@cloudflare/build-output-utils@0.9.14': + '@cloudflare/build-output-utils@1.0.0-rc.0': dependencies: - '@cloudflare/config': 0.32.1 + '@cloudflare/config': 1.0.0-rc.0 - '@cloudflare/cli-shared-helpers@0.3.8(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': + '@cloudflare/cli-shared-helpers@0.3.9(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': dependencies: '@clack/core': 1.2.0 - '@cloudflare/workers-utils': 0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/workers-utils': 0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) chalk: 5.3.0 ci-info: 4.4.0 cross-spawn: 7.0.6 @@ -4262,34 +4262,34 @@ snapshots: - msw - vitest - '@cloudflare/codemods@0.7.8': {} + '@cloudflare/codemods@0.8.0': {} - '@cloudflare/config@0.32.1': + '@cloudflare/config@1.0.0-rc.0': dependencies: zod: 4.6.6 - '@cloudflare/containers-shared@0.26.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': + '@cloudflare/containers-shared@0.26.2(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': dependencies: - '@cloudflare/build-output-utils': 0.9.14 - '@cloudflare/cli-shared-helpers': 0.3.8(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) - '@cloudflare/config': 0.32.1 - '@cloudflare/workers-utils': 0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/build-output-utils': 1.0.0-rc.0 + '@cloudflare/cli-shared-helpers': 0.3.9(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/config': 1.0.0-rc.0 + '@cloudflare/workers-utils': 0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) transitivePeerDependencies: - msw - vitest - '@cloudflare/deploy-helpers@0.27.0(@types/node@26.6.6)(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': + '@cloudflare/deploy-helpers@0.27.1(@types/node@26.6.6)(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': dependencies: - '@cloudflare/cli-shared-helpers': 0.3.8(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) - '@cloudflare/config': 0.32.1 - '@cloudflare/containers-shared': 0.26.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) - '@cloudflare/workers-utils': 0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/cli-shared-helpers': 0.3.9(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/config': 1.0.0-rc.0 + '@cloudflare/containers-shared': 0.26.2(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/workers-utils': 0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) blake3-wasm: 2.1.5 chalk: 5.3.0 command-exists: 1.2.9 devtools-protocol: 0.0.1182435 dotenv: 16.3.1 - miniflare: 5.20261113.0-beta(@types/node@26.6.6) + miniflare: 5.20261116.0-beta(@types/node@26.6.6) p-queue: 9.0.0 pretty-bytes: 6.1.1 undici: 7.30.1 @@ -4308,29 +4308,29 @@ snapshots: '@cloudflare/kv-asset-handler@0.5.0': {} - '@cloudflare/runtime-types@0.1.28(@types/node@26.6.6)': + '@cloudflare/runtime-types@0.1.29(@types/node@26.6.6)': dependencies: - miniflare: 5.20261113.0-beta(@types/node@26.6.6) - workerd: 1.20261113.1 + miniflare: 5.20261116.0-beta(@types/node@26.6.6) + workerd: 1.20261116.1 transitivePeerDependencies: - '@types/node' - bufferutil - kerberos - utf-8-validate - '@cloudflare/unenv-preset@2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261113.1)': + '@cloudflare/unenv-preset@2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261116.1)': dependencies: unenv: 2.0.0-rc.24 optionalDependencies: - workerd: 1.20261113.1 + workerd: 1.20261116.1 - '@cloudflare/vite-plugin@2.0.0-beta.v.17(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(workerd@1.20261113.1)': + '@cloudflare/vite-plugin@2.0.0-rc.0(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(workerd@1.20261116.1)': dependencies: - '@cloudflare/build-output-utils': 0.9.14 - '@cloudflare/config': 0.32.1 - '@cloudflare/runtime-types': 0.1.28(@types/node@26.6.6) - '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261113.1) - miniflare: 5.20261113.0-beta(@types/node@26.6.6) + '@cloudflare/build-output-utils': 1.0.0-rc.0 + '@cloudflare/config': 1.0.0-rc.0 + '@cloudflare/runtime-types': 0.1.29(@types/node@26.6.6) + '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261116.1) + miniflare: 5.20261116.0-beta(@types/node@26.6.6) unenv: 2.0.0-rc.24 vite: '@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)' ws: 8.21.0 @@ -4341,32 +4341,32 @@ snapshots: - utf-8-validate - workerd - '@cloudflare/workerd-darwin-64@1.20261113.1': + '@cloudflare/workerd-darwin-64@1.20261116.1': optional: true - '@cloudflare/workerd-darwin-arm64@1.20261113.1': + '@cloudflare/workerd-darwin-arm64@1.20261116.1': optional: true - '@cloudflare/workerd-linux-64@1.20261113.1': + '@cloudflare/workerd-linux-64@1.20261116.1': optional: true - '@cloudflare/workerd-linux-arm64@1.20261113.1': + '@cloudflare/workerd-linux-arm64@1.20261116.1': optional: true - '@cloudflare/workerd-windows-64@1.20261113.1': + '@cloudflare/workerd-windows-64@1.20261116.1': optional: true - '@cloudflare/workers-auth@0.18.2(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': + '@cloudflare/workers-auth@0.18.3(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': dependencies: - '@cloudflare/workers-utils': 0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) + '@cloudflare/workers-utils': 0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0) undici: 7.30.1 optionalDependencies: msw: 3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3) vitest: 5.1.0(@types/node@26.6.6)(@vitest/browser-preview@5.1.0)(@vitest/ui@5.1.0)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3)) - '@cloudflare/workers-types@5.20261115.1': {} + '@cloudflare/workers-types@5.20261116.1': {} - '@cloudflare/workers-utils@0.54.0(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': + '@cloudflare/workers-utils@0.54.1(msw@3.0.4(@types/node@26.6.6)(@voidzero-dev/vite-plus-core@1.5.0(@types/node@26.6.6)(esbuild@0.28.2)(tsx@4.21.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(graphql@16.14.2)(supports-color@10.2.2)(typescript@6.0.3))(vitest@5.1.0)': dependencies: '@cspotcode/source-map-support': 0.8.1 chalk: 5.3.0 @@ -6045,12 +6045,12 @@ snapshots: mimic-fn@2.1.0: {} - miniflare@5.20261113.0-beta(@types/node@26.6.6): + miniflare@5.20261116.0-beta(@types/node@26.6.6): dependencies: '@cspotcode/source-map-support': 0.8.1 sharp: 0.35.5(@types/node@26.6.6) undici: 7.30.1 - workerd: 1.20261113.1 + workerd: 1.20261116.1 ws: 8.21.0 youch: 4.1.0-beta.10 transitivePeerDependencies: @@ -6865,27 +6865,27 @@ snapshots: why-is-node-running@3.2.1: {} - workerd@1.20261113.1: + workerd@1.20261116.1: optionalDependencies: - '@cloudflare/workerd-darwin-64': 1.20261113.1 - '@cloudflare/workerd-darwin-arm64': 1.20261113.1 - '@cloudflare/workerd-linux-64': 1.20261113.1 - '@cloudflare/workerd-linux-arm64': 1.20261113.1 - '@cloudflare/workerd-windows-64': 1.20261113.1 + '@cloudflare/workerd-darwin-64': 1.20261116.1 + '@cloudflare/workerd-darwin-arm64': 1.20261116.1 + '@cloudflare/workerd-linux-64': 1.20261116.1 + '@cloudflare/workerd-linux-arm64': 1.20261116.1 + '@cloudflare/workerd-windows-64': 1.20261116.1 - wrangler@4.162.0(@cloudflare/workers-types@5.20261115.1)(@types/node@26.6.6): + wrangler@4.163.0(@cloudflare/workers-types@5.20261116.1)(@types/node@26.6.6): dependencies: '@cloudflare/kv-asset-handler': 0.5.0 - '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261113.1) + '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261116.1) '@cspotcode/source-map-support': 0.8.1 blake3-wasm: 2.1.5 esbuild: 0.28.2 - miniflare: 5.20261113.0-beta(@types/node@26.6.6) + miniflare: 5.20261116.0-beta(@types/node@26.6.6) path-to-regexp: 6.3.0 unenv: 2.0.0-rc.24 - workerd: 1.20261113.1 + workerd: 1.20261116.1 optionalDependencies: - '@cloudflare/workers-types': 5.20261115.1 + '@cloudflare/workers-types': 5.20261116.1 fsevents: 2.3.3 transitivePeerDependencies: - '@types/node'