From 186b1aedcb37783ce59307082527064e5d6f580d Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 10 Nov 2017 08:29:40 -0500
Subject: [PATCH] exclude loading.svg. filter glyphicons

---
 gulpfile.js       | 3 ++-
 webpack.common.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 9a0eb1b388..4ac77f9254 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -27,7 +27,7 @@ const sidebarActionManifestObj = {
 
 function dist(browserName, manifest) {
     return gulp.src(paths.dist + '**/*')
-        .pipe(gulpif(browserName !== 'edge', filter(['**', '!dist/edge/**/*'])))
+        .pipe(gulpif(browserName !== 'edge', filter(['**', '!dist/edge/**/*', '!dist/popup/fonts/glyphicons*'])))
         .pipe(gulpif('popup/index.html', replace('__BROWSER__', browserName)))
         .pipe(gulpif('manifest.json', jeditor(manifest)))
         .pipe(zip(`dist-${browserName}.zip`))
@@ -83,6 +83,7 @@ function copyDistEdge(source, dest) {
     return new Promise((resolve, reject) => {
         gulp.src(source)
             .on('error', reject)
+            .pipe(filter(['**', '!dist/popup/fonts/glyphicons*']))
             .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'edge')))
             .pipe(gulpif('manifest.json', jeditor((manifest) => {
                 manifest['-ms-preload'] = {
diff --git a/webpack.common.js b/webpack.common.js
index cc9d9bc3ec..d576131ff6 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -36,6 +36,7 @@ module.exports = {
             },
             {
                 test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+                exclude: /loading.svg/,
                 use: [{
                     loader: 'file-loader',
                     options: {