feat: update FontAwesome 5.0.x to 5.1.0

GaiAma · Oct 6, 2018 · f9c51e7 · f9c51e7
1 parent 1ca929a
commit f9c51e7
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 20 deletions.
diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import g from 'glamorous'
 import axios from 'axios'
 import isEmail from 'validator/lib/isEmail'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { colors, fontFamilies } from '@/theme'
 import { Button } from '@/components/layout/Button'
 import TextareaAutosize from 'react-textarea-autosize'

diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { css } from 'glamor'
 import Link from '@/components/Link'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import hex2rgba from 'hex2rgba'
 import { colors, media } from '@/theme'
 

diff --git a/src/components/Icon.js b/src/components/Icon.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { colors } from '@/theme'
 
 const Wrapper = ({

diff --git a/src/components/NewsletterWidget/index.js b/src/components/NewsletterWidget/index.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import g from 'glamorous'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import isEmail from 'validator/lib/isEmail'
 import { colors, fontFamilies } from '@/theme'
 import { Button } from '@/components/layout/Button'

diff --git a/src/components/ShareWidget.js b/src/components/ShareWidget.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { colors, media } from '@/theme'
 
 const ShareWidget = ({ label, post, siteUrl, ...props }) => (

diff --git a/src/components/Shared.js b/src/components/Shared.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import { Link } from 'gatsby'
+import { Link, graphql } from 'gatsby'
 import Img from 'gatsby-image'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { colors, Box, fontFamilies, H2, fullPageWidth, media } from '@/theme'
 import Lazy from '@/components/Lazy'
 // import DonationForm from '@/components/DonationForm'

diff --git a/src/templates/ContactPage.js b/src/templates/ContactPage.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { graphql } from 'gatsby'
 import MainLayout from '@/components/MainLayout'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { colors, media } from '@/theme'
 import TitledCopy from '@/components/TitledCopy'
 import { Newsletter } from '@/components/NewsletterWidget'

diff --git a/src/templates/SupportPage.js b/src/templates/SupportPage.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { graphql } from 'gatsby'
 import Img from 'gatsby-image'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { css } from 'glamor'
 import MainLayout from '@/components/MainLayout'
 import { SupportWidget } from '@/components/Shared'

diff --git a/src/utils/fontawesome.js b/src/utils/fontawesome.js
@@ -1,7 +1,5 @@
-import fontawesome from '@fortawesome/fontawesome'
-
-import { faEnvelope } from '@fortawesome/fontawesome-free-regular/shakable'
-
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faEnvelope } from '@fortawesome/free-regular-svg-icons'
 import {
   faFacebookSquare,
   faInstagram,
@@ -11,8 +9,7 @@ import {
   faGooglePlusSquare,
   faGithub,
   faTelegramPlane,
-} from '@fortawesome/fontawesome-free-brands/shakable'
-
+} from '@fortawesome/free-brands-svg-icons'
 import {
   faCaretDown,
   faNewspaper,
@@ -23,12 +20,9 @@ import {
   faCaretLeft,
   faCaretRight,
   faSpinner,
-} from '@fortawesome/fontawesome-free-solid/shakable'
-
-// Watch the DOM for any changes and add, replace, or modify icons on-the-fly
-fontawesome.config.observeMutations = false
+} from '@fortawesome/free-solid-svg-icons'
 
-fontawesome.library.add(
+library.add(
   faFacebookSquare,
   faInstagram,
   faYoutube,