Skip to content

Commit

Permalink
Merge branch 'main' into slorber/poc-rspack
Browse files Browse the repository at this point in the history
  • Loading branch information
slorber committed Oct 10, 2024
2 parents 961a940 + c7fd8d1 commit a26613e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Code of Conduct

Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
Meta has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The [Open Source Guides](https://opensource.guide/) website has a collection of

## Code of Conduct

Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.fb.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
Meta has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.fb.com/codeofconduct) so that you can understand what actions will and will not be tolerated.

## Get Involved

Expand Down Expand Up @@ -63,7 +63,7 @@ If you're only fixing a bug, it's fine to submit a pull request right away but w

### Security Bugs

Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues; go through the process outlined on that page.
Meta has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues; go through the process outlined on that page.

### Feature requests

Expand Down Expand Up @@ -206,7 +206,7 @@ This is also auto-fixable with the `header/header` ESLint rule.

### Contributor License Agreement (CLA)

In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, the Facebook GitHub Bot will reply with a link to the CLA form. You may also [complete your CLA here](https://code.facebook.com/cla).
In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Meta open source project, you're good to go. If you are submitting a pull request for the first time, the Meta GitHub Bot will reply with a link to the CLA form. You may also [complete your CLA here](https://code.facebook.com/cla).

After you have signed the CLA, the CLA bot would automatically update the PR status. There's no need to open a new PR.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ npm init docusaurus@latest

## Contributing

We've released Docusaurus because it helps us better scale and supports the many OSS projects at Facebook. We hope that other organizations can benefit from the project. We are thankful for any contributions from the community.
We've released Docusaurus because it helps us better scale and supports the many OSS projects at Meta. We hope that other organizations can benefit from the project. We are thankful for any contributions from the community.

### [Code of Conduct](https://code.fb.com/codeofconduct)

Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.fb.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
Meta has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.fb.com/codeofconduct) so that you can understand what actions will and will not be tolerated.

### Contributing guide

Expand Down
9 changes: 8 additions & 1 deletion packages/docusaurus-bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"@babel/core": "^7.23.3",
"@docusaurus/babel": "3.5.2",
"@docusaurus/cssnano-preset": "3.5.2",
"@docusaurus/faster": "3.5.2",
"@docusaurus/logger": "3.5.2",
"@docusaurus/types": "3.5.2",
"@docusaurus/utils": "3.5.2",
Expand All @@ -45,6 +44,14 @@
"webpack": "^5.95.0",
"webpackbar": "^6.0.1"
},
"peerDependencies": {
"@docusaurus/faster": "3.5.2"
},
"peerDependenciesMeta": {
"@docusaurus/faster": {
"optional": true
}
},
"devDependencies": {
"@total-typescript/shoehorn": "^0.1.2"
},
Expand Down
6 changes: 0 additions & 6 deletions packages/docusaurus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,10 @@
"tree-node-cli": "^1.6.0"
},
"peerDependencies": {
"@docusaurus/faster": "3.5.2",
"@mdx-js/react": "^3.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
"peerDependenciesMeta": {
"@docusaurus/faster": {
"optional": true
}
},
"engines": {
"node": ">=18.0"
}
Expand Down

0 comments on commit a26613e

Please sign in to comment.