Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update cra template #388

Merged
merged 1 commit into from
Nov 3, 2022
Merged

update cra template #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fifty-waves-play.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@gnosis.pm/cra-template-safe-app': minor
---

Replace Averta font with DM Sans and update dependencies
40 changes: 20 additions & 20 deletions packages/cra-template-safe-app/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
"package": {
"homepage": "./",
"dependencies": {
"@gnosis.pm/safe-apps-react-sdk": "^4.5.0",
"@gnosis.pm/safe-react-components": "^1.1.4",
"@gnosis.pm/safe-apps-react-sdk": "^4.6.2",
"@gnosis.pm/safe-react-components": "^1.2.0",
"@material-ui/core": "^4.12.4",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-scripts": "5.0.1",
"styled-components": "^5.3.5"
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "^5.0.1",
"styled-components": "^5.3.6"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^14.2.1",
"@types/jest": "^28.1.3",
"@types/node": "^18.0.0",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.0",
"@types/styled-components": "^5.1.25",
"@typescript-eslint/eslint-plugin": "^5.30.0",
"@typescript-eslint/parser": "^5.30.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.2.0",
"@types/node": "^18.11.7",
"@types/react": "^17.0.52",
"@types/react-dom": "^17.0.18",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.41.0",
"@typescript-eslint/parser": "^5.41.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.0",
"eslint-plugin-prettier": "^4.1.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^2.7.1",
"typescript": "^4.7.4"
"typescript": "^4.8.4"
},
"scripts": {
"start": "react-scripts start",
Expand Down
5 changes: 4 additions & 1 deletion packages/cra-template-safe-app/template/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Gnosis Safe App</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;700&display=swap" rel="stylesheet">
<title>Safe App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
12 changes: 2 additions & 10 deletions packages/cra-template-safe-app/template/src/GlobalStyle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { createGlobalStyle } from 'styled-components'
import avertaFont from '@gnosis.pm/safe-react-components/dist/fonts/averta-normal.woff2'
import avertaBoldFont from '@gnosis.pm/safe-react-components/dist/fonts/averta-bold.woff2'

const GlobalStyle = createGlobalStyle`
html {
height: 100%
height: 100%;
font-family: 'DM Sans', sans-serif;
}

body {
Expand All @@ -22,13 +21,6 @@ const GlobalStyle = createGlobalStyle`
.MuiInputBase-root {
width: 100% !important;
}

@font-face {
font-family: 'Averta';
src: local('Averta'), local('Averta Bold'),
url(${avertaFont}) format('woff2'),
url(${avertaBoldFont}) format('woff');
}
`

export default GlobalStyle
2 changes: 0 additions & 2 deletions packages/cra-template-safe-app/template/src/fonts.d.ts
View file
Open in desktop

This file was deleted.