Compare commits

...

17 Commits

Author SHA1 Message Date
Rich Harris
09b4dc1b9a -> v0.14.0 2018-06-28 13:35:21 -04:00
Rich Harris
bdd5a54527 Merge pull request #301 from sveltejs/gh-297
treat foo/index.json.js as foo.json.js
2018-06-28 13:27:57 -04:00
Rich Harris
b7bb4db8c1 treat foo/index.json.js as foo.json.js - fixes #297 2018-06-28 13:20:41 -04:00
Rich Harris
5b5f33d3cf error on 4xx.html and 5xx.html 2018-06-28 12:57:59 -04:00
Rich Harris
9611656b76 Merge pull request #300 from sveltejs/gh-293
[WIP] simplify rendering of error pages
2018-06-28 12:52:41 -04:00
Rich Harris
e9a71774d5 Merge pull request #299 from sveltejs/gh-270
return a Promise from goto
2018-06-28 12:18:32 -04:00
Rich Harris
2205b8aec5 oops 2018-06-28 12:03:27 -04:00
Rich Harris
5c4e4d5d36 only navigate if route is found - fixes #279 2018-06-28 11:45:38 -04:00
Rich Harris
e87247493f replace 4xx.html and 5xx.html with _error.html 2018-06-28 11:38:21 -04:00
Rich Harris
0aeb63a05b simplify rendering of error pages 2018-06-27 18:35:41 -04:00
Rich Harris
57eeb5659a return a Promise from goto - fixes #270 2018-06-27 17:32:20 -04:00
Rich Harris
f821c19528 -> v0.13.6 2018-06-27 17:20:45 -04:00
Rich Harris
b9a120164a Merge pull request #298 from sveltejs/gh-296
fix req.baseUrl synthesis
2018-06-27 17:19:55 -04:00
Rich Harris
087356f781 fix req.baseUrl synthesis 2018-06-27 16:57:04 -04:00
Rich Harris
31110a5326 -> v0.13.5 2018-06-26 18:30:46 -04:00
Rich Harris
667a68768c Merge pull request #294 from sveltejs/gh-289
fix handling of fatal errors
2018-06-26 18:29:56 -04:00
Rich Harris
5075981a90 fix handling of fatal errors - fixes #289 2018-06-26 13:49:11 -04:00
16 changed files with 168 additions and 142 deletions

View File

