totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-11 19:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96 from mrkishi/master

Browse Source 
Identify js and html route clashes
This commit is contained in:
Rich Harris
2018-01-20 18:36:50 -05:00
committed by GitHub
parent d11bd954e0 8a8526d9ed
commit 4590aa313c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/utils/create_routes.js
View File

@@ -78,7 +78,7 @@ module.exports = function create_matchers(files) {
const b_is_dynamic = b_part[0] === '[';
if (a_is_dynamic === b_is_dynamic) {
if (!a_is_dynamic) same = false;
if (!a_is_dynamic && a_part !== b_part) same = false;
continue;
}

4
test/unit/create_routes.test.js
View File

@@ -70,6 +70,10 @@ describe('create_routes', () => {
assert.throws(() => {
create_routes(['[foo].html', '[bar]/index.html']);
}, /The \[foo\].html and \[bar\]\/index.html routes clash/);
assert.throws(() => {
create_routes(['foo.html', 'foo.js']);
}, /The foo.html and foo.js routes clash/);
});
it('matches nested routes', () => {