Skip to content

Commit 66164bd

Browse files
committed
Add font-awesome into app
1 parent 4adc33f commit 66164bd

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

app/App.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import ReactDOM from 'react-dom';
33
import { Router, Route, IndexRoute, hashHistory } from 'react-router'
44
import 'bulma/css/bulma.css'
5+
import 'font-awesome-webpack'
56

67
import iClientComponent from 'components/iClient/iClientComponent';
78
import HomeComponent from 'components/Home/HomeComponent';

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@
1717
"babel-preset-es2015": "^6.16.0",
1818
"babel-preset-react": "^6.16.0",
1919
"css-loader": "^0.25.0",
20+
"file-loader": "^0.9.0",
21+
"font-awesome-webpack": "0.0.4",
2022
"http-server": "^0.9.0",
23+
"less": "^2.7.1",
24+
"less-loader": "^2.2.3",
2125
"npm-run-all": "^3.1.0",
2226
"path": "^0.12.7",
2327
"style-loader": "^0.13.1",
28+
"url-loader": "^0.5.7",
2429
"webpack": "^1.13.2"
2530
},
2631
"scripts": {

webpack.config.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@ const path = require('path');
33
module.exports = {
44
entry: "./app/App.js",
55
output: {
6-
filename: "public/dist/bundle.js"
6+
path: 'public/dist/',
7+
publicPath: '/dist/',
8+
filename: "bundle.js",
79
},
810
module: {
911
loaders: [
12+
//Bulma loader
1013
{ test: /\.css$/, loader: "style-loader!css-loader" },
14+
//Font-awesome loader
15+
{ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
16+
{ test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader" },
17+
//Jsx loader
1118
{
1219
test: /\.js$/,
1320
exclude: /node_modules/,

0 commit comments

Comments
 (0)