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

ignore things that look like temp files when generating manifest data - fixes #220

Browse Source
This commit is contained in:
Rich Harris
2018-09-02 20:33:00 -04:00
parent c0b833862a
commit 1b6dfd3580
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/create_manifest_data.ts
View File

@@ -30,13 +30,16 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
const file = path.relative(cwd, resolved); const file = path.relative(cwd, resolved);
const is_dir = fs.statSync(resolved).isDirectory(); const is_dir = fs.statSync(resolved).isDirectory();
const ext = path.extname(basename);
if (!is_dir && !/^\.[a-z]+$/i.test(ext)) return null; // filter out tmp files etc
const segment = is_dir const segment = is_dir
? basename ? basename
: basename.slice(0, -path.extname(basename).length); : basename.slice(0, -path.extname(basename).length);
const parts = get_parts(segment); const parts = get_parts(segment);
const is_index = is_dir ? false : basename.startsWith('index.'); const is_index = is_dir ? false : basename.startsWith('index.');
const is_page = path.extname(basename) === '.html'; const is_page = ext === '.html';
parts.forEach(part => { parts.forEach(part => {
if (/\]\[/.test(part.content)) { if (/\]\[/.test(part.content)) {
@@ -57,6 +60,7 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
is_page is_page
}; };
}) })
.filter(Boolean)
.sort(comparator); .sort(comparator);
items.forEach(item => { items.forEach(item => {

33
test/unit/create_manifest_data/index.ts
View File

@@ -1,10 +1,10 @@
import * as path from 'path'; import * as path from 'path';
import * as assert from 'assert'; import * as assert from 'assert';
import manifest_data from '../../../src/core/create_manifest_data'; import create_manifest_data from '../../../src/core/create_manifest_data';
describe('manifest_data', () => { describe('manifest_data', () => {
it('creates routes', () => { it('creates routes', () => {
const { components, pages, server_routes } = manifest_data(path.join(__dirname, 'samples/basic')); const { components, pages, server_routes } = create_manifest_data(path.join(__dirname, 'samples/basic'));
const index = { name: 'index', file: 'index.html' }; const index = { name: 'index', file: 'index.html' };
const about = { name: 'about', file: 'about.html' }; const about = { name: 'about', file: 'about.html' };
@@ -68,7 +68,7 @@ describe('manifest_data', () => {
}); });
it('encodes invalid characters', () => { it('encodes invalid characters', () => {
const { components, pages } = manifest_data(path.join(__dirname, 'samples/encoding')); const { components, pages } = create_manifest_data(path.join(__dirname, 'samples/encoding'));
// had to remove ? and " because windows // had to remove ? and " because windows
@@ -90,7 +90,7 @@ describe('manifest_data', () => {
}); });
it('allows regex qualifiers', () => { it('allows regex qualifiers', () => {
const { pages } = manifest_data(path.join(__dirname, 'samples/qualifiers')); const { pages } = create_manifest_data(path.join(__dirname, 'samples/qualifiers'));
assert.deepEqual(pages.map(p => p.pattern), [ assert.deepEqual(pages.map(p => p.pattern), [
/^\/([0-9-a-z]{3,})\/?$/, /^\/([0-9-a-z]{3,})\/?$/,
@@ -100,7 +100,7 @@ describe('manifest_data', () => {
}); });
it('sorts routes correctly', () => { it('sorts routes correctly', () => {
const { pages } = manifest_data(path.join(__dirname, 'samples/sorting')); const { pages } = create_manifest_data(path.join(__dirname, 'samples/sorting'));
assert.deepEqual(pages.map(p => p.parts.map(part => part && part.component.file)), [ assert.deepEqual(pages.map(p => p.parts.map(part => part && part.component.file)), [
['index.html'], ['index.html'],
@@ -116,7 +116,7 @@ describe('manifest_data', () => {
}); });
it('ignores files and directories with leading underscores', () => { it('ignores files and directories with leading underscores', () => {
const { server_routes } = manifest_data(path.join(__dirname, 'samples/hidden-underscore')); const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-underscore'));
assert.deepEqual(server_routes.map(r => r.file), [ assert.deepEqual(server_routes.map(r => r.file), [
'index.js', 'index.js',
@@ -125,7 +125,7 @@ describe('manifest_data', () => {
}); });
it('ignores files and directories with leading dots except .well-known', () => { it('ignores files and directories with leading dots except .well-known', () => {
const { server_routes } = manifest_data(path.join(__dirname, 'samples/hidden-dot')); const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-dot'));
assert.deepEqual(server_routes.map(r => r.file), [ assert.deepEqual(server_routes.map(r => r.file), [
'.well-known/dnt-policy.txt.js' '.well-known/dnt-policy.txt.js'
@@ -134,24 +134,35 @@ describe('manifest_data', () => {
it('fails on clashes', () => { it('fails on clashes', () => {
assert.throws(() => { assert.throws(() => {
const { pages } = manifest_data(path.join(__dirname, 'samples/clash-pages')); const { pages } = create_manifest_data(path.join(__dirname, 'samples/clash-pages'));
}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/); }, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
assert.throws(() => { assert.throws(() => {
const { server_routes } = manifest_data(path.join(__dirname, 'samples/clash-routes')); const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/clash-routes'));
console.log(server_routes); console.log(server_routes);
}, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/); }, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/);
}); });
it('fails if dynamic params are not separated', () => { it('fails if dynamic params are not separated', () => {
assert.throws(() => { assert.throws(() => {
manifest_data(path.join(__dirname, 'samples/invalid-params')); create_manifest_data(path.join(__dirname, 'samples/invalid-params'));
}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/); }, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
}); });
it('errors when trying to use reserved characters in route regexp', () => { it('errors when trying to use reserved characters in route regexp', () => {
assert.throws(() => { assert.throws(() => {
manifest_data(path.join(__dirname, 'samples/invalid-qualifier')); create_manifest_data(path.join(__dirname, 'samples/invalid-qualifier'));
}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/); }, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
}); });
it('ignores things that look like lockfiles' , () => {
const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/lockfiles'));
assert.deepEqual(server_routes, [{
file: 'foo.js',
name: 'route_foo',
params: [],
pattern: /^\/foo$/
}]);
});
}); });

0
test/unit/create_manifest_data/samples/lockfiles/foo.js Normal file
View File

0
test/unit/create_manifest_data/samples/lockfiles/foo.js_tmp Normal file
View File