From a7cb0191026c790b8587be9329e3ee1cee8b21ca Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 19 Apr 2018 11:05:29 -0400
Subject: [PATCH] update to v2

---
 package.json                   |  2 +-
 routes/4xx.html                |  4 ++--
 routes/5xx.html                |  4 ++--
 routes/_components/Layout.html |  2 +-
 routes/_components/Nav.html    |  6 +++---
 routes/about.html              |  4 ++--
 routes/blog/[slug].html        | 10 +++++-----
 routes/blog/index.html         | 10 +++++-----
 routes/index.html              |  4 ++--
 webpack/client.config.js       |  2 --
 webpack/server.config.js       |  2 --
 11 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 7830d21..b62a1e3 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "polka": "^0.3.4",
     "sapper": "^0.10.0",
     "serve-static": "^1.13.1",
-    "svelte": "^1.57.3",
+    "svelte": "^2.0.0",
     "svelte-loader": "^2.3.3",
     "webpack": "^4.1.0"
   }
diff --git a/routes/4xx.html b/routes/4xx.html
index 0a98eb7..21d4dfa 100644
--- a/routes/4xx.html
+++ b/routes/4xx.html
@@ -1,6 +1,6 @@
-<:Head>
+<svelte:head>
 	<title>Not found</title>
-</:Head>
+</svelte:head>
 
 <Layout page='home'>
 	<h1>Not found</h1>
diff --git a/routes/5xx.html b/routes/5xx.html
index b920a35..bbd413b 100644
--- a/routes/5xx.html
+++ b/routes/5xx.html
@@ -1,6 +1,6 @@
-<:Head>
+<svelte:head>
 	<title>Internal server error</title>
-</:Head>
+</svelte:head>
 
 <Layout page='home'>
 	<h1>Internal server error</h1>
diff --git a/routes/_components/Layout.html b/routes/_components/Layout.html
index 64ac22e..f5e0742 100644
--- a/routes/_components/Layout.html
+++ b/routes/_components/Layout.html
@@ -1,4 +1,4 @@
-<Nav page={{page}}/>
+<Nav page={page}/>
 
 <main>
 	<slot></slot>
diff --git a/routes/_components/Nav.html b/routes/_components/Nav.html
index 522b1ab..699d59f 100644
--- a/routes/_components/Nav.html
+++ b/routes/_components/Nav.html
@@ -1,11 +1,11 @@
 <nav>
 	<ul>
-		<li><a class='{{page === "home"  ? "selected" : ""}}' href='.'>home</a></li>
-		<li><a class='{{page === "about"  ? "selected" : ""}}' href='about'>about</a></li>
+		<li><a class='{page === "home"  ? "selected" : ""}' href='.'>home</a></li>
+		<li><a class='{page === "about"  ? "selected" : ""}' href='about'>about</a></li>
 
 		<!-- for the blog link, we're using rel=prefetch so that Sapper prefetches
 		     the blog data when we hover over the link or tap it on a touchscreen -->
-		<li><a rel=prefetch class='{{page === "blog"  ? "selected" : ""}}' href='blog'>blog</a></li>
+		<li><a rel=prefetch class='{page === "blog"  ? "selected" : ""}' href='blog'>blog</a></li>
 	</ul>
 </nav>
 
diff --git a/routes/about.html b/routes/about.html
index 2ffb692..04597a2 100644
--- a/routes/about.html
+++ b/routes/about.html
@@ -1,6 +1,6 @@
-<:Head>
+<svelte:head>
 	<title>About</title>
-</:Head>
+</svelte:head>
 
 <Layout page='about'>
 	<h1>About this site</h1>
diff --git a/routes/blog/[slug].html b/routes/blog/[slug].html
index df17455..2d7ede7 100644
--- a/routes/blog/[slug].html
+++ b/routes/blog/[slug].html
@@ -1,12 +1,12 @@
-<:Head>
-	<title>{{post.title}}</title>
-</:Head>
+<svelte:head>
+	<title>{post.title}</title>
+</svelte:head>
 
 <Layout page='blog'>
-	<h1>{{post.title}}</h1>
+	<h1>{post.title}</h1>
 
 	<div class='content'>
-		{{{post.html}}}
+		{@html post.html}
 	</div>
 </Layout>
 
diff --git a/routes/blog/index.html b/routes/blog/index.html
index 1b5f62c..9c1dad8 100644
--- a/routes/blog/index.html
+++ b/routes/blog/index.html
@@ -1,18 +1,18 @@
-<:Head>
+<svelte:head>
 	<title>Blog</title>
-</:Head>
+</svelte:head>
 
 <Layout page='blog'>
 	<h1>Recent posts</h1>
 
 	<ul>
-		{{#each posts as post}}
+		{#each posts as post}
 			<!-- we're using the non-standard `rel=prefetch` attribute to
 			     tell Sapper to load the data for the page as soon as
 			     the user hovers over the link or taps it, instead of
 			     waiting for the 'click' event -->
-			<li><a rel='prefetch' href='blog/{{post.slug}}'>{{post.title}}</a></li>
-		{{/each}}
+			<li><a rel='prefetch' href='blog/{post.slug}'>{post.title}</a></li>
+		{/each}
 	</ul>
 </Layout>
 
diff --git a/routes/index.html b/routes/index.html
index 0b5f857..2118c60 100644
--- a/routes/index.html
+++ b/routes/index.html
@@ -1,6 +1,6 @@
-<:Head>
+<svelte:head>
 	<title>Sapper project template</title>
-</:Head>
+</svelte:head>
 
 <Layout page='home'>
 	<h1>Great success!</h1>
diff --git a/webpack/client.config.js b/webpack/client.config.js
index b8798da..259f24a 100644
--- a/webpack/client.config.js
+++ b/webpack/client.config.js
@@ -19,8 +19,6 @@ module.exports = {
 					loader: 'svelte-loader',
 					options: {
 						hydratable: true,
-						cascade: false,
-						store: true,
 						hotReload: true
 					}
 				}
diff --git a/webpack/server.config.js b/webpack/server.config.js
index e400d67..3e2d855 100644
--- a/webpack/server.config.js
+++ b/webpack/server.config.js
@@ -18,8 +18,6 @@ module.exports = {
 					loader: 'svelte-loader',
 					options: {
 						css: false,
-						cascade: false,
-						store: true,
 						generate: 'ssr'
 					}
 				}