From 4d1231387dba454221a740a7a661545c33f7c735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 10 Oct 2024 16:18:20 +0200 Subject: [PATCH] pl-fe: Replace react-helmet with react-helmet-async MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- packages/pl-fe/package.json | 3 +- packages/pl-fe/src/components/helmet.tsx | 2 +- .../src/features/status/components/thread.tsx | 2 +- packages/pl-fe/src/init/pl-fe.tsx | 13 ++++--- packages/pl-fe/src/layouts/event-layout.tsx | 2 +- packages/pl-fe/src/layouts/profile-layout.tsx | 2 +- packages/pl-fe/yarn.lock | 36 ++++++++----------- 7 files changed, 27 insertions(+), 33 deletions(-) diff --git a/packages/pl-fe/package.json b/packages/pl-fe/package.json index 483a47b37..0521a1ce7 100644 --- a/packages/pl-fe/package.json +++ b/packages/pl-fe/package.json @@ -114,7 +114,7 @@ "react-datepicker": "^7.4.0", "react-dom": "^18.3.1", "react-error-boundary": "^4.0.11", - "react-helmet": "^6.1.0", + "react-helmet-async": "^2.0.5", "react-hot-toast": "^2.4.0", "react-inlinesvg": "^4.0.0", "react-intl": "^6.7.0", @@ -166,7 +166,6 @@ "@types/react": "^18.3.11", "@types/react-color": "^3.0.12", "@types/react-dom": "^18.3.0", - "@types/react-helmet": "^6.1.11", "@types/react-motion": "^0.0.40", "@types/react-router-dom": "^5.3.3", "@types/react-sparklines": "^1.7.5", diff --git a/packages/pl-fe/src/components/helmet.tsx b/packages/pl-fe/src/components/helmet.tsx index e75da6452..7b1aee72c 100644 --- a/packages/pl-fe/src/components/helmet.tsx +++ b/packages/pl-fe/src/components/helmet.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Helmet as ReactHelmet } from 'react-helmet'; +import { Helmet as ReactHelmet } from 'react-helmet-async'; import { useStatContext } from 'pl-fe/contexts/stat-context'; import { useAppSelector, useInstance, useSettings } from 'pl-fe/hooks'; diff --git a/packages/pl-fe/src/features/status/components/thread.tsx b/packages/pl-fe/src/features/status/components/thread.tsx index 7929499a8..e3a8450de 100644 --- a/packages/pl-fe/src/features/status/components/thread.tsx +++ b/packages/pl-fe/src/features/status/components/thread.tsx @@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit'; import clsx from 'clsx'; import { List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable'; import React, { useEffect, useRef } from 'react'; -import { Helmet } from 'react-helmet'; +import { Helmet } from 'react-helmet-async'; import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; diff --git a/packages/pl-fe/src/init/pl-fe.tsx b/packages/pl-fe/src/init/pl-fe.tsx index 32c3977e9..649c7f1db 100644 --- a/packages/pl-fe/src/init/pl-fe.tsx +++ b/packages/pl-fe/src/init/pl-fe.tsx @@ -1,5 +1,6 @@ import { QueryClientProvider } from '@tanstack/react-query'; import React from 'react'; +import { HelmetProvider } from 'react-helmet-async'; import { Provider } from 'react-redux'; import { StatProvider } from 'pl-fe/contexts/stat-context'; @@ -28,11 +29,13 @@ const PlFe: React.FC = () => ( - - - - - + + + + + + + diff --git a/packages/pl-fe/src/layouts/event-layout.tsx b/packages/pl-fe/src/layouts/event-layout.tsx index bff125771..3261952ed 100644 --- a/packages/pl-fe/src/layouts/event-layout.tsx +++ b/packages/pl-fe/src/layouts/event-layout.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Helmet } from 'react-helmet'; +import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; import { useHistory } from 'react-router-dom'; diff --git a/packages/pl-fe/src/layouts/profile-layout.tsx b/packages/pl-fe/src/layouts/profile-layout.tsx index 321dd5bc0..7ab5ca1e4 100644 --- a/packages/pl-fe/src/layouts/profile-layout.tsx +++ b/packages/pl-fe/src/layouts/profile-layout.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Helmet } from 'react-helmet'; +import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; import { Redirect, useHistory } from 'react-router-dom'; diff --git a/packages/pl-fe/yarn.lock b/packages/pl-fe/yarn.lock index fa1f5ed1a..1aab347cb 100644 --- a/packages/pl-fe/yarn.lock +++ b/packages/pl-fe/yarn.lock @@ -2578,13 +2578,6 @@ dependencies: "@types/react" "*" -"@types/react-helmet@^6.1.11": - version "6.1.11" - resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.11.tgz#8cafcafff38f75361f451563ba7b406b0c5d3907" - integrity sha512-0QcdGLddTERotCXo3VFlUSWO3ztraw8nZ6e3zJSgG7apwV5xt+pJUS8ewPBqT4NYB1optGLprNQzFleIY84u/g== - dependencies: - "@types/react" "*" - "@types/react-motion@^0.0.40": version "0.0.40" resolved "https://registry.yarnpkg.com/@types/react-motion/-/react-motion-0.0.40.tgz#e743961e999688d9aa31d6e6b71b65cbb53b3104" @@ -8499,7 +8492,7 @@ processenv@1.1.0: dependencies: babel-runtime "6.26.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.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -8643,7 +8636,7 @@ react-event-listener@^0.6.0: prop-types "^15.6.0" warning "^4.0.1" -react-fast-compare@^3.1.1: +react-fast-compare@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49" integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ== @@ -8653,15 +8646,14 @@ react-from-dom@^0.7.2: resolved "https://registry.yarnpkg.com/react-from-dom/-/react-from-dom-0.7.3.tgz#60e75fde2369ceb0a8f87d88f9cfbeb67b730e43" integrity sha512-9IK6R7+eD1wOAMC2ZCrENev0eK1625cb7vX+cnnOR9LBRNbjKiaJk4ij2zQbcefEXTWjXFhA7CTO1cd8wMONnw== -react-helmet@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" - integrity sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw== +react-helmet-async@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-2.0.5.tgz#cfc70cd7bb32df7883a8ed55502a1513747223ec" + integrity sha512-rYUYHeus+i27MvFE+Jaa4WsyBKGkL6qVgbJvSBoX8mbsWoABJXdEO0bZyi0F6i+4f0NuIb8AvqPMj3iXFHkMwg== dependencies: - object-assign "^4.1.1" - prop-types "^15.7.2" - react-fast-compare "^3.1.1" - react-side-effect "^2.1.0" + invariant "^2.2.4" + react-fast-compare "^3.2.2" + shallowequal "^1.1.0" react-hot-toast@^2.4.0: version "2.4.1" @@ -8777,11 +8769,6 @@ react-router@6.26.2: dependencies: "@remix-run/router" "1.19.2" -react-side-effect@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.2.tgz#dc6345b9e8f9906dc2eeb68700b615e0b4fe752a" - integrity sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw== - react-simple-pull-to-refresh@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/react-simple-pull-to-refresh/-/react-simple-pull-to-refresh-1.3.3.tgz#118afe0d8ba6cade87094786b3889fb2ffd5b9bc" @@ -9363,6 +9350,11 @@ shallow-equal@^1.2.1: resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da" integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA== +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== + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"