From 0fb4b10aebd5f87709d24e303956c5fd7d2e6bc4 Mon Sep 17 00:00:00 2001 From: Luna Ruan Date: Thu, 14 Nov 2019 19:03:35 -0800 Subject: [PATCH 1/3] Update for 16.12 (#2568) --- content/versions.yml | 2 ++ package.json | 4 ++-- src/site-constants.js | 2 +- yarn.lock | 26 +++++++++++++------------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/content/versions.yml b/content/versions.yml index 506b5b489..22a95aa48 100644 --- a/content/versions.yml +++ b/content/versions.yml @@ -1,3 +1,5 @@ +- title: '16.12.0' + changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16120-november-14-2019 - title: '16.11' changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16110-october-22-2019 - title: '16.10.2' diff --git a/package.json b/package.json index f5dc7f45c..38cda64af 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,8 @@ "normalize.css": "^8.0.0", "prettier": "^1.7.4", "prismjs": "^1.15.0", - "react": "^16.10.2", - "react-dom": "^16.10.2", + "react": "^16.12.0", + "react-dom": "^16.12.0", "react-helmet": "^5.2.0", "react-live": "1.8.0-0", "remarkable": "^1.7.1", diff --git a/src/site-constants.js b/src/site-constants.js index d8b2b5ce1..0b4abc3e0 100644 --- a/src/site-constants.js +++ b/src/site-constants.js @@ -8,7 +8,7 @@ // NOTE: We can't just use `location.toString()` because when we are rendering // the SSR part in node.js we won't have a proper location. const urlRoot = 'https://reactjs.org'; -const version = '16.11.0'; +const version = '16.12.0'; const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js'; export {babelURL, urlRoot, version}; diff --git a/yarn.lock b/yarn.lock index 292486549..fe8a5a65b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10241,15 +10241,15 @@ react-dev-utils@^4.2.1: strip-ansi "3.0.1" text-table "0.2.0" -react-dom@^16.10.2: - version "16.10.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.2.tgz#4840bce5409176bc3a1f2bd8cb10b92db452fda6" - integrity sha512-kWGDcH3ItJK4+6Pl9DZB16BXYAZyrYQItU4OMy0jAkv5aNqc+mAKb4TpFtAteI6TJZu+9ZlNhaeNQSVQDHJzkw== +react-dom@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" + integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.16.2" + scheduler "^0.18.0" react-error-overlay@^3.0.0: version "3.0.0" @@ -10303,10 +10303,10 @@ react-side-effect@^1.1.0: exenv "^1.2.1" shallowequal "^1.0.1" -react@^16.10.2: - version "16.10.2" - resolved "https://registry.yarnpkg.com/react/-/react-16.10.2.tgz#a5ede5cdd5c536f745173c8da47bda64797a4cf0" - integrity sha512-MFVIq0DpIhrHFyqLU0S3+4dIcBhhOvBE8bJ/5kHPVOVaGdo0KuiQzpcjCPsf585WvhypqtrMILyoE2th6dT+Lw== +react@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83" + integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -11019,10 +11019,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz#f74cd9d33eff6fc554edfb79864868e4819132c1" - integrity sha512-BqYVWqwz6s1wZMhjFvLfVR5WXP7ZY32M/wYPo04CcuPM7XZEbV2TBNW7Z0UkguPTl0dWMA59VbNXxK6q+pHItg== +scheduler@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4" + integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" From 72775e97f9a5f26d93153f58e650eb8c604d207f Mon Sep 17 00:00:00 2001 From: Dan Date: Sun, 17 Nov 2019 13:00:09 +0000 Subject: [PATCH 2/3] Make the experimental notice scarier --- content/docs/concurrent-mode-adoption.md | 13 ++++++++++++- content/docs/concurrent-mode-intro.md | 13 ++++++++++++- content/docs/concurrent-mode-patterns.md | 13 ++++++++++++- content/docs/concurrent-mode-reference.md | 13 ++++++++++++- content/docs/concurrent-mode-suspense.md | 12 +++++++++++- 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/content/docs/concurrent-mode-adoption.md b/content/docs/concurrent-mode-adoption.md index 972635ca0..f0624b282 100644 --- a/content/docs/concurrent-mode-adoption.md +++ b/content/docs/concurrent-mode-adoption.md @@ -6,11 +6,22 @@ prev: concurrent-mode-patterns.html next: concurrent-mode-reference.html --- + + +
+ >Caution: > >This page describes **experimental features that are not yet available in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React. > ->This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now. +>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now. + +
- [Installation](#installation) - [Who Is This Experimental Release For?](#who-is-this-experimental-release-for) diff --git a/content/docs/concurrent-mode-intro.md b/content/docs/concurrent-mode-intro.md index dba52653b..b2980ce3d 100644 --- a/content/docs/concurrent-mode-intro.md +++ b/content/docs/concurrent-mode-intro.md @@ -5,11 +5,22 @@ permalink: docs/concurrent-mode-intro.html next: concurrent-mode-suspense.html --- + + +
+ >Caution: > >This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React. > ->This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now. +>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now. + +
This page provides a theoretical overview of Concurrent Mode. **For a more practical introduction, you might want to check out the next sections:** diff --git a/content/docs/concurrent-mode-patterns.md b/content/docs/concurrent-mode-patterns.md index 21b7b2bff..137d6f182 100644 --- a/content/docs/concurrent-mode-patterns.md +++ b/content/docs/concurrent-mode-patterns.md @@ -6,11 +6,22 @@ prev: concurrent-mode-suspense.html next: concurrent-mode-adoption.html --- + + +
+ >Caution: > >This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React. > ->This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now. +>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now. For example, if you're looking for a data fetching tutorial that works today, read [this article](https://www.robinwieruch.de/react-hooks-fetch-data/) instead. + +
Usually, when we update the state, we expect to see changes on the screen immediately. This makes sense because we want to keep our app responsive to user input. However, there are cases where we might prefer to **defer an update from appearing on the screen**. diff --git a/content/docs/concurrent-mode-reference.md b/content/docs/concurrent-mode-reference.md index 288bfebbb..d2c016cd4 100644 --- a/content/docs/concurrent-mode-reference.md +++ b/content/docs/concurrent-mode-reference.md @@ -5,11 +5,22 @@ permalink: docs/concurrent-mode-reference.html prev: concurrent-mode-adoption.html --- + + +
+ >Caution: > >This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React. > ->This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now. +>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now. + +
This page is an API reference for the React [Concurrent Mode](/docs/concurrent-mode-intro.html). If you're looking for a guided introduction instead, check out [Concurrent UI Patterns](/docs/concurrent-mode-patterns.html). diff --git a/content/docs/concurrent-mode-suspense.md b/content/docs/concurrent-mode-suspense.md index 2ce7891df..1dadfdc76 100644 --- a/content/docs/concurrent-mode-suspense.md +++ b/content/docs/concurrent-mode-suspense.md @@ -6,12 +6,22 @@ prev: concurrent-mode-intro.html next: concurrent-mode-patterns.html --- + + +
+ >Caution: > >This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React. > ->This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now. +>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now. For example, if you're looking for a data fetching tutorial that works today, read [this article](https://www.robinwieruch.de/react-hooks-fetch-data/) instead. +
React 16.6 added a `` component that lets you "wait" for some code to load and declaratively specify a loading state (like a spinner) while we're waiting: From 138f77568a96abc07c111d06ad0aff1796829e28 Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Tue, 19 Nov 2019 13:18:02 +0900 Subject: [PATCH 3/3] Resolve merge conflict Related to 0fb4b10 --- src/site-constants.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/site-constants.js b/src/site-constants.js index 4670b504e..3c5000dee 100644 --- a/src/site-constants.js +++ b/src/site-constants.js @@ -7,13 +7,8 @@ // NOTE: We can't just use `location.toString()` because when we are rendering // the SSR part in node.js we won't have a proper location. -<<<<<<< HEAD const urlRoot = 'https://ko.reactjs.org'; -const version = '16.11.0'; -======= -const urlRoot = 'https://reactjs.org'; const version = '16.12.0'; ->>>>>>> 72775e97f9a5f26d93153f58e650eb8c604d207f const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js'; export {babelURL, urlRoot, version};