diff --git a/example/src/App.tsx b/example/src/App.tsx index cd4590c..7e92dfb 100644 --- a/example/src/App.tsx +++ b/example/src/App.tsx @@ -1,3 +1,4 @@ +import "@fontsource/roboto"; import { useState, useEffect, useMemo } from "react"; import { SnackbarProvider, useSnackbar } from "notistack"; import { Button, Grid, makeStyles } from "@material-ui/core"; diff --git a/example/src/index.css b/example/src/index.css index 4a1df4d..6525b22 100644 --- a/example/src/index.css +++ b/example/src/index.css @@ -1,3 +1,4 @@ +@import url("https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap"); body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", diff --git a/package.json b/package.json index 9a2ca7d..c0bb37d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,6 @@ "homepage": "https://github.com/project-serum/swap-ui", "license": "Apache-2.0", "dependencies": { - "@fontsource/roboto": "^4.3.0", "@project-serum/serum": "^0.13.34", "@project-serum/swap": "^0.1.0-alpha.31", "@solana/spl-token": "^0.1.4" @@ -36,6 +35,7 @@ ] }, "devDependencies": { + "@fontsource/roboto": "4.3.0", "@material-ui/core": "^4.11.4", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.58", diff --git a/src/index.css b/src/index.css deleted file mode 100644 index dd3d92d..0000000 --- a/src/index.css +++ /dev/null @@ -1 +0,0 @@ -@import url("https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap"); diff --git a/src/index.tsx b/src/index.tsx index 184181d..ecc7109 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,4 +1,3 @@ -import "@fontsource/roboto"; import { ReactElement } from "react"; import { PublicKey } from "@solana/web3.js"; import { TokenListContainer } from "@solana/spl-token-registry"; diff --git a/tsconfig.json b/tsconfig.json index 9572e23..119388e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,7 @@ "strict": true, "forceConsistentCasingInFileNames": true, "noFallthroughCasesInSwitch": true, - "module": "esnext", + "module": "commonjs", "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, diff --git a/yarn.lock b/yarn.lock index db0ed14..8a1329f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1255,7 +1255,7 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fontsource/roboto@^4.3.0": +"@fontsource/roboto@4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-4.3.0.tgz#00f1cceca43eff85bb0e1d424311751ee41f6aa6" integrity sha512-WeFWCWYutLWyEtRmBhn+bLbW4/km0l+HhTpR8wWDxJLiGiMOhVLO/Z0q5w6l20ZOkWnf6Z1rN3o3W2HjvYN6Rg==