ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit d53ea89ce3f9d596410d49e0212fbf4fd0848594
parent 9593e7a4fd79d21c662b3b705862421e05a27dcc
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Mon, 31 Aug 2015 07:44:52 +0300

Merge PR #239

Diffstat:
Mtools/config.js | 14+++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/config.js b/tools/config.js @@ -68,7 +68,7 @@ const config = { module: { loaders: [{ test: /\.txt/, - loader: 'file?name=[path][name].[ext]' + loader: 'file-loader?name=[path][name].[ext]' }, { test: /\.gif/, loader: 'url-loader?limit=10000&mimetype=image/gif' @@ -82,6 +82,18 @@ const config = { test: /\.svg/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }, { + test: /\.eot/, + loader: 'url-loader?limit=100000&mimetype=application/vnd.ms-fontobject' + }, { + test: /\.woff2/, + loader: 'url-loader?limit=100000&mimetype=application/font-woff2' + }, { + test: /\.woff/, + loader: 'url-loader?limit=100000&mimetype=application/font-woff' + }, { + test: /\.ttf/, + loader: 'url-loader?limit=100000&mimetype=application/font-ttf' + }, { test: /\.jsx?$/, include: [ path.resolve(__dirname, '../node_modules/react-routing/src'),