From acdea56c7fdd8fe165fecef0b9837ccdd23becd6 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Sun, 5 Apr 2020 14:09:34 +0200 Subject: [PATCH] packages/core: fix dependencies and imports --- packages/core/jest.config.ts | 20 ------------------- packages/core/package.json | 4 +++- .../src/layout/HeaderLabel/HeaderLabel.tsx | 3 +-- .../core/src/layout/InfoCard/BottomLink.tsx | 17 ++++++++++------ .../core/{jest.setup.ts => src/setupTests.ts} | 0 packages/core/src/testUtils/index.js | 2 +- yarn.lock | 4 ++-- 7 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 packages/core/jest.config.ts rename packages/core/{jest.setup.ts => src/setupTests.ts} (100%) diff --git a/packages/core/jest.config.ts b/packages/core/jest.config.ts deleted file mode 100644 index 2e584f12dc..0000000000 --- a/packages/core/jest.config.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2020 Spotify AB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -module.exports = { - ...require('@spotify/web-scripts/config/jest.config.js'), - setupFilesAfterEnv: ['../jest.setup.ts'], -}; diff --git a/packages/core/package.json b/packages/core/package.json index dbac96cf02..897d828b8e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -31,6 +31,8 @@ "@types/jest": "^24.0.0", "@types/node": "^12.0.0", "classnames": "^2.2.6", + "clsx": "^1.1.0", + "prop-types": "^15.7.2", "rc-progress": "^2.5.2", "react": "^16.12.0", "react-addons-text-content": "0.0.4", @@ -44,6 +46,6 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", - "prop-types": "^15.7.2" + "react-router": "^5.1.2" } } diff --git a/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx b/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx index 4349399194..56fcd01152 100644 --- a/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx +++ b/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx @@ -14,9 +14,8 @@ * limitations under the License. */ +import { Link, makeStyles, Typography } from '@material-ui/core'; import React, { FC } from 'react'; -import { Typography, makeStyles } from '@material-ui/core'; -import { Link } from '@material-ui/core'; import { BackstageTheme } from '../../theme/theme'; const useStyles = makeStyles(theme => ({ diff --git a/packages/core/src/layout/InfoCard/BottomLink.tsx b/packages/core/src/layout/InfoCard/BottomLink.tsx index bf82f6cd11..12eabbe753 100644 --- a/packages/core/src/layout/InfoCard/BottomLink.tsx +++ b/packages/core/src/layout/InfoCard/BottomLink.tsx @@ -14,13 +14,18 @@ * limitations under the License. */ -import React, { FC } from 'react'; -import { Link } from '@material-ui/core'; -import { Divider, ListItemText, makeStyles } from '@material-ui/core'; -import { ListItem, ListItemIcon } from '@material-ui/core'; -import ArrowIcon from '@material-ui/icons/ArrowForward'; -import grey from '@material-ui/core/colors/grey'; +import { + Divider, + Link, + ListItem, + ListItemIcon, + ListItemText, + makeStyles, +} from '@material-ui/core'; import Box from '@material-ui/core/Box'; +import grey from '@material-ui/core/colors/grey'; +import ArrowIcon from '@material-ui/icons/ArrowForward'; +import React, { FC } from 'react'; import { BackstageTheme } from '../../theme/theme'; const useStyles = makeStyles(theme => ({ diff --git a/packages/core/jest.setup.ts b/packages/core/src/setupTests.ts similarity index 100% rename from packages/core/jest.setup.ts rename to packages/core/src/setupTests.ts diff --git a/packages/core/src/testUtils/index.js b/packages/core/src/testUtils/index.js index a0eab3e72b..611633dcde 100644 --- a/packages/core/src/testUtils/index.js +++ b/packages/core/src/testUtils/index.js @@ -15,7 +15,7 @@ */ import React from 'react'; -import { ThemeProvider } from '@material-ui/styles'; +import { ThemeProvider } from '@material-ui/core'; import { MemoryRouter } from 'react-router'; import { Route } from 'react-router-dom'; diff --git a/yarn.lock b/yarn.lock index ae5f9823f6..402e134b3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6110,7 +6110,7 @@ clone@^1.0.2: resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clsx@^1.0.2, clsx@^1.0.4: +clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/clsx/-/clsx-1.1.0.tgz#62937c6adfea771247c34b54d320fb99624f5702" integrity sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA== @@ -16293,7 +16293,7 @@ react-router-dom@^5.1.2: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@5.1.2: +react-router@5.1.2, react-router@^5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418" integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==