From 27917a145d4ce5d5f328261a12638044137c1429 Mon Sep 17 00:00:00 2001 From: Alex Zherdev Date: Sat, 30 Jul 2016 15:33:19 +0300 Subject: [PATCH 1/2] Accept version when loading fonts e.g. font-awesome --- config/webpack.config.dev.js | 2 +- config/webpack.config.prod.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js index b2f274fe92e..022e2d7d9c8 100644 --- a/config/webpack.config.dev.js +++ b/config/webpack.config.dev.js @@ -73,7 +73,7 @@ module.exports = { loader: 'json' }, { - test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)$/, + test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)(\?.*)?$/, include: [paths.appSrc, paths.appNodeModules], loader: 'file', query: { diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index 010f47fd1b5..9d8120fffed 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -82,7 +82,7 @@ module.exports = { loader: 'json' }, { - test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)$/, + test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)(\?.*)?$/, include: [paths.appSrc, paths.appNodeModules], loader: 'file', query: { From b8572795a7367bb6c19109af3b27d15bab1c41da Mon Sep 17 00:00:00 2001 From: Alex Zherdev Date: Sat, 30 Jul 2016 18:36:20 +0300 Subject: [PATCH 2/2] Add query string support to mp4/webm --- config/webpack.config.dev.js | 2 +- config/webpack.config.prod.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js index 022e2d7d9c8..5a5a2ff6122 100644 --- a/config/webpack.config.dev.js +++ b/config/webpack.config.dev.js @@ -81,7 +81,7 @@ module.exports = { } }, { - test: /\.(mp4|webm)$/, + test: /\.(mp4|webm)(\?.*)?$/, include: [paths.appSrc, paths.appNodeModules], loader: 'url', query: { diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index 9d8120fffed..bc1887df177 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -90,7 +90,7 @@ module.exports = { } }, { - test: /\.(mp4|webm)$/, + test: /\.(mp4|webm)(\?.*)?$/, include: [paths.appSrc, paths.appNodeModules], loader: 'url', query: {