Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge next into main for v5 release #5446

Merged
merged 48 commits into from
May 7, 2024
Merged

chore: merge next into main for v5 release #5446

merged 48 commits into from
May 7, 2024

Conversation

jsumners
Copy link
Member

@jsumners jsumners commented May 4, 2024

For the same reasoning as given in pinojs/pino#1947 (comment), we should just get v5 released.

Important: once this PR is merged in:

  1. We need to create a 4.x branch (actually, do this right before merging)
  2. We need to issue new releases for all of the direct dependencies managed under the Fastify org and then update them in this repo
  3. Should be able to issue the v5 release at this point

I'd say we get the thing out the door and then issue any sort of weblog post (i.e. we shouldn't block on the post being written first).

Checklist

mcollina and others added 30 commits August 19, 2022 12:03
Signed-off-by: Matteo Collina <hello@matteocollina.com>
# Conflicts:
#	fastify.js
#	package.json
# Conflicts:
#	fastify.js
#	package.json
# Conflicts:
#	fastify.js
#	package.json
# Conflicts:
#	fastify.js
#	package.json
Signed-off-by: RafaelGSS <rafael.nunu@hotmail.com>
Signed-off-by: KaKa <kaka@kakang.dev>

# Conflicts:
#	docs/Reference/Errors.md
#	docs/Reference/Server.md
#	fastify.js
#	lib/route.js
#	package.json
#	test/default-route.test.js
#	test/types/instance.test-d.ts
#	test/types/route.test-d.ts
Signed-off-by: KaKa <kaka@kakang.dev>

# Conflicts:
#	fastify.js
#	package.json
* Disallow `decorate('name', null)` in the types

Preferred to use `decorate('name')` , `decorateRequest('name')`, `decorateReply('name')` variants instead

Deprecation not feasible because of microsoft/TypeScript#54872

Follow up to #4874

* Docs: Drop `null` from placeholder decorations

Signed-off-by: Pelle Wessman <pelle@kodfabrik.se>

---------

Signed-off-by: Pelle Wessman <pelle@kodfabrik.se>
Co-authored-by: Carlos Fuentes <me@metcoder.dev>
* add option to disable/ignore request-id header

fixes #4192

* add more restrictive schema definition

* update configValidator

generated by running 'node build/build-validation.js'
after change on 'build-validation.js'

* move logic into reqIdGenFactory

* change default value from requestIdHeader

Changes default from 'request-id' to `false`.
Making it opt-in instead of opt-out.

NOTE: when user sets requestIdHeader to
`true` the behavior is the same as if it was set to `false`
because `req.headers[true] || genReqId(req)`
 is equivalent to `genReqId(req)` (req.headers[true] is undefined).
TL;DR requestIdHeader must be a string, else it will be 'ignored'.
Solution: Provide a default value for requestIdHeader when `true` or throw.

* remove comment

* adapt

---------

