From 788bf786b4c5cb8e1bdd6464d3f88b4125cebc75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jan 2026 07:54:48 +0100 Subject: [PATCH 1/2] chore(deps): bump the workerd-and-workers-types group with 2 updates (#11993) * chore(deps): bump the workerd-and-workers-types group with 2 updates Bumps the workerd-and-workers-types group with 2 updates: [workerd](https://github.com/cloudflare/workerd) and [@cloudflare/workers-types](https://github.com/cloudflare/workerd). Updates `workerd` from 1.20260116.0 to 1.20260120.0 - [Release notes](https://github.com/cloudflare/workerd/releases) - [Changelog](https://github.com/cloudflare/workerd/blob/main/RELEASE.md) - [Commits](https://github.com/cloudflare/workerd/compare/v1.20260116.0...v1.20260120.0) Updates `@cloudflare/workers-types` from 4.20260116.0 to 4.20260120.0 - [Release notes](https://github.com/cloudflare/workerd/releases) - [Changelog](https://github.com/cloudflare/workerd/blob/main/RELEASE.md) - [Commits](https://github.com/cloudflare/workerd/commits) --- updated-dependencies: - dependency-name: workerd dependency-version: 1.20260120.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: workerd-and-workers-types - dependency-name: "@cloudflare/workers-types" dependency-version: 4.20260120.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: workerd-and-workers-types ... Signed-off-by: dependabot[bot] * chore: update dependencies of "miniflare", "wrangler" The following dependency versions have been updated: | Dependency | From | To | | ---------- | ------------ | ------------ | | workerd | 1.20260116.0 | 1.20260120.0 | --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Wrangler automated PR updater --- .changeset/dependabot-update-11993.md | 12 ++ packages/miniflare/package.json | 2 +- packages/wrangler/package.json | 2 +- pnpm-lock.yaml | 300 +++++++++++++------------- pnpm-workspace.yaml | 4 +- 5 files changed, 166 insertions(+), 154 deletions(-) create mode 100644 .changeset/dependabot-update-11993.md diff --git a/.changeset/dependabot-update-11993.md b/.changeset/dependabot-update-11993.md new file mode 100644 index 000000000000..a413f13cddfd --- /dev/null +++ b/.changeset/dependabot-update-11993.md @@ -0,0 +1,12 @@ +--- +"miniflare": patch +"wrangler": patch +--- + +chore: update dependencies of "miniflare", "wrangler" + +The following dependency versions have been updated: + +| Dependency | From | To | +| ---------- | ------------ | ------------ | +| workerd | 1.20260116.0 | 1.20260120.0 | diff --git a/packages/miniflare/package.json b/packages/miniflare/package.json index 08670814332d..c915fd24a45f 100644 --- a/packages/miniflare/package.json +++ b/packages/miniflare/package.json @@ -46,7 +46,7 @@ "@cspotcode/source-map-support": "0.8.1", "sharp": "^0.34.5", "undici": "catalog:default", - "workerd": "1.20260116.0", + "workerd": "1.20260120.0", "ws": "catalog:default", "youch": "4.1.0-beta.10", "zod": "^3.25.76" diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json index b5cc32b8fb49..fe7ed2e84865 100644 --- a/packages/wrangler/package.json +++ b/packages/wrangler/package.json @@ -73,7 +73,7 @@ "miniflare": "workspace:*", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.24", - "workerd": "1.20260116.0" + "workerd": "1.20260120.0" }, "devDependencies": { "@aws-sdk/client-s3": "^3.721.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9fa190b537a4..51b8d6490a04 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,8 +10,8 @@ catalogs: specifier: ^0.10.11 version: 0.10.15 '@cloudflare/workers-types': - specifier: ^4.20260116.0 - version: 4.20260116.0 + specifier: ^4.20260120.0 + version: 4.20260120.0 '@typescript-eslint/eslint-plugin': specifier: ^8.35.1 version: 8.46.3 @@ -160,7 +160,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -205,7 +205,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 ts-dedent: specifier: ^2.2.0 version: 2.2.0 @@ -223,7 +223,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -244,7 +244,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -268,7 +268,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -304,7 +304,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 undici: specifier: catalog:default version: 7.18.2 @@ -319,7 +319,7 @@ importers: devDependencies: '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/mimetext': specifier: ^2.0.4 version: 2.0.4 @@ -358,7 +358,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/jest-image-snapshot': specifier: ^6.4.0 version: 6.4.0 @@ -385,7 +385,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 miniflare: specifier: workspace:* version: link:../../packages/miniflare @@ -455,7 +455,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/node': specifier: ^20.19.9 version: 20.19.9 @@ -479,7 +479,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/is-even': specifier: ^1.0.2 version: 1.0.2 @@ -516,7 +516,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -544,7 +544,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/node': specifier: ^20.19.9 version: 20.19.9 @@ -574,7 +574,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 undici: specifier: catalog:default version: 7.18.2 @@ -592,7 +592,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/debug': specifier: 4.1.12 version: 4.1.12 @@ -625,7 +625,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -646,7 +646,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -671,7 +671,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@fixture/pages-plugin': specifier: workspace:* version: link:../pages-plugin-example @@ -695,7 +695,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -734,7 +734,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -755,7 +755,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -776,7 +776,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -794,7 +794,7 @@ importers: devDependencies: '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 is-odd: specifier: ^3.0.1 version: 3.0.1 @@ -813,7 +813,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@fixture/pages-plugin': specifier: workspace:* version: link:../pages-plugin-example @@ -873,7 +873,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -894,7 +894,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -1071,19 +1071,19 @@ importers: devDependencies: '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 fixtures/rules-app: devDependencies: '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 fixtures/secrets-store: devDependencies: '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -1107,7 +1107,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/is-even': specifier: ^1.0.2 version: 1.0.2 @@ -1131,7 +1131,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 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) @@ -1146,7 +1146,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 esbuild: specifier: catalog:default version: 0.27.0 @@ -1176,7 +1176,7 @@ importers: version: link:../../packages/vitest-pool-workers '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@microlabs/otel-cf-workers': specifier: 1.0.0-rc.45 version: 1.0.0-rc.45(@opentelemetry/api@1.7.0) @@ -1238,7 +1238,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 undici: specifier: catalog:default version: 7.18.2 @@ -1293,7 +1293,7 @@ importers: devDependencies: '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 wrangler: specifier: workspace:* version: link:../../packages/wrangler @@ -1332,7 +1332,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 run-script-os: specifier: ^1.1.6 version: 1.1.6 @@ -1356,7 +1356,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -1377,7 +1377,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -1398,7 +1398,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -1419,7 +1419,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -1440,7 +1440,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/jest-image-snapshot': specifier: ^6.4.0 version: 6.4.0 @@ -1473,7 +1473,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 playwright-chromium: specifier: catalog:default version: 1.56.1 @@ -1497,7 +1497,7 @@ importers: version: link:../../packages/workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -1515,7 +1515,7 @@ importers: devDependencies: '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -1617,7 +1617,7 @@ importers: version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@cloudflare/workers-utils': specifier: workspace:* version: link:../workers-utils @@ -1755,7 +1755,7 @@ importers: version: link:../eslint-config-shared '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@octokit/types': specifier: ^13.8.0 version: 13.8.0 @@ -1779,7 +1779,7 @@ importers: version: link:../eslint-config-shared '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/cookie': specifier: ^0.6.0 version: 0.6.0 @@ -1845,7 +1845,7 @@ importers: version: link:../eslint-config-shared '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 eslint: specifier: catalog:default version: 9.39.1(jiti@2.6.0) @@ -1875,10 +1875,10 @@ importers: version: link:../eslint-config-shared '@cloudflare/vitest-pool-workers': specifier: catalog:default - version: 0.10.15(@cloudflare/workers-types@4.20260116.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@2.1.9) + version: 0.10.15(@cloudflare/workers-types@4.20260120.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@2.1.9) '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/mime': specifier: ^3.0.4 version: 3.0.4 @@ -1910,8 +1910,8 @@ importers: specifier: catalog:default version: 7.18.2 workerd: - specifier: 1.20260116.0 - version: 1.20260116.0 + specifier: 1.20260120.0 + version: 1.20260120.0 ws: specifier: catalog:default version: 8.18.0 @@ -1939,7 +1939,7 @@ importers: version: link:../workers-shared '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@cloudflare/workflows-shared': specifier: workspace:* version: link:../workflows-shared @@ -2108,7 +2108,7 @@ importers: version: link:../eslint-config-shared '@cloudflare/vitest-pool-workers': specifier: catalog:default - version: 0.10.15(@cloudflare/workers-types@4.20260116.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@3.2.3) + version: 0.10.15(@cloudflare/workers-types@4.20260120.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@3.2.3) '@cloudflare/workers-shared': specifier: workspace:* version: link:../workers-shared @@ -2117,7 +2117,7 @@ importers: version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 concurrently: specifier: ^8.2.2 version: 8.2.2 @@ -2157,7 +2157,7 @@ importers: version: link:../eslint-config-shared '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/cookie': specifier: ^0.6.0 version: 0.6.0 @@ -2197,7 +2197,7 @@ importers: version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/node': specifier: ^20.19.9 version: 20.19.9 @@ -2227,7 +2227,7 @@ importers: version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 esbuild: specifier: catalog:default version: 0.27.0 @@ -2316,7 +2316,7 @@ importers: version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@cloudflare/workers-utils': specifier: workspace:* version: link:../workers-utils @@ -2403,7 +2403,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2424,7 +2424,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2445,7 +2445,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2466,7 +2466,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2487,7 +2487,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2508,7 +2508,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2529,7 +2529,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2550,7 +2550,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2571,7 +2571,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2592,7 +2592,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2613,7 +2613,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2634,7 +2634,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2655,7 +2655,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2676,7 +2676,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2697,7 +2697,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2718,7 +2718,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2739,7 +2739,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/mimetext': specifier: ^2.0.4 version: 2.0.4 @@ -2772,7 +2772,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2793,7 +2793,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2814,7 +2814,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2835,7 +2835,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2856,7 +2856,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2877,7 +2877,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -2898,7 +2898,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@playground/main-resolution-package': specifier: file:./package version: file:packages/vite-plugin-cloudflare/playground/main-resolution/package @@ -2922,7 +2922,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/express': specifier: ^5.0.1 version: 5.0.1 @@ -2949,7 +2949,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@playground/module-resolution-excludes': specifier: file:./packages/excludes version: file:packages/vite-plugin-cloudflare/playground/module-resolution/packages/excludes @@ -2961,7 +2961,7 @@ importers: version: file:packages/vite-plugin-cloudflare/playground/module-resolution/packages/requires '@remix-run/cloudflare': specifier: 2.12.0 - version: 2.12.0(@cloudflare/workers-types@4.20260116.0)(typescript@5.8.3) + version: 2.12.0(@cloudflare/workers-types@4.20260120.0)(typescript@5.8.3) '@types/react': specifier: ^18.3.11 version: 18.3.18 @@ -2994,7 +2994,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3015,7 +3015,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/debug': specifier: ^4.1.12 version: 4.1.12 @@ -3064,7 +3064,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/react': specifier: 19.1.0 version: 19.1.0 @@ -3085,7 +3085,7 @@ importers: dependencies: partyserver: specifier: ^0.0.64 - version: 0.0.64(@cloudflare/workers-types@4.20260116.0) + version: 0.0.64(@cloudflare/workers-types@4.20260120.0) partysocket: specifier: ^1.0.3 version: 1.0.3 @@ -3104,7 +3104,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@tailwindcss/vite': specifier: ^4.0.15 version: 4.0.15(vite@7.1.12(@types/node@20.19.9)(jiti@2.6.0)(lightningcss@1.30.2)(yaml@2.8.1)) @@ -3140,7 +3140,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@prisma/adapter-d1': specifier: ^7.0.0 version: 7.0.1 @@ -3177,7 +3177,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/react': specifier: 19.1.0 version: 19.1.0 @@ -3207,7 +3207,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3228,7 +3228,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3256,7 +3256,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/react': specifier: 19.1.0 version: 19.1.0 @@ -3289,7 +3289,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3310,7 +3310,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3331,7 +3331,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@vitejs/plugin-basic-ssl': specifier: ^2.0.0 version: 2.0.0(vite@7.1.12(@types/node@20.19.9)(jiti@2.6.0)(lightningcss@1.30.2)(yaml@2.8.1)) @@ -3355,7 +3355,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3376,7 +3376,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3397,7 +3397,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3418,7 +3418,7 @@ importers: version: link:../../../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 typescript: specifier: catalog:default version: 5.8.3 @@ -3458,7 +3458,7 @@ importers: version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@cloudflare/workflows-shared': specifier: workspace:* version: link:../workflows-shared @@ -3676,13 +3676,13 @@ importers: version: link:../eslint-config-shared '@cloudflare/vitest-pool-workers': specifier: catalog:default - version: 0.10.15(@cloudflare/workers-types@4.20260116.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@2.1.9) + version: 0.10.15(@cloudflare/workers-types@4.20260120.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@2.1.9) '@cloudflare/workers-tsconfig': specifier: workspace:* version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@sentry/cli': specifier: ^2.37.0 version: 2.41.1(encoding@0.1.13) @@ -3799,13 +3799,13 @@ importers: version: link:../eslint-config-shared '@cloudflare/vitest-pool-workers': specifier: catalog:default - version: 0.10.15(@cloudflare/workers-types@4.20260116.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@3.2.3) + version: 0.10.15(@cloudflare/workers-types@4.20260120.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@3.2.3) '@cloudflare/workers-tsconfig': specifier: workspace:* version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@types/mime': specifier: ^3.0.4 version: 3.0.4 @@ -3849,8 +3849,8 @@ importers: specifier: 2.0.0-rc.24 version: 2.0.0-rc.24 workerd: - specifier: 1.20260116.0 - version: 1.20260116.0 + specifier: 1.20260120.0 + version: 1.20260120.0 optionalDependencies: fsevents: specifier: ~2.3.2 @@ -3882,7 +3882,7 @@ importers: version: link:../workers-tsconfig '@cloudflare/workers-types': specifier: catalog:default - version: 4.20260116.0 + version: 4.20260120.0 '@cloudflare/workers-utils': specifier: workspace:* version: link:../workers-utils @@ -4881,8 +4881,8 @@ packages: cpu: [x64] os: [darwin] - '@cloudflare/workerd-darwin-64@1.20260116.0': - resolution: {integrity: sha512-0LF2jR/5bfCIMYsqtCXHqaZRlXEMgnz4NzG/8KVmHROlKb06SJezYYoNKw+7s6ji4fgi1BcYAJBmWbC4nzMbqw==} + '@cloudflare/workerd-darwin-64@1.20260120.0': + resolution: {integrity: sha512-JLHx3p5dpwz4wjVSis45YNReftttnI3ndhdMh5BUbbpdreN/g0jgxNt5Qp9tDFqEKl++N63qv+hxJiIIvSLR+Q==} engines: {node: '>=16'} cpu: [x64] os: [darwin] @@ -4899,8 +4899,8 @@ packages: cpu: [arm64] os: [darwin] - '@cloudflare/workerd-darwin-arm64@1.20260116.0': - resolution: {integrity: sha512-a9OHts4jMoOkPedc4CnuHPeo9XRG3VCMMgr0ER5HtSfEDRQhh7MwIuPEmqI27KKrYj+DeoCazIgbp3gW9bFTAg==} + '@cloudflare/workerd-darwin-arm64@1.20260120.0': + resolution: {integrity: sha512-1Md2tCRhZjwajsZNOiBeOVGiS3zbpLPzUDjHr4+XGTXWOA6FzzwScJwQZLa0Doc28Cp4Nr1n7xGL0Dwiz1XuOA==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] @@ -4917,8 +4917,8 @@ packages: cpu: [x64] os: [linux] - '@cloudflare/workerd-linux-64@1.20260116.0': - resolution: {integrity: sha512-nCMy7D7BeH/feGiD7C5Z1LG19Wvs3qmHSRe3cwz6HYRQHdDXUHTjXwEVid7Vejf9QFNe3iAn49Sy/h2XY2Rqeg==} + '@cloudflare/workerd-linux-64@1.20260120.0': + resolution: {integrity: sha512-O0mIfJfvU7F8N5siCoRDaVDuI12wkz2xlG4zK6/Ct7U9c9FiE0ViXNFWXFQm5PPj+qbkNRyhjUwhP+GCKTk5EQ==} engines: {node: '>=16'} cpu: [x64] os: [linux] @@ -4935,8 +4935,8 @@ packages: cpu: [arm64] os: [linux] - '@cloudflare/workerd-linux-arm64@1.20260116.0': - resolution: {integrity: sha512-Hve4ciPI69aIzwfSD12PVZJoEnKIkdR3Vd0w8rD1hDVxk75xAA65KqVYf5qW+8KOYrYkU3pg7hBTMjeyDF//IQ==} + '@cloudflare/workerd-linux-arm64@1.20260120.0': + resolution: {integrity: sha512-aRHO/7bjxVpjZEmVVcpmhbzpN6ITbFCxuLLZSW0H9O0C0w40cDCClWSi19T87Ax/PQcYjFNT22pTewKsupkckA==} engines: {node: '>=16'} cpu: [arm64] os: [linux] @@ -4953,14 +4953,14 @@ packages: cpu: [x64] os: [win32] - '@cloudflare/workerd-windows-64@1.20260116.0': - resolution: {integrity: sha512-7QA6OTXQtBdszkXw3rzxpkk1RoINZJY1ADQjF0vFNAbVXD1VEXLZnk0jc505tqARI8w/0DdVjaJszqL7K5k00w==} + '@cloudflare/workerd-windows-64@1.20260120.0': + resolution: {integrity: sha512-ASZIz1E8sqZQqQCgcfY1PJbBpUDrxPt8NZ+lqNil0qxnO4qX38hbCsdDF2/TDAuq0Txh7nu8ztgTelfNDlb4EA==} engines: {node: '>=16'} cpu: [x64] os: [win32] - '@cloudflare/workers-types@4.20260116.0': - resolution: {integrity: sha512-iMZIQDco7ARzzH+r8j90757kbPKEetKY3/6V5UurOzS6T1GJ+rsREw5i7vlBA4XjFV5UMaPtUD6HuUFSMLcxPQ==} + '@cloudflare/workers-types@4.20260120.0': + resolution: {integrity: sha512-B8pueG+a5S+mdK3z8oKu1ShcxloZ7qWb68IEyLLaepvdryIbNC7JVPcY0bWsjS56UQVKc5fnyRge3yZIwc9bxw==} '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} @@ -13975,8 +13975,8 @@ packages: engines: {node: '>=16'} hasBin: true - workerd@1.20260116.0: - resolution: {integrity: sha512-tVdBes3qkZKm9ntrgSDlvKzk4g2mcMp4bNM1+UgZMpTesb0x7e59vYYcKclbSNypmVkdLWpEc2TOpO0WF/rrZw==} + workerd@1.20260120.0: + resolution: {integrity: sha512-R6X/VQOkwLTBGLp4VRUwLQZZVxZ9T9J8pGiJ6GQUMaRkY7TVWrCSkVfoNMM1/YyFsY5UYhhPoQe5IehnhZ3Pdw==} engines: {node: '>=16'} hasBin: true @@ -15402,7 +15402,7 @@ snapshots: lodash.memoize: 4.1.2 marked: 0.3.19 - '@cloudflare/vitest-pool-workers@0.10.15(@cloudflare/workers-types@4.20260116.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@2.1.9)': + '@cloudflare/vitest-pool-workers@0.10.15(@cloudflare/workers-types@4.20260120.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@2.1.9)': dependencies: '@vitest/runner': 3.2.3 '@vitest/snapshot': 3.2.3 @@ -15412,14 +15412,14 @@ snapshots: miniflare: 4.20251210.0 semver: 7.7.3 vitest: 2.1.9(@types/node@20.19.9)(@vitest/ui@2.1.9)(lightningcss@1.30.2)(msw@2.12.0(@types/node@20.19.9)(typescript@5.9.3)) - wrangler: 4.54.0(@cloudflare/workers-types@4.20260116.0) + wrangler: 4.54.0(@cloudflare/workers-types@4.20260120.0) zod: 3.25.76 transitivePeerDependencies: - '@cloudflare/workers-types' - bufferutil - utf-8-validate - '@cloudflare/vitest-pool-workers@0.10.15(@cloudflare/workers-types@4.20260116.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@3.2.3)': + '@cloudflare/vitest-pool-workers@0.10.15(@cloudflare/workers-types@4.20260120.0)(@vitest/runner@3.2.3)(@vitest/snapshot@3.2.3)(vitest@3.2.3)': dependencies: '@vitest/runner': 3.2.3 '@vitest/snapshot': 3.2.3 @@ -15429,7 +15429,7 @@ snapshots: miniflare: 4.20251210.0 semver: 7.7.3 vitest: 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) - wrangler: 4.54.0(@cloudflare/workers-types@4.20260116.0) + wrangler: 4.54.0(@cloudflare/workers-types@4.20260120.0) zod: 3.25.76 transitivePeerDependencies: - '@cloudflare/workers-types' @@ -15442,7 +15442,7 @@ snapshots: '@cloudflare/workerd-darwin-64@1.20260111.0': optional: true - '@cloudflare/workerd-darwin-64@1.20260116.0': + '@cloudflare/workerd-darwin-64@1.20260120.0': optional: true '@cloudflare/workerd-darwin-arm64@1.20251210.0': @@ -15451,7 +15451,7 @@ snapshots: '@cloudflare/workerd-darwin-arm64@1.20260111.0': optional: true - '@cloudflare/workerd-darwin-arm64@1.20260116.0': + '@cloudflare/workerd-darwin-arm64@1.20260120.0': optional: true '@cloudflare/workerd-linux-64@1.20251210.0': @@ -15460,7 +15460,7 @@ snapshots: '@cloudflare/workerd-linux-64@1.20260111.0': optional: true - '@cloudflare/workerd-linux-64@1.20260116.0': + '@cloudflare/workerd-linux-64@1.20260120.0': optional: true '@cloudflare/workerd-linux-arm64@1.20251210.0': @@ -15469,7 +15469,7 @@ snapshots: '@cloudflare/workerd-linux-arm64@1.20260111.0': optional: true - '@cloudflare/workerd-linux-arm64@1.20260116.0': + '@cloudflare/workerd-linux-arm64@1.20260120.0': optional: true '@cloudflare/workerd-windows-64@1.20251210.0': @@ -15478,10 +15478,10 @@ snapshots: '@cloudflare/workerd-windows-64@1.20260111.0': optional: true - '@cloudflare/workerd-windows-64@1.20260116.0': + '@cloudflare/workerd-windows-64@1.20260120.0': optional: true - '@cloudflare/workers-types@4.20260116.0': {} + '@cloudflare/workers-types@4.20260120.0': {} '@colors/colors@1.5.0': optional: true @@ -16731,7 +16731,7 @@ snapshots: '@prisma/adapter-d1@7.0.1': dependencies: - '@cloudflare/workers-types': 4.20260116.0 + '@cloudflare/workers-types': 4.20260120.0 '@prisma/driver-adapter-utils': 7.0.1 ky: 1.7.5 @@ -16958,10 +16958,10 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@remix-run/cloudflare@2.12.0(@cloudflare/workers-types@4.20260116.0)(typescript@5.8.3)': + '@remix-run/cloudflare@2.12.0(@cloudflare/workers-types@4.20260120.0)(typescript@5.8.3)': dependencies: '@cloudflare/kv-asset-handler': 0.1.3 - '@cloudflare/workers-types': 4.20260116.0 + '@cloudflare/workers-types': 4.20260120.0 '@remix-run/server-runtime': 2.12.0(typescript@5.8.3) optionalDependencies: typescript: 5.8.3 @@ -22481,9 +22481,9 @@ snapshots: parseurl@1.3.3: {} - partyserver@0.0.64(@cloudflare/workers-types@4.20260116.0): + partyserver@0.0.64(@cloudflare/workers-types@4.20260120.0): dependencies: - '@cloudflare/workers-types': 4.20260116.0 + '@cloudflare/workers-types': 4.20260120.0 nanoid: 5.1.0 partysocket@1.0.3: @@ -25340,15 +25340,15 @@ snapshots: '@cloudflare/workerd-linux-arm64': 1.20260111.0 '@cloudflare/workerd-windows-64': 1.20260111.0 - workerd@1.20260116.0: + workerd@1.20260120.0: optionalDependencies: - '@cloudflare/workerd-darwin-64': 1.20260116.0 - '@cloudflare/workerd-darwin-arm64': 1.20260116.0 - '@cloudflare/workerd-linux-64': 1.20260116.0 - '@cloudflare/workerd-linux-arm64': 1.20260116.0 - '@cloudflare/workerd-windows-64': 1.20260116.0 + '@cloudflare/workerd-darwin-64': 1.20260120.0 + '@cloudflare/workerd-darwin-arm64': 1.20260120.0 + '@cloudflare/workerd-linux-64': 1.20260120.0 + '@cloudflare/workerd-linux-arm64': 1.20260120.0 + '@cloudflare/workerd-windows-64': 1.20260120.0 - wrangler@4.54.0(@cloudflare/workers-types@4.20260116.0): + wrangler@4.54.0(@cloudflare/workers-types@4.20260120.0): dependencies: '@cloudflare/kv-asset-handler': 0.4.1 '@cloudflare/unenv-preset': 2.7.13(unenv@2.0.0-rc.24)(workerd@1.20251210.0) @@ -25359,7 +25359,7 @@ snapshots: unenv: 2.0.0-rc.24 workerd: 1.20251210.0 optionalDependencies: - '@cloudflare/workers-types': 4.20260116.0 + '@cloudflare/workers-types': 4.20260120.0 fsevents: 2.3.3 transitivePeerDependencies: - bufferutil diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 4796d3ecb80c..b7c2559d49a2 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -34,8 +34,8 @@ catalog: "ws": "8.18.0" esbuild: "0.27.0" playwright-chromium: "^1.56.1" - "@cloudflare/workers-types": "^4.20260116.0" - workerd: "1.20260116.0" + "@cloudflare/workers-types": "^4.20260120.0" + workerd: "1.20260120.0" eslint: "^9.39.1" smol-toml: "^1.5.2" # CAUTION: Most usage of @cloudflare/vitest-pool-workers in this mono repo should use workspace:* instead of this catalog version From e84e8fab79f17ffcc6a4c29c92c6924ceb351f94 Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Wed, 21 Jan 2026 07:04:20 +0000 Subject: [PATCH 2/2] Fix quick-edit relative path computation when the root folder name appears multiple times in a path (#11878) * Fix quick-edit relative path computation when the root folder name appears multiple times in a path * Fix the quick-edit package not working since its name has been recently changed (without reflecting the same change to the source code logic that relies on the package name) * remove incorrect changeset --- .changeset/rare-seals-exist.md | 9 +++++ packages/quick-edit-extension/src/cfs.ts | 37 ++++++++++++++++--- packages/quick-edit/editor-files/workbench.ts | 4 +- packages/quick-edit/src/index.ts | 2 +- 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 .changeset/rare-seals-exist.md diff --git a/.changeset/rare-seals-exist.md b/.changeset/rare-seals-exist.md new file mode 100644 index 000000000000..650b1c100b73 --- /dev/null +++ b/.changeset/rare-seals-exist.md @@ -0,0 +1,9 @@ +--- +"@cloudflare/quick-edit": patch +--- + +Fix relative path computation when the root folder name appears multiple times in a path + +Previously, the logic assumed the root folder appeared exactly once in the path. When the root folder name appeared more than once, file modifications were not correctly detected. + +For example, if the root folder is `my-worker`, a path like `/my-worker/my-worker/util.js` would incorrectly return `/` instead of `/my-worker/util.js`. diff --git a/packages/quick-edit-extension/src/cfs.ts b/packages/quick-edit-extension/src/cfs.ts index 3b83bf61429d..dd5f2cac192d 100644 --- a/packages/quick-edit-extension/src/cfs.ts +++ b/packages/quick-edit-extension/src/cfs.ts @@ -106,6 +106,33 @@ export class CFS private readRoot: ((value: [string, FileType][]) => void) | null = null; + /** + * + * Given a path this function returns the path relative to the root folder, this function also handles the case in which the root folder + * is not present in the path, or present in the middle of it. + * + * @example + * Assuming that the root folder is `my-worker`: + * - given `/my-worker/worker.js` returns `/worker.js` + * - given `/workspace/my-worker/worker.js` returns `/worker.js` + * - given `/workspace/my-worker/sub-dir/my-worker/worker.js` returns `/sub-dir/my-worker/worker.js` + * - given `/my-worker/my-worker/util.js` returns `/my-worker/util.js` + * + * @param path The target path + * @returns The path relative to the root folder + */ + private getRootRelativePath(path: string): string { + const rootFolderStr = `/${this.rootFolder}/`; + const indexOfRoot = path.indexOf(rootFolderStr); + + if (indexOfRoot < 0) { + // The root folder is not in the path so let's return the path as is + return path; + } + + return path.slice(indexOfRoot + rootFolderStr.length); + } + constructor(channel: Channel) { this.channel = channel; this.disposable = Disposable.from( @@ -268,7 +295,7 @@ declare module "*.bin" { this.channel.postMessage({ type: "CreateFile", body: { - path: uri.path.split(this.rootFolder)[1], + path: this.getRootRelativePath(uri.path), contents: content, }, }); @@ -285,7 +312,7 @@ declare module "*.bin" { this.channel.postMessage({ type: "UpdateFile", body: { - path: uri.path.split(this.rootFolder)[1], + path: this.getRootRelativePath(uri.path), contents: content, }, }); @@ -315,13 +342,13 @@ declare module "*.bin" { this.channel.postMessage({ type: "DeleteFile", body: { - path: oldUri.path.split(this.rootFolder)[1], + path: this.getRootRelativePath(oldUri.path), }, }); this.channel.postMessage({ type: "CreateFile", body: { - path: newUri.path.split(this.rootFolder)[1], + path: this.getRootRelativePath(newUri.path), contents: await this.readFile(newUri), }, }); @@ -353,7 +380,7 @@ declare module "*.bin" { this.channel.postMessage({ type: "DeleteFile", body: { - path: uri.path.split(this.rootFolder)[1], + path: this.getRootRelativePath(uri.path), }, }); this._fireSoon( diff --git a/packages/quick-edit/editor-files/workbench.ts b/packages/quick-edit/editor-files/workbench.ts index 39c87f8fe624..3801a6cc9490 100644 --- a/packages/quick-edit/editor-files/workbench.ts +++ b/packages/quick-edit/editor-files/workbench.ts @@ -62,8 +62,8 @@ function createEditor(port: MessagePort) { const messagePorts = new Map(); - // This passes the MessagePort through to the `cloudflare.quick-edit-extension` VSCode extension, which is preloaded - messagePorts.set("cloudflare.quick-edit-extension", port); + // This passes the MessagePort through to the `cloudflare.@cloudflare/quick-edit-extension` VSCode extension, which is preloaded + messagePorts.set("cloudflare.@cloudflare/quick-edit-extension", port); const folderUri = searchParams.get("worker"); diff --git a/packages/quick-edit/src/index.ts b/packages/quick-edit/src/index.ts index a732d8426356..ea856ab4fe6a 100644 --- a/packages/quick-edit/src/index.ts +++ b/packages/quick-edit/src/index.ts @@ -29,7 +29,7 @@ export default { dataFolderName: ".quick-edit", version: "1.76.0", extensionEnabledApiProposals: { - "cloudflare.quick-edit-extension": [ + "cloudflare.@cloudflare/quick-edit-extension": [ "fileSearchProvider", "textSearchProvider", "ipc",