From 4e839d16c62d3fde4d4b4bfdf41df021d874d555 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 2 Nov 2022 17:20:45 +0100 Subject: [PATCH] update cra template --- .changeset/fifty-waves-play.md | 5 +++ packages/cra-template-safe-app/template.json | 40 +++++++++---------- .../template/public/index.html | 5 ++- .../template/src/GlobalStyle.ts | 12 +----- .../template/src/fonts.d.ts | 2 - 5 files changed, 31 insertions(+), 33 deletions(-) create mode 100644 .changeset/fifty-waves-play.md delete mode 100644 packages/cra-template-safe-app/template/src/fonts.d.ts diff --git a/.changeset/fifty-waves-play.md b/.changeset/fifty-waves-play.md new file mode 100644 index 00000000..226e48c6 --- /dev/null +++ b/.changeset/fifty-waves-play.md @@ -0,0 +1,5 @@ +--- +'@gnosis.pm/cra-template-safe-app': minor +--- + +Replace Averta font with DM Sans and update dependencies diff --git a/packages/cra-template-safe-app/template.json b/packages/cra-template-safe-app/template.json index 260a159a..65c19e75 100644 --- a/packages/cra-template-safe-app/template.json +++ b/packages/cra-template-safe-app/template.json @@ -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", diff --git a/packages/cra-template-safe-app/template/public/index.html b/packages/cra-template-safe-app/template/public/index.html index 67d58811..106ae3da 100644 --- a/packages/cra-template-safe-app/template/public/index.html +++ b/packages/cra-template-safe-app/template/public/index.html @@ -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`. --> - Gnosis Safe App + + + + Safe App diff --git a/packages/cra-template-safe-app/template/src/GlobalStyle.ts b/packages/cra-template-safe-app/template/src/GlobalStyle.ts index 3c709691..b9e27e7f 100644 --- a/packages/cra-template-safe-app/template/src/GlobalStyle.ts +++ b/packages/cra-template-safe-app/template/src/GlobalStyle.ts @@ -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 { @@ -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 diff --git a/packages/cra-template-safe-app/template/src/fonts.d.ts b/packages/cra-template-safe-app/template/src/fonts.d.ts deleted file mode 100644 index 7bbf68bb..00000000 --- a/packages/cra-template-safe-app/template/src/fonts.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -declare module '*.woff'; -declare module '*.woff2';