From 7303e811be7c25a7ece65ee7f637aaa1358c844f Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 3 May 2018 21:54:23 -0400
Subject: [PATCH] update tests, move test app to v2

---
 package.json                                     | 16 ++++++++--------
 test/app/routes/4xx.html                         |  8 ++++----
 test/app/routes/5xx.html                         |  6 +++---
 test/app/routes/about.html                       |  4 ++--
 test/app/routes/blog/[slug].html                 | 10 +++++-----
 test/app/routes/blog/index.html                  | 10 +++++-----
 test/app/routes/credentials/index.html           |  2 +-
 test/app/routes/index.html                       |  6 +++---
 test/app/routes/preload-values/custom-class.html |  2 +-
 test/app/routes/preload-values/set.html          |  2 +-
 test/app/routes/show-url.html                    |  2 +-
 test/app/routes/store.html                       |  2 +-
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 2d52c51..0108244 100644
--- a/package.json
+++ b/package.json
@@ -34,13 +34,13 @@
     "rimraf": "^2.6.2",
     "sade": "^1.4.0",
     "sander": "^0.6.0",
-    "source-map-support": "^0.5.4",
+    "source-map-support": "^0.5.5",
     "tslib": "^1.9.0",
     "url-parse": "^1.2.0",
     "webpack-format-messages": "^1.0.2"
   },
   "devDependencies": {
-    "@std/esm": "^0.25.3",
+    "@std/esm": "^0.26.0",
     "@types/glob": "^5.0.34",
     "@types/mkdirp": "^0.5.2",
     "@types/rimraf": "^2.0.2",
@@ -53,16 +53,16 @@
     "nightmare": "^3.0.0",
     "npm-run-all": "^4.1.2",
     "polka": "^0.3.4",
-    "rollup": "^0.57.0",
-    "rollup-plugin-commonjs": "^9.1.0",
+    "rollup": "^0.58.2",
+    "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-json": "^2.3.0",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-typescript": "^0.8.1",
     "serve-static": "^1.13.2",
-    "svelte": "^1.57.4",
-    "svelte-loader": "^2.5.1",
-    "ts-node": "^5.0.1",
-    "typescript": "^2.6.2",
+    "svelte": "^2.4.4",
+    "svelte-loader": "^2.9.0",
+    "ts-node": "^6.0.2",
+    "typescript": "^2.8.3",
     "walk-sync": "^0.3.2",
     "webpack": "^4.1.0"
   },
diff --git a/test/app/routes/4xx.html b/test/app/routes/4xx.html
index df21c6b..c63ca84 100644
--- a/test/app/routes/4xx.html
+++ b/test/app/routes/4xx.html
@@ -1,6 +1,6 @@
-<:Head>
-	<title>{{status}}</title>
-</:Head>
+<svelte:head>
+	<title>{status}</title>
+</svelte:head>
 
 <h1>Not found</h1>
-<p>{{error.message}}</p>
\ No newline at end of file
+<p>{error.message}</p>
\ No newline at end of file
diff --git a/test/app/routes/5xx.html b/test/app/routes/5xx.html
index 9208b04..1425e2a 100644
--- a/test/app/routes/5xx.html
+++ b/test/app/routes/5xx.html
@@ -1,6 +1,6 @@
-<:Head>
+<svelte:head>
 	<title>Internal server error</title>
-</:Head>
+</svelte:head>
 
 <h1>Internal server error</h1>
-<p>{{error.message}}</p>
\ No newline at end of file
+<p>{error.message}</p>
\ No newline at end of file
diff --git a/test/app/routes/about.html b/test/app/routes/about.html
index e09a72e..605e0db 100644
--- a/test/app/routes/about.html
+++ b/test/app/routes/about.html
@@ -1,6 +1,6 @@
-<:Head>
+<svelte:head>
 	<title>About</title>
-</:Head>
+</svelte:head>
 
 <h1>About this site</h1>
 
