Commit 0bb2fee
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).4 files changed
Lines changed: 123 additions & 177 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | | - | |
| 142 | + | |
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
| |||
0 commit comments