Merge pull request #69 from sveltejs/0.14

[WIP] update for 0.14

cypress.json

@@ -1,4 +1,4 @@
 {
 	"baseUrl": "http://localhost:3000",
-	"videoRecording": false
+	"video": false
 }

package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "compression": "^1.7.1",
     "polka": "^0.4.0",
-    "sapper": "^0.13.0",
+    "sapper": "^0.14.0",
     "sirv": "^0.1.1"
   },
   "devDependencies": {

routes/5xx.html

@@ -1,22 +0,0 @@
-<svelte:head>
-	<title>Internal server error</title>
-</svelte:head>
-
-<h1>Internal server error</h1>
-
-<style>
-	h1 {
-		text-align: center;
-		margin: 0 auto;
-		font-size: 2.8em;
-		text-transform: uppercase;
-		font-weight: 700;
-		margin: 0 0 0.5em 0;
-	}
-
-	@media (min-width: 480px) {
-		h1 {
-			font-size: 4em;
-		}
-	}
-</style>

routes/_error.html

@@ -1,20 +1,18 @@
 <svelte:head>
-	<title>Not found</title>
+	<title>{status}</title>
 </svelte:head>
 
-<h1>Not found</h1>
+<h1>{status}</h1>
 
-<p>Please check the URL</p>
+<p>{error.message}</p>
 
 <style>
 	h1, p {
-		text-align: center;
 		margin: 0 auto;
 	}
 
 	h1 {
 		font-size: 2.8em;
-		text-transform: uppercase;
 		font-weight: 700;
 		margin: 0 0 0.5em 0;
 	}

routes/blog/[slug].html

@@ -46,14 +46,17 @@
 
 <script>
 	export default {
-		preload({ params, query }) {
+		async preload({ params, query }) {
-			// the `slug` parameter is available because this file
+			// the `slug` parameter is available because
-			// is called [slug].html
+			// this file is called [slug].html
-			const { slug } = params;
+			const res = await this.fetch(`blog/${params.slug}.json`);
+			const data = await res.json();
 
-			return this.fetch(`blog/${slug}.json`).then(r => r.json()).then(post => {
+			if (res.status === 200) {
-				return { post };
+				return { post: data };
-			});
+			} else {
+				this.error(res.status, data.message);
+			}
 		}
 	};
 </script>

routes/blog/[slug].json.js

@@ -6,8 +6,8 @@ posts.forEach(post => {
 });
 
 export function get(req, res, next) {
-	// the `slug` parameter is available because this file
+	// the `slug` parameter is available because
-	// is called [slug].json.js
+	// this file is called [slug].json.js
 	const { slug } = req.params;
 
 	if (lookup.has(slug)) {
@@ -17,6 +17,12 @@ export function get(req, res, next) {
 
 		res.end(lookup.get(slug));
 	} else {
-		next();
+		res.writeHead(404, {
+			'Content-Type': 'application/json'
+		});
+
+		res.end(JSON.stringify({
+			message: `Not found`
+		}));
 	}
 }

routes/blog/index.json.js

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