Merge pull request #3788 from blockscout/vb-update-fontawesome

Update fontawesome NPM package
blockscout · Apr 8, 2021 · ec5017e · ec5017e
2 parents 3e8f3ad + 6fc5a26
commit ec5017e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#3748](https://github.com/blockscout/blockscout/pull/3748) - Skip null topics in eth_getLogs API endpoint
 
 ### Chore
+- [#3788](https://github.com/blockscout/blockscout/pull/3788) - Update fontawesome NPM package
 
 
 ## 3.6.0-beta

diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss
@@ -10,9 +10,9 @@
 // Font Awesome
 $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "fontawesome";
-@import "fa-brands";
-@import "fa-regular";
-@import "fa-solid";
+@import "~@fortawesome/fontawesome-free/scss/brands";
+@import "~@fortawesome/fontawesome-free/scss/regular";
+@import "~@fortawesome/fontawesome-free/scss/solid";
 
 // Bootstrap Core CSS
 @import "node_modules/bootstrap/scss/functions";

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
@@ -19,7 +19,7 @@
     "eslint": "eslint js/**"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "5.1.0-4",
+    "@fortawesome/fontawesome-free": "^5.15.3",
     "assert": "^2.0.0",
     "awesomplete": "^1.1.5",
     "bignumber.js": "^9.0.0",