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

Sync with react.dev @ 4f9e9a56 #108

Merged
merged 15 commits into from
Dec 6, 2023
Merged

Sync with react.dev @ 4f9e9a56 #108

merged 15 commits into from
Dec 6, 2023

Conversation

react-translations-bot
Copy link
Collaborator

This PR was automatically generated.

Merge changes from react.dev at 4f9e9a5

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from main and cause them to show up as conflicts the next time we merge.

smikitky and others added 14 commits November 6, 2023 14:09
Summary of changes:
"Server Action", like "Effect", is a React-specific notion
that would be benefited from captailization to be distinguished
from its genertic meaning.

It seems like [Next doc](https://nextjs.org/docs/app/api-reference/functions/server-actions)
has also adopted such connventions and we should probably do the same.

Co-authored-by: xuan.huang <[email protected]>
Summary of changes:
following <reactjs/react.dev#6417>

Co-authored-by: xuan.huang <[email protected]>
Summary of changes:
See <reactjs/react.dev#6417>

Co-authored-by: xuan.huang <[email protected]>
Summary of changes:
See <reactjs/react.dev#6417>.

There is one exception though. The error message
“Rendered fewer hooks than expected” from React is indeed "hooks"
so I kept as-is. Shall we change the error message from React?

Co-authored-by: xuan.huang <[email protected]>
Summary of changes:
See <reactjs/react.dev#6417>

Co-authored-by: xuan.huang <[email protected]>
Summary of changes:
See <reactjs/react.dev#6417>

Co-authored-by: xuan.huang <[email protected]>
Copy link
Collaborator

@moshfiqrony moshfiqrony left a comment

Choose a reason for hiding this comment

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

Conflict resolved

@moshfiqrony moshfiqrony added this pull request to the merge queue Dec 6, 2023
Merged via the queue into main with commit 5c6db7f Dec 6, 2023
2 checks passed
@moshfiqrony moshfiqrony deleted the sync-4f9e9a56 branch December 6, 2023 15:50
Copy link

github-actions bot commented Dec 6, 2023

Size changes

📦 Next.js Bundle Analysis for react-dev

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

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.

7 participants