Merge pull request #107 from StrikeForceZero/fix-fonts

Fix not being able to serve fonts and other assets using query string cache busters.
jakemmarsh · Nov 9, 2015 · 6abbbeb · 6abbbeb
2 parents 77027da + 7df2726
commit 6abbbeb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/gulp/config.js b/gulp/config.js
@@ -30,6 +30,20 @@ export default {
     dest: 'build/fonts'
   },
 
+  assetExtensions: [
+    'js',
+    'css',
+    'png',
+    'jpe?g',
+    'gif',
+    'svg',
+    'eot',
+    'otf',
+    'ttc',
+    'ttf',
+    'woff2?'
+  ],
+
   views: {
     index: 'app/index.html',
     src: 'app/views/**/*.html',

diff --git a/gulp/tasks/browserSync.js b/gulp/tasks/browserSync.js
@@ -8,16 +8,15 @@ import gulp        from 'gulp';
 gulp.task('browserSync', function() {
 
   const DEFAULT_FILE = 'index.html';
-  const ASSET_EXTENSIONS = ['js', 'css', 'png', 'jpg', 'jpeg', 'gif'];
+  const ASSET_EXTENSION_REGEX = new RegExp(`\\b(?!\\?)\\.(${config.assetExtensions.join('|')})\\b(?!\\.)`, 'i');
 
   browserSync.init({
     server: {
       baseDir: config.buildDir,
       middleware: function(req, res, next) {
-        let fileHrefArray = url.parse(req.url).href.split('.');
-        let fileExtension = fileHrefArray[fileHrefArray.length - 1];
+        let fileHref = url.parse(req.url).href;
 
-        if ( ASSET_EXTENSIONS.indexOf(fileExtension) === -1 ) {
+        if ( !ASSET_EXTENSION_REGEX.test(fileHref) ) {
           req.url = '/' + DEFAULT_FILE;
         }