diff --git a/test/app/routes/blog/[slug].html b/test/app/routes/blog/[slug].html
index ac5245b..7fdc8b4 100644
--- a/test/app/routes/blog/[slug].html
+++ b/test/app/routes/blog/[slug].html
@@ -1,11 +1,11 @@
-<:Head>
-	<title>{{post.title}}</title>
-</:Head>
+<svelte:head>
+	<title>{post.title}</title>
+</svelte:head>
 
-<h1>{{post.title}}</h1>
+<h1>{post.title}</h1>
 
 <div class='content'>
-	{{{post.html}}}
+	{@html post.html}
 </div>
 
 <script>
diff --git a/test/app/routes/blog/index.html b/test/app/routes/blog/index.html
index 0dc74a6..2e9f428 100644
--- a/test/app/routes/blog/index.html
+++ b/test/app/routes/blog/index.html
@@ -1,17 +1,17 @@
-<:Head>
+<svelte:head>
 	<title>Blog</title>
-</:Head>
+</svelte:head>
 
 <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>
 
 <script>
diff --git a/test/app/routes/credentials/index.html b/test/app/routes/credentials/index.html
index 76e4a63..688ece6 100644
--- a/test/app/routes/credentials/index.html
+++ b/test/app/routes/credentials/index.html
@@ -1,4 +1,4 @@
-<h1>{{message}}</h1>
+<h1>{message}</h1>
 
 <script>
 	export default {
diff --git a/test/app/routes/index.html b/test/app/routes/index.html
index 2aec308..cb37b8c 100644
--- a/test/app/routes/index.html
+++ b/test/app/routes/index.html
@@ -1,6 +1,6 @@
-<:Head>
+<svelte:head>
 	<title>Sapper project template</title>
-</:Head>
+</svelte:head>
 
 <h1>Great success!</h1>
 
@@ -11,7 +11,7 @@
 <a href='blog/nope'>broken link</a>
 <a href='blog/throw-an-error'>error link</a>
 <a href='credentials?creds=include'>credentials</a>
-<a rel=prefetch class='{{page === "blog"  ? "selected" : ""}}' href='blog'>blog</a>
+<a rel=prefetch class='{page === "blog"  ? "selected" : ""}' href='blog'>blog</a>
 
 <div class='hydrate-test'></div>
 
diff --git a/test/app/routes/preload-values/custom-class.html b/test/app/routes/preload-values/custom-class.html
index 328e335..44e94cb 100644
--- a/test/app/routes/preload-values/custom-class.html
+++ b/test/app/routes/preload-values/custom-class.html
@@ -1,4 +1,4 @@
-<h1>{{foo.bar()}}</h1>
+<h1>{foo.bar()}</h1>
 
 <script>
 	export default {
diff --git a/test/app/routes/preload-values/set.html b/test/app/routes/preload-values/set.html
index b8c0df1..43066c9 100644
--- a/test/app/routes/preload-values/set.html
+++ b/test/app/routes/preload-values/set.html
@@ -1,4 +1,4 @@
-<h1>{{set.has('x')}}</h1>
+<h1>{set.has('x')}</h1>
 
 <script>
 	export default {
diff --git a/test/app/routes/show-url.html b/test/app/routes/show-url.html
index bf73f7a..bf1e6b9 100644
--- a/test/app/routes/show-url.html
+++ b/test/app/routes/show-url.html
@@ -1,4 +1,4 @@
-<p>URL is {{url}}</p>
+<p>URL is {url}</p>
 
 <script>
 	export default {
diff --git a/test/app/routes/store.html b/test/app/routes/store.html
index bdbb15c..148147a 100644
--- a/test/app/routes/store.html
+++ b/test/app/routes/store.html
@@ -1 +1 @@
-<h1>{{$title}}</h1>
\ No newline at end of file
+<h1>{$title}</h1>
\ No newline at end of file