From 3fcee1088729b49b667d8b30fc8290ec0cb4f449 Mon Sep 17 00:00:00 2001 From: Sean King Date: Thu, 12 Aug 2021 09:06:28 -0600 Subject: [PATCH] Move to new fontsource packages --- app/styles/application.scss | 8 ++++---- package.json | 4 ++-- yarn.lock | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/styles/application.scss b/app/styles/application.scss index 09b2aa355f..9b9bbff361 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -1,9 +1,9 @@ // Fonts from elsewhere @import '~fork-awesome/css/fork-awesome.css'; -@import '~fontsource-roboto/300.css'; -@import '~fontsource-roboto/400.css'; -@import '~fontsource-roboto/700.css'; -@import '~fontsource-montserrat/800.css'; +@import '~@fontsource/roboto/300.css'; +@import '~@fontsource/roboto/400.css'; +@import '~@fontsource/roboto/700.css'; +@import '~@fontsource/montserrat/800.css'; @import 'mixins'; @import 'themes'; diff --git a/package.json b/package.json index e001cdc72a..0386a3b1b2 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,8 @@ "@babel/preset-env": "^7.14.7", "@babel/preset-react": "^7.14.5", "@babel/runtime": "^7.14.6", + "@fontsource/montserrat": "^4.5.1", + "@fontsource/roboto": "^4.5.0", "@popperjs/core": "^2.4.4", "@welldone-software/why-did-you-render": "^6.2.0", "array-includes": "^3.0.3", @@ -74,8 +76,6 @@ "escape-html": "^1.0.3", "exif-js": "^2.3.0", "file-loader": "^6.0.0", - "fontsource-montserrat": "^3.0.9", - "fontsource-roboto": "^3.0.3", "fork-awesome": "https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265", "html-webpack-harddisk-plugin": "^1.0.1", "html-webpack-plugin": "^4.3.0", diff --git a/yarn.lock b/yarn.lock index 996db8ba3d..031ea8ab9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1695,6 +1695,16 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/montserrat@^4.5.1": + version "4.5.1" + resolved "https://registry.yarnpkg.com/@fontsource/montserrat/-/montserrat-4.5.1.tgz#64a33ffdb77bbc63484c0321710bed272cc5b16f" + integrity sha512-xdMkzsnFlzDt5Vj9+AWuUp4Vd9F3hYN2I0GTZZYscWN/bQ20wVOGtdWLO8Okfv7SZ9t/z39/EayAAt+f/8tAvw== + +"@fontsource/roboto@^4.5.0": + version "4.5.0" + resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-4.5.0.tgz#d6f925668ba6af46707f1040c43aff498ba204bb" + integrity sha512-ja4XYw/9kNRFM5Ndk9vwzHWsdBMXczyBazFkTXJQ74QQBnT0BbSsHn0pF60AU0Iznig1Wt9x3rADfG8LANvMpw== + "@formatjs/ecma402-abstract@1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz#ac6c17a8fffac43c6d68c849a7b732626d32654c" @@ -5760,16 +5770,6 @@ 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-montserrat@^3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/fontsource-montserrat/-/fontsource-montserrat-3.0.9.tgz#ff614725c420839c4aefbca6f2b49c6224050991" - integrity sha512-kSE4GwWoEKJlIp0UyuoYtBvjKv5kwOTK7EvCwdQ7ukvKvgIK1LR5+GpZC5c/juonasNtFTKav67Zd7/C7m+a5w== - -fontsource-roboto@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/fontsource-roboto/-/fontsource-roboto-3.0.3.tgz#99c312babeabce22b3e933b3edf2951d4508f4f7" - integrity sha512-kfsC9qAP6XhwnSDAhg2lhWeaUJfLGXZh7GcLxFiz/4lXdkV2pVhWv2Xp9ES3b3BHdc9UuPrWXXLOphzHIStcOw== - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"