diff --git a/package.json b/package.json index 97d07f3..9f6cfcd 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,11 @@ "main": "./webpack.config.coffee", "devDependencies": { "angular": "^1.4.x", - "zepto": "0.0.4", + "font-awesome": "^4.5.0", + "npm-prepublish": "^1.2.1", "react": "0.14.x", "react-dom": "0.14.x", - "npm-prepublish": "^1.2.1" + "zepto": "0.0.4" }, "scripts": { "dev": "webpack-dev-server -d --colors", diff --git a/src/scripts/elements/hello.react.jade b/src/scripts/elements/hello.react.jade index 329bb40..7c97e75 100644 --- a/src/scripts/elements/hello.react.jade +++ b/src/scripts/elements/hello.react.jade @@ -2,4 +2,4 @@ h1= message -button(onClick=onClick) click me \ No newline at end of file +button(onClick=onClick) #[i(className="fa fa-reddit-alien")] click me \ No newline at end of file diff --git a/src/src.coffee b/src/src.coffee index ee987f6..b2500a3 100644 --- a/src/src.coffee +++ b/src/src.coffee @@ -3,4 +3,11 @@ require 'angular' require './scripts/home' require './views/home' require './styles/home' -require './images/project-custom.svg' \ No newline at end of file +require './images/project-custom.svg' + +require '../node_modules/font-awesome/fonts/fontawesome-webfont.eot' +require '../node_modules/font-awesome/fonts/fontawesome-webfont.svg' +require '../node_modules/font-awesome/fonts/fontawesome-webfont.ttf' +require '../node_modules/font-awesome/fonts/fontawesome-webfont.woff' +require '../node_modules/font-awesome/fonts/fontawesome-webfont.woff2' +require '../node_modules/font-awesome/css/font-awesome.css' \ No newline at end of file diff --git a/webpack.config.coffee b/webpack.config.coffee index 7dfcdd5..8381db3 100644 --- a/webpack.config.coffee +++ b/webpack.config.coffee @@ -173,7 +173,13 @@ module.exports = (options) -> # Rename the file using the asset hash # Pass along the updated reference to your code # You can add here any file extension you want to get copied to your output - test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot)$/ + test: /\.(png|jpg|jpeg|gif)$/ + loader: 'file' + , + test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/ + loader: 'file' + , + test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/ loader: 'file' ] postLoaders: [