totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-22 07:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

enforce stable sort

Browse Source
This commit is contained in:
Rich-Harris
2018-03-25 15:12:35 -04:00
parent 3220c522d7
commit 25809ec409
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/create_routes.ts
View File

@@ -102,7 +102,10 @@ export default function create_routes({ files } = { files: glob.sync('**/*.*', {
} }
if (!a_sub_part.dynamic && a_sub_part.content !== b_sub_part.content) { if (!a_sub_part.dynamic && a_sub_part.content !== b_sub_part.content) {
return b_sub_part.content.length - a_sub_part.content.length; return (
(b_sub_part.content.length - a_sub_part.content.length) ||
(a_sub_part.content < b_sub_part.content ? -1 : 1)
);
} }
} }
} }

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

@@ -12,8 +12,8 @@ describe('create_routes', () => {
[ [
'index.html', 'index.html',
'about.html', 'about.html',
'post/foo.html',
'post/bar.html', 'post/bar.html',
'post/foo.html',
'post/f[xx].html', 'post/f[xx].html',
'post/[id].json.js', 'post/[id].json.js',
'post/[id].html', 'post/[id].html',
@@ -23,7 +23,7 @@ describe('create_routes', () => {
}); });
it('prefers index page to nested route', () => { it('prefers index page to nested route', () => {
const routes = create_routes({ let routes = create_routes({
files: [ files: [
'api/examples/[slug].js', 'api/examples/[slug].js',
'api/examples/index.js', 'api/examples/index.js',
@@ -55,6 +55,45 @@ describe('create_routes', () => {
'api/gists/[id].js', 'api/gists/[id].js',
] ]
); );
routes = create_routes({
files: [
'4xx.html',
'5xx.html',
'api/blog/[slug].js',
'api/blog/index.js',
'api/guide/contents.js',
'api/guide/index.js',
'blog/[slug].html',
'blog/index.html',
'blog/rss.xml.js',
'gist/[id].js',
'gist/create.js',
'guide/index.html',
'index.html',
'repl/index.html'
]
});
assert.deepEqual(
routes.map(r => r.file),
[
'4xx.html',
'5xx.html',
'index.html',
'guide/index.html',
'blog/index.html',
'blog/rss.xml.js',
'blog/[slug].html',
'gist/create.js',
'gist/[id].js',
'repl/index.html',
'api/guide/index.js',
'api/guide/contents.js',
'api/blog/index.js',
'api/blog/[slug].js',
]
);
}); });
it('generates params', () => { it('generates params', () => {