Co-authored-by: Uzlopak <aras.abbasi@googlemail.com>
* make FastifySchemaValidationError.params wider (#4476)

* fix: FastifySchemaValidationError.params could be unknown

* refactor: use FastifySchemaValidationError instead of ValidationResult

* fix: export ValidationResult for backword compatibility

* test: add non-assignable test for AjvErrorObject

* docs(ecosystem): add fastify-hashids (#4934)

* fix: hasPlugin does not track parent plugins (#4929)

Co-authored-by: Carlos Fuentes <me@metcoder.dev>

* docs: early hints plugin is fastify plugin (#4947)

* docs: early hints plugin is fastify plugin

* fix

* Update docs/Guides/Ecosystem.md

Co-authored-by: Frazer Smith <frazer.dev@outlook.com>

---------

Co-authored-by: Frazer Smith <frazer.dev@outlook.com>

* chore: add pull request title check (#4951)

* chore: add pull request title check

* Update .github/workflows/pull-request-title.yml

Co-authored-by: Frazer Smith <frazer.dev@outlook.com>

---------

Co-authored-by: Frazer Smith <frazer.dev@outlook.com>

* chore: Bump @sinclair/typebox from 0.29.6 to 0.30.2 (#4952)

Bumps [@sinclair/typebox](https://github.com/sinclairzx81/typebox) from 0.29.6 to 0.30.2.
- [Commits](sinclairzx81/typebox@0.29.6...0.30.2)

---
updated-dependencies:
- dependency-name: "@sinclair/typebox"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: prove pr title check (#4953)

* improve pr title check

* Apply suggestions from code review

* fix

* fix

* Update .github/workflows/pull-request-title.yml

Co-authored-by: Luis Orbaiceta <luisorbaiceta@gmail.com>

* Apply suggestions from code review

---------

Co-authored-by: Luis Orbaiceta <luisorbaiceta@gmail.com>

* ci: fix warnings in benchmark workflows (#4954)

* improve pr title check

* Apply suggestions from code review

* fix

* fix

* ci: fix warnings in benchmark workflow

* Update .github/workflows/benchmark.yml

* Update .github/workflows/benchmark.yml

* docs: fix removeAdditional comment (#4948)

* docs(Validator Compiler): fix removeAdditional comment

* Update docs/Reference/Validation-and-Serialization.md

Co-authored-by: Uzlopak <aras.abbasi@googlemail.com>

* fix: typo in comment

* Update docs/Reference/Validation-and-Serialization.md

Co-authored-by: Frazer Smith <frazer.dev@outlook.com>

---------

Co-authored-by: Uzlopak <aras.abbasi@googlemail.com>
Co-authored-by: Frazer Smith <frazer.dev@outlook.com>

* fix: Try to fix parser benchmark workflow (#4956)

* fix: infer correct hook handler (#4945)

* fix: infer correct hook handler

* Update test/types/hooks.test-d.ts

* simplify

* remove duplicate typing tests

* remove duplicate test

* remove unused import

* fix

* fix linting

* fix: remove http version check

* test: remove unsupported http version

* remove obsolete documentation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: cm-ayf <cm.ayf2734@gmail.com>
Co-authored-by: Anderson <andersonjoseph@mailfence.com>
Co-authored-by: Manuel Spigolon <behemoth89@gmail.com>
Co-authored-by: Carlos Fuentes <me@metcoder.dev>
Co-authored-by: Uzlopak <aras.abbasi@googlemail.com>
Co-authored-by: Frazer Smith <frazer.dev@outlook.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Luis Orbaiceta <luisorbaiceta@gmail.com>
Co-authored-by: Mohammed Gomaa <midomaxgomaa@gmail.com>
Co-authored-by: Igor Savin <iselwin@gmail.com>
Co-authored-by: Cem <cembkoztekin@gmail.com>
Co-authored-by: Carlos Fuentes <me@metcoder.dev>
# Conflicts:
#	fastify.js
#	lib/warnings.js
#	package.json
#	test/default-route.test.js
#	test/listen.deprecated.test.js
#	test/serial/logger.0.test.js
#	test/serial/logger.1.test.js
#	test/stream.test.js
# Conflicts:
#	docs/Reference/Errors.md
#	fastify.js
#	lib/pluginUtils.js
#	lib/route.js
#	lib/server.js
#	lib/warnings.js
#	package.json
#	test/default-route.test.js
#	test/plugin.4.test.js
#	types/instance.d.ts
# Conflicts:
#	lib/configValidator.js
@gurgunday
Copy link
Member

gurgunday commented May 4, 2024

I agree with releasing v5, or at least a prerelease, ASAP at this point

@mcollina told me he'd get to it (the full release) in July

But by doing that direct merge to next from main, we just lost a few PRs:

#5419

@gurgunday
Copy link
Member

Should I create a new PR for #5419?

@jsumners
Copy link
Member Author

jsumners commented May 4, 2024

Should I create a new PR for #5419?

No. Please just wait for me to mark this as ready for review.

@gurgunday

This comment was marked as outdated.

@gurgunday
Copy link
Member

gurgunday commented May 4, 2024

It's fine, we should merge #5444 and it should be good

Edit: ok merge handled those

@jsumners jsumners marked this pull request as ready for review May 4, 2024 14:20
@mcollina
Copy link
Member

mcollina commented May 4, 2024

I can have time to finalize v5 and issue releases for all the modules in July.

@mcollina
Copy link
Member

mcollina commented May 4, 2024

This can land right now and we can start shipping alphas.

@jsumners
Copy link
Member Author

jsumners commented May 4, 2024

Yeah, I can't wait for July. My notifications are already unmanageable and the biggest reason is this ongoing v5 work.

},
"dependencies": {
"@fastify/ajv-compiler": "^3.5.0",
"@fastify/error": "^3.4.0",
"@fastify/error": "^3.4.1",
"@fastify/fast-json-stringify-compiler": "^4.3.0",
"abstract-logging": "^2.0.1",
"avvio": "^8.3.0",
"fast-content-type-parse": "^1.1.0",
Copy link
Member

@gurgunday gurgunday May 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no longer used and should've been removed after #4450

"fast-content-type-parse": "^1.1.0",

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleaning up of dependencies can happen subsequent to this PR. This PR is about updating main for v5 and is already big enough.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, was just documenting for future reference

Comment on lines 117 to 118
- os: macos-latest
node-version: 16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that important but node 14 exclusions were removed so why not also remove 16?

Suggested change
- os: macos-latest
node-version: 16

Copy link
Member

@gurgunday gurgunday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mcollina
Copy link
Member

mcollina commented May 4, 2024

As I said, I don't think I have the time deliver v5 before July. When I shipped v4 it took almost a week of full time work, and I can't simply fit into my calendar before then.

We can ship alphas/rcs before then.

We do need blog post and announcements etc, as it's also a marketing thing.

@mcollina
Copy link
Member

mcollina commented May 4, 2024

I plan to issue another v4 release before landing this.

@jsumners
Copy link
Member Author

jsumners commented May 4, 2024

When I shipped v4 it took almost a week of full time work, and I can't simply fit into my calendar before then.

Right. None of us have time for that and really never will. We're just going to have to ship modules as we have time to get to them and/or as people indicate that they need the v5 compatible version.

I'm okay with getting the PR merged and going through alpha releases. At least getting next => main will hopefully allow for getting rid of the backlog of notifications.

@Eomm
Copy link
Member

Eomm commented May 4, 2024

We do need blog post and announcements etc, as it's also a marketing thing.

I can draft it 👍🏼

Signed-off-by: Matteo Collina <hello@matteocollina.com>
@mcollina mcollina merged commit b5891ef into main May 7, 2024
31 of 36 checks passed
@mcollina mcollina deleted the next branch May 7, 2024 13:07
@mcollina
Copy link
Member

mcollina commented May 7, 2024

Landed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet