paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 31 Packages Projects Releases Wiki Activity

Bump Helmet to 6.0.0 (#1019)

Browse Source 
* Bump Helmet to 6.0.0

* fix: failing tests

Co-authored-by: Nikita Nek Dudnik <nikdudnik@gmail.com>
This commit is contained in:
Stefan Ålund
2020-05-27 10:46:26 +02:00
committed by GitHub
parent f72d97dc17
commit 093c311256
6 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/package.json
+1 -1
View File
@@ -48,7 +48,7 @@
"react": "^16.12.0",
"react-addons-text-content": "0.0.4",
"react-dom": "^16.12.0",
"react-helmet": "5.2.1",
"react-helmet": "6.0.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-sparklines": "^1.7.0",
packages/core/src/layout/ContentHeader/ContentHeader.test.tsx
+3 -1
View File
@@ -20,7 +20,9 @@ import ContentHeader from './ContentHeader';
import { wrapInThemedTestApp } from '@backstage/test-utils';
jest.mock('react-helmet', () => {
return ({ defaultTitle }: any) => <div>defaultTitle: {defaultTitle}</div>;
return {
Helmet: ({ defaultTitle }: any) => <div>defaultTitle: {defaultTitle}</div>,
};
});
describe('<ContentHeader/>', () => {
packages/core/src/layout/ContentHeader/ContentHeader.tsx
+1 -1
View File
@@ -20,7 +20,7 @@
import React, { ComponentType, Fragment, FC } from 'react';
import { Typography, makeStyles } from '@material-ui/core';
import Helmet from 'react-helmet';
import { Helmet } from 'react-helmet';
const useStyles = makeStyles(theme => ({
container: {
packages/core/src/layout/Header/Header.test.tsx
+3 -1
View File
@@ -20,7 +20,9 @@ import { wrapInThemedTestApp } from '@backstage/test-utils';
import Header from './Header';
jest.mock('react-helmet', () => {
return ({ defaultTitle }: any) => <div>defaultTitle: {defaultTitle}</div>;
return {
Helmet: ({ defaultTitle }: any) => <div>defaultTitle: {defaultTitle}</div>,
};
});
describe('<Header/>', () => {
packages/core/src/layout/Header/Header.tsx
+3 -4
View File
@@ -15,15 +15,14 @@
*/
import React, { Fragment, ReactNode, CSSProperties, FC } from 'react';
import Helmet from 'react-helmet';
import { Helmet } from 'react-helmet';
import { Typography, Tooltip, makeStyles } from '@material-ui/core';
import { BackstageTheme } from '@backstage/theme';
import { Theme } from '../Page/Page';
// import { Link } from 'shared/components';
import Waves from './Waves';
const useStyles = makeStyles<BackstageTheme>((theme) => ({
const useStyles = makeStyles<BackstageTheme>(theme => ({
header: {
gridArea: 'pageHeader',
padding: theme.spacing(3),
@@ -175,7 +174,7 @@ export const Header: FC<Props> = ({
<Fragment>
<Helmet titleTemplate={titleTemplate} defaultTitle={defaultTitle} />
<Theme.Consumer>
{(theme) => (
{theme => (
<header style={style} className={classes.header}>
<Waves theme={theme} />
<div className={classes.leftItemsBox}>
yarn.lock
+14 -16
View File
@@ -16892,7 +16892,7 @@ promzard@^0.3.0:
dependencies:
read "1"
prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -17298,7 +17298,7 @@ react-error-overlay@^6.0.3, react-error-overlay@^6.0.7:
resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108"
integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==
react-fast-compare@^2.0.2, react-fast-compare@^2.0.4:
react-fast-compare@^2.0.4:
version "2.0.4"
resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
@@ -17326,15 +17326,15 @@ react-helmet-async@^1.0.2:
react-fast-compare "^2.0.4"
shallowequal "^1.1.0"
react-helmet@5.2.1:
version "5.2.1"
resolved "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz#16a7192fdd09951f8e0fe22ffccbf9bb3e591ffa"
integrity sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==
react-helmet@6.0.0:
version "6.0.0"
resolved "https://registry.npmjs.org/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-hook-form@^5.7.2:
version "5.7.2"
@@ -17471,12 +17471,10 @@ react-router@5.2.0, react-router@^5.1.2, react-router@^5.2.0:
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
react-side-effect@^1.1.0:
version "1.2.0"
resolved "https://registry.npmjs.org/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.npmjs.org/react-side-effect/-/react-side-effect-2.1.0.tgz#1ce4a8b4445168c487ed24dab886421f74d380d3"
integrity sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg==
react-sizeme@^2.6.7:
version "2.6.12"
@@ -18742,7 +18740,7 @@ shallow-equal@^1.1.0:
resolved "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==
shallowequal@^1.0.1, shallowequal@^1.1.0:
shallowequal@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==