Skip to content

Commit

Permalink
Change order or rewrite rules
Browse files Browse the repository at this point in the history
  • Loading branch information
shakyShane committed Oct 7, 2016
1 parent 9c998f7 commit 1d0ce37
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
10 changes: 10 additions & 0 deletions lib/browser-sync.js
Expand Up @@ -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();
};

Expand Down
13 changes: 7 additions & 6 deletions lib/server/utils.js
Expand Up @@ -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)) {
Expand All @@ -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(),
Expand Down

0 comments on commit 1d0ce37

Please sign in to comment.