From 006f8d531cbdd5a6eee389954e2b170e28a7ad90 Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Sat, 18 Jun 2016 19:34:12 +0300 Subject: [PATCH] #123: remove font duplicates during build --- src/icons.font.json | 2 +- webpack.config.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/icons.font.json b/src/icons.font.json index 500c37f..d1afb36 100644 --- a/src/icons.font.json +++ b/src/icons.font.json @@ -1,6 +1,6 @@ { "files": ["icons/webfont/*"], - "fileName": "[hash]-[fontname][ext]", + "fileName": "assets/fonts/[fontname][ext]?[hash]", "fontName": "ely-account-icons", "cssTemplate": "icons.css.hbs", "classPrefix": "", diff --git a/webpack.config.js b/webpack.config.js index 24f75f3..6cfda7d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -154,11 +154,7 @@ var webpackConfig = { }, { test: /\.(png|gif|jpg|svg)$/, - loader: 'url?limit=1000' - }, - { // TODO: увы, эта штука пока не работает. Хеш добавляется через ./webpack/node-sass-iconfont-importer - test: /\.(woff|woff2|eot|ttf)$/, - loader: 'url' + loader: 'url?limit=1000&name=assets/[name].[ext]?[hash]' }, { test: /\.json$/,