From fa460a2989cb7646937a0827dfb3f4f00ce0dcac Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 28 Jun 2018 11:48:18 -0400
Subject: [PATCH 1/4] replace 4xx and 5xx with _error, per 0.14

---
 routes/5xx.html                  | 22 ----------------------
 routes/{4xx.html => _error.html} |  8 +++-----
 routes/blog/[slug].html          | 17 ++++++++++-------
 routes/blog/[slug].json.js       | 12 +++++++++---
 4 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100644 routes/5xx.html
 rename routes/{4xx.html => _error.html} (66%)

diff --git a/routes/5xx.html b/routes/5xx.html
deleted file mode 100644
index 7f008e0..0000000
--- a/routes/5xx.html
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/routes/4xx.html b/routes/_error.html
similarity index 66%
rename from routes/4xx.html
rename to routes/_error.html
index 9ff1ae7..72b3395 100644
--- a/routes/4xx.html
+++ b/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;
 	}
diff --git a/routes/blog/[slug].html b/routes/blog/[slug].html
index 61f4a97..27354be 100644
--- a/routes/blog/[slug].html
+++ b/routes/blog/[slug].html
@@ -46,14 +46,17 @@
 
 <script>
 	export default {
-		preload({ params, query }) {
-			// the `slug` parameter is available because this file
-			// is called [slug].html
-			const { slug } = params;
+		async preload({ params, query }) {
+			// the `slug` parameter is available because
+			// this file is called [slug].html
+			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 => {
-				return { post };
-			});
+			if (res.status === 200) {
+				return { post: data };
+			} else {
+				this.error(res.status, data.message);
+			}
 		}
 	};
 </script>
\ No newline at end of file
diff --git a/routes/blog/[slug].json.js b/routes/blog/[slug].json.js
index cd8ab53..176890d 100644
--- a/routes/blog/[slug].json.js
+++ b/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
-	// is called [slug].json.js
+	// the `slug` parameter is available because
+	// 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`
+		}));
 	}
 }

From 6d86b00c2628624a31429c5e7308402140892fc6 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 28 Jun 2018 13:24:06 -0400
Subject: [PATCH 2/4] move file

---
 routes/{blog.json.js => blog/index.json.js} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename routes/{blog.json.js => blog/index.json.js} (85%)

diff --git a/routes/blog.json.js b/routes/blog/index.json.js
similarity index 85%
rename from routes/blog.json.js
rename to routes/blog/index.json.js
index 0556da5..bfd9389 100644
--- a/routes/blog.json.js
+++ b/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 {

From c9275b441db4c3ef49bd620b79c9f2bb85de299f Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 28 Jun 2018 13:36:46 -0400
Subject: [PATCH 3/4] update sapper

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6ae7f4e..cf2cdd1 100644
--- a/package.json
+++ b/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": {

From 520f22af2f8f0f64edd2958b56dd76c0809d532c Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 28 Jun 2018 13:43:30 -0400
Subject: [PATCH 4/4] update cypress config

---
 cypress.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress.json b/cypress.json
index 27d948e..f5622fa 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,4 +1,4 @@
 {
 	"baseUrl": "http://localhost:3000",
-	"videoRecording": false
+	"video": false
 }
\ No newline at end of file