Skip to content

Sync next-branch#4815

Merged
climba03003 merged 41 commits intonextfrom
main
Jul 3, 2023
Merged

Sync next-branch#4815
climba03003 merged 41 commits intonextfrom
main

Conversation

@github-actions
Copy link

Sync next-branch with latest changes of the main-branch

Uzlopak and others added 10 commits June 9, 2023 08:57
* ci(ci): replace node 19 with node 20 in test matrix

* fix: options.https do not accept boolean

* test: fix missing host header

* test: split custom-parser.test.js

* ci(package-manager-ci): add node 20 to test matrix

* docs(reference/lts): add node 20 to runtime lists

* ci(integration): add node 20 to test matrix

* docs(reference/lts): add node 20 to package manager runtimes

* fix: tests

* Skip Node.js v14 on Windows

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* remove terse reporter

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

---------

Signed-off-by: Matteo Collina <hello@matteocollina.com>
Co-authored-by: KaKa <kaka@kakawebsitedemo.com>
Co-authored-by: Manuel Spigolon <behemoth89@gmail.com>
Co-authored-by: Manuel Spigolon <manuel.spigolon@nearform.com>
Co-authored-by: Matteo Collina <hello@matteocollina.com>
* Fix broken CI

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

---------

Signed-off-by: Matteo Collina <hello@matteocollina.com>
Signed-off-by: Matteo Collina <hello@matteocollina.com>
The listenCallback() function is called for each secondary
address that a server should listen on. However, each call sets
the listening state to true, so subsequent addresses fail with
FST_ERR_REOPENED_SERVER. This commit resets the state on each
call.
Signed-off-by: Matteo Collina <hello@matteocollina.com>
…nal server is supplied (#4741)

* fix: added a check to prevent creation of secondary server when external server is passed to serverfactory #4725

* fix: serverFactoryListening now uses the serverfactory if supplied rather than the options

* fix: added warning if secondary server is being created and if supplied server is listening, then the first server throws an error. added test cases for the same

* Update lib/server.js

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

* fix: rewords FST_ERR_DUPLICATE_SERVER to  FST_ERR_SERVER_ALREADY_LISTENING and changed the message as well

* fix: changed warning label, error message

* fix: serverFactory usage does not throw an error and instead avoids creating secondary server

---------

Signed-off-by: Matteo Collina <hello@matteocollina.com>
Co-authored-by: Carlos Fuentes <me@metcoder.dev>
Co-authored-by: Matteo Collina <hello@matteocollina.com>
Bumps [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) from 0.7.1 to 0.8.1.
- [Changelog](https://github.com/DavidAnson/markdownlint-cli2/blob/main/CHANGELOG.md)
- [Commits](DavidAnson/markdownlint-cli2@v0.7.1...v0.8.1)

---
updated-dependencies:
- dependency-name: markdownlint-cli2
  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>
@mcollina
Copy link
Member

@Uzlopak Can you fix the script? It generates conflicts due to the different versions.

@Uzlopak
Copy link
Contributor

Uzlopak commented Jun 13, 2023

What do you have in mind?

@mcollina
Copy link
Member

The github action should be able to handle this conflict. If someone has to manually intervene it's not useful at all.

@mcollina
Copy link
Member

Note that you cannot fix this conflict using the GitHub UI because otherwise this would make a change to the main branch.

mcollina and others added 3 commits June 13, 2023 20:33
* Add Platformatic to deploy strategies

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* Update docs/Guides/Serverless.md

Co-authored-by: James Sumners <james@sumners.email>

---------

Signed-off-by: Matteo Collina <hello@matteocollina.com>
Co-authored-by: James Sumners <james@sumners.email>
@jsumners
Copy link
Member

The github action should be able to handle this conflict. If someone has to manually intervene it's not useful at all.

I don't think there's anyway to avoid conflicts when syncing these branches. They will always require a human to make decisions.

@mcollina
Copy link
Member

The ones that are currently listed can 100% be automated, it's just a matter of changing the version number, running the sync version script and commit.

sergburn and others added 11 commits June 16, 2023 17:39
* Fixes #4748: correct type defiinition for genReqId(), it receives raw request as argument, not FastifyRequest

* Clarify this in docs

* Update docs/Reference/Server.md

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

* Improved tests

* Removed irrelevant tests

---------

Co-authored-by: Frazer Smith <frazer.dev@outlook.com>
Co-authored-by: Uzlopak <aras.abbasi@googlemail.com>
Co-authored-by: Giulio Davide <giuliodavide.carparelli@mia-platform.eu>
* fix: close bindings through the hook system

* docs: replace comments

Co-authored-by: James Sumners <james@sumners.email>

* refactor: shallow error for hook

* docs: add warning about Server usage

* fix: bad quoting

Co-authored-by: Manuel Spigolon <behemoth89@gmail.com>

* test: add proper testing

* test: improve scenarios

* test: adjust pipelining test

---------

Co-authored-by: James Sumners <james@sumners.email>
Co-authored-by: Manuel Spigolon <behemoth89@gmail.com>
…tify (#4852)

* Added "Principles" to explain the key technical principles behind Fastify

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* Apply suggestions from code review

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

* Update docs/Reference/Principles.md

Co-authored-by: Matteo Collina <hello@matteocollina.com>

---------

Signed-off-by: Matteo Collina <hello@matteocollina.com>
Co-authored-by: Frazer Smith <frazer.dev@outlook.com>
* pluginName will be exposed in FastifyInstance

* adding pluginName typescript property test and removed readonly from pluginName

* exposed pluginName type in typescript

---------

Co-authored-by: Md Adil <md-adil@live.com>
…if disabled (#4825)

Co-authored-by: Carlos Fuentes <me@metcoder.dev>
kibertoad and others added 16 commits June 25, 2023 15:47
Co-authored-by: Frazer Smith <frazer.dev@outlook.com>
Bumps [eslint-plugin-n](https://github.com/eslint-community/eslint-plugin-n) from 15.7.0 to 16.0.1.
- [Release notes](https://github.com/eslint-community/eslint-plugin-n/releases)
- [Commits](eslint-community/eslint-plugin-n@15.7.0...16.0.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-n
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frazer Smith <frazer.dev@outlook.com>
* feat: have `decorate()` etc enforce typed values

Non-breaking backwards compatible enhancement of decorators.

Should not have the issues of #4110 which was reverted in #4129

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

* test: test typed decoration properties

* Add support + tests for `getter`/`setter` interface

* Use the same definition for all decoration methods

---------

Signed-off-by: Pelle Wessman <pelle@kodfabrik.se>
* minor jsdoc fixes

* Update lib/schema-controller.js

Co-authored-by: James Sumners <james@sumners.email>

* Update lib/schema-controller.js

Co-authored-by: James Sumners <james@sumners.email>

---------

Co-authored-by: James Sumners <james@sumners.email>
* initial type narrowing functionality

* type narrow on wildcards

* fix typo in tests and add docs

* fix typo in test/types/reply.test-d.ts

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

* Fix typo on reply.test-d.ts

* renaming and refactoring

* fixed failing test

---------

Co-authored-by: Uzlopak <aras.abbasi@googlemail.com>
Signed-off-by: Matteo Collina <hello@matteocollina.com>
Signed-off-by: Matteo Collina <hello@matteocollina.com>
* Overload `DecorationMethod` to fix #4870

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

* Add additional tests for other decorators

* Test all of `DecorationMethod` on all decorators

* Allow `decorate('name', null)` for now

---------

Signed-off-by: Pelle Wessman <pelle@kodfabrik.se>
@climba03003 climba03003 merged commit f3c5c6f into next Jul 3, 2023
@github-actions
Copy link
Author

github-actions bot commented Jul 3, 2024

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.