@@ -1,5 +1,21 @@
# sapper changelog # sapper changelog
## 0.14.0
* `4xx.html` and `5xx.html` are replaced with `_error.html` ([#209](https://github.com/sveltejs/sapper/issues/209))
* Treat `foo/index.json.js` and `foo.json.js` as equivalents ([#297](https://github.com/sveltejs/sapper/issues/297))
* Return a promise from `goto` ([#270](https://github.com/sveltejs/sapper/issues/270))
* Use store when rendering error pages ([#293](https://github.com/sveltejs/sapper/issues/293))
* Prevent console errors when visiting an error page ([#279](https://github.com/sveltejs/sapper/issues/279))
## 0.13.6
* Fix `baseUrl` synthesis ([#296](https://github.com/sveltejs/sapper/issues/296))
## 0.13.5
* Fix handling of fatal errors ([#289](https://github.com/sveltejs/sapper/issues/289))
## 0.13.4 ## 0.13.4
* Focus `<body>` after navigation ([#287](https://github.com/sveltejs/sapper/issues/287)) * Focus `<body>` after navigation ([#287](https://github.com/sveltejs/sapper/issues/287))

View File

@@ -1,6 +1,6 @@
{ {
"name": "sapper", "name": "sapper",
"version": "0.13.4", "version": "0.14.0",
"description": "Military-grade apps, engineered by Svelte", "description": "Military-grade apps, engineered by Svelte",
"main": "dist/middleware.ts.js", "main": "dist/middleware.ts.js",
"bin": { "bin": {

View File

@@ -33,6 +33,7 @@ class Watcher extends EventEmitter {
server: Deferred; server: Deferred;
}; };
crashed: boolean;
restarting: boolean; restarting: boolean;
current_build: { current_build: {
changed: Set<string>; changed: Set<string>;
@@ -130,10 +131,16 @@ class Watcher extends EventEmitter {
// TODO watch the configs themselves? // TODO watch the configs themselves?
const compilers = create_compilers({ webpack: this.dirs.webpack }); const compilers = create_compilers({ webpack: this.dirs.webpack });
let log = '';
const emitFatal = () => { const emitFatal = () => {
this.emit('fatal', <events.FatalEvent>{ this.emit('fatal', <events.FatalEvent>{
message: `Server crashed` message: `Server crashed`,
log
}); });
this.crashed = true;
this.proc = null;
}; };
this.watch(compilers.server, { this.watch(compilers.server, {
@@ -149,18 +156,30 @@ class Watcher extends EventEmitter {
this.deferreds.client.promise.then(() => { this.deferreds.client.promise.then(() => {
const restart = () => { const restart = () => {
ports.wait(this.port).then((() => { log = '';
this.emit('ready', <events.ReadyEvent>{ this.crashed = false;
port: this.port,
process: this.proc
});
this.deferreds.server.fulfil(); ports.wait(this.port)
.then((() => {
this.emit('ready', <events.ReadyEvent>{
port: this.port,
process: this.proc
});
this.dev_server.send({ this.deferreds.server.fulfil();
status: 'completed'
this.dev_server.send({
status: 'completed'
});
}))
.catch(err => {
if (this.crashed) return;
this.emit('fatal', <events.FatalEvent>{
message: `Server is not listening on port ${this.port}`,
log
});
}); });
}));
}; };
if (this.proc) { if (this.proc) {
@@ -180,10 +199,12 @@ class Watcher extends EventEmitter {
}); });
this.proc.stdout.on('data', chunk => { this.proc.stdout.on('data', chunk => {
log += chunk;
this.emit('stdout', chunk); this.emit('stdout', chunk);
}); });
this.proc.stderr.on('data', chunk => { this.proc.stderr.on('data', chunk => {
log += chunk;
this.emit('stderr', chunk); this.emit('stderr', chunk);
}); });
@@ -301,7 +322,7 @@ class Watcher extends EventEmitter {
if (err) { if (err) {
this.emit('error', <events.ErrorEvent>{ this.emit('error', <events.ErrorEvent>{
type: name, type: name,
error: err message: err.message
}); });
} else { } else {
const messages = format_messages(stats); const messages = format_messages(stats);

View File

@@ -12,6 +12,7 @@ export type ErrorEvent = {
export type FatalEvent = { export type FatalEvent = {
message: string; message: string;
log?: string;
}; };
export type InvalidEvent = { export type InvalidEvent = {

View File

@@ -36,11 +36,12 @@ export function dev(opts: { port: number, open: boolean }) {
watcher.on('error', (event: events.ErrorEvent) => { watcher.on('error', (event: events.ErrorEvent) => {
console.log(`${colors.red(`${event.type}`)}`); console.log(`${colors.red(`${event.type}`)}`);
console.log(`${colors.red(event.error.message)}`); console.log(`${colors.red(event.message)}`);
}); });
watcher.on('fatal', (event: events.FatalEvent) => { watcher.on('fatal', (event: events.FatalEvent) => {
console.log(`${colors.bold.red(`> ${event.error.message}`)}`); console.log(`${colors.bold.red(`> ${event.message}`)}`);
if (event.log) console.log(event.log);
}); });
watcher.on('build', (event: events.BuildEvent) => { watcher.on('build', (event: events.BuildEvent) => {

View File

@@ -52,8 +52,8 @@ function generate_client(routes: Route[], path_to_routes: string, dev_port?: num
const file = posixify(`${path_to_routes}/${page.file}`); const file = posixify(`${path_to_routes}/${page.file}`);
if (route.id === '_4xx' || route.id === '_5xx') { if (route.id === '_error') {
return `{ error: '${route.id.slice(1)}', load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`; return `{ error: true, load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`;
} }
const params = route.params.length === 0 const params = route.params.length === 0
@@ -107,8 +107,8 @@ function generate_server(routes: Route[], path_to_routes: string) {
`{ type: '${type}', module: ${route.id}${index} }`) `{ type: '${type}', module: ${route.id}${index} }`)
.join(', '); .join(', ');
if (route.id === '_4xx' || route.id === '_5xx') { if (route.id === '_error') {
return `{ error: '${route.id.slice(1)}', handlers: [${handlers}] }`; return `{ error: true, handlers: [${handlers}] }`;
} }
const params = route.params.length === 0 const params = route.params.length === 0

View File

@@ -5,17 +5,22 @@ import { Route } from '../interfaces';
export default function create_routes({ files } = { files: glob.sync('**/*.*', { cwd: locations.routes(), dot: true, nodir: true }) }) { export default function create_routes({ files } = { files: glob.sync('**/*.*', { cwd: locations.routes(), dot: true, nodir: true }) }) {
const routes: Route[] = files const routes: Route[] = files
.filter((file: string) => !/(^|\/|\\)_/.test(file)) .filter((file: string) => !/(^|\/|\\)(_(?!error\.html)|\.(?!well-known))/.test(file))
.map((file: string) => { .map((file: string) => {
if (/(^|\/|\\)(_|\.(?!well-known))/.test(file)) return;
if (/]\[/.test(file)) { if (/]\[/.test(file)) {
throw new Error(`Invalid route ${file} — parameters must be separated`); throw new Error(`Invalid route ${file} — parameters must be separated`);
} }
if (file === '4xx.html' || file === '5xx.html') {
throw new Error('As of Sapper 0.14, 4xx.html and 5xx.html should be replaced with _error.html');
}
const base = file.replace(/\.[^/.]+$/, ''); const base = file.replace(/\.[^/.]+$/, '');
const parts = base.split('/'); // glob output is always posix-style const parts = base.split('/'); // glob output is always posix-style
if (parts[parts.length - 1] === 'index') parts.pop(); if (/^index(\..+)?/.test(parts[parts.length - 1])) {
const part = parts.pop();
if (parts.length > 0) parts[parts.length - 1] += part.slice(5);
}
return { return {
files: [file], files: [file],
@@ -30,8 +35,8 @@ export default function create_routes({ files } = { files: glob.sync('**/*.*', {
return !found; return !found;
}) })
.sort((a, b) => { .sort((a, b) => {
if (a.parts[0] === '4xx' || a.parts[0] === '5xx') return -1; if (a.parts[0] === '_error') return -1;
if (b.parts[0] === '4xx' || b.parts[0] === '5xx') return 1; if (b.parts[0] === '_error') return 1;
const max = Math.max(a.parts.length, b.parts.length); const max = Math.max(a.parts.length, b.parts.length);

View File

@@ -61,8 +61,13 @@ export default function middleware({ App, routes, store }: {
const middleware = compose_handlers([ const middleware = compose_handlers([
(req: Req, res: ServerResponse, next: () => void) => { (req: Req, res: ServerResponse, next: () => void) => {
if (req.baseUrl === undefined) { if (req.baseUrl === undefined) {
req.baseUrl = req.originalUrl let { originalUrl } = req;
? req.originalUrl.slice(0, -req.url.length) if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {
originalUrl += '/';
}
req.baseUrl = originalUrl
? originalUrl.slice(0, -req.url.length)
: ''; : '';
} }
@@ -157,8 +162,12 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8') ? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8')
: (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8')); : (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8'));
function handle_route(route: RouteObject, req: Req, res: ServerResponse) { const error_route = routes.find((route: RouteObject) => route.error);
req.params = route.params(route.pattern.exec(req.path));
function handle_route(route: RouteObject, req: Req, res: ServerResponse, status = 200, error: Error | string = null) {
req.params = error
? {}
: route.params(route.pattern.exec(req.path));
const handlers = route.handlers[Symbol.iterator](); const handlers = route.handlers[Symbol.iterator]();
@@ -169,7 +178,14 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
const { value: handler, done } = handlers.next(); const { value: handler, done } = handlers.next();
if (done) { if (done) {
handle_error(req, res, 404, 'Not found'); if (route.error) {
// there was an error rendering the error page!
res.statusCode = status;
res.end(error instanceof Error ? error.message : error);
} else {
handle_route(error_route, req, res, 404, 'Not found');
}
return; return;
} }
@@ -181,7 +197,7 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
// preload main.js and current route // preload main.js and current route
// TODO detect other stuff we can preload? images, CSS, fonts? // TODO detect other stuff we can preload? images, CSS, fonts?
const link = [] const link = []
.concat(chunks.main, chunks[route.id]) .concat(chunks.main, chunks[route.id] || chunks._error) // TODO this is gross
.filter(file => !file.match(/\.map$/)) .filter(file => !file.match(/\.map$/))
.map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`) .map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`)
.join(', '); .join(', ');
@@ -191,8 +207,13 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
const store = store_getter ? store_getter(req) : null; const store = store_getter ? store_getter(req) : null;
const props = { params: req.params, query: req.query, path: req.path }; const props = { params: req.params, query: req.query, path: req.path };
if (route.error) {
props.error = error instanceof Error ? error : { message: error };
props.status = status;
}
let redirect: { statusCode: number, location: string }; let redirect: { statusCode: number, location: string };
let error: { statusCode: number, message: Error | string }; let preload_error: { statusCode: number, message: Error | string };
Promise.resolve( Promise.resolve(
mod.preload ? mod.preload.call({ mod.preload ? mod.preload.call({
@@ -200,7 +221,7 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
redirect = { statusCode, location }; redirect = { statusCode, location };
}, },
error: (statusCode: number, message: Error | string) => { error: (statusCode: number, message: Error | string) => {
error = { statusCode, message }; preload_error = { statusCode, message };
}, },
fetch: (url: string, opts?: any) => { fetch: (url: string, opts?: any) => {
const parsed = new URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl ? req.baseUrl + '/' :''}`); const parsed = new URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl ? req.baseUrl + '/' :''}`);
@@ -240,7 +261,7 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
store store
}, req) : {} }, req) : {}
).catch(err => { ).catch(err => {
error = { statusCode: 500, message: err }; preload_error = { statusCode: 500, message: err };
}).then(preloaded => { }).then(preloaded => {
if (redirect) { if (redirect) {
res.statusCode = redirect.statusCode; res.statusCode = redirect.statusCode;
@@ -250,8 +271,8 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
return; return;
} }
if (error) { if (preload_error) {
handle_error(req, res, error.statusCode, error.message); handle_route(error_route, req, res, preload_error.statusCode, preload_error.message);
return; return;
} }
@@ -289,6 +310,7 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
.replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`) .replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
.replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : '')); .replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : ''));
res.statusCode = status;
res.end(page); res.end(page);
if (process.send) { if (process.send) {
@@ -365,84 +387,25 @@ function get_route_handler(App: Component, routes: RouteObject[], store_getter:
} }
} }
} catch (error) { } catch (error) {
handle_error(req, res, 500, error); if (route.error) {
// there was an error rendering the error page!
res.statusCode = status;
res.end(error instanceof Error ? error.message : error);
} else {
handle_route(error_route, req, res, 500, error || 'Internal server error');
}
} }
} }
next(); next();
} }
const not_found_route = routes.find((route: RouteObject) => route.error === '4xx');
const error_route = routes.find((route: RouteObject) => route.error === '5xx');
function handle_error(req: Req, res: ServerResponse, statusCode: number, message: Error | string) {
res.statusCode = statusCode;
res.setHeader('Content-Type', 'text/html');
const error = message instanceof Error ? message : new Error(message);
const not_found = statusCode >= 400 && statusCode < 500;
const route = not_found
? not_found_route
: error_route;
function render_page({ head, css, html }) {
const page = template()
.replace('%sapper.base%', `<base href="${req.baseUrl}/">`)
.replace('%sapper.scripts%', `<script>__SAPPER__={baseUrl: "${req.baseUrl}"}</script><script src='${req.baseUrl}/client/${get_chunks().main}'></script>`)
.replace('%sapper.html%', html)
.replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
.replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : ''));
res.end(page);
}
function handle_notfound() {
const title: string = not_found
? 'Not found'
: `Internal server error: ${error.message}`;
render_page({ head: '', css: null, html: title });
}
if (route) {
const handlers = route.handlers[Symbol.iterator]();
function next() {
const { value: handler, done } = handlers.next();
if (done) {
handle_notfound();
} else if (handler.type === 'page') {
render_page(handler.module.render({
status: statusCode,
error
}, {
store: store_getter && store_getter(req)
}));
} else {
const handle_method = mod[method_export];
if (handle_method) {
handle_method(req, res, next);
} else {
next();
}
}
}
next();
} else {
handle_notfound();
}
}
return function find_route(req: Req, res: ServerResponse) { return function find_route(req: Req, res: ServerResponse) {
for (const route of routes) { for (const route of routes) {
if (!route.error && route.pattern.test(req.path)) return handle_route(route, req, res); if (!route.error && route.pattern.test(req.path)) return handle_route(route, req, res);
} }
handle_error(req, res, 404, 'Not found'); handle_route(error_route, req, res, 404, 'Not found');
}; };
} }

View File

@@ -8,7 +8,7 @@ export let component: Component;
let target: Node; let target: Node;
let store: Store; let store: Store;
let routes: Route[]; let routes: Route[];
let errors: { '4xx': Route, '5xx': Route }; let error_route: Route;
const history = typeof window !== 'undefined' ? window.history : { const history = typeof window !== 'undefined' ? window.history : {
pushState: (state: any, title: string, href: string) => {}, pushState: (state: any, title: string, href: string) => {},
@@ -117,11 +117,7 @@ function prepare_route(Page: ComponentConstructor, props: RouteData) {
error = { statusCode: 500, message: err }; error = { statusCode: 500, message: err };
}).then(preloaded => { }).then(preloaded => {
if (error) { if (error) {
const route = error.statusCode >= 400 && error.statusCode < 500 return error_route.load().then(({ default: Page }: { default: ComponentConstructor }) => {
? errors['4xx']
: errors['5xx'];
return route.load().then(({ default: Page }: { default: ComponentConstructor }) => {
const err = error.message instanceof Error ? error.message : new Error(error.message); const err = error.message instanceof Error ? error.message : new Error(error.message);
Object.assign(props, { status: error.statusCode, error: err }); Object.assign(props, { status: error.statusCode, error: err });
return { Page, props, redirect: null }; return { Page, props, redirect: null };
@@ -133,7 +129,7 @@ function prepare_route(Page: ComponentConstructor, props: RouteData) {
}); });
} }
function navigate(target: Target, id: number) { function navigate(target: Target, id: number): Promise<any> {
if (id) { if (id) {
// popstate or initial navigation // popstate or initial navigation
cid = id; cid = id;
@@ -212,7 +208,11 @@ function handle_popstate(event: PopStateEvent) {
if (event.state) { if (event.state) {
const url = new URL(window.location.href); const url = new URL(window.location.href);
const target = select_route(url); const target = select_route(url);
navigate(target, event.state.id); if (target) {
navigate(target, event.state.id);
} else {
window.location.href = window.location.href;
}
} else { } else {
// hashchange // hashchange
cid = ++uid; cid = ++uid;
@@ -262,10 +262,7 @@ export function init(opts: { App: ComponentConstructor, target: Node, routes: Ro
App = opts.App; App = opts.App;
target = opts.target; target = opts.target;
routes = opts.routes.filter(r => !r.error); routes = opts.routes.filter(r => !r.error);
errors = { error_route = opts.routes.find(r => r.error);
'4xx': opts.routes.find(r => r.error === '4xx'),
'5xx': opts.routes.find(r => r.error === '5xx')
};
if (opts && opts.store) { if (opts && opts.store) {
store = opts.store(manifest.store); store = opts.store(manifest.store);
@@ -293,19 +290,23 @@ export function init(opts: { App: ComponentConstructor, target: Node, routes: Ro
history.replaceState({ id: uid }, '', href); history.replaceState({ id: uid }, '', href);
const target = select_route(new URL(window.location.href)); const target = select_route(new URL(window.location.href));
return navigate(target, uid); if (target) return navigate(target, uid);
}); });
} }
export function goto(href: string, opts = { replaceState: false }) { export function goto(href: string, opts = { replaceState: false }) {
const target = select_route(new URL(href, document.baseURI)); const target = select_route(new URL(href, document.baseURI));
let promise;
if (target) { if (target) {
navigate(target, null); promise = navigate(target, null);
if (history) history[opts.replaceState ? 'replaceState' : 'pushState']({ id: cid }, '', href); if (history) history[opts.replaceState ? 'replaceState' : 'pushState']({ id: cid }, '', href);
} else { } else {
window.location.href = href; window.location.href = href;
promise = new Promise(f => {}); // never resolves
} }
return promise;
} }
export function prefetchRoutes(pathnames: string[]) { export function prefetchRoutes(pathnames: string[]) {

View File

@@ -17,7 +17,7 @@ export interface Component {
export type Route = { export type Route = {
pattern: RegExp; pattern: RegExp;
load: () => Promise<{ default: ComponentConstructor }>; load: () => Promise<{ default: ComponentConstructor }>;
error?: string; error?: boolean;
params?: (match: RegExpExecArray) => Record<string, string>; params?: (match: RegExpExecArray) => Record<string, string>;
ignore?: boolean; ignore?: boolean;
}; };

View File

@@ -1,6 +0,0 @@
<svelte:head>
<title>Internal server error</title>
</svelte:head>
<h1>Internal server error</h1>
<p>{error.message}</p>

View File

@@ -2,5 +2,5 @@
<title>{status}</title> <title>{status}</title>
</svelte:head> </svelte:head>
<h1>Not found</h1> <h1>{status}</h1>
<p>{error.message}</p> <p>{error.message}</p>

View File

@@ -6,15 +6,21 @@
<p>This is the 'about' page. There's not much here.</p> <p>This is the 'about' page. There's not much here.</p>
<button class='goto' on:click='goto("blog/what-is-sapper")'>What is Sapper?</button>
<button class='prefetch' on:click='prefetch("blog/why-the-name")'>Why the name?</button> <button class='prefetch' on:click='prefetch("blog/why-the-name")'>Why the name?</button>
<script> <script>
import { goto, prefetch } from '../../../runtime.js'; import { goto, prefetch } from '../../../runtime.js';
export default { export default {
oncreate() {
window.goto = goto;
},
ondestroy() {
window.goto = null;
},
methods: { methods: {
goto,
prefetch prefetch
} }
}; };

View File

@@ -1,4 +1,4 @@
import posts from './blog/_posts.js'; import posts from './_posts.js';
const contents = JSON.stringify(posts.map(post => { const contents = JSON.stringify(posts.map(post => {
return { return {

View File

@@ -281,9 +281,7 @@ function run({ mode, basepath = '' }) {
return nightmare return nightmare
.goto(`${base}/about`) .goto(`${base}/about`)
.init() .init()
.click('.goto') .evaluate(() => window.goto('blog/what-is-sapper'))
.wait(url => window.location.pathname === url, `${basepath}/blog/what-is-sapper`)
.wait(100)
.title() .title()
.then(title => { .then(title => {
assert.equal(title, 'What is Sapper?'); assert.equal(title, 'What is Sapper?');
@@ -441,7 +439,7 @@ function run({ mode, basepath = '' }) {
}) })
.then(() => nightmare.page.title()) .then(() => nightmare.page.title())
.then(title => { .then(title => {
assert.equal(title, 'Not found') assert.equal(title, '404')
}); });
}); });
@@ -456,7 +454,7 @@ function run({ mode, basepath = '' }) {
}) })
.then(() => nightmare.page.title()) .then(() => nightmare.page.title())
.then(title => { .then(title => {
assert.equal(title, 'Not found'); assert.equal(title, '404');
}); });
}); });
@@ -468,7 +466,7 @@ function run({ mode, basepath = '' }) {
}) })
.then(() => nightmare.page.title()) .then(() => nightmare.page.title())
.then(title => { .then(title => {
assert.equal(title, 'Internal server error') assert.equal(title, '500')
}); });
}); });
@@ -483,7 +481,7 @@ function run({ mode, basepath = '' }) {
}) })
.then(() => nightmare.page.title()) .then(() => nightmare.page.title())
.then(title => { .then(title => {
assert.equal(title, 'Internal server error'); assert.equal(title, '500');
}); });
}); });

View File

@@ -71,8 +71,7 @@ describe('create_routes', () => {
'blog/[slug].html', 'blog/[slug].html',
'api/gists/[id].js', 'api/gists/[id].js',
'api/gists/index.js', 'api/gists/index.js',
'4xx.html', '_error.html',
'5xx.html',
'blog/index.html', 'blog/index.html',
'blog/rss.xml.js', 'blog/rss.xml.js',
'guide/index.html', 'guide/index.html',
@@ -83,8 +82,7 @@ describe('create_routes', () => {
assert.deepEqual( assert.deepEqual(
routes.map(r => r.handlers[0].file), routes.map(r => r.handlers[0].file),
[ [
'4xx.html', '_error.html',
'5xx.html',
'index.html', 'index.html',
'guide/index.html', 'guide/index.html',
'blog/index.html', 'blog/index.html',
@@ -99,8 +97,7 @@ describe('create_routes', () => {
routes = create_routes({ routes = create_routes({
files: [ files: [
'4xx.html', '_error.html',
'5xx.html',
'api/blog/[slug].js', 'api/blog/[slug].js',
'api/blog/index.js', 'api/blog/index.js',
'api/guide/contents.js', 'api/guide/contents.js',
@@ -119,8 +116,7 @@ describe('create_routes', () => {
assert.deepEqual( assert.deepEqual(
routes.map(r => r.handlers[0].file), routes.map(r => r.handlers[0].file),
[ [
'4xx.html', '_error.html',
'5xx.html',
'index.html', 'index.html',
'guide/index.html', 'guide/index.html',
'blog/index.html', 'blog/index.html',
@@ -284,4 +280,28 @@ describe('create_routes', () => {
}); });
}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/); }, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
}); });
it('errors on 4xx.html', () => {
assert.throws(() => {
create_routes({
files: ['4xx.html']
});
}, /As of Sapper 0.14, 4xx.html and 5xx.html should be replaced with _error.html/);
});
it('errors on 5xx.html', () => {
assert.throws(() => {
create_routes({
files: ['5xx.html']
});
}, /As of Sapper 0.14, 4xx.html and 5xx.html should be replaced with _error.html/);
});
it('treats foo/index.json.js the same as foo.json.js', () => {
const route = create_routes({
files: ['foo/index.json.js']
})[0];
assert.ok(route.test('/foo.json'));
});
}); });