From 1d0ce378c6738538773d5033c1f5ece88d5a1f99 Mon Sep 17 00:00:00 2001
From: Shane Osbourne <shane.osbourne8@gmail.com>
Date: Fri, 7 Oct 2016 18:43:06 +0100
Subject: [PATCH] Change order or rewrite rules

---
 lib/browser-sync.js | 10 ++++++++++
 lib/server/utils.js | 13 +++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/browser-sync.js b/lib/browser-sync.js
index fd34c592c..233c07ada 100644
--- a/lib/browser-sync.js
+++ b/lib/browser-sync.js
@@ -605,6 +605,16 @@ BrowserSync.prototype.removeRewriteRule = function (id) {
             return rule.id !== id;
         });
     });
+
+    bs.resetMiddlewareStack();
+};
+
+BrowserSync.prototype.setRewriteRules = function (rules) {
+    var bs = this;
+    bs.options = bs.options.update("rewriteRules", function (_) {
+        return rules;
+    });
+
     bs.resetMiddlewareStack();
 };
 
diff --git a/lib/server/utils.js b/lib/server/utils.js
index 7a748e7a4..47ffb4073 100644
--- a/lib/server/utils.js
+++ b/lib/server/utils.js
@@ -190,18 +190,13 @@ var serverUtils = {
             .concat(bs.options.getIn(["snippetOptions", "ignorePaths"]))
             .concat(bs.options.getIn(["snippetOptions", "blacklist"]))
             .filter(Boolean);
+
         var whitelist = List([])
             .concat(bs.options.getIn(["snippetOptions", "whitelist"]));
 
         // Snippet
         rules.push(snippetUtils.getRegex(bs.options.get("snippet"), bs.options.get("snippetOptions")));
 
-        // Proxy
-        if (bs.options.get("proxy")) {
-            var proxyRule = require("./proxy-utils").rewriteLinks(bs.options.getIn(["proxy", "url"]).toJS());
-            rules.push(proxyRule);
-        }
-
         // User
         bs.options.get("rewriteRules").forEach(function (rule) {
             if (Map.isMap(rule)) {
@@ -212,6 +207,12 @@ var serverUtils = {
             }
         });
 
+        // Proxy
+        if (bs.options.get("proxy")) {
+            var proxyRule = require("./proxy-utils").rewriteLinks(bs.options.getIn(["proxy", "url"]).toJS());
+            rules.push(proxyRule);
+        }
+
         var lr = lrSnippet.create({
             rules:     rules,
             blacklist: blacklist.toArray(),