diff --git a/package-lock.json b/package-lock.json
index a61043bd..ad727aee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,8 +35,8 @@
         "vitest": "^3.2.4"
       },
       "engines": {
-        "node": ">=16",
-        "npm": ">=8"
+        "node": ">=20",
+        "npm": ">=10.8"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -8676,18 +8676,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -10170,10 +10158,10 @@
     },
     "packages/connect-query": {
       "name": "@connectrpc/connect-query",
-      "version": "2.1.1",
+      "version": "2.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@connectrpc/connect-query-core": "^2.1.1"
+        "@connectrpc/connect-query-core": "^2.2.0"
       },
       "devDependencies": {
         "@arethetypeswrong/cli": "^0.18.1",
@@ -10202,7 +10190,7 @@
     },
     "packages/connect-query-core": {
       "name": "@connectrpc/connect-query-core",
-      "version": "2.1.1",
+      "version": "2.2.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "@arethetypeswrong/cli": "^0.18.1",
@@ -10224,15 +10212,15 @@
     },
     "packages/examples/react/basic": {
       "name": "@connectrpc/connect-query-example-basic",
-      "version": "2.1.1",
+      "version": "2.2.0",
       "dependencies": {
         "@bufbuild/buf": "1.54.0",
         "@bufbuild/protobuf": "^2.5.1",
         "@bufbuild/protoc-gen-es": "^2.5.1",
         "@connectrpc/connect": "^2.0.2",
-        "@connectrpc/connect-query": "^2.1.1",
+        "@connectrpc/connect-query": "^2.2.0",
         "@connectrpc/connect-web": "^2.0.2",
-        "@connectrpc/protoc-gen-connect-query": "^2.1.1",
+        "@connectrpc/protoc-gen-connect-query": "^2.2.0",
         "@tanstack/react-query": "^5.79.0",
         "@tanstack/react-query-devtools": "^5.79.0",
         "@testing-library/jest-dom": "^6.6.3",
@@ -10348,7 +10336,7 @@
     },
     "packages/protoc-gen-connect-query": {
       "name": "@connectrpc/protoc-gen-connect-query",
-      "version": "2.1.1",
+      "version": "2.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@bufbuild/protobuf": "^2.5.1",
@@ -10361,12 +10349,12 @@
         "@bufbuild/buf": "1.54.0",
         "@bufbuild/protoc-gen-es": "^2.5.1",
         "@connectrpc/connect": "^2.0.2",
-        "@connectrpc/connect-query": "^2.1.1",
+        "@connectrpc/connect-query": "^2.2.0",
         "@tanstack/react-query": "^5.79.0",
         "typescript": "^5.8.3"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       },
       "peerDependencies": {
         "@bufbuild/protoc-gen-es": "2.x"
@@ -10378,7 +10366,7 @@
       }
     },
     "packages/test-utils": {
-      "version": "2.1.1",
+      "version": "2.2.0",
       "devDependencies": {
         "@bufbuild/buf": "^1.54.0",
         "@bufbuild/protobuf": "^2.5.1",
diff --git a/packages/connect-query-core/package.json b/packages/connect-query-core/package.json
index b16cbe8f..1b464cae 100644
--- a/packages/connect-query-core/package.json
+++ b/packages/connect-query-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connectrpc/connect-query-core",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Core of Connect-Query, framework agnostic helpers for type-safe queries.",
   "license": "Apache-2.0",
   "repository": {
diff --git a/packages/connect-query/package.json b/packages/connect-query/package.json
index 023b17b5..4597257c 100644
--- a/packages/connect-query/package.json
+++ b/packages/connect-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connectrpc/connect-query",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "TypeScript-first expansion pack for TanStack Query that gives you Protobuf superpowers.",
   "license": "Apache-2.0",
   "repository": {
@@ -30,7 +30,7 @@
     }
   },
   "dependencies": {
-    "@connectrpc/connect-query-core": "^2.1.1"
+    "@connectrpc/connect-query-core": "^2.2.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.1",
diff --git a/packages/examples/react/basic/package.json b/packages/examples/react/basic/package.json
index bf22d8ca..82645310 100644
--- a/packages/examples/react/basic/package.json
+++ b/packages/examples/react/basic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connectrpc/connect-query-example-basic",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -17,9 +17,9 @@
     "@bufbuild/protobuf": "^2.5.1",
     "@bufbuild/protoc-gen-es": "^2.5.1",
     "@connectrpc/connect": "^2.0.2",
-    "@connectrpc/connect-query": "^2.1.1",
+    "@connectrpc/connect-query": "^2.2.0",
     "@connectrpc/connect-web": "^2.0.2",
-    "@connectrpc/protoc-gen-connect-query": "^2.1.1",
+    "@connectrpc/protoc-gen-connect-query": "^2.2.0",
     "@tanstack/react-query": "^5.79.0",
     "@tanstack/react-query-devtools": "^5.79.0",
     "@testing-library/jest-dom": "^6.6.3",
diff --git a/packages/examples/react/basic/src/gen/eliza-ElizaService_connectquery.ts b/packages/examples/react/basic/src/gen/eliza-ElizaService_connectquery.ts
index 1e83b4f9..e35a447e 100644
--- a/packages/examples/react/basic/src/gen/eliza-ElizaService_connectquery.ts
+++ b/packages/examples/react/basic/src/gen/eliza-ElizaService_connectquery.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// @generated by protoc-gen-connect-query v2.1.1 with parameter "target=ts"
+// @generated by protoc-gen-connect-query v2.2.0 with parameter "target=ts"
 // @generated from file eliza.proto (package connectrpc.eliza.v1, syntax proto3)
 /* eslint-disable */
 
diff --git a/packages/protoc-gen-connect-query/package.json b/packages/protoc-gen-connect-query/package.json
index 31b2b761..2a5559b3 100644
--- a/packages/protoc-gen-connect-query/package.json
+++ b/packages/protoc-gen-connect-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connectrpc/protoc-gen-connect-query",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Code generator for connect-query",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -30,7 +30,7 @@
     "@bufbuild/buf": "1.54.0",
     "@bufbuild/protoc-gen-es": "^2.5.1",
     "@connectrpc/connect": "^2.0.2",
-    "@connectrpc/connect-query": "^2.1.1",
+    "@connectrpc/connect-query": "^2.2.0",
     "@tanstack/react-query": "^5.79.0",
     "typescript": "^5.8.3"
   },
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index c31f8b76..a0dd16db 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "test-utils",
   "private": true,
-  "version": "2.1.1",
+  "version": "2.2.0",
   "type": "module",
   "scripts": {
     "generate": "buf generate",