diff --git a/package.json b/package.json index 643e55d..e0943dc 100644 --- a/package.json +++ b/package.json @@ -15,26 +15,26 @@ "devDependencies": { "@commitlint/cli": "8.2.0", "@commitlint/config-conventional": "8.2.0", - "@material-ui/core": "4.6.0", + "@material-ui/core": "4.6.1", "@material-ui/icons": "4.5.1", - "@octokit/rest": "16.34.1", - "@testing-library/react": "9.3.0", + "@octokit/rest": "16.35.0", + "@testing-library/react": "9.3.2", "@types/autosuggest-highlight": "3.1.0", "@types/enzyme": "3.10.3", - "@types/jest": "24.0.20", + "@types/jest": "24.0.23", "@types/js-base64": "2.3.1", - "@types/lodash": "4.14.144", - "@types/node": "12.12.6", + "@types/lodash": "4.14.146", + "@types/node": "12.12.7", "@types/react": "16.9.11", "@types/react-autosuggest": "9.3.13", "@types/react-dom": "16.9.4", - "@types/react-router-dom": "5.1.0", + "@types/react-router-dom": "5.1.2", "@types/request": "2.48.3", "@types/validator": "10.11.3", "@types/webpack-env": "1.14.1", - "@typescript-eslint/parser": "2.5.0", + "@typescript-eslint/parser": "2.7.0", "@verdaccio/babel-preset": "8.2.0", - "@verdaccio/commons-api": "8.2.0", + "@verdaccio/commons-api": "8.3.0", "@verdaccio/eslint-config": "8.2.0", "@verdaccio/types": "8.3.0", "autosuggest-highlight": "3.1.1", @@ -45,8 +45,8 @@ "concurrently": "5.0.0", "cross-env": "6.0.3", "css-loader": "3.2.0", - "date-fns": "2.6.0", - "detect-secrets": "1.0.4", + "date-fns": "2.7.0", + "detect-secrets": "1.0.5", "emotion": "9.2.12", "enzyme": "3.10.0", "enzyme-adapter-react-16": "1.15.1", @@ -75,7 +75,7 @@ "jest-fetch-mock": "2.1.2", "js-base64": "2.5.1", "js-yaml": "3.13.1", - "lint-staged": "8.2.1", + "lint-staged": "9.4.2", "localstorage-memory": "1.0.3", "lockfile-lint": "2.2.0", "lodash": "^4.17.15", @@ -84,17 +84,17 @@ "normalize.css": "8.0.1", "optimize-css-assets-webpack-plugin": "5.0.3", "ora": "4.0.2", - "prettier": "1.18.2", + "prettier": "1.19.1", "prop-types": "15.7.2", "puppeteer": "2.0.0", "react": "16.11.0", "react-autosuggest": "9.4.3", "react-dom": "16.11.0", "react-emotion": "9.2.12", - "react-hot-loader": "4.12.15", + "react-hot-loader": "4.12.16", "react-router-dom": "5.1.2", "request": "2.88.0", - "resolve-url-loader": "3.1.0", + "resolve-url-loader": "3.1.1", "rimraf": "3.0.0", "source-map-loader": "0.2.4", "standard-version": "7.0.0", @@ -106,10 +106,10 @@ "stylelint-webpack-plugin": "1.0.3", "supertest": "4.0.2", "typeface-roboto": "0.0.75", - "typescript": "3.7.1-rc", + "typescript": "3.7.2", "uglifyjs-webpack-plugin": "2.2.0", "url-loader": "2.2.0", - "validator": "11.1.0", + "validator": "12.0.0", "verdaccio": "4.3.4", "verdaccio-auth-memory": "8.3.0", "verdaccio-memory": "8.3.0", diff --git a/src/App/App.tsx b/src/App/App.tsx index f1843a6..e19329a 100644 --- a/src/App/App.tsx +++ b/src/App/App.tsx @@ -1,7 +1,5 @@ import React, { Component, ReactElement } from 'react'; import isNil from 'lodash/isNil'; -import 'normalize.css'; -import 'typeface-roboto/index.css'; import storage from '../utils/storage'; import { makeLogin, isTokenExpire } from '../utils/login'; @@ -10,8 +8,8 @@ import LoginModal from '../components/Login'; import Header from '../components/Header'; import { Container, Content } from '../components/Layout'; import API from '../utils/api'; -import '../utils/styles/global'; import Footer from '../components/Footer'; +import StyleBaseline from '../design-tokens/StyleBaseline'; import AppRoute from './AppRoute'; import { AppProps, AppContextProvider } from './AppContext'; @@ -46,10 +44,13 @@ export default class App extends Component<{}, AppProps> { const context = { isUserLoggedIn, packages, logoUrl, user, scope }; return ( - - {isLoading ? : {this.renderContent()}} - {this.renderLoginModal()} - + <> + + + {isLoading ? : {this.renderContent()}} + {this.renderLoginModal()} + + ); } diff --git a/src/components/Footer/__snapshots__/Footer.test.tsx.snap b/src/components/Footer/__snapshots__/Footer.test.tsx.snap index aa1ccfc..d0b2e36 100644 --- a/src/components/Footer/__snapshots__/Footer.test.tsx.snap +++ b/src/components/Footer/__snapshots__/Footer.test.tsx.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`