Merge origin/fix-title-update into stable

FreeFeed · May 19, 2020 · 9cd2c53 · 9cd2c53
2 parents f2d2e04 + c8c3ec6
commit 9cd2c53
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "react-dropzone-component": "~3.2.0",
     "react-final-form-hooks": "~2.0.2",
     "react-google-recaptcha": "~2.0.1",
-    "react-helmet": "~5.2.0",
+    "react-helmet": "~6.0.0",
     "react-highcharts": "~16.1.0",
     "react-photoswipe": "~1.3.0",
     "react-portal": "~4.2.1",

diff --git a/src/components/all-groups.jsx b/src/components/all-groups.jsx
@@ -3,7 +3,7 @@ import React, { useEffect, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { sortBy, range } from 'lodash';
 import { Link } from 'react-router';
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet';
 
 import { faCaretDown, faUserFriends } from '@fortawesome/free-solid-svg-icons';
 import { getAllGroups } from '../redux/action-creators';
@@ -25,7 +25,7 @@ export default function AllGroups() {
 
   return (
     <div className="content">
-      <Helmet title={`All Groups - ${CONFIG.siteTitle}`} />
+      <Helmet title={`All Groups - ${CONFIG.siteTitle}`} defer={false} />
       <div className="box">
         <div className="box-header-timeline">All Groups</div>
         <div className="box-body">

diff --git a/src/components/color-theme-setter.jsx b/src/components/color-theme-setter.jsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet';
 
 import { darkTheme } from './select-utils';
 
@@ -15,7 +15,7 @@ class ColorSchemeSetterBase extends Component {
 
   render() {
     return (
-      <Helmet>
+      <Helmet defer={false}>
         <meta name="theme-color" content={this.props.darkTheme ? 'hsl(220, 9%, 10%)' : 'white'} />
       </Helmet>
     );

diff --git a/src/components/group-settings.jsx b/src/components/group-settings.jsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router';
 import { useSelector, useDispatch } from 'react-redux';
 import _ from 'lodash';
 
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet';
 import { updateGroupPicture } from '../redux/action-creators';
 import { initialAsyncState } from '../redux/async-helpers';
 import { PictureEditForm } from './settings/forms/profile-picture';
@@ -73,7 +73,7 @@ export default function GroupSettings({ params: { userName: username } }) {
 function Layout({ username, children }) {
   return (
     <div className="box">
-      <Helmet title={`'${username}' group settings - ${CONFIG.siteTitle}`} />
+      <Helmet title={`'${username}' group settings - ${CONFIG.siteTitle}`} defer={false} />
       <div className="box-header-timeline">Group settings</div>
       <div className="box-body">{children}</div>
     </div>

diff --git a/src/components/layout.jsx b/src/components/layout.jsx
@@ -2,7 +2,7 @@
 import React, { Suspense } from 'react';
 import { IndexLink, Link } from 'react-router';
 import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet';
 import classnames from 'classnames';
 
 import { unauthenticated, home } from '../redux/action-creators';
@@ -149,7 +149,7 @@ class Layout extends React.Component {
     return (
       <div className={layoutClassNames}>
         <ErrorBoundary>
-          <Helmet title={props.title} />
+          <Helmet title={props.title} defer={false} />
           <ColorSchemeSetter />
           <SVGSymbolDeclarations />
 

diff --git a/src/components/settings/layout.jsx b/src/components/settings/layout.jsx
@@ -1,7 +1,7 @@
 /* global CONFIG */
 import React, { useCallback, useMemo, Suspense } from 'react';
 import { Link } from 'react-router';
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet';
 import cn from 'classnames';
 
 import {
@@ -94,7 +94,7 @@ export default function Layout({ children, router }) {
 export function SettingsPage({ title, header = title, children }) {
   return (
     <>
-      <Helmet title={title} />
+      <Helmet title={title} defer={false} />
       <h3 className={styles.pageHeader}>{header}</h3>
       {children}
     </>

diff --git a/src/components/user.jsx b/src/components/user.jsx
@@ -1,6 +1,6 @@
 /* global CONFIG */
 import React, { useEffect } from 'react';
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet';
 import { connect } from 'react-redux';
 import _ from 'lodash';
 import { formatPattern } from 'react-router/es/PatternUtils';

diff --git a/yarn.lock b/yarn.lock
@@ -7800,7 +7800,7 @@ promise@^7.0.1, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@>=15.0.0, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@~15.7.2:
+prop-types@>=15.0.0, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@~15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -8097,7 +8097,7 @@ react-dropzone-component@~3.2.0:
     dropzone "^5.4.0"
     extend "^3.0.1"
 
-react-fast-compare@^2.0.2:
+react-fast-compare@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
@@ -8115,15 +8115,15 @@ react-google-recaptcha@~2.0.1:
     prop-types "^15.5.0"
     react-async-script "^1.1.1"
 
-react-helmet@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.2.1.tgz#16a7192fdd09951f8e0fe22ffccbf9bb3e591ffa"
-  integrity sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==
+react-helmet@~6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.0.0.tgz#fcb93ebaca3ba562a686eb2f1f9d46093d83b5f8"
+  integrity sha512-My6S4sa0uHN/IuVUn0HFmasW5xj9clTkB9qmMngscVycQ5vVG51Qp44BEvLJ4lixupTwDlU9qX1/sCrMN4AEPg==
   dependencies:
     object-assign "^4.1.1"
-    prop-types "^15.5.4"
-    react-fast-compare "^2.0.2"
-    react-side-effect "^1.1.0"
+    prop-types "^15.7.2"
+    react-fast-compare "^2.0.4"
+    react-side-effect "^2.1.0"
 
 react-highcharts@~16.1.0:
   version "16.1.0"
@@ -8238,12 +8238,10 @@ react-select@~1.2.1:
     prop-types "^15.5.8"
     react-input-autosize "^2.1.2"
 
-react-side-effect@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-1.2.0.tgz#0e940c78faba0c73b9b0eba9cd3dda8dfb7e7dae"
-  integrity sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==
-  dependencies:
-    shallowequal "^1.0.1"
+react-side-effect@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.0.tgz#1ce4a8b4445168c487ed24dab886421f74d380d3"
+  integrity sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg==
 
 react-sortablejs@~1.5.1:
   version "1.5.1"
@@ -9013,7 +9011,7 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shallowequal@^1.0.1, shallowequal@^1.1.0:
+shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==