From e9ca6e0f4328b0d610766fe1135bf48df48a63ac Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 3 Feb 2019 09:19:30 -0500
Subject: [PATCH] use @sapper imports

---
 _template/build.sh    | 16 ++++++++--------
 src/client.js         |  2 +-
 src/server.js         |  2 +-
 src/service-worker.js |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/_template/build.sh b/_template/build.sh
index a69d58c..edef35f 100755
--- a/_template/build.sh
+++ b/_template/build.sh
@@ -6,13 +6,13 @@ cd "$(dirname $0)"/..
 echo "$SSH_KEY" > ~/.ssh/id_rsa
 chmod 600 ~/.ssh/id_rsa
 
-# make sure we're on master, and delete the rollup and webpack branches
+# make sure we're on master, and delete the rollup-v3 and webpack-v3 branches
 git symbolic-ref HEAD refs/heads/master
 git reset --hard
-git branch -D rollup webpack
+git branch -D rollup-v3 webpack-v3
 
-# create the rollup branch off the current master
-git checkout -b rollup
+# create the rollup-v3 branch off the current master
+git checkout -b rollup-v3
 node _template/build-pkg.js rollup
 git rm -r --cached .travis.yml _template package_template.json webpack.config.js
 git add package.json
@@ -20,8 +20,8 @@ git commit -m 'Sapper template for Rollup'
 git symbolic-ref HEAD refs/heads/master
 git reset --hard
 
-# create the webpack branch off the current master
-git checkout -b webpack
+# create the webpack-v3 branch off the current master
+git checkout -b webpack-v3
 node _template/build-pkg.js webpack
 git rm -r --cached .travis.yml _template package_template.json rollup.config.js
 git add package.json
@@ -29,5 +29,5 @@ git commit -m 'Sapper template for webpack'
 git symbolic-ref HEAD refs/heads/master
 git reset --hard
 
-# force push rollup and webpack branches
-git push git@github.com:sveltejs/sapper-template.git rollup webpack -f
+# force push rollup-v3 and webpack branches
+git push git@github.com:sveltejs/sapper-template.git rollup-v3 webpack-v3 -f
diff --git a/src/client.js b/src/client.js
index 4a61c78..cec9172 100644
--- a/src/client.js
+++ b/src/client.js
@@ -1,4 +1,4 @@
-import * as sapper from '../__sapper__/client.js';
+import * as sapper from '@sapper/app';
 
 sapper.start({
 	target: document.querySelector('#sapper')
diff --git a/src/server.js b/src/server.js
index e8247c2..c77f593 100644
--- a/src/server.js
+++ b/src/server.js
@@ -1,7 +1,7 @@
 import sirv from 'sirv';
 import polka from 'polka';
 import compression from 'compression';
-import * as sapper from '../__sapper__/server.js';
+import * as sapper from '@sapper/server';
 
 const { PORT, NODE_ENV } = process.env;
 const dev = NODE_ENV === 'development';
diff --git a/src/service-worker.js b/src/service-worker.js
index 4676551..dd09def 100644
--- a/src/service-worker.js
+++ b/src/service-worker.js
@@ -1,4 +1,4 @@
-import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js';
+import { timestamp, files, shell, routes } from '@sapper/service-worker';
 
 const ASSETS = `cache${timestamp}`;