Skip to content

replaced slasher functionality #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

replaced slasher functionality #249

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2b9357
replaced slasher functionality
HaykoKoryun Dec 3, 2017
be84f6d
fixed formatting
HaykoKoryun Dec 3, 2017
3b0a8ed
fixed remaining formatting issues
HaykoKoryun Dec 3, 2017
01c1117
fixed remaining formatting issues
HaykoKoryun Dec 3, 2017
9757d2e
should take care of source being just '/'
HaykoKoryun Dec 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lib/middleware/redirects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ var _ = require('lodash');

var minimatch = require('minimatch');
var pathToRegexp = require('path-to-regexp');
var slasher = require('glob-slasher');

function formatExternalUrl(u) {
var cleaned = u
Expand All @@ -32,10 +31,22 @@ function addQuery(url, qs) {

var Redirect = function(source, destination, type) {
this.type = type || 301;
this.source = slasher(source);

// no leading slash
if (source[0] !== '/') {
// glob pattern but no leading slash
if (source[0] === '!' && source[1] && source[1] !== '/') {
this.source = '!/' + source.substring(2);
} else {
this.source = '/' + source;
}
} else {
this.source = source;
}

this.destination = destination;

if (this.destination.match(/(?:^|\/):/)) {
if (this.source.match(/(?:^|\/):/)) {
this.captureKeys = [];
this.capture = pathToRegexp(this.source, this.captureKeys);
this.compileDestination = pathToRegexp.compile(this.destination);
Expand All @@ -51,9 +62,11 @@ Redirect.prototype.test = function(url) {
}

var match;

if (this.capture) {
match = this.capture.exec(url);
}

if (match) {
var params = {};
for (var i = 0; i < this.captureKeys.length; i++) {
Expand Down