From 156d7b0f2c172edc49f3ad5cb19df0c2a373807e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20T=C3=B6rnqvist?= <carl@tornqv.ist>
Date: Tue, 11 Jun 2019 16:20:11 +0200
Subject: [PATCH 1/3] Update choo

---
 package.json | 13 ++++++++-----
 ssr/choo.js  |  8 ++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index a56ef3c4..95acc407 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,9 @@
     "debug": "DEBUG='*' ./bin.js start -q example"
   },
   "keywords": [],
+  "peerDependencies": {
+    "choo": "7.x"
+  },
   "dependencies": {
     "@choojs/findup": "^0.2.0",
     "ansi-diff": "^1.0.10",
@@ -53,7 +56,7 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "nanohtml": "^1.2.4",
-    "nanologger": "^1.3.1",
+    "nanologger": "^2.0.0",
     "nanoraf": "^3.0.1",
     "nanotiming": "^7.2.0",
     "on-idle": "^3.1.4",
@@ -82,14 +85,14 @@
     "v8-compile-cache": "^2.0.0",
     "wasm-brotli": "^1.0.2",
     "watchify": "^3.10.0",
-    "wayfarer": "^6.6.3"
+    "wayfarer": "^7.0.0"
   },
   "devDependencies": {
     "a-module-with-babelrc": "^1.0.0",
     "assert-html": "^1.1.5",
-    "choo": "^6.8.0",
-    "choo-devtools": "^2.3.3",
-    "choo-service-worker": "^2.4.0",
+    "choo": "^7.0.0",
+    "choo-devtools": "^3.0.0",
+    "choo-service-worker": "^3.0.0",
     "read-file-tree": "^1.1.0",
     "standard": "^11.0",
     "tachyons": "^4.9.1",
diff --git a/ssr/choo.js b/ssr/choo.js
index 419cbe08..cef2452b 100644
--- a/ssr/choo.js
+++ b/ssr/choo.js
@@ -55,10 +55,6 @@ module.exports.listRoutes = function (app) {
 //
 // NOTE: state is never passed in it seems. Funky fn signature, this should be
 // fixed.
-//
-// NOTE: Choo currently doesn't use the passed-in state as the base. It probably
-// should, so we can treat the state as the only stateful bits, and the rest is
-// just context.
 
 module.exports.render = function (app, route, cb) {
   var state = {}
@@ -80,8 +76,8 @@ module.exports.render = function (app, route, cb) {
     var res = { state: state }
     res.body = app.toString(route, state)
     delete res.state._experimental_prefetch // State needs to be serializable.
-    if (app.state.title) res.title = app.state.title
-    if (app.state.language) res.language = app.state.language
+    if (state.title) res.title = state.title
+    if (state.language) res.language = state.language
     if (app.selector) res.selector = app.selector
     cb(null, res)
   }

From 116734723d6ae961c9c622cea6506d48d30dc41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20T=C3=B6rnqvist?= <carl@tornqv.ist>
Date: Sat, 10 Aug 2019 14:24:26 +0200
Subject: [PATCH 2/3] Remove choo peerDependency

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index 95acc407..09d568f6 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,6 @@
     "debug": "DEBUG='*' ./bin.js start -q example"
   },
   "keywords": [],
-  "peerDependencies": {
-    "choo": "7.x"
-  },
   "dependencies": {
     "@choojs/findup": "^0.2.0",
     "ansi-diff": "^1.0.10",

From 0dd2c42e68cacccae5f4359a658417c6fdf62a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20T=C3=B6rnqvist?= <carl@tornqv.ist>
Date: Sat, 10 Aug 2019 14:24:54 +0200
Subject: [PATCH 3/3] Add support for choo@6

---
 ssr/choo.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ssr/choo.js b/ssr/choo.js
index cef2452b..267d0048 100644
--- a/ssr/choo.js
+++ b/ssr/choo.js
@@ -76,8 +76,10 @@ module.exports.render = function (app, route, cb) {
     var res = { state: state }
     res.body = app.toString(route, state)
     delete res.state._experimental_prefetch // State needs to be serializable.
-    if (state.title) res.title = state.title
-    if (state.language) res.language = state.language
+    var title = state.title || app.state.title // Support for choo@6
+    var lang = state.language || app.state.language // Support for choo@6
+    if (title) res.title = title
+    if (lang) res.language = lang
     if (app.selector) res.selector = app.selector
     cb(null, res)
   }