From 4136300bffc11ba84e2e2d1f20254ca60155c62d Mon Sep 17 00:00:00 2001 From: Michael Hienle <40914576+mhienle@users.noreply.github.com> Date: Tue, 1 Oct 2019 23:58:52 +0200 Subject: [PATCH 01/20] Mention Rollup (#2379) --- content/docs/code-splitting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/code-splitting.md b/content/docs/code-splitting.md index c049fc498..d7ace8a2f 100644 --- a/content/docs/code-splitting.md +++ b/content/docs/code-splitting.md @@ -63,7 +63,7 @@ it so large that your app takes a long time to load. To avoid winding up with a large bundle, it's good to get ahead of the problem and start "splitting" your bundle. [Code-Splitting](https://webpack.js.org/guides/code-splitting/) is a feature -supported by bundlers like Webpack and Browserify (via +supported by bundlers like Webpack, [Rollup](https://rollupjs.org/guide/en/#code-splitting) and Browserify (via [factor-bundle](https://github.com/browserify/factor-bundle)) which can create multiple bundles that can be dynamically loaded at runtime. From 6b937dbafe589d3e10e73ad105ac73bbbd087e0c Mon Sep 17 00:00:00 2001 From: Katiuska Gamero Date: Wed, 2 Oct 2019 00:00:09 +0200 Subject: [PATCH 02/20] update to latest conferences (#2380) moved latest conferences to past section added latest ReactEurope 2020 --- content/community/conferences.md | 95 +++++++++++++++++--------------- 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/content/community/conferences.md b/content/community/conferences.md index f3a90ac68..cef7ba01b 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -12,21 +12,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c ## Upcoming Conferences {#upcoming-conferences} -### React Boston 2019 {#react-boston-2019} -September 21-22, 2019 in Boston, Massachusetts USA - -[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston) - -### React India 2019 {#react-india-2019} -September 26-28, 2019 in Goa, India - -[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - -### React Alicante 2019 {#react-alicante-2019} -September 26-28, 2019 in Alicante, Spain - -[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante) - ### React Conf 2019 {#react-conf-2019} October 24-25, 2019 in Henderson, Nevada USA @@ -57,6 +42,11 @@ May 4-6, 2020. Atlanta, GA, USA. [Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) +### ReactEurope 2020 {#reacteurope-2020} +May 14-15, 2020 in Paris, France + +[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf) + ### React Finland 2020 {#react-finland-2020} May 26-29 in Helsinki, Finland @@ -75,36 +65,6 @@ July 17, 2020. New York City, USA. ## Past Conferences {#past-conferences} -### React Rally 2019 {#react-rally-2019} -August 22-23, 2019. Salt Lake City, USA. - -[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/) - -### ComponentsConf 2019 {#componentsconf-2019} -September 6, 2019 in Melbourne, Australia - -[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf) - -### React Native EU 2019 {#react-native-eu-2019} -September 5-6 in Wrocław, Poland - -[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu) - -### React New York 2019 {#react-new-york-2019} -September 13th, 2019. New York, USA - -[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork) - -### React Live 2019 {#react-live-2019} -September 13th, 2019. Amsterdam, The Netherlands - -[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl) - -### React Conf Iran 2019 {#react-conf-iran-2019} -August 29, 2019. Tehran, Iran. - -[Website](https://reactconf.ir/) - [Videos](https://www.youtube.com/playlist?list=PL-VNqZFI5Nf-Nsj0rD3CWXGPkH-DI_0VY) - [Highlights](https://github.com/ReactConf/react-conf-highlights) - ### React.js Conf 2015 {#reactjs-conf-2015} January 28 & 29 in Facebook HQ, CA @@ -437,3 +397,48 @@ July 11-12, 2019. Portland, OR, USA. [Website](https://infinite.red/ChainReactConf) +### React Rally 2019 {#react-rally-2019} +August 22-23, 2019. Salt Lake City, USA. + +[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/) + +### React Conf Iran 2019 {#react-conf-iran-2019} +August 29, 2019. Tehran, Iran. + +[Website](https://reactconf.ir/) - [Videos](https://www.youtube.com/playlist?list=PL-VNqZFI5Nf-Nsj0rD3CWXGPkH-DI_0VY) - [Highlights](https://github.com/ReactConf/react-conf-highlights) + +### React Native EU 2019 {#react-native-eu-2019} +September 5-6 in Wrocław, Poland + +[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu) + +### ComponentsConf 2019 {#componentsconf-2019} +September 6, 2019 in Melbourne, Australia + +[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf) + +### React New York 2019 {#react-new-york-2019} +September 13th, 2019. New York, USA + +[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork) + +### React Live 2019 {#react-live-2019} +September 13th, 2019. Amsterdam, The Netherlands + +[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl) + +### React Boston 2019 {#react-boston-2019} +September 21-22, 2019 in Boston, Massachusetts USA + +[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston) + +### React India 2019 {#react-india-2019} +September 26-28, 2019 in Goa, India + +[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) + +### React Alicante 2019 {#react-alicante-2019} +September 26-28, 2019 in Alicante, Spain + +[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante) + From 87685fd27fe7ae15ec9951a7cc1485321c4979dc Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Wed, 2 Oct 2019 01:01:21 +0300 Subject: [PATCH 03/20] Improve Code Splitting --- content/docs/code-splitting.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/code-splitting.md b/content/docs/code-splitting.md index d7ace8a2f..9d1101cdc 100644 --- a/content/docs/code-splitting.md +++ b/content/docs/code-splitting.md @@ -62,8 +62,8 @@ it so large that your app takes a long time to load. To avoid winding up with a large bundle, it's good to get ahead of the problem and start "splitting" your bundle. - [Code-Splitting](https://webpack.js.org/guides/code-splitting/) is a feature -supported by bundlers like Webpack, [Rollup](https://rollupjs.org/guide/en/#code-splitting) and Browserify (via +Code-Splitting is a feature +supported by bundlers like [Webpack](https://webpack.js.org/guides/code-splitting/), [Rollup](https://rollupjs.org/guide/en/#code-splitting) and Browserify (via [factor-bundle](https://github.com/browserify/factor-bundle)) which can create multiple bundles that can be dynamically loaded at runtime. From 453a3bd4f2a7c9eb756948849810efc7e6f99d9c Mon Sep 17 00:00:00 2001 From: Cheng Lou Date: Tue, 1 Oct 2019 23:27:06 -0700 Subject: [PATCH 04/20] Swap order of increment and decrement in Counter examples (#2382) I think UI-wise, decrement comes first. --- content/docs/hooks-reference.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/docs/hooks-reference.md b/content/docs/hooks-reference.md index bf43fdebb..7352b3208 100644 --- a/content/docs/hooks-reference.md +++ b/content/docs/hooks-reference.md @@ -60,8 +60,8 @@ function Counter({initialCount}) { <> Count: {count} - + ); } @@ -231,8 +231,8 @@ function Counter() { return ( <> Count: {state.count} - + ); } @@ -290,8 +290,8 @@ function Counter({initialCount}) { onClick={() => dispatch({type: 'reset', payload: initialCount})}> Reset - + ); } From 9c2e8937745ff51c1864c5f31704b6c861fdfb2c Mon Sep 17 00:00:00 2001 From: David Beitey Date: Thu, 3 Oct 2019 03:22:16 +1000 Subject: [PATCH 05/20] Use gist URLs instead of RawGit in React docs (#2385) RawGit is being shut down (eg Oct 2019, https://rawgit.com/) and this change uses the direct links to the files as served from gist.github.com. The same files are being served, just that the links are only dependent on GitHub's gist service. --- content/docs/add-react-to-a-website.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/docs/add-react-to-a-website.md b/content/docs/add-react-to-a-website.md index b103cfae4..a03d0e8a5 100644 --- a/content/docs/add-react-to-a-website.md +++ b/content/docs/add-react-to-a-website.md @@ -69,13 +69,13 @@ The first two tags load React. The third one will load your component code. Create a file called `like_button.js` next to your HTML page. -Open **[this starter code](https://cdn.rawgit.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** and paste it into the file you created. +Open **[this starter code](https://gist.github.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** and paste it into the file you created. >Tip > >This code defines a React component called `LikeButton`. Don't worry if you don't understand it yet -- we'll cover the building blocks of React later in our [hands-on tutorial](/tutorial/tutorial.html) and [main concepts guide](/docs/hello-world.html). For now, let's just get it showing on the screen! -After **[the starter code](https://cdn.rawgit.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)**, add two lines to the bottom of `like_button.js`: +After **[the starter code](https://gist.github.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)**, add two lines to the bottom of `like_button.js`: ```js{3,4} // ... the starter code you pasted ... @@ -195,7 +195,7 @@ npx babel --watch src --out-dir . --presets react-app/prod Don't wait for it to finish -- this command starts an automated watcher for JSX. -If you now create a file called `src/like_button.js` with this **[JSX starter code](https://cdn.rawgit.com/gaearon/c8e112dc74ac44aac4f673f2c39d19d1/raw/09b951c86c1bf1116af741fa4664511f2f179f0a/like_button.js)**, the watcher will create a preprocessed `like_button.js` with the plain JavaScript code suitable for the browser. When you edit the source file with JSX, the transform will re-run automatically. +If you now create a file called `src/like_button.js` with this **[JSX starter code](https://gist.github.com/gaearon/c8e112dc74ac44aac4f673f2c39d19d1/raw/09b951c86c1bf1116af741fa4664511f2f179f0a/like_button.js)**, the watcher will create a preprocessed `like_button.js` with the plain JavaScript code suitable for the browser. When you edit the source file with JSX, the transform will re-run automatically. As a bonus, this also lets you use modern JavaScript syntax features like classes without worrying about breaking older browsers. The tool we just used is called Babel, and you can learn more about it from [its documentation](https://babeljs.io/docs/en/babel-cli/). From 060d129aa0bdd6bbce92f1911f3458fb3f4ffaab Mon Sep 17 00:00:00 2001 From: Wes Lord Date: Wed, 2 Oct 2019 11:35:01 -0700 Subject: [PATCH 06/20] Change usePrevious example in hooks-faq.md (#2387) In the example, `count` is initialized to 0 and then multiplied by 100... which is 0. Changing this to addition so the previous value will differ from the current value. --- content/docs/hooks-faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/hooks-faq.md b/content/docs/hooks-faq.md index d2c297d0e..9034ed817 100644 --- a/content/docs/hooks-faq.md +++ b/content/docs/hooks-faq.md @@ -373,7 +373,7 @@ Note how this would work for props, state, or any other calculated value. function Counter() { const [count, setCount] = useState(0); - const calculation = count * 100; + const calculation = count + 100; const prevCalculation = usePrevious(calculation); // ... ``` From 7e481cd3c4fbc49c26d5a39bf26f60b7046d57d4 Mon Sep 17 00:00:00 2001 From: Eric Bishard Date: Wed, 2 Oct 2019 11:43:42 -0700 Subject: [PATCH 07/20] Add React Hooks article to community/articles (#2388) * add react hooks article by Amelia W * Update community article description --- content/community/articles.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/articles.md b/content/community/articles.md index 3558dde34..ae79e6b72 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -15,3 +15,4 @@ permalink: community/articles.html - [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state. - [The Hands-On Guide to Learning React Hooks](https://www.telerik.com/kendo-react-ui/react-hooks-guide/) - Eric Bishard's step-by-step guide to learning React Hooks. - [How to Use the React Profiler Component to Measure Render Performance](https://medium.com/@adamhenson/how-to-use-the-react-profiler-component-to-measure-performance-improvements-from-hooks-d43b7092d7a8) - Adam Henson's article exemplifying a use case for ``. +- [Thinking in React Hooks](https://wattenberger.com/blog/react-hooks) - Amelia Wattenberger's provides visualizations and highlighting the mindset change needed switching from classes to functional components + hooks. From 8f24f5f0196a9ab9532c4c8006639359766de05a Mon Sep 17 00:00:00 2001 From: dblervaque <31546200+dblervaque@users.noreply.github.com> Date: Wed, 2 Oct 2019 23:55:51 +0200 Subject: [PATCH 08/20] Update meetups.md (#2383) Add Lille, France meetup group --- content/community/meetups.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/meetups.md b/content/community/meetups.md index 62fdfa7d2..320c64263 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -51,6 +51,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [React.JS Girls London](https://www.meetup.com/ReactJS-Girls-London/) ## France {#france} +* [Lille](https://www.meetup.com/ReactBeerLille/) * [Paris](https://www.meetup.com/ReactJS-Paris/) ## Germany {#germany} From ef3caa8fecb6fc11d7e90b81ca5afe6e07b6573e Mon Sep 17 00:00:00 2001 From: Gergely Nemeth Date: Wed, 2 Oct 2019 14:58:31 -0700 Subject: [PATCH 09/20] Add Base Web to UI Components (#2381) * Add Base Web to UI Components * Update content/community/tools-ui-components.md Co-Authored-By: Alexey Pyltsyn --- content/community/tools-ui-components.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/tools-ui-components.md b/content/community/tools-ui-components.md index 238160075..e4b41502b 100644 --- a/content/community/tools-ui-components.md +++ b/content/community/tools-ui-components.md @@ -8,6 +8,7 @@ permalink: community/ui-components.html ## Free Components {#free-components} * **[Amaze UI React](https://github.com/amazeui/amazeui-react) (in Chinese):** [Amaze UI](https://github.com/allmobilize/amazeui) components built with React. * **[Ant Design of React](https://github.com/ant-design/ant-design)** An enterprise-class UI design language and React-based implementation. +* **[Base Web](http://baseweb.design):** A foundation for initiating, evolving, and unifying web products. * **[Belle](https://github.com/nikgraf/belle/):** Configurable React Components with great UX. * **[chartify](https://github.com/kirillstepkin/chartify)**: Ultra lightweight and customizable React.js chart component. * **[Elemental UI](http://elemental-ui.com):** A UI toolkit for React websites and apps, themeable and composed of individually packaged components From bc3c7b4a134fe989efa4bf2ebff10abce67543ab Mon Sep 17 00:00:00 2001 From: Karthikeyan Ranasthala Date: Fri, 4 Oct 2019 00:55:37 +0530 Subject: [PATCH 10/20] Update Examples Projects With Unit Converter (#2390) --- content/community/examples.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/community/examples.md b/content/community/examples.md index f6ac8c3a3..8b5eb87a5 100644 --- a/content/community/examples.md +++ b/content/community/examples.md @@ -22,4 +22,5 @@ There are many example projects created by the React community. Feel free to add * **[Builder Book](https://github.com/builderbook/builderbook)** Open source web app to write and host documentation or sell books. Built with React, Material-UI, Next, Express, Mongoose, MongoDB. * **[GFonts Space](https://github.com/pankajladhar/GFontsSpace)** A space which allows user to play with Google fonts. Built with React, Redux and React-Router. * **[Course Learn Page](https://github.com/ulearnpro/ulearn)** Open Source LMS script in Laravel 5.8 and ReactJS 16.9 -* **[Speedy math](https://github.com/pankajladhar/speedy-math)** An application which allows kids to practice basic Mathematics i.e Addition, Subtraction, Multiply, Comparison. It is a PWA (Progressive web app) with offline support and install as App features. \ No newline at end of file +* **[Speedy math](https://github.com/pankajladhar/speedy-math)** An application which allows kids to practice basic Mathematics i.e Addition, Subtraction, Multiply, Comparison. It is a PWA (Progressive web app) with offline support and install as App features. +* **[Unit Converter](https://github.com/KarthikeyanRanasthala/react-unit-converter)** Minimal Yet Responsive Unit Converter Built With React, Material-UI & Convert-Units. \ No newline at end of file From 9b8654c07abb2287c92dadd94af086208ea37f03 Mon Sep 17 00:00:00 2001 From: murdochd <55087729+murdochd@users.noreply.github.com> Date: Thu, 3 Oct 2019 20:27:31 +0100 Subject: [PATCH 11/20] Update site-constants (#2391) At the time of writing, the latest version of react is v16.10.1 --- src/site-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site-constants.js b/src/site-constants.js index fa55681e1..f6f14b827 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.10.0'; +const version = '16.10.1'; const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js'; export {babelURL, urlRoot, version}; From 9f6849cfec2773a7f70b4c9ad91b82f388c08291 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Thu, 3 Oct 2019 14:32:47 -0700 Subject: [PATCH 12/20] Update meetups.md (#2393) adjusting the phili to newer spot. removing inactive links --- content/community/meetups.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/content/community/meetups.md b/content/community/meetups.md index 320c64263..6a58b58ca 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -31,7 +31,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Bolivia](https://www.meetup.com/ReactBolivia/) ## Canada {#canada} -* [Montreal, QC - ReactJS](https://www.meetup.com/fr-FR/ReactMontreal/) * [Montreal, QC - React Native](https://www.meetup.com/fr-FR/React-Native-MTL/) * [Vancouver, BC](https://www.meetup.com/ReactJS-Vancouver-Meetup/) * [Ottawa, ON](https://www.meetup.com/Ottawa-ReactJS-Meetup/) @@ -61,7 +60,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/) * [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/) * [React Berlin](https://www.meetup.com/React-Open-Source/) -* [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/) ## Greece {#greece} * [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/) @@ -148,7 +146,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/) * [New York, NY - useReactNYC](https://www.meetup.com/useReactNYC/) * [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/) -* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/) +* [Philadelphia, PA - ReactJS](https://www.meetup.com/Reactadelphia/) * [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/) * [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/) * [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/) From b3ff55f163035db21167b27846493af593a746b7 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Thu, 3 Oct 2019 14:59:19 -0700 Subject: [PATCH 13/20] Update for 16.10.2 (#2392) --- content/versions.yml | 4 ++++ package.json | 4 ++-- src/site-constants.js | 2 +- yarn.lock | 26 +++++++++++++------------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/content/versions.yml b/content/versions.yml index 41a2bed4f..e805d6757 100644 --- a/content/versions.yml +++ b/content/versions.yml @@ -1,3 +1,7 @@ +- title: '16.10.2' + changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16102-october-3-2019 +- title: '16.10.1' + changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16101-september-28-2019 - title: '16.10' changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16100-september-27-2019 - title: '16.9' diff --git a/package.json b/package.json index 573fb3665..f5dc7f45c 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.0", - "react-dom": "^16.10.0", + "react": "^16.10.2", + "react-dom": "^16.10.2", "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 f6f14b827..f8356a75e 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.10.1'; +const version = '16.10.2'; 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 622ba4828..292486549 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.0: - version "16.10.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.0.tgz#319356767b5c044f3c016eef28518ef7726dce84" - integrity sha512-0QJQUFrKG04hB/1lWyUs/FOd1qNseKGRQI+JBRsADIqVAFxYObhZ2zsVQKjt+nVSCmi8KA0sL52RLwwWuXQtOw== +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== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.16.0" + scheduler "^0.16.2" 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.0: - version "16.10.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.10.0.tgz#95c41e8fc1c706e174deef54b663b5ab94c8ee32" - integrity sha512-lc37bD3j6ZWJRso/a1rrFu6CO1qOf30ZadUDBi1c5RHA1lBSWA8x2MGABB6Oikk+RfmgC+kAT+XegL0eD1ecKg== +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== 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.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.0.tgz#cc8914b79c5c1cfa16714cb1ddc4cbd2c7513efa" - integrity sha512-Jq59uCXQzi71B562VEjuDgvsgfTfkLDvdjNhA7hamN/fKBxecXIEFF24Zu4OVrnAz9NJJ8twa9X16Zp4b0P/xQ== +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== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" From 20aa0fc553c04d4fc22400b0b876d8145c0edc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=20S=C3=A1nchez?= Date: Fri, 4 Oct 2019 08:06:50 -0500 Subject: [PATCH 14/20] Added ChakraUI components library (#2394) --- content/community/tools-ui-components.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/tools-ui-components.md b/content/community/tools-ui-components.md index e4b41502b..fe3d4953d 100644 --- a/content/community/tools-ui-components.md +++ b/content/community/tools-ui-components.md @@ -10,6 +10,7 @@ permalink: community/ui-components.html * **[Ant Design of React](https://github.com/ant-design/ant-design)** An enterprise-class UI design language and React-based implementation. * **[Base Web](http://baseweb.design):** A foundation for initiating, evolving, and unifying web products. * **[Belle](https://github.com/nikgraf/belle/):** Configurable React Components with great UX. +* **[Chakra UI](https://chakra-ui.com/)**: Simple, modular and accessible component library. * **[chartify](https://github.com/kirillstepkin/chartify)**: Ultra lightweight and customizable React.js chart component. * **[Elemental UI](http://elemental-ui.com):** A UI toolkit for React websites and apps, themeable and composed of individually packaged components * **[Grommet](https://grommet.io/)** The most advanced open source UX framework for enterprise applications. From 22574f878c006bce4c736f2649b8fac35094294d Mon Sep 17 00:00:00 2001 From: GermaVinsmoke <32815509+GermaVinsmoke@users.noreply.github.com> Date: Sat, 5 Oct 2019 00:59:35 +0530 Subject: [PATCH 15/20] Update examples.md (#2323) --- content/community/examples.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/community/examples.md b/content/community/examples.md index 8b5eb87a5..55541310b 100644 --- a/content/community/examples.md +++ b/content/community/examples.md @@ -23,4 +23,5 @@ There are many example projects created by the React community. Feel free to add * **[GFonts Space](https://github.com/pankajladhar/GFontsSpace)** A space which allows user to play with Google fonts. Built with React, Redux and React-Router. * **[Course Learn Page](https://github.com/ulearnpro/ulearn)** Open Source LMS script in Laravel 5.8 and ReactJS 16.9 * **[Speedy math](https://github.com/pankajladhar/speedy-math)** An application which allows kids to practice basic Mathematics i.e Addition, Subtraction, Multiply, Comparison. It is a PWA (Progressive web app) with offline support and install as App features. -* **[Unit Converter](https://github.com/KarthikeyanRanasthala/react-unit-converter)** Minimal Yet Responsive Unit Converter Built With React, Material-UI & Convert-Units. \ No newline at end of file +* **[Unit Converter](https://github.com/KarthikeyanRanasthala/react-unit-converter)** Minimal Yet Responsive Unit Converter Built With React, Material-UI & Convert-Units. +* **[BMI Calculator](https://github.com/GermaVinsmoke/bmi-calculator)** A React Hooks app for calculating BMI From 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f Mon Sep 17 00:00:00 2001 From: David Cho-Lerat Date: Sun, 6 Oct 2019 19:43:11 +0200 Subject: [PATCH 16/20] Update hooks-reference.md (#2364) typo: "effects run [..], but you can [..] fire it" => "effects run [..], but you can [..] fire them" --- content/docs/hooks-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/hooks-reference.md b/content/docs/hooks-reference.md index 7352b3208..41464b47d 100644 --- a/content/docs/hooks-reference.md +++ b/content/docs/hooks-reference.md @@ -111,7 +111,7 @@ Mutations, subscriptions, timers, logging, and other side effects are not allowe Instead, use `useEffect`. The function passed to `useEffect` will run after the render is committed to the screen. Think of effects as an escape hatch from React's purely functional world into the imperative world. -By default, effects run after every completed render, but you can choose to fire it [only when certain values have changed](#conditionally-firing-an-effect). +By default, effects run after every completed render, but you can choose to fire them [only when certain values have changed](#conditionally-firing-an-effect). #### Cleaning up an effect {#cleaning-up-an-effect} From b0d4158557533eeea33da26dced0c0c601478846 Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Wed, 9 Oct 2019 13:09:08 +0900 Subject: [PATCH 17/20] Resolve merge conflict Related to b3ff55f --- src/site-constants.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/site-constants.js b/src/site-constants.js index 5378fb349..a97e9d501 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.10.0'; -======= -const urlRoot = 'https://reactjs.org'; const version = '16.10.2'; ->>>>>>> 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js'; export {babelURL, urlRoot, version}; From 19be3dbf515a68fc44cc7a7266bc4945b14b68a0 Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Wed, 9 Oct 2019 13:12:10 +0900 Subject: [PATCH 18/20] Resolve merge conflict Related to 5c371e5 --- content/docs/hooks-reference.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/docs/hooks-reference.md b/content/docs/hooks-reference.md index 98b165414..f84561d5d 100644 --- a/content/docs/hooks-reference.md +++ b/content/docs/hooks-reference.md @@ -111,11 +111,7 @@ useEffect(didUpdate); 대신에 `useEffect`를 사용하세요. `useEffect`에 전달된 함수는 화면에 렌더링이 완료된 후에 수행되게 될 것입니다. React의 순수한 함수적인 세계에서 명령적인 세계로의 탈출구로 생각하세요. -<<<<<<< HEAD 기본적으로 동작은 모든 렌더링이 완료된 후에 수행됩니다만, [어떤 값이 변경되었을 때만](#conditionally-firing-an-effect) 실행되게 할 수도 있습니다. -======= -By default, effects run after every completed render, but you can choose to fire them [only when certain values have changed](#conditionally-firing-an-effect). ->>>>>>> 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f #### effect 정리 {#cleaning-up-an-effect} From 8b8a34cc32e9e7d3f492e540d2c2231268bd59f2 Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Wed, 9 Oct 2019 13:18:16 +0900 Subject: [PATCH 19/20] Resolve merge conflict Related to 4136300, 87685fd --- content/docs/code-splitting.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/content/docs/code-splitting.md b/content/docs/code-splitting.md index dd19b646b..fa583d50a 100644 --- a/content/docs/code-splitting.md +++ b/content/docs/code-splitting.md @@ -50,17 +50,8 @@ console.log(add(16, 26)); // 42 번들링은 훌륭하지만 여러분의 앱이 커지면 번들도 커집니다. 특히 큰 규모의 서드 파티 라이브러리를 추가할 때 실수로 앱이 커져서 로드 시간이 길어지는 것을 방지하기 위해 코드를 주의 깊게 살펴야 합니다. -<<<<<<< HEAD 번들이 거대해지는 것을 방지하기 위한 좋은 해결방법은 번들을 "나누는" 것입니다. -[코드 분할](https://webpack.js.org/guides/code-splitting/)은 런타임시 여러 번들을 동적으로 만들고 불러오는 것으로 Webpack 와 Browserify ([factor-bundle](https://github.com/browserify/factor-bundle)) 같은 번들러들이 지원하는 기능입니다. -======= -To avoid winding up with a large bundle, it's good to get ahead of the problem -and start "splitting" your bundle. -Code-Splitting is a feature -supported by bundlers like [Webpack](https://webpack.js.org/guides/code-splitting/), [Rollup](https://rollupjs.org/guide/en/#code-splitting) and Browserify (via -[factor-bundle](https://github.com/browserify/factor-bundle)) which can create -multiple bundles that can be dynamically loaded at runtime. ->>>>>>> 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f +코드 분할은 런타임에 여러 번들을 동적으로 만들고 불러오는 것으로 [Webpack](https://webpack.js.org/guides/code-splitting/), [Rollup](https://rollupjs.org/guide/en/#code-splitting)과 Browserify ([factor-bundle](https://github.com/browserify/factor-bundle)) 같은 번들러가 지원하는 기능입니다. 코드 분할은 여러분의 앱을 "지연 로딩" 하게 도와주고 앱 사용자에게 획기적인 성능 향상을 하게 합니다. From 1a5ebb04c32015c8967406af634bde1bdd5e18d2 Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Wed, 9 Oct 2019 13:22:21 +0900 Subject: [PATCH 20/20] Resolve merge conflict Related to 9c2e893 --- content/docs/add-react-to-a-website.md | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/content/docs/add-react-to-a-website.md b/content/docs/add-react-to-a-website.md index 051af2fb1..9fd29ca4f 100644 --- a/content/docs/add-react-to-a-website.md +++ b/content/docs/add-react-to-a-website.md @@ -69,21 +69,13 @@ React는 처음부터 점진적으로 도입할 수 있게 설계되었습니다 `like_button.js` 라는 이름으로 HTML 페이지 옆에 새 파일을 만듭니다. -<<<<<<< HEAD - 이 **[스타터 코드](https://cdn.rawgit.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** 를 열고 코드를 방금 만든 파일에 복사해줍니다. -======= -Open **[this starter code](https://gist.github.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** and paste it into the file you created. ->>>>>>> 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f + 이 **[스타터 코드](https://gist.github.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** 를 열고 코드를 방금 만든 파일에 복사해줍니다. >팁 > >이 코드는 `LikeButton` 이라는 React 컴포넌트를 정의해줍니다. 지금 당장 이해가 안 되어도 걱정 마세요. React에 대한 개념을 쌓아 나가는 것은 나중에 [자습서](/tutorial/tutorial.html)와 [주요 개념 가이드](/docs/hello-world.html)에서 다룰 겁니다. 그러니 지금 당장은, 컴포넌트를 화면에 띄우는 데 집중해봅시다! -<<<<<<< HEAD -`like_button.js`의 맨 뒷 줄, 그러니까 아까 붙여넣은 **[스타터 코드](https://cdn.rawgit.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** 뒤에 다음 코드 두 줄을 추가해줍니다. -======= -After **[the starter code](https://gist.github.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)**, add two lines to the bottom of `like_button.js`: ->>>>>>> 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f +`like_button.js`의 맨 뒷 줄, 그러니까 아까 붙여넣은 **[스타터 코드](https://gist.github.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** 뒤에 다음 코드 두 줄을 추가해줍니다. ```js{3,4} // ... 복사했던 스타터 코드 ... @@ -203,11 +195,7 @@ npx babel --watch src --out-dir . --presets react-app/prod 끝날 때 까지 기다릴 필요가 없습니다. 이 명령어는 자동화 된 JSX 감시기를 실행합니다. -<<<<<<< HEAD -**[JSX 스타터 코드](https://cdn.rawgit.com/gaearon/c8e112dc74ac44aac4f673f2c39d19d1/raw/09b951c86c1bf1116af741fa4664511f2f179f0a/like_button.js)**를 통해 `src/like_button.js`라는 파일을 만들어주면, 감시기가 전처리 되어 브라우저와 호환되는 순수 JavaScript로 구성된 `like_button.js`를 생성합니다. JSX를 포함한 소스 파일을 편집하면 이 과정이 자동으로 다시 실행됩니다. -======= -If you now create a file called `src/like_button.js` with this **[JSX starter code](https://gist.github.com/gaearon/c8e112dc74ac44aac4f673f2c39d19d1/raw/09b951c86c1bf1116af741fa4664511f2f179f0a/like_button.js)**, the watcher will create a preprocessed `like_button.js` with the plain JavaScript code suitable for the browser. When you edit the source file with JSX, the transform will re-run automatically. ->>>>>>> 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f +**[JSX 스타터 코드](https://gist.github.com/gaearon/c8e112dc74ac44aac4f673f2c39d19d1/raw/09b951c86c1bf1116af741fa4664511f2f179f0a/like_button.js)**를 통해 `src/like_button.js`라는 파일을 만들어주면, 감시기가 전처리 되어 브라우저와 호환되는 순수 JavaScript로 구성된 `like_button.js`를 생성합니다. JSX를 포함한 소스 파일을 편집하면 이 과정이 자동으로 다시 실행됩니다. 덤으로 이 감시기는 구형 브라우저와의 호환성 문제를 걱정할 필요 없이 클래스와 같은 모던 JavaScript 문법을 쓸 수 있게 해줍니다. 아까 사용했던 도구는 Babel이라고 부릅니다. Babel에 대한 자세한 정보는 [공식 문서](http://babeljs.io/docs/en/babel-cli/)에서 볼 수 있습니다.