Skip to content

Commit 1d0ce37

Browse files
committed
Change order or rewrite rules
1 parent 9c998f7 commit 1d0ce37

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

lib/browser-sync.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,16 @@ BrowserSync.prototype.removeRewriteRule = function (id) {
605605
return rule.id !== id;
606606
});
607607
});
608+
609+
bs.resetMiddlewareStack();
610+
};
611+
612+
BrowserSync.prototype.setRewriteRules = function (rules) {
613+
var bs = this;
614+
bs.options = bs.options.update("rewriteRules", function (_) {
615+
return rules;
616+
});
617+
608618
bs.resetMiddlewareStack();
609619
};
610620

lib/server/utils.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,13 @@ var serverUtils = {
190190
.concat(bs.options.getIn(["snippetOptions", "ignorePaths"]))
191191
.concat(bs.options.getIn(["snippetOptions", "blacklist"]))
192192
.filter(Boolean);
193+
193194
var whitelist = List([])
194195
.concat(bs.options.getIn(["snippetOptions", "whitelist"]));
195196

196197
// Snippet
197198
rules.push(snippetUtils.getRegex(bs.options.get("snippet"), bs.options.get("snippetOptions")));
198199

199-
// Proxy
200-
if (bs.options.get("proxy")) {
201-
var proxyRule = require("./proxy-utils").rewriteLinks(bs.options.getIn(["proxy", "url"]).toJS());
202-
rules.push(proxyRule);
203-
}
204-
205200
// User
206201
bs.options.get("rewriteRules").forEach(function (rule) {
207202
if (Map.isMap(rule)) {
@@ -212,6 +207,12 @@ var serverUtils = {
212207
}
213208
});
214209

210+
// Proxy
211+
if (bs.options.get("proxy")) {
212+
var proxyRule = require("./proxy-utils").rewriteLinks(bs.options.getIn(["proxy", "url"]).toJS());
213+
rules.push(proxyRule);
214+
}
215+
215216
var lr = lrSnippet.create({
216217
rules: rules,
217218
blacklist: blacklist.toArray(),

0 commit comments

Comments
 (0)