From dd7438d4be9bff2076f6dca15de2c9d2fd59b6d7 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Wed, 28 Oct 2026 11:07:35 +0000 Subject: [PATCH] [vite-plugin] Update v1 development registry and runtime Consolidate the existing final backport diff before rebasing onto the current v1 stack. https://github.com/cloudflare/workers-sdk/pull/16539 --- .changeset/v1-dev-registry-runtime.md | 7 +++ fixtures/dev-registry/package.json | 2 +- .../dev-registry/tests/dev-registry.test.ts | 25 +++++++--- fixtures/shared/package.json | 2 +- .../shared/src/run-wrangler-long-lived.ts | 10 +++- packages/remote-bindings/package.json | 4 +- .../package.json | 2 +- packages/vite-plugin-cloudflare/package.json | 6 +-- pnpm-lock.yaml | 46 +++++++++---------- 9 files changed, 65 insertions(+), 39 deletions(-) create mode 100644 .changeset/v1-dev-registry-runtime.md diff --git a/.changeset/v1-dev-registry-runtime.md b/.changeset/v1-dev-registry-runtime.md new file mode 100644 index 00000000000..e92ead218de --- /dev/null +++ b/.changeset/v1-dev-registry-runtime.md @@ -0,0 +1,7 @@ +--- +"@cloudflare/vite-plugin": minor +--- + +Update the development registry to use the canonical Cloudflare path + +Upgrade Miniflare to 5.20261023.1-beta and Wrangler to 4.154.0. Vite plugin v1 now uses `CLOUDFLARE_DEV_REGISTRY_PATH` or `/dev-registry/v5` for Worker discovery. `MINIFLARE_REGISTRY_PATH` is no longer read. When mixing Vite and Wrangler development sessions, set the same `CLOUDFLARE_DEV_REGISTRY_PATH` for both because Wrangler retains its legacy default. diff --git a/fixtures/dev-registry/package.json b/fixtures/dev-registry/package.json index 63acbf7a79f..351dbae36c0 100644 --- a/fixtures/dev-registry/package.json +++ b/fixtures/dev-registry/package.json @@ -16,6 +16,6 @@ "typescript": "catalog:default", "vite": "catalog:default", "vitest": "catalog:default", - "wrangler": "4.151.0" + "wrangler": "4.154.0" } } diff --git a/fixtures/dev-registry/tests/dev-registry.test.ts b/fixtures/dev-registry/tests/dev-registry.test.ts index bd12900743b..aadcd710e3f 100644 --- a/fixtures/dev-registry/tests/dev-registry.test.ts +++ b/fixtures/dev-registry/tests/dev-registry.test.ts @@ -47,7 +47,7 @@ async function runViteDev( devRegistryPath?: string ): Promise { const proc = await runLongLived("pnpm", `vite --config ${config}`, cwd, { - MINIFLARE_REGISTRY_PATH: devRegistryPath, + CLOUDFLARE_DEV_REGISTRY_PATH: devRegistryPath, }); const url = await waitForReady(proc); @@ -78,7 +78,7 @@ async function runWranglerDev( ? config.map((configPath) => `--config=${configPath}`) : [`--config=${config}`] ), - { WRANGLER_REGISTRY_PATH: devRegistryPath } + { CLOUDFLARE_DEV_REGISTRY_PATH: devRegistryPath } ); onTestFailed(() => { @@ -121,7 +121,7 @@ async function startTailPair( } async function setupPlatformProxy(config: string, devRegistryPath?: string) { - vi.stubEnv("WRANGLER_REGISTRY_PATH", devRegistryPath); + vi.stubEnv("CLOUDFLARE_DEV_REGISTRY_PATH", devRegistryPath); onTestFinished(() => { vi.unstubAllEnvs(); @@ -881,12 +881,25 @@ describe("Dev Registry: vite dev <-> vite dev", () => { }); describe("Dev Registry: vite dev <-> wrangler dev", () => { - it("uses the same dev registry path by default", async () => { + it("shares the canonical registry override despite conflicting legacy paths", async ({ + devRegistryPath, + }) => { + vi.stubEnv( + "WRANGLER_REGISTRY_PATH", + path.join(devRegistryPath, "wrangler") + ); + vi.stubEnv( + "MINIFLARE_REGISTRY_PATH", + path.join(devRegistryPath, "miniflare") + ); + onTestFinished(() => vi.unstubAllEnvs()); const workerEntrypoint = await runViteDev( - "vite.worker-entrypoint.config.ts" + "vite.worker-entrypoint.config.ts", + devRegistryPath ); const exportedHandler = await runWranglerDev( - "wrangler.exported-handler.jsonc" + "wrangler.exported-handler.jsonc", + devRegistryPath ); // Test wrangler dev -> vite dev yet diff --git a/fixtures/shared/package.json b/fixtures/shared/package.json index 21192713457..6923bcf5961 100644 --- a/fixtures/shared/package.json +++ b/fixtures/shared/package.json @@ -4,6 +4,6 @@ "description": "Shared fixtures for testing", "devDependencies": { "@cloudflare/workers-utils": "0.49.0", - "wrangler": "4.151.0" + "wrangler": "4.154.0" } } diff --git a/fixtures/shared/src/run-wrangler-long-lived.ts b/fixtures/shared/src/run-wrangler-long-lived.ts index ef4f692d555..6280c7d7c59 100644 --- a/fixtures/shared/src/run-wrangler-long-lived.ts +++ b/fixtures/shared/src/run-wrangler-long-lived.ts @@ -112,8 +112,14 @@ async function runLongLivedWrangler( if (!env?.WRANGLER_REGISTRY_PATH && !process.env.WRANGLER_REGISTRY_PATH) { registryEnv.WRANGLER_REGISTRY_PATH = getIsolatedRegistryPath(); } - if (!env?.MINIFLARE_REGISTRY_PATH && !process.env.MINIFLARE_REGISTRY_PATH) { - registryEnv.MINIFLARE_REGISTRY_PATH = getIsolatedRegistryPath(); + if ( + !env?.CLOUDFLARE_DEV_REGISTRY_PATH && + !process.env.CLOUDFLARE_DEV_REGISTRY_PATH + ) { + registryEnv.CLOUDFLARE_DEV_REGISTRY_PATH = + env?.WRANGLER_REGISTRY_PATH || + process.env.WRANGLER_REGISTRY_PATH || + getIsolatedRegistryPath(); } const wranglerProcess = fork(wranglerEntryPath, command, { diff --git a/packages/remote-bindings/package.json b/packages/remote-bindings/package.json index 3b409ccd5f9..61ac6e6bf01 100644 --- a/packages/remote-bindings/package.json +++ b/packages/remote-bindings/package.json @@ -32,11 +32,11 @@ }, "dependencies": { "@cloudflare/cli-shared-helpers": "0.2.7", - "@cloudflare/deploy-helpers": "0.24.0", + "@cloudflare/deploy-helpers": "0.24.1", "@cloudflare/workers-auth": "0.15.1", "@cloudflare/workers-utils": "0.49.0", "chalk": "catalog:default", - "miniflare": "5.20261023.0-beta", + "miniflare": "5.20261023.1-beta", "undici": "catalog:default", "ws": "catalog:default" }, diff --git a/packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings-config-account-id/package.json b/packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings-config-account-id/package.json index 0fd08a797a3..63d04d6227e 100644 --- a/packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings-config-account-id/package.json +++ b/packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings-config-account-id/package.json @@ -14,7 +14,7 @@ "@cloudflare/vite-plugin": "*", "@cloudflare/workers-types": "^5.20260706.1", "globals": "^15.14.0", - "miniflare": "5.20261023.0-beta", + "miniflare": "5.20261023.1-beta", "typescript": "~5.7.2", "vite": "^8.0.0", "wrangler": "*" diff --git a/packages/vite-plugin-cloudflare/package.json b/packages/vite-plugin-cloudflare/package.json index 357970709b9..2d0b70a1c61 100644 --- a/packages/vite-plugin-cloudflare/package.json +++ b/packages/vite-plugin-cloudflare/package.json @@ -46,9 +46,9 @@ }, "dependencies": { "@cloudflare/unenv-preset": "2.16.2", - "miniflare": "5.20261023.0-beta", + "miniflare": "5.20261023.1-beta", "unenv": "2.0.0-rc.24", - "wrangler": "4.153.0", + "wrangler": "4.154.0", "ws": "8.22.0" }, "devDependencies": { @@ -82,7 +82,7 @@ }, "peerDependencies": { "vite": "^6.1.0 || ^7.0.0 || ^8.0.0", - "wrangler": "^4.153.0" + "wrangler": "^4.154.0" }, "workers-sdk": { "prerelease": true diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 00b511247e8..ea4a0e6d3db 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -195,8 +195,8 @@ importers: specifier: catalog:default version: 5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0)) wrangler: - specifier: 4.151.0 - version: 4.151.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17) + specifier: 4.154.0 + version: 4.154.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17) fixtures/shared: devDependencies: @@ -204,8 +204,8 @@ importers: specifier: 0.49.0 version: 0.49.0(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0))) wrangler: - specifier: 4.151.0 - version: 4.151.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17) + specifier: 4.154.0 + version: 4.154.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17) packages/lint-config-shared: devDependencies: @@ -252,8 +252,8 @@ importers: specifier: 0.2.7 version: 0.2.7(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0))) '@cloudflare/deploy-helpers': - specifier: 0.24.0 - version: 0.24.0(@types/node@22.15.17)(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0))) + specifier: 0.24.1 + version: 0.24.1(@types/node@22.15.17)(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0))) '@cloudflare/workers-auth': specifier: 0.15.1 version: 0.15.1(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0))) @@ -264,8 +264,8 @@ importers: specifier: catalog:default version: 5.3.0 miniflare: - specifier: 5.20261023.0-beta - version: 5.20261023.0-beta(@types/node@22.15.17) + specifier: 5.20261023.1-beta + version: 5.20261023.1-beta(@types/node@22.15.17) undici: specifier: catalog:default version: 7.30.1 @@ -304,14 +304,14 @@ importers: specifier: 2.16.2 version: 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261023.1) miniflare: - specifier: 5.20261023.0-beta - version: 5.20261023.0-beta(@types/node@22.15.17) + specifier: 5.20261023.1-beta + version: 5.20261023.1-beta(@types/node@22.15.17) unenv: specifier: 2.0.0-rc.24 version: 2.0.0-rc.24 wrangler: - specifier: 4.153.0 - version: 4.153.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17) + specifier: 4.154.0 + version: 4.154.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17) ws: specifier: 8.22.0 version: 8.22.0 @@ -1940,8 +1940,8 @@ packages: resolution: {integrity: sha512-dT5RpbmMjh3OOgoGKVWQxsOKJ9RDYVvae9Ut5ln5mvfUfRlzqw5e7WQSF4HtVFqna975LpFyWTzpid4lUQ+rWQ==} engines: {node: '>=22.0.0'} - '@cloudflare/deploy-helpers@0.24.0': - resolution: {integrity: sha512-OU7ZvCVUo+NwlhbgBU8+xXfqDqR4G4uyaKa33+n4xHU1EyQwjvZf0u4RE8ohETFUcrheYMLzHiCrah4TsUPd4g==} + '@cloudflare/deploy-helpers@0.24.1': + resolution: {integrity: sha512-6sUukvTnkxFZ6c47E3ofBNNWZbmuMM51dGwKERvhoZfexFd7O7pgVciDczl5mPz+zSModNVAp+atWK35ov3y0g==} '@cloudflare/kv-asset-handler@0.1.3': resolution: {integrity: sha512-FNcunDuTmEfQTLRLtA6zz+buIXUHj1soPvSWzzQFBC+n2lsy+CGf/NIrR3SEPCmsVNQj70/Jx2lViCpq+09YpQ==} @@ -5831,8 +5831,8 @@ packages: resolution: {integrity: sha512-Cjrs+vHHQ7krLO4HYELYpYBJBuMhcnNZD/Z5z/UcQSnFqWSQY3DhtTCFalXgI1/yO1iK+YrRKK8EYkumrEopxg==} engines: {node: '>=22.0.0'} - miniflare@5.20261023.0-beta: - resolution: {integrity: sha512-SHY8A98gCvmrnBLqABHRTSh3duAL1z+tHPRZu/tqxHFqVARrZ4oQis/ALYwp3XvzHvs6B/ff/CdcCafqP+cOFA==} + miniflare@5.20261023.1-beta: + resolution: {integrity: sha512-hgm1AJhwC6W+iaRhvMnfs7bPOsxjKa8LXTFR2WVPA5qA9KhpyBd2LddmT+9M9tm65VZ8YWkwQGvB+cKbqJoKeA==} engines: {node: '>=22.0.0'} minimatch@10.2.6: @@ -7271,8 +7271,8 @@ packages: '@cloudflare/workers-types': optional: true - wrangler@4.153.0: - resolution: {integrity: sha512-Hn1AowKzZao/729rMpdpxBZt/RaKQNJ4GtKtHQcOrwT+J/GIq0iwl680+dhJyO00iSsXaCkxoNcLg3yVIwIvyw==} + wrangler@4.154.0: + resolution: {integrity: sha512-duA4dckBE/51ibAlGh2mUYcvGiu7sZFcn61I+KfNEeK5KQzKKEth9Xf5ROatoPBOebYPz0gfknXOCjBhwLOo8Q==} engines: {node: '>=22.0.0'} hasBin: true peerDependencies: @@ -8235,7 +8235,7 @@ snapshots: transitivePeerDependencies: - vitest - '@cloudflare/deploy-helpers@0.24.0(@types/node@22.15.17)(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0)))': + '@cloudflare/deploy-helpers@0.24.1(@types/node@22.15.17)(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0)))': dependencies: '@cloudflare/cli-shared-helpers': 0.2.9(vitest@5.0.4(@opentelemetry/api@1.9.1)(@types/node@22.15.17)(msw@2.14.6(@types/node@22.15.17)(typescript@5.8.3))(vite@8.3.4(@types/node@22.15.17)(esbuild@0.28.2)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.9.0))) '@cloudflare/config': 0.28.1 @@ -8246,7 +8246,7 @@ snapshots: command-exists: 1.2.9 devtools-protocol: 0.0.1182435 dotenv: 16.3.1 - miniflare: 5.20261023.0-beta(@types/node@22.15.17) + miniflare: 5.20261023.1-beta(@types/node@22.15.17) p-queue: 9.0.0 pretty-bytes: 6.1.1 undici: 7.30.1 @@ -11768,7 +11768,7 @@ snapshots: - bufferutil - utf-8-validate - miniflare@5.20261023.0-beta(@types/node@22.15.17): + miniflare@5.20261023.1-beta(@types/node@22.15.17): dependencies: '@cspotcode/source-map-support': 0.8.1 sharp: 0.35.5(@types/node@22.15.17) @@ -13233,13 +13233,13 @@ snapshots: - bufferutil - utf-8-validate - wrangler@4.153.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17): + wrangler@4.154.0(@cloudflare/workers-types@5.20261023.1)(@types/node@22.15.17): dependencies: '@cloudflare/kv-asset-handler': 0.5.0 '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261023.1) blake3-wasm: 2.1.5 esbuild: 0.28.2 - miniflare: 5.20261023.0-beta(@types/node@22.15.17) + miniflare: 5.20261023.1-beta(@types/node@22.15.17) path-to-regexp: 6.3.0 unenv: 2.0.0-rc.24 workerd: 1.20261023.1