Merge PR #239

kriasoft · Aug 31, 2015 · d53ea89 · d53ea89
2 parents 9593e7a + b3c569c
commit d53ea89
Showing 1 changed file with 13 additions and 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'
@@ -81,6 +81,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: [