From a7afdd67343859d1c07c196f4be8dd562d838da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Somhairle=20MacLe=C3=B2id?= Date: Mon, 19 Jan 2026 11:12:36 +0000 Subject: [PATCH 1/3] Expand hotfix details (#11953) * Update CONTRIBUTING.md * Remove hotfix release section from CONTRIBUTING.md Removed hotfix release guidelines from CONTRIBUTING.md. --- CONTRIBUTING.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 37c2a16a9976..4f2d925a3a47 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -463,23 +463,3 @@ When contributing to Wrangler, please refer to the [`STYLEGUIDE.md file`](STYLEG ## Releases We generally cut Wrangler releases on Tuesday & Thursday each week. If you need a release cut outside of the regular cadence, please reach out to the [@cloudflare/wrangler-admins](https://github.com/orgs/cloudflare/teams/wrangler-admins) team. - -### Hotfix releases - -Only members of `@cloudflare/wrangler` can trigger a hotfix release. A hotfix release should be treated as a solution of last resort—before use, please first check whether the fix can be applied and released using the regular Version Packages release flow. - -If a hotfix release of Wrangler, Miniflare, or C3 is required, you should: - -- Prepare a hotfix release PR: - - - Checkout the previous release of `workers-sdk` - - Apply the changes that should be in the hotfix - - Manually, increment the patch version of the packages that should be released as part of the hotfix - - Manually, update the changelog for the package(s) being released. - -- Get approvals for that PR, and make sure CI checks are passing -- Manually trigger a hotfix release from that PR using the ["Release a hotfix"](https://github.com/cloudflare/workers-sdk/actions/workflows/hotfix-release.yml) GitHub action. - - Make sure you set the dist-tag to `latest` - - Optionally, you can first publish it to the `hotfix` dist-tag on NPM in order to verify the release. -- **[CRUCIAL]** Once the hotfix release is out and verified, merge the fixes into main before the next regular release of `workers-sdk`. - - Make sure that the version number of the released package(s) on `main` are the same as the versions that were released to ensure that any subsequent changesets will bump the version correctly for the next release. From 029531acd2e6fac10f21c7b0cecb6b4830f77d02 Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Mon, 19 Jan 2026 12:15:00 +0000 Subject: [PATCH 2/3] Wrangler: cache chosen account in memory to avoid repeated prompts (#11962) --- .changeset/gold-forks-build.md | 7 ++ packages/wrangler/src/__tests__/user.test.ts | 96 ++++++++++++++++++++ packages/wrangler/src/user/choose-account.ts | 10 +- packages/wrangler/src/user/shared.ts | 4 + packages/wrangler/src/user/user.ts | 34 +++---- 5 files changed, 127 insertions(+), 24 deletions(-) create mode 100644 .changeset/gold-forks-build.md create mode 100644 packages/wrangler/src/user/shared.ts diff --git a/.changeset/gold-forks-build.md b/.changeset/gold-forks-build.md new file mode 100644 index 000000000000..8a705c278fb9 --- /dev/null +++ b/.changeset/gold-forks-build.md @@ -0,0 +1,7 @@ +--- +"wrangler": patch +--- + +Cache chosen account in memory to avoid repeated prompts + +When users have multiple accounts and no `node_modules` directory exists for file caching, Wrangler (run via `npx` and equivalent commands) would prompt for account selection multiple times during a single command. Now the selected account is also stored in process memory, preventing duplicate prompts and potential issues from inconsistent account choices. diff --git a/packages/wrangler/src/__tests__/user.test.ts b/packages/wrangler/src/__tests__/user.test.ts index dfef4dbe7e9e..fbb668f970cf 100644 --- a/packages/wrangler/src/__tests__/user.test.ts +++ b/packages/wrangler/src/__tests__/user.test.ts @@ -10,6 +10,8 @@ import { http, HttpResponse } from "msw"; import { beforeEach, describe, expect, it, vi } from "vitest"; import { CI } from "../is-ci"; import { + getAccountFromCache, + getAccountId, getAuthConfigFilePath, getOAuthTokenFromLocalState, loginOrRefreshIfRequired, @@ -18,9 +20,11 @@ import { writeAuthConfigFile, } from "../user"; import { mockConsoleMethods } from "./helpers/mock-console"; +import { mockSelect } from "./helpers/mock-dialogs"; import { useMockIsTTY } from "./helpers/mock-istty"; import { mockExchangeRefreshTokenForAccessToken, + mockGetMemberships, mockOAuthFlow, } from "./helpers/mock-oauth-flow"; import { @@ -505,4 +509,96 @@ describe("User", () => { expect(token).toBeUndefined(); }); }); + + describe("account caching", () => { + beforeEach(() => { + vi.stubEnv("CLOUDFLARE_API_TOKEN", "test-api-token"); + }); + + it("should only prompt for account selection once when getAccountId is called multiple times", async () => { + setIsTTY(true); + + // Mock the memberships API to return multiple accounts + // Note: mockGetMemberships uses { once: true }, so we need to set it up for each expected call + // But since we're testing caching, the second call should NOT hit the API + mockGetMemberships([ + { + id: "membership-1", + account: { id: "account-1", name: "Account One" }, + }, + { + id: "membership-2", + account: { id: "account-2", name: "Account Two" }, + }, + ]); + + // Mock the select dialog - should only be called once + mockSelect({ + text: "Select an account", + result: "account-1", + }); + + // First call - should prompt for account selection + const firstAccountId = await getAccountId({}); + expect(firstAccountId).toBe("account-1"); + + // Verify account is cached + const cachedAccount = getAccountFromCache(); + expect(cachedAccount).toEqual({ id: "account-1", name: "Account One" }); + + // Second call - should use cached account, not prompt again + const secondAccountId = await getAccountId({}); + expect(secondAccountId).toBe("account-1"); + + // Third call - should still use cached account + const thirdAccountId = await getAccountId({}); + expect(thirdAccountId).toBe("account-1"); + + // If mockSelect was called more than once, the test would fail because + // we only set up one expectation and prompts mock throws on unexpected calls + }); + + it("should use account_id from config without prompting", async () => { + // When config has account_id, it should be used directly without prompting + const accountId = await getAccountId({ account_id: "config-account-id" }); + expect(accountId).toBe("config-account-id"); + + // Cache should not be populated when using config account_id + const cachedAccount = getAccountFromCache(); + expect(cachedAccount).toBeUndefined(); + }); + + it("should cache account when only one account is available (no prompt needed)", async () => { + // Mock single account - no prompt needed + mockGetMemberships([ + { + id: "membership-1", + account: { id: "single-account", name: "Only Account" }, + }, + ]); + + const accountId = await getAccountId({}); + expect(accountId).toBe("single-account"); + + // Account should still be cached even without prompting + const cachedAccount = getAccountFromCache(); + expect(cachedAccount).toEqual({ + id: "single-account", + name: "Only Account", + }); + + // Set up another membership response for verification + // (won't be called because cache is used) + mockGetMemberships([ + { + id: "membership-2", + account: { id: "different-account", name: "Different" }, + }, + ]); + + // Second call should use cache + const secondAccountId = await getAccountId({}); + expect(secondAccountId).toBe("single-account"); + }); + }); }); diff --git a/packages/wrangler/src/user/choose-account.ts b/packages/wrangler/src/user/choose-account.ts index 290d5b8733b8..777a0d1ed821 100644 --- a/packages/wrangler/src/user/choose-account.ts +++ b/packages/wrangler/src/user/choose-account.ts @@ -1,26 +1,22 @@ import { configFileName, UserError } from "@cloudflare/workers-utils"; import { fetchPagedListResult } from "../cfetch"; import { getCloudflareAccountIdFromEnv } from "./auth-variables"; +import type { Account } from "./shared"; import type { ComplianceConfig } from "@cloudflare/workers-utils"; -export type ChooseAccountItem = { - id: string; - name: string; -}; - /** * Infer a list of available accounts for the current user. */ export async function getAccountChoices( complianceConfig: ComplianceConfig -): Promise { +): Promise { const accountIdFromEnv = getCloudflareAccountIdFromEnv(); if (accountIdFromEnv) { return [{ id: accountIdFromEnv, name: "" }]; } else { try { const response = await fetchPagedListResult<{ - account: ChooseAccountItem; + account: Account; }>(complianceConfig, `/memberships`); const accounts = response.map((r) => r.account); if (accounts.length === 0) { diff --git a/packages/wrangler/src/user/shared.ts b/packages/wrangler/src/user/shared.ts new file mode 100644 index 000000000000..d2a85665b916 --- /dev/null +++ b/packages/wrangler/src/user/shared.ts @@ -0,0 +1,4 @@ +/** + * Details for one of the user's accounts + */ +export type Account = { id: string; name: string }; diff --git a/packages/wrangler/src/user/user.ts b/packages/wrangler/src/user/user.ts index 74268b709d94..70f788c89668 100644 --- a/packages/wrangler/src/user/user.ts +++ b/packages/wrangler/src/user/user.ts @@ -249,7 +249,7 @@ import { import { getAccountChoices } from "./choose-account"; import { generateAuthUrl } from "./generate-auth-url"; import { generateRandomState } from "./generate-random-state"; -import type { ChooseAccountItem } from "./choose-account"; +import type { Account } from "./shared"; import type { ComplianceConfig } from "@cloudflare/workers-utils"; import type { ParsedUrlQuery } from "node:querystring"; import type { Response } from "undici"; @@ -305,6 +305,7 @@ interface State extends AuthTokens { hasAuthCodeBeenExchangedForAccessToken?: boolean; stateQueryParam?: string; scopes?: Scope[]; + account?: Account; } /** @@ -1289,9 +1290,7 @@ export async function getAccountId( value: account.id, })), }); - const account = accounts.find( - (a) => a.id === accountID - ) as ChooseAccountItem; + const account = accounts.find((a) => a.id === accountID) as Account; saveAccountToCache({ id: account.id, name: account.name }); return accountID; } catch (e) { @@ -1349,24 +1348,25 @@ export function requireApiToken(): ApiCredentials { } /** - * Save the given account details to a cache + * Saves the given account details to the filesystem cache as well as the local state + * + * @param account The account to save */ -function saveAccountToCache(account: { id: string; name: string }): void { - saveToConfigCache<{ account: { id: string; name: string } }>( - "wrangler-account.json", - { account } - ); +function saveAccountToCache(account: Account): void { + localState.account = account; + saveToConfigCache<{ account: Account }>("wrangler-account.json", { account }); } /** - * Fetch the given account details from a cache if available + * Retrieves the account details from either the local state or the filesystem cache (in that order) + * + * @returns The cached account if present, `undefined` otherwise */ -export function getAccountFromCache(): - | undefined - | { id: string; name: string } { - return getConfigCache<{ account: { id: string; name: string } }>( - "wrangler-account.json" - ).account; +export function getAccountFromCache(): undefined | Account { + if (localState.account) { + return localState.account; + } + return getConfigCache<{ account: Account }>("wrangler-account.json").account; } /** From 202c59e4f4f28419fb6ac0aa8c7dc3960a0c8d3e Mon Sep 17 00:00:00 2001 From: emily-shen <69125074+emily-shen@users.noreply.github.com> Date: Mon, 19 Jan 2026 12:35:08 +0000 Subject: [PATCH 3/3] chore: bump undici (#11967) * bump undici * Remove packages from changeset that would cause a redeployment undici is a dev dependency only used for testing so redeploying would have no effect anyway --- .changeset/large-cooks-cough.md | 15 ++++ pnpm-lock.yaml | 126 +++++++++++++++++--------------- pnpm-workspace.yaml | 4 +- 3 files changed, 83 insertions(+), 62 deletions(-) create mode 100644 .changeset/large-cooks-cough.md diff --git a/.changeset/large-cooks-cough.md b/.changeset/large-cooks-cough.md new file mode 100644 index 000000000000..c13d49451aa0 --- /dev/null +++ b/.changeset/large-cooks-cough.md @@ -0,0 +1,15 @@ +--- +"@cloudflare/cli": patch +"create-cloudflare": patch +"miniflare": patch +"@cloudflare/vitest-pool-workers": patch +"wrangler": patch +--- + +chore: update undici + +The following dependency versions have been updated: + +| Dependency | From | To | +| ---------- | ------ | ------ | +| undici | 7.14.0 | 7.18.2 | diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 26d1d7f1c3cc..c0d3b0587e62 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,8 +49,8 @@ catalogs: specifier: ~5.8.3 version: 5.8.3 undici: - specifier: 7.14.0 - version: 7.14.0 + specifier: 7.18.2 + version: 7.18.2 vite: specifier: ^5.4.14 version: 5.4.14 @@ -72,7 +72,7 @@ overrides: '@cloudflare/elements>@types/react': ^18 '@types/node': ^20.19.9 vitest>vite: ^5.0.0 - '@types/node>undici-types': 7.14.0 + '@types/node>undici-types': 7.18.2 patchedDependencies: '@cloudflare/component-listbox@1.10.6': @@ -166,7 +166,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -229,7 +229,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -250,7 +250,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -289,7 +289,7 @@ importers: version: link:../../packages/workers-tsconfig undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -307,7 +307,7 @@ importers: version: 4.20260115.0 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -343,7 +343,7 @@ importers: version: 2.2.0 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -370,7 +370,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -415,7 +415,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -439,7 +439,7 @@ importers: version: 7.1.0 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -522,7 +522,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -577,7 +577,7 @@ importers: version: 4.20260115.0 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -610,7 +610,7 @@ importers: version: 1.2.7 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -631,7 +631,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -652,7 +652,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -680,7 +680,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -701,7 +701,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -719,7 +719,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -740,7 +740,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -761,7 +761,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -782,7 +782,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -822,7 +822,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -843,7 +843,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -858,7 +858,7 @@ importers: version: link:../../packages/workers-tsconfig undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -879,7 +879,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -900,7 +900,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -918,7 +918,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -936,7 +936,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -954,7 +954,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -972,7 +972,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -990,7 +990,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1029,7 +1029,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1044,7 +1044,7 @@ importers: version: link:../../packages/workers-tsconfig undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -1059,7 +1059,7 @@ importers: version: link:../../packages/workers-tsconfig undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3))(yaml@2.8.1) @@ -1241,7 +1241,7 @@ importers: version: 4.20260115.0 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -1263,7 +1263,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1341,7 +1341,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1362,7 +1362,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1383,7 +1383,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1404,7 +1404,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1425,7 +1425,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1458,7 +1458,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1482,7 +1482,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1503,7 +1503,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1521,7 +1521,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -1563,7 +1563,7 @@ importers: version: 5.0.1 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 packages/containers-shared: devDependencies: @@ -1719,7 +1719,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vite: specifier: catalog:default version: 5.4.14(@types/node@20.19.9)(lightningcss@1.30.2) @@ -1905,7 +1905,7 @@ importers: version: 0.34.5 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 workerd: specifier: 1.20260115.0 version: 1.20260115.0 @@ -2175,7 +2175,7 @@ importers: version: 4.0.0(patch_hash=qxsfpdzvzbhq2ecirbu5xq4vlq) undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 wrangler: specifier: workspace:* version: link:../wrangler @@ -3497,7 +3497,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vitest: specifier: catalog:default version: 3.2.3(@types/debug@4.1.12)(@types/node@20.19.9)(@vitest/ui@3.2.3)(jiti@2.6.0)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.8.3))(supports-color@9.2.2)(yaml@2.8.1) @@ -3658,7 +3658,7 @@ importers: version: 3.12.10 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 vite: specifier: catalog:default version: 5.4.14(@types/node@20.19.9)(lightningcss@1.30.2) @@ -4119,7 +4119,7 @@ importers: version: 5.8.3 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 update-check: specifier: ^1.5.4 version: 1.5.4 @@ -4185,7 +4185,7 @@ importers: version: 2.2.0 undici: specifier: catalog:default - version: 7.14.0 + version: 7.18.2 wrangler: specifier: workspace:* version: link:../packages/wrangler @@ -13557,8 +13557,8 @@ packages: unconfig@7.3.3: resolution: {integrity: sha512-QCkQoOnJF8L107gxfHL0uavn7WD9b3dpBcFX6HtfQYmjw2YzWxGuFQ0N0J6tE9oguCBJn9KOvfqYDCMPHIZrBA==} - undici-types@7.14.0: - resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==} + undici-types@7.18.2: + resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} undici@5.28.5: resolution: {integrity: sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==} @@ -13568,6 +13568,10 @@ packages: resolution: {integrity: sha512-Vqs8HTzjpQXZeXdpsfChQTlafcMQaaIwnGwLam1wudSSjlJeQ3bw1j+TLPePgrCnCpUXx7Ba5Pdpf5OBih62NQ==} engines: {node: '>=20.18.1'} + undici@7.18.2: + resolution: {integrity: sha512-y+8YjDFzWdQlSE9N5nzKMT3g4a5UBX1HKowfdXh0uvAnTaqqwqB92Jt4UXBAeKekDs5IaDKyJFR4X1gYVCgXcw==} + engines: {node: '>=20.18.1'} + unenv@2.0.0-rc.24: resolution: {integrity: sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==} @@ -18004,11 +18008,11 @@ snapshots: '@types/node@20.19.9': dependencies: - undici-types: 7.14.0 + undici-types: 7.18.2 '@types/node@22.15.17': dependencies: - undici-types: 7.14.0 + undici-types: 7.18.2 '@types/normalize-package-data@2.4.4': {} @@ -24675,7 +24679,7 @@ snapshots: jiti: 2.6.0 quansync: 0.2.11 - undici-types@7.14.0: {} + undici-types@7.18.2: {} undici@5.28.5: dependencies: @@ -24683,6 +24687,8 @@ snapshots: undici@7.14.0: {} + undici@7.18.2: {} + unenv@2.0.0-rc.24: dependencies: pathe: 2.0.3 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 84c175cdef2c..794ddac936ab 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -25,10 +25,10 @@ catalog: # rimraf@6 requires node 20 or >=22 rimraf: "^6.0.1" typescript: "~5.8.3" - undici: "7.14.0" + undici: "7.18.2" # Override undici-types from @types/node so that the Cloudflare SDK typings match our installed # version of Undici - undici-types: "7.14.0" + undici-types: "7.18.2" vitest: "~3.2.0" vite: "^5.4.14" "ws": "8.18.0"