Skip to content

Commit 67a5dee

Browse files
mcollinamcollina
committed
Merge branch 'main' into next
2 parents 1003d9d + cc5440b commit 67a5dee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2929
-587
lines changed

‎.github/labeler.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# PRs that only touch the docs folder
2+
documentation:
3+
- all: ["docs/**/*"]
4+
5+
# PRs that only touch type files
6+
typescript:
7+
- all: ["**/*[.|-]d.ts"]
8+
9+
plugin:
10+
- all: ["docs/Ecosystem.md"]

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v2
2727

2828
- name: Use Node.js
29-
uses: actions/setup-node@v2.1.4
29+
uses: actions/setup-node@v2.1.5
3030
with:
3131
node-version: ${{ matrix.node-version }}
3232

@@ -63,7 +63,7 @@ jobs:
6363
needs: test
6464
runs-on: ubuntu-latest
6565
steps:
66-
- uses: fastify/github-action-merge-dependabot@v1.1.1
66+
- uses: fastify/github-action-merge-dependabot@v2.0.0
6767
if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }}
6868
with:
6969
github-token: ${{secrets.github_token}}

‎.github/workflows/labeler.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: "Pull Request Labeler"
2+
on: pull_request_target
3+
4+
jobs:
5+
label:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/labeler@main
9+
with:
10+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/package-manager-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: package-manager-ci
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
pnpm:
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v2
2020

2121
- name: Use Node.js
22-
uses: actions/setup-node@v2.1.4
22+
uses: actions/setup-node@v2.1.5
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525

@@ -45,7 +45,7 @@ jobs:
4545
- uses: actions/checkout@v2
4646

4747
- name: Use Node.js
48-
uses: actions/setup-node@v2.1.4
48+
uses: actions/setup-node@v2.1.5
4949
with:
5050
node-version: ${{ matrix.node-version }}
5151

‎.github/workflows/website.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: website
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
paths:
88
- 'docs/*'
99

‎.gitignore

+96-21
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,147 @@
22
logs
33
*.log
44
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
lerna-debug.log*
8+
9+
# Diagnostic reports (https://nodejs.org/api/report.html)
10+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
511

612
# Runtime data
713
pids
814
*.pid
915
*.seed
16+
*.pid.lock
1017

1118
# Directory for instrumented libs generated by jscoverage/JSCover
1219
lib-cov
1320

1421
# Coverage directory used by tools like istanbul
1522
coverage
23+
*.lcov
1624

1725
# nyc test coverage
1826
.nyc_output
1927

20-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
28+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
2129
.grunt
2230

31+
# Bower dependency directory (https://bower.io/)
32+
bower_components
33+
2334
# node-waf configuration
2435
.lock-wscript
2536

26-
# Compiled binary addons (http://nodejs.org/api/addons.html)
37+
# Compiled binary addons (https://nodejs.org/api/addons.html)
2738
build/Release
2839

2940
# Dependency directories
30-
node_modules
31-
jspm_packages
41+
node_modules/
42+
jspm_packages/
43+
44+
# Snowpack dependency directory (https://snowpack.dev/)
45+
web_modules/
46+
47+
# TypeScript cache
48+
*.tsbuildinfo
3249

3350
# Optional npm cache directory
3451
.npm
3552

36-
# Optional compressed files (npm generated package, zip, etc)
37-
/*.tgz
38-
/*.zip
53+
# Optional eslint cache
54+
.eslintcache
55+
56+
# Microbundle cache
57+
.rpt2_cache/
58+
.rts2_cache_cjs/
59+
.rts2_cache_es/
60+
.rts2_cache_umd/
3961

4062
# Optional REPL history
4163
.node_repl_history
4264

43-
# 0x
44-
profile-*
65+
# Output of 'npm pack'
66+
*.tgz
4567

46-
# mac files
47-
.DS_Store
68+
# Yarn Integrity file
69+
.yarn-integrity
70+
71+
# dotenv environment variables file
72+
.env
73+
.env.test
74+
75+
# parcel-bundler cache (https://parceljs.org/)
76+
.cache
77+
.parcel-cache
78+
79+
# Next.js build output
80+
.next
81+
out
82+
83+
# Nuxt.js build / generate output
84+
.nuxt
85+
dist
86+
87+
# Gatsby files
88+
.cache/
89+
# Comment in the public line in if your project uses Gatsby and not Next.js
90+
# https://nextjs.org/blog/next-9-1#public-directory-support
91+
# public
92+
93+
# vuepress build output
94+
.vuepress/dist
95+
96+
# Serverless directories
97+
.serverless/
98+
99+
# FuseBox cache
100+
.fusebox/
101+
102+
# DynamoDB Local files
103+
.dynamodb/
104+
105+
# TernJS port file
106+
.tern-port
48107

49-
# vim swap files
108+
# Stores VSCode versions used for testing VSCode extensions
109+
.vscode-test
110+
111+
# yarn v2
112+
.yarn/cache
113+
.yarn/unplugged
114+
.yarn/build-state.yml
115+
.yarn/install-state.gz
116+
.pnp.*
117+
118+
# Vim swap files
50119
*.swp
51120

52-
# webstorm
53-
.idea
121+
# macOS files
122+
.DS_Store
123+
124+
# lock files
125+
package-lock.json
126+
yarn.lock
54127

55-
# vscode
128+
# editor files
56129
.vscode
57-
*code-workspace
130+
.idea
131+
132+
# Optional compressed files (npm generated package, zip, etc)
133+
/*.zip
134+
135+
# 0x
136+
profile-*
58137

59138
# clinic
60139
profile*
61140
*clinic*
62141
*flamegraph*
63142

64-
# lock files
65-
yarn.lock
66-
package-lock.json
67-
68143
# generated code
69144
examples/typescript-server.js
70145
test/types/index.js
71146

72147
# test tap report
73-
out.tap
148+
out.tap

‎CODE_OF_CONDUCT.md

+58-55
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Code of Conduct
22

3-
Fastify, as member project of the OpenJS Foundation, use [Contributor Covenant v1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct) as their code of conduct. The full text is included [below](#contributor-covenant-code-of-conduct) in English, and translations are available from the Contributor Covenant organisation:
3+
Fastify, as member project of the OpenJS Foundation, use [Contributor Covenant v2.0](https://contributor-covenant.org/version/2/0/code_of_conduct) as their code of conduct. The full text is included [below](#contributor-covenant-code-of-conduct) in English, and translations are available from the Contributor Covenant organisation:
44

55
- [contributor-covenant.org/translations](https://www.contributor-covenant.org/translations)
6-
- [github.com/ContributorCovenant](https://github.com/ContributorCovenant/contributor_covenant/tree/release/content/version/1/4)
6+
- [github.com/ContributorCovenant](https://github.com/ContributorCovenant/contributor_covenant/tree/release/content/version/2/0)
77

88
Refer to the sections on reporting and escalation in this document for the specific emails that can be used to report and escalate issues.
99

@@ -29,82 +29,85 @@ For reporting issues in spaces managed by the OpenJS Foundation, for example, re
2929

3030
The OpenJS Foundation maintains a Code of Conduct Panel (CoCP). This is a foundation-wide team established to manage escalation when a reporter believes that a report to a member project or the CPC has not been properly handled. In order to escalate to the CoCP send an email to `coc-escalation@lists.openjsf.org`.
3131

32-
For more information, refer to the full [Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/blob/master/CODE_OF_CONDUCT.md).
32+
For more information, refer to the full [Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/CODE_OF_CONDUCT.md).
3333

3434
---
3535

36-
## Contributor Covenant Code of Conduct
36+
## Contributor Covenant Code of Conduct v2.0
3737

3838
### Our Pledge
3939

40-
In the interest of fostering an open and welcoming environment, we as
41-
contributors and maintainers pledge to making participation in our project and
42-
our community a harassment-free experience for everyone, regardless of age, body
43-
size, disability, ethnicity, gender identity and expression, level of experience,
44-
nationality, personal appearance, race, religion, or sexual identity and
45-
orientation.
40+
We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
41+
42+
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
4643

4744
### Our Standards
4845

49-
Examples of behavior that contributes to creating a positive environment
50-
include:
46+
Examples of behavior that contributes to a positive environment for our community include:
5147

52-
* Using welcoming and inclusive language
53-
* Being respectful of differing viewpoints and experiences
54-
* Gracefully accepting constructive criticism
55-
* Focusing on what is best for the community
56-
* Showing empathy towards other community members
48+
* Demonstrating empathy and kindness toward other people
49+
* Being respectful of differing opinions, viewpoints, and experiences
50+
* Giving and gracefully accepting constructive feedback
51+
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
52+
* Focusing on what is best not just for us as individuals, but for the overall community
5753

58-
Examples of unacceptable behavior by participants include:
54+
Examples of unacceptable behavior include:
5955

60-
* The use of sexualized language or imagery and unwelcome sexual attention or
61-
advances
62-
* Trolling, insulting/derogatory comments, and personal or political attacks
56+
* The use of sexualized language or imagery, and sexual attention or advances of any kind
57+
* Trolling, insulting or derogatory comments, and personal or political attacks
6358
* Public or private harassment
64-
* Publishing others' private information, such as a physical or electronic
65-
address, without explicit permission
66-
* Other conduct which could reasonably be considered inappropriate in a
67-
professional setting
59+
* Publishing others' private information, such as a physical or email address, without their explicit permission
60+
* Other conduct which could reasonably be considered inappropriate in a professional setting
6861

69-
### Our Responsibilities
62+
### Enforcement Responsibilities
7063

71-
Project maintainers are responsible for clarifying the standards of acceptable
72-
behavior and are expected to take appropriate and fair corrective action in
73-
response to any instances of unacceptable behavior.
64+
Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
7465

75-
Project maintainers have the right and responsibility to remove, edit, or
76-
reject comments, commits, code, wiki edits, issues, and other contributions
77-
that are not aligned to this Code of Conduct, or to ban temporarily or
78-
permanently any contributor for other behaviors that they deem inappropriate,
79-
threatening, offensive, or harmful.
66+
Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
8067

8168
### Scope
8269

83-
This Code of Conduct applies both within project spaces and in public spaces
84-
when an individual is representing the project or its community. Examples of
85-
representing a project or community include using an official project e-mail
86-
address, posting via an official social media account, or acting as an appointed
87-
representative at an online or offline event. Representation of a project may be
88-
further defined and clarified by project maintainers.
70+
This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
8971

9072
### Enforcement
9173

92-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
93-
reported by contacting the project team at the email addresses listed above in
94-
the [Reporting](#reporting) and [Escalation](#escalation) sections. All
95-
complaints will be reviewed and investigated and will result in a response that
96-
is deemed necessary and appropriate to the circumstances. The project team is
97-
obligated to maintain confidentiality with regard to the reporter of an
98-
incident. Further details of specific enforcement policies may be posted
99-
separately.
74+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at the email addresses listed above in the [Reporting](#reporting) and [Escalation](#escalation) sections. All complaints will be reviewed and investigated promptly and fairly.
75+
76+
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
77+
78+
### Enforcement Guidelines
79+
80+
Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
81+
82+
#### 1. Correction
83+
84+
**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
85+
86+
**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
87+
88+
#### 2. Warning
89+
90+
**Community Impact**: A violation through a single incident or series of actions.
91+
92+
**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
93+
94+
#### 3. Temporary Ban
95+
96+
**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
97+
98+
**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
99+
100+
#### 4. Permanent Ban
101+
102+
**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
103+
104+
**Consequence**: A permanent ban from any sort of public interaction within the project community.
100105

101-
Project maintainers who do not follow or enforce the Code of Conduct in good
102-
faith may face temporary or permanent repercussions as determined by other
103-
members of the project's leadership.
106+
### Attribution
104107

105-
## Attribution
108+
This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 2.0, available at [contributor-covenant.org/version/2/0/code_of_conduct](https://www.contributor-covenant.org/version/2/0/code_of_conduct).
106109

107-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
108-
available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct/](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
110+
Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
109111

110-
[homepage]: https://www.contributor-covenant.org
112+
For answers to common questions about this code of conduct, see the FAQ at
113+
[contributor-covenant.org/faq](https://www.contributor-covenant.org/faq). Translations are available at [contributor-covenant.org/translations](https://www.contributor-covenant.org/translations).

0 commit comments

Comments
 (0)