From dd79941caf15396748972fee7a56d6d98865a268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20V=C3=A9ras=20Valentim?= Date: Wed, 15 May 2019 22:24:20 -0300 Subject: [PATCH 1/4] Add canonical url to the head section (#1987) --- src/components/MarkdownPage/MarkdownPage.js | 4 ++-- src/components/TitleAndMetaTags/TitleAndMetaTags.js | 7 ++++--- src/pages/acknowledgements.html.js | 2 +- src/pages/blog/all.html.js | 2 +- src/pages/index.js | 4 ++-- src/pages/languages.js | 6 +++++- src/pages/versions.js | 6 +++++- src/utils/{createOgUrl.js => createCanonicalUrl.js} | 0 8 files changed, 20 insertions(+), 11 deletions(-) rename src/utils/{createOgUrl.js => createCanonicalUrl.js} (100%) diff --git a/src/components/MarkdownPage/MarkdownPage.js b/src/components/MarkdownPage/MarkdownPage.js index 9214552bb..4e4e082f8 100644 --- a/src/components/MarkdownPage/MarkdownPage.js +++ b/src/components/MarkdownPage/MarkdownPage.js @@ -15,7 +15,7 @@ import TitleAndMetaTags from 'components/TitleAndMetaTags'; import findSectionForPath from 'utils/findSectionForPath'; import toCommaSeparatedList from 'utils/toCommaSeparatedList'; import {sharedStyles} from 'theme'; -import createOgUrl from 'utils/createOgUrl'; +import createCanonicalUrl from 'utils/createCanonicalUrl'; import type {Node} from 'types'; @@ -74,7 +74,7 @@ const MarkdownPage = ({ }}>
diff --git a/src/components/TitleAndMetaTags/TitleAndMetaTags.js b/src/components/TitleAndMetaTags/TitleAndMetaTags.js index 37dc325bf..3310e01ed 100644 --- a/src/components/TitleAndMetaTags/TitleAndMetaTags.js +++ b/src/components/TitleAndMetaTags/TitleAndMetaTags.js @@ -13,21 +13,22 @@ const defaultDescription = 'A JavaScript library for building user interfaces'; type Props = { title: string, ogDescription: string, - ogUrl: string, + canonicalUrl: string, }; -const TitleAndMetaTags = ({title, ogDescription, ogUrl}: Props) => { +const TitleAndMetaTags = ({title, ogDescription, canonicalUrl}: Props) => { return ( - {ogUrl && } + {canonicalUrl && } + {canonicalUrl && } ); }; diff --git a/src/pages/acknowledgements.html.js b/src/pages/acknowledgements.html.js index 513aea22f..7a67b4c24 100644 --- a/src/pages/acknowledgements.html.js +++ b/src/pages/acknowledgements.html.js @@ -21,7 +21,7 @@ const Acknowlegements = ({data, location}) => (
Acknowledgements
diff --git a/src/pages/blog/all.html.js b/src/pages/blog/all.html.js index 2e029539d..35734b5b1 100644 --- a/src/pages/blog/all.html.js +++ b/src/pages/blog/all.html.js @@ -30,7 +30,7 @@ const AllBlogPosts = ({data, location}: Props) => (
All Posts
    (
    Languages
    - +

    diff --git a/src/pages/versions.js b/src/pages/versions.js index 2dd95976a..c4e3532b3 100644 --- a/src/pages/versions.js +++ b/src/pages/versions.js @@ -10,6 +10,7 @@ import Container from 'components/Container'; import Header from 'components/Header'; import TitleAndMetaTags from 'components/TitleAndMetaTags'; import React from 'react'; +import {urlRoot} from 'site-constants'; import {sharedStyles} from 'theme'; // $FlowFixMe This is a valid path @@ -25,7 +26,10 @@ const Versions = ({location}: Props) => (

    React Versions
    - +

    A complete release history for React is available{' '} diff --git a/src/utils/createOgUrl.js b/src/utils/createCanonicalUrl.js similarity index 100% rename from src/utils/createOgUrl.js rename to src/utils/createCanonicalUrl.js From a03df074eecc2e59f3c9058222670c054272e921 Mon Sep 17 00:00:00 2001 From: Tejas Kumar Date: Thu, 16 May 2019 12:20:26 +0200 Subject: [PATCH 2/4] Update conferences.md (#2002) This PR updates the page to be more current. --- content/community/conferences.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/content/community/conferences.md b/content/community/conferences.md index c3ffbfdbb..ea8bed22d 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 Finland 2019 {#react-finland-2019} -April 24-26 in Helsinki, Finland - -[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland) - -### ReactJS Girls Conference {#reactjs-girls-conference} -May 3, 2019 in London, UK - -[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls) - -### 2019 {#reactnotaconf--2019} -May 11 in Sofia, Bulgaria - -[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156) - ### ReactEurope 2019 {#reacteurope-2019} May 23-24, 2019 in Paris, France @@ -385,3 +370,18 @@ April 4-5, 2019 in Kraków, Poland April 12, 2019 in Amsterdam, The Netherlands [Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences) + +### React Finland 2019 {#react-finland-2019} +April 24-26 in Helsinki, Finland + +[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland) + +### ReactJS Girls Conference {#reactjs-girls-conference} +May 3, 2019 in London, UK + +[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls) + +### 2019 {#reactnotaconf--2019} +May 11 in Sofia, Bulgaria + +[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156) From 06deefa56756f8dac13af59ee657186a81d28151 Mon Sep 17 00:00:00 2001 From: Brent Date: Thu, 16 May 2019 16:35:06 -0400 Subject: [PATCH 3/4] Update hooks-effect.md (#2005) --- content/docs/hooks-effect.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/hooks-effect.md b/content/docs/hooks-effect.md index 124a5f4f1..142dd6756 100644 --- a/content/docs/hooks-effect.md +++ b/content/docs/hooks-effect.md @@ -333,7 +333,7 @@ function FriendStatusWithCounter(props) { } ``` -**Hooks lets us split the code based on what it is doing** rather than a lifecycle method name. React will apply *every* effect used by the component, in the order they were specified. +**Hooks let us split the code based on what it is doing** rather than a lifecycle method name. React will apply *every* effect used by the component, in the order they were specified. ### Explanation: Why Effects Run on Each Update {#explanation-why-effects-run-on-each-update} From 7325a43c088c298a828868306ab0c85f98ac93a5 Mon Sep 17 00:00:00 2001 From: Arshad Kazmi Date: Fri, 17 May 2019 20:54:52 +0530 Subject: [PATCH 4/4] conflicts fixes --- src/pages/index.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/pages/index.js b/src/pages/index.js index 4d67ccc4b..459f98e26 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -50,13 +50,8 @@ class Home extends Component { return ( >>>>>> 06deefa56756f8dac13af59ee657186a81d28151 />