diff --git a/packages/webapp/package.json b/packages/webapp/package.json index aacdb3d8..16a22af2 100644 --- a/packages/webapp/package.json +++ b/packages/webapp/package.json @@ -7,6 +7,7 @@ "axios": "0.20.0", "bytes": "3.1.0", "classnames": "2.2.6", + "fontsource-metropolis": "3.0.1", "gatsby": "2.24.76", "gatsby-image": "2.4.21", "gatsby-plugin-manifest": "2.4.33", @@ -32,8 +33,7 @@ "react-mailchimp-subscribe": "2.1.0", "react-syntax-highlighter": "15.2.1", "react-visibility-sensor": "5.1.1", - "skynet-js": "2.0.9", - "typeface-metropolis": "0.0.74" + "skynet-js": "2.0.9" }, "devDependencies": { "cypress": "5.3.0", diff --git a/packages/webapp/src/pages/index.js b/packages/webapp/src/pages/index.js index c13c9885..4eb433e3 100644 --- a/packages/webapp/src/pages/index.js +++ b/packages/webapp/src/pages/index.js @@ -4,7 +4,7 @@ import SEO from "../components/seo"; import { App } from "../components"; import "../global.scss"; import AppContext from "../AppContext"; -import "typeface-metropolis"; // import Metropolis typeface +import "fontsource-metropolis/all.css"; // import Metropolis typeface export default function IndexPage({ location }) { const context = useMemo( diff --git a/yarn.lock b/yarn.lock index cb60ab9b..560afa1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -955,7 +955,7 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": version "7.11.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== @@ -6535,6 +6535,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.10.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== +fontsource-metropolis@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fontsource-metropolis/-/fontsource-metropolis-3.0.1.tgz#ed003537ac8531849cbed70b7bad557d1cbd553e" + integrity sha512-Cmog2eixbXddQgRXgf138p6ywlIo6kOzjbz+FvTXrnl5cSwTeiIO8bjqkTJe969ckKjOEZSf0WhgQdf4/DPLfw== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -6876,10 +6881,10 @@ gatsby-plugin-page-creator@^2.3.28: graphql "^14.7.0" lodash "^4.17.20" -gatsby-plugin-react-helmet@3.3.12: - version "3.3.12" - resolved "https://registry.yarnpkg.com/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.12.tgz#d6c2e706e3493985e8cba5ebcda7f95495792008" - integrity sha512-dRIi2RLUhO+R1OaG7TrI9k1xOPf0xDQZHx1tMIcwXEm3LWS+zwv0uX+RpyQ2lQE0L/NNhjfm253CAlcEBVN4ww== +gatsby-plugin-react-helmet@3.3.14: + version "3.3.14" + resolved "https://registry.yarnpkg.com/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.14.tgz#6eac5854e24d008352742783fe68817b18e24151" + integrity sha512-5GsIVZIVOax2V9g1UL8row1TG3p2zPY2I+8Rq52H0R5xD9QoMTPde2Q4N0Y2td+qzfRdcfkbSj/kokK2I5owPw== dependencies: "@babel/runtime" "^7.11.2" @@ -6896,10 +6901,10 @@ gatsby-plugin-robots-txt@1.5.3: "@babel/runtime" "^7.11.2" generate-robotstxt "^8.0.3" -gatsby-plugin-sass@2.3.14: - version "2.3.14" - resolved "https://registry.yarnpkg.com/gatsby-plugin-sass/-/gatsby-plugin-sass-2.3.14.tgz#cf2dd18524a68f0eacb9b4dd6b5226fc95cbd5c1" - integrity sha512-ne6Ub/EfrqlTAQfx9YDmcp9eNrzNpu90EEJ+wrNm0F4s8zJ8g4NX6V2VHHE1XtwYWypZqCrdPZeWG8Nb7XMH5g== +gatsby-plugin-sass@2.3.16: + version "2.3.16" + resolved "https://registry.yarnpkg.com/gatsby-plugin-sass/-/gatsby-plugin-sass-2.3.16.tgz#aa9f375993b44d03c721e82363dec35fceeb1fce" + integrity sha512-gY2Ankprpn0TEIboDqco4bycjveZNYTrpiwJYLPtnFPCgmxoQzld44Uj/9bbZXxsV/tIqubulenr+TymCbe/hg== dependencies: "@babel/runtime" "^7.11.2" sass-loader "^7.3.1" @@ -7080,12 +7085,12 @@ gatsby-telemetry@^1.3.35, gatsby-telemetry@^1.3.36: node-fetch "^2.6.0" uuid "3.4.0" -gatsby-transformer-sharp@2.5.14: - version "2.5.14" - resolved "https://registry.yarnpkg.com/gatsby-transformer-sharp/-/gatsby-transformer-sharp-2.5.14.tgz#8329d5c2fead279ff43d7a8c04fb003412b8d9be" - integrity sha512-CnbTKuxhFYgziTJEgTjW2tLr9AtYpZnhI8TsqFMRos6t1RABdBubzgi5IG0fUg5MpVpD1D6xeX6YaXQtERoPew== +gatsby-transformer-sharp@2.5.17: + version "2.5.17" + resolved "https://registry.yarnpkg.com/gatsby-transformer-sharp/-/gatsby-transformer-sharp-2.5.17.tgz#e1c33995a0a3f56b93b415fa21153aa3c7184c4b" + integrity sha512-S+yqOz/vPPGmkLuVjgd9sNrLe9S5fc9SwV3Ak4iFkQqnFpuNLJ1DNjjXNwBfNaQ1bjiy6d24FPbouHED0XyRxQ== dependencies: - "@babel/runtime" "^7.10.3" + "@babel/runtime" "^7.11.2" bluebird "^3.7.2" fs-extra "^9.0.1" potrace "^2.1.8" @@ -12448,10 +12453,10 @@ react-style-singleton@^2.1.0: invariant "^2.2.4" tslib "^1.0.0" -react-syntax-highlighter@13.5.3: - version "13.5.3" - resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6" - integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg== +react-syntax-highlighter@15.2.1: + version "15.2.1" + resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.2.1.tgz#63a42be96a645407a394cd7b93b99622f3ea179f" + integrity sha512-xrSfqX5Rztf9x4Fa6W+DbbKaJmi5zvh+tAvG2MnktZPDLeX/iMkumwxJdGYn5M1jM3d4+EJTloVAB8UvD7O0nA== dependencies: "@babel/runtime" "^7.3.1" highlight.js "^10.1.1" @@ -14794,11 +14799,6 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typeface-metropolis@0.0.74: - version "0.0.74" - resolved "https://registry.yarnpkg.com/typeface-metropolis/-/typeface-metropolis-0.0.74.tgz#4201ff1e3b86f55825eed53662c49dff54c461f3" - integrity sha512-8qJnWwD5GkFqoNkv0t068jXziJHoIayq7dNl9a0BRy30/VznqmEgrQWkMDG8KxH2hRXXAWZfayXM9L6sZEkaaw== - unbzip2-stream@^1.0.9: version "1.4.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"