Sync with reactjs.org @ 7e4f503d #322
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
was inconsistent across examples
* remove a reference to fbjs from codebase overview * Update codebase-overview.md Co-authored-by: Sunil Pai <[email protected]>
We shouldn't be encouraging this pattern which requires good understanding of JS quirks and can lead to bugs in other instances.
Added MyContext for clarity.
Removed unused props for clarity.
The ternary syntax using parenthesis was an unconventional prettier invention, going out of its way to format react ternaries differently from normal ternaries (if i remember correctly, because vim users had trouble re-formating without a mouse). If they made the right decision or not is one thing, but the additional noise could mislead beginners here, thinking they have to add more characters to make a simple 2-slot ternary, or that it is a "react thing".
Co-authored-by: Sunil Pai <[email protected]>
* Minor grammar edit (syntactic -> syntactical). * Update handling-events.md Co-authored-by: Sunil Pai <[email protected]>
* Clarify preferred "props default to true" expr The current text is ambiguous without reading further into the paragraph -- until I re-read this text, I was trying to avoid both types of syntax because it seemed to imply that it wans't recommended (eg "props default to true" --> "we don't recommend using this"). * Update jsx-in-depth.md Co-authored-by: Sunil Pai <[email protected]>
* Make React.memo documentation more clear * Update reference-react.md Co-authored-by: Sunil Pai <[email protected]>
* DOC: Updated the React Native Home URL * Blog: Updated the React URL Link * Relative link added
* Upgrade to node 12 LTS * Run prettier
Date change for Render-Atlanta 2020 due to the Coronavirus pandemic.
Having the information that the plugin is already installed by default after the installation instructions is probably wasting a lot of people's time. Moving it up probably avoids multiple installs of the plugin.
|
Deploy preview for ja-reactjs ready! Built with commit 81ac565 |
|
以下のようにしました git checkout sync-7e4f503d
# "mergnig all conflicts" の直前にいったん戻る
# (次からは git revert にします…)
git reset --hard 7e4f503
# botの真似をして以下を発行する (origin = ja.reactjs.org.git)
git pull origin master
# yarn.lockを含む大量のコンフリクトが発生する
# ここで package.json を編集して @textlint-rule の依存をいったん消す
# @textlint-rule を入れなおす
yarn add @textlint-rule/textlint-rule-no-invalid-control-character@^1.2.0
# yarn.lock のコンフリクトが解決したので後はまたbotの真似をする
git commit -n -am "Resolve conflicts of yarn.lock, merging all other conflicts"
git push -f
# yarn.lock の競合は解決したのであとはいつも通りに処理する関連するbotのコードはこれ： https://github.com/reactjs/reactjs.org-translation/blob/master/scripts/sync.js |
smikitky
approved these changes
Mar 24, 2020
smikitky
reviewed
Mar 24, 2020
| @@ -15,12 +15,6 @@ redirect_from: | |||
|
|
|||
| これらの規約のいずれかをあなたの React アプリケーションで推奨しているというわけでは必ずしもありません。規約の多くは歴史的な理由で存在しており、時間とともに変化する可能性があります。 | |||
|
|
|||
| ### 外部の依存関係 {#external-dependencies} | |||
smikitky
reviewed
Mar 24, 2020
| @@ -1 +1 @@ | |||
| lts/carbon | |||
| lts/erbium | |||
There was a problem hiding this comment.
Netlifyはこれを見てNode.jsのバージョンを変えているようです (carbon = 8.x, erbium = 12.x)
https://docs.netlify.com/configure-builds/manage-dependencies/
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated.
Merge changes from reactjs.org at 7e4f503
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 master and cause them to show up as conflicts the next time we merge.