remove font-awesome-webpack dependency

Author: bertho-zero

.bootstraprc

@@ -1,7 +1,7 @@
 {
   "bootstrapVersion": 3,
   "preBootstrapCustomizations": "./src/theme/variables.scss",
-  "appStyles": "./src/theme/bootstrap.overrides.scss",
+  "appStyles": "./src/theme/app.scss",
   "loglevel": "disabled",
   "env": {
     "development": {

README.md

@@ -30,7 +30,8 @@ This is a starter boilerplate app I've put together using the following technolo
 * [lru-memoize](https://github.com/erikras/lru-memoize) to speed up form validation
 * [multireducer](https://github.com/erikras/multireducer) to combine single reducers into one key-based reducer
 * [style-loader](https://github.com/webpack/style-loader), [sass-loader](https://github.com/jtangelder/sass-loader) and [less-loader](https://github.com/webpack/less-loader) to allow import of stylesheets in plain css, sass and less,
-* [bootstrap-loader](https://github.com/shakacode/bootstrap-loader) and [font-awesome-webpack](https://github.com/gowravshekar/font-awesome-webpack) to customize Bootstrap and FontAwesome
+* [bootstrap-loader](https://github.com/shakacode/bootstrap-loader) to customize Bootstrap
+* [font-awesome](https://github.com/FortAwesome/Font-Awesome)
 * [react-helmet](https://github.com/nfl/react-helmet) to manage title and meta tag information on both server and client
 * [webpack-isomorphic-tools](https://github.com/halt-hammerzeit/webpack-isomorphic-tools) to allow require() work for statics both on client and server
 * [Jest](https://facebook.github.io/jest/) and [mocha](https://mochajs.org/) to allow writing unit tests for the project.

package.json

@@ -190,7 +190,6 @@
     "extract-text-webpack-plugin": "3.0.0",
     "file-loader": "^0.11.2",
     "font-awesome": "^4.7.0",
-    "font-awesome-webpack": "^0.0.5-beta.2",
     "happypack": "^3.0.2",
     "html-webpack-plugin": "^2.30.1",
     "husky": "^0.14.3",

src/containers/Home/Home.js

@@ -29,13 +29,9 @@ export default class Home extends Component {
                 <img src={logoImage} alt="presentation" />
               </p>
             </div>
-            <h1>
-              {config.app.title}
-            </h1>
+            <h1>{config.app.title}</h1>
 
-            <h2>
-              {config.app.description}
-            </h2>
+            <h2>{config.app.description}</h2>
 
             <p>
               <a
@@ -47,7 +43,7 @@ export default class Home extends Component {
                 <i className="fa fa-github" /> View on Github
               </a>
             </p>
-            {online &&
+            {online && (
               <GithubButton
                 user="erikras"
                 repo="react-redux-universal-hot-example"
@@ -56,8 +52,9 @@ export default class Home extends Component {
                 height={30}
                 count
                 large
-              />}
-            {online &&
+              />
+            )}
+            {online && (
               <GithubButton
                 user="erikras"
                 repo="react-redux-universal-hot-example"
@@ -66,7 +63,8 @@ export default class Home extends Component {
                 height={30}
                 count
                 large
-              />}
+              />
+            )}
 
             <p className={styles.humility}>
               Created and maintained by{' '}
@@ -194,11 +192,12 @@ export default class Home extends Component {
               <a href="https://github.com/shakacode/bootstrap-sass-loader" target="_blank" rel="noopener noreferrer">
                 bootstrap-sass-loader
               </a>{' '}
-              and{' '}
-              <a href="https://github.com/gowravshekar/font-awesome-webpack" target="_blank" rel="noopener noreferrer">
-                font-awesome-webpack
-              </a>{' '}
-              to customize Bootstrap and FontAwesome
+              to customize Bootstrap
+            </li>
+            <li>
+              <a href="https://github.com/FortAwesome/Font-Awesome" target="_blank" rel="noopener noreferrer">
+                font-awesome
+              </a>
             </li>
             <li>
               <a href="http://socket.io/">socket.io</a> for real-time communication

src/theme/bootstrap.overrides.scss renamed to src/theme/app.scss

@@ -1,3 +1,5 @@
+@import "~font-awesome/scss/font-awesome.scss";
+
 /**
  * Override Bootstrap styles that you can't modify via variables here.
  *

src/theme/buildExtractStylesLoader.js

@@ -51,7 +51,6 @@ var webpackConfig = module.exports = {
       'webpack-hot-middleware/client?path=http://' + host + ':' + port + '/__webpack_hmr',
       'react-hot-loader/patch',
       'bootstrap-loader',
-      'font-awesome-webpack!./src/theme/font-awesome.config.js',
       './src/client.js'
     ]
   },