Skip to content

Commit 0bb2fee

Browse files
committed
Merge branch 'main' into epic/1.0_breaking_changes
Sync main (0.3.14) into the epic. Conflict resolutions: - Kept epic's CHANGELOG, README, package.json version (1.0.0-beta.0), rest_handler.ts (GET+POST resubscribe already implemented as superset of main's #569), and its test coverage. - Discarded main's docs edits and 0.3.14 CHANGELOG entry (release-please will regenerate the next entry from commit history). - Preserved dependabot bumps on samples (@grpc/grpc-js 1.14.3->1.14.4, tsx 4.19.3->4.22.4). - Bumped root @grpc/grpc-js devDep to ^1.14.4 to keep root and samples workspaces on the same version and avoid TS type-identity lint errors. - npm-publish.yml, release-please.yml, and other workflows auto-merged cleanly (no divergence in file content).
2 parents 4806f8f + cfeed0d commit 0bb2fee

4 files changed

Lines changed: 123 additions & 177 deletions

File tree

package-lock.json

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
"@bufbuild/protobuf": "^2.10.2",
140140
"@cloudflare/vitest-pool-workers": "^0.12.5",
141141
"@eslint/js": "^9.39.1",
142-
"@grpc/grpc-js": "^1.11.0",
142+
"@grpc/grpc-js": "^1.14.4",
143143
"@types/express": "^5.0.3",
144144
"@types/node": "^22.13.14",
145145
"@types/supertest": "^6.0.3",

0 commit comments

Comments
 (0)