From c3f89421406d7b9df25506b86519ebf3fae22fb8 Mon Sep 17 00:00:00 2001 From: Paul Sachs Date: Thu, 12 Dec 2024 10:48:22 -0500 Subject: [PATCH 1/4] Improved workspace version update to support private packages Signed-off-by: Paul Sachs --- scripts/set-workspace-version.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/set-workspace-version.js b/scripts/set-workspace-version.js index c33e7b28..5d757b52 100755 --- a/scripts/set-workspace-version.js +++ b/scripts/set-workspace-version.js @@ -59,7 +59,7 @@ function setVersion(packages, lock, newVersion) { if (typeof pkg.version !== "string") { continue; } - assert(pkg.name); + assert(pkg.name, "Missing package name"); if (pkg.version === newVersion) { continue; } @@ -68,8 +68,15 @@ function setVersion(packages, lock, newVersion) { const l = Array.from(Object.values(lock.packages)).find( (l) => l.name === pkg.name, ); - assert(l); - l.version = newVersion; + if (!pkg.private) { + assert( + l, + `Cannot find lock entry for ${pkg.name} and it is not private`, + ); + } + if (l) { + l.version = newVersion; + } } updates.push({ package: pkg, From 5d4d3544a188212dc67750c7a31c6296ab73ea95 Mon Sep 17 00:00:00 2001 From: Paul Sachs Date: Thu, 12 Dec 2024 10:52:30 -0500 Subject: [PATCH 2/4] Release 2.0.1 Signed-off-by: Paul Sachs --- package-lock.json | 14 +++++++------- packages/connect-query-core/package.json | 2 +- packages/connect-query/package.json | 4 ++-- .../src/gen/eliza-ElizaService_connectquery.ts | 2 +- packages/protoc-gen-connect-query/package.json | 4 ++-- packages/test-utils/package.json | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 322b2ef0..bb9ba620 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8973,10 +8973,10 @@ }, "packages/connect-query": { "name": "@connectrpc/connect-query", - "version": "2.0.0", + "version": "2.0.1", "license": "Apache-2.0", "dependencies": { - "@connectrpc/connect-query-core": "^2.0.0" + "@connectrpc/connect-query-core": "^2.0.1" }, "devDependencies": { "@arethetypeswrong/cli": "^0.16.4", @@ -9005,7 +9005,7 @@ }, "packages/connect-query-core": { "name": "@connectrpc/connect-query-core", - "version": "2.0.0", + "version": "2.0.1", "license": "Apache-2.0", "devDependencies": { "@arethetypeswrong/cli": "^0.16.4", @@ -9033,9 +9033,9 @@ "@bufbuild/protobuf": "^2.2.1", "@bufbuild/protoc-gen-es": "^2.2.1", "@connectrpc/connect": "^2.0.0", - "@connectrpc/connect-query": "^2.0.0", + "@connectrpc/connect-query": "^2.0.1", "@connectrpc/connect-web": "^2.0.0", - "@connectrpc/protoc-gen-connect-query": "^2.0.0", + "@connectrpc/protoc-gen-connect-query": "^2.0.1", "@tanstack/react-query": "^5.62.7", "@tanstack/react-query-devtools": "^5.62.7", "@testing-library/jest-dom": "^6.6.3", @@ -9051,7 +9051,7 @@ }, "packages/protoc-gen-connect-query": { "name": "@connectrpc/protoc-gen-connect-query", - "version": "2.0.0", + "version": "2.0.1", "license": "Apache-2.0", "dependencies": { "@bufbuild/protobuf": "^2.2.1", @@ -9064,7 +9064,7 @@ "@bufbuild/buf": "1.46.0", "@bufbuild/protoc-gen-es": "^2.2.1", "@connectrpc/connect": "^2.0.0", - "@connectrpc/connect-query": "^2.0.0", + "@connectrpc/connect-query": "^2.0.1", "@tanstack/react-query": "^5.59.16", "typescript": "^5.6.3" }, diff --git a/packages/connect-query-core/package.json b/packages/connect-query-core/package.json index 264adbad..91a20f6e 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.0.0", + "version": "2.0.1", "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 8f88969f..0f789eaa 100644 --- a/packages/connect-query/package.json +++ b/packages/connect-query/package.json @@ -1,6 +1,6 @@ { "name": "@connectrpc/connect-query", - "version": "2.0.0", + "version": "2.0.1", "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.0.0" + "@connectrpc/connect-query-core": "^2.0.1" }, "devDependencies": { "@arethetypeswrong/cli": "^0.16.4", 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 65dfb995..a15880c1 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.0.0 with parameter "target=ts" +// @generated by protoc-gen-connect-query v2.0.1 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 e6b72f2c..785fa728 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.0.0", + "version": "2.0.1", "description": "Code generator for connect-query", "license": "Apache-2.0", "sideEffects": false, @@ -30,7 +30,7 @@ "@bufbuild/buf": "1.46.0", "@bufbuild/protoc-gen-es": "^2.2.1", "@connectrpc/connect": "^2.0.0", - "@connectrpc/connect-query": "^2.0.0", + "@connectrpc/connect-query": "^2.0.1", "@tanstack/react-query": "^5.59.16", "typescript": "^5.6.3" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 4178fb78..c653b8f6 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,7 +1,7 @@ { "name": "test-utils", "private": true, - "version": "2.0.0", + "version": "2.0.1", "type": "module", "scripts": { "generate": "buf generate", From e4c7c79f010fd21066a39b5d367fe9cfbb70aaeb Mon Sep 17 00:00:00 2001 From: Paul Sachs Date: Fri, 13 Dec 2024 10:52:50 -0500 Subject: [PATCH 3/4] Update example package lock file Signed-off-by: Paul Sachs --- package-lock.json | 2 +- packages/examples/react/basic/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb5c7aeb..39d62743 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9027,7 +9027,7 @@ }, "packages/examples/react/basic": { "name": "@connectrpc/connect-query-example-basic", - "version": "2.0.0", + "version": "2.0.1", "dependencies": { "@bufbuild/buf": "1.46.0", "@bufbuild/protobuf": "^2.2.1", diff --git a/packages/examples/react/basic/package.json b/packages/examples/react/basic/package.json index f862414d..c36e74ef 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.0.0", + "version": "2.0.1", "private": true, "type": "module", "scripts": { From 12809f56a39d562af083094fb0056a9aa11e05a1 Mon Sep 17 00:00:00 2001 From: Paul Sachs Date: Fri, 13 Dec 2024 11:27:36 -0500 Subject: [PATCH 4/4] Review comments Signed-off-by: Paul Sachs --- package-lock.json | 2 +- packages/examples/react/basic/package.json | 4 ++-- scripts/set-workspace-version.js | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39d62743..5a3b9afc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9081,7 +9081,7 @@ } }, "packages/test-utils": { - "version": "2.0.0", + "version": "2.0.1", "devDependencies": { "@bufbuild/buf": "^1.46.0", "@bufbuild/protobuf": "^2.2.1", diff --git a/packages/examples/react/basic/package.json b/packages/examples/react/basic/package.json index c36e74ef..56957b70 100644 --- a/packages/examples/react/basic/package.json +++ b/packages/examples/react/basic/package.json @@ -17,9 +17,9 @@ "@bufbuild/protobuf": "^2.2.1", "@bufbuild/protoc-gen-es": "^2.2.1", "@connectrpc/connect": "^2.0.0", - "@connectrpc/connect-query": "^2.0.0", + "@connectrpc/connect-query": "^2.0.1", "@connectrpc/connect-web": "^2.0.0", - "@connectrpc/protoc-gen-connect-query": "^2.0.0", + "@connectrpc/protoc-gen-connect-query": "^2.0.1", "@tanstack/react-query": "^5.62.7", "@tanstack/react-query-devtools": "^5.62.7", "@testing-library/jest-dom": "^6.6.3", diff --git a/scripts/set-workspace-version.js b/scripts/set-workspace-version.js index 5c33cd59..deb647b5 100755 --- a/scripts/set-workspace-version.js +++ b/scripts/set-workspace-version.js @@ -75,6 +75,10 @@ try { process.exit(1); } +/** + * @typedef {{path: string; pkg: Package}} Workspace + */ + /** * Read the given root package.json file, and return an array of workspace * packages.