diff --git a/.prettierrc b/.prettierrc index 6dc5529b..8417a0e3 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,5 +3,6 @@ "singleQuote": true, "printWidth": 100, "trailingComma": "none", - "quoteProps": "preserve" + "quoteProps": "preserve", + "endOfLine": "auto" } diff --git a/build/webpack.config.js b/build/webpack.config.js index 20d4839e..5191b894 100644 --- a/build/webpack.config.js +++ b/build/webpack.config.js @@ -131,7 +131,7 @@ function config(options) { ] }, { - test: /fonts\/.*\.(woff|ttf|eot|svg)$/, + test: /fonts[\\/].*\.(woff|ttf|eot|svg)$/, use: ['url-loader', 'ignore-loader'] }, { test: /\.woff2$/, loader: 'url-loader' },