Accept version when loading fonts e.g. font-awesome (facebook#298)

alexzherdev · gaearon · commit c239551713e7 · 2016-07-30T18:51:27.000+01:00
* Accept version when loading fonts e.g. font-awesome

* Add query string support to mp4/webm
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
@@ -73,15 +73,15 @@ 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: {
           name: 'static/media/[name].[ext]'
         }
       },
       {
-        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
@@ -82,15 +82,15 @@ 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: {
           name: 'static/media/[name].[hash:8].[ext]'
         }
       },
       {
-        test: /\.(mp4|webm)$/,
+        test: /\.(mp4|webm)(\?.*)?$/,
         include: [paths.appSrc, paths.appNodeModules],
         loader: 'url',
         query: {

Original file line number	Diff line number	Diff line change
`@@ -73,15 +73,15 @@ module.exports = {`
`73`	`73`	`loader: 'json'`
`74`	`74`	`},`
`75`	`75`	`{`
`76`		`- test: /\.(jpg\|png\|gif\|eot\|svg\|ttf\|woff\|woff2)$/,`
	`76`	`+ test: /\.(jpg\|png\|gif\|eot\|svg\|ttf\|woff\|woff2)(\?.*)?$/,`
`77`	`77`	`include: [paths.appSrc, paths.appNodeModules],`
`78`	`78`	`loader: 'file',`
`79`	`79`	`query: {`
`80`	`80`	`name: 'static/media/[name].[ext]'`
`81`	`81`	`}`
`82`	`82`	`},`
`83`	`83`	`{`
`84`		`- test: /\.(mp4\|webm)$/,`
	`84`	`+ test: /\.(mp4\|webm)(\?.*)?$/,`
`85`	`85`	`include: [paths.appSrc, paths.appNodeModules],`
`86`	`86`	`loader: 'url',`
`87`	`87`	`query: {`
Original file line number	Diff line number	Diff line change
`@@ -82,15 +82,15 @@ module.exports = {`
`82`	`82`	`loader: 'json'`
`83`	`83`	`},`
`84`	`84`	`{`
`85`		`- test: /\.(jpg\|png\|gif\|eot\|svg\|ttf\|woff\|woff2)$/,`
	`85`	`+ test: /\.(jpg\|png\|gif\|eot\|svg\|ttf\|woff\|woff2)(\?.*)?$/,`
`86`	`86`	`include: [paths.appSrc, paths.appNodeModules],`
`87`	`87`	`loader: 'file',`
`88`	`88`	`query: {`
`89`	`89`	`name: 'static/media/[name].[hash:8].[ext]'`
`90`	`90`	`}`
`91`	`91`	`},`
`92`	`92`	`{`
`93`		`- test: /\.(mp4\|webm)$/,`
	`93`	`+ test: /\.(mp4\|webm)(\?.*)?$/,`
`94`	`94`	`include: [paths.appSrc, paths.appNodeModules],`
`95`	`95`	`loader: 'url',`
`96`	`96`	`query: {`