Swap express for polka.

.netlify/state.json

@@ -0,0 +1,3 @@
+{
+	"siteId": "c80398a1-fd2e-4698-8373-988dc10d95cc"
+}

netlify.toml

@@ -0,0 +1,10 @@
+[build]
+  publish = "__sapper__/export"
+  command = "yarn export"
+  functions = "src/lambda/"
+
+[dev]
+  functions = "src/lambda/"
+  command = "yarn dev" # Command to start your dev server
+  port = 3000 # Port that the dev server will be listening on
+  publish = "__sapper__/dev"

package.json

@@ -21,9 +21,11 @@
     "express-session": "^1.16.2",
     "marked": "^0.6.2",
     "node-fetch": "^2.1.2",
+    "polka": "^0.5.2",
     "sapper": "^0.27.4",
     "serve-static": "^1.13.1",
     "session-file-store": "^1.2.0",
+    "sirv": "^0.4.2",
     "svelte-extras": "^2.0.2"
   },
   "devDependencies": {
@@ -52,4 +54,4 @@
       "yarn.lock"
     ]
   }
-}
+}

src/routes/auth/login.js

@@ -5,10 +5,7 @@ export function post(req, res) {
 
 	api.post('users/login', { user }).then(response => {
 		if (response.user) req.session.user = response.user;
-		console.log(response.user);
-		res.set({
-			'Content-Type': 'application/json'
-		});
+		res.setHeader('Content-Type', 'application/json');
 
 		res.end(JSON.stringify(response));
 	});

src/routes/auth/register.js

@@ -8,9 +8,7 @@ export function post(req, res) {
 			req.session.user = response.user;
 		}
 
-		res.set({
-			'Content-Type': 'application/json'
-		});
+		res.setHeader('Content-Type', 'application/json');
 
 		res.end(JSON.stringify(response));
 	});

src/routes/auth/save.js

@@ -8,9 +8,7 @@ export function post(req, res) {
 			req.session.user = response.user;
 		}
 
-		res.set({
-			'Content-Type': 'application/json'
-		});
+		res.setHeader('Content-Type', 'application/json');
 
 		res.end(JSON.stringify(response));
 	});

src/routes/auth/user.js

@@ -1,7 +1,5 @@
 export function get(req, res) {
-	res.set({
-		'Content-Type': 'application/json'
-	});
+	res.setHeader('Content-Type', 'application/json');
 
 	res.end(JSON.stringify({ user: req.session.user || null }));
 }

src/routes/editor/_Editor.svelte

@@ -3,24 +3,24 @@
       <div class="row">
         <div class="col-md-10 offset-md-1 col-xs-12">
           <ListErrors {errors}/>
-  
+
           <form>
             <fieldset>
               <fieldset class="form-group">
                 <input class="form-control form-control-lg" type="text" placeholder="Article Title" bind:value={article.title}>
               </fieldset>
-  
+
               <fieldset class="form-group">
                 <input class="form-control" type="text" placeholder="What's this article about?" bind:value={article.description}>
               </fieldset>
-  
+
               <fieldset class="form-group">
                 <textarea class="form-control" rows="8" placeholder="Write your article (in markdown)" bind:value={article.body}/>
               </fieldset>
-  
+
               <fieldset class="form-group">
                 <input class="form-control" type="text" placeholder="Enter tags" use:enter='{addTag}'>
-  
+
                 <div class="tag-list">
                   {#each article.tagList as tag, i}
                     <span class="tag-default tag-pill">
@@ -30,7 +30,7 @@
                   {/each}
                 </div>
               </fieldset>
-  
+
               <button class="btn btn-lg pull-xs-right btn-primary" type="button" disabled={inProgress} on:click='{publish}'>
                 Publish Article
               </button>
@@ -48,13 +48,11 @@
 
   export let params, article;
 
-  console.log(params)
   let inProgress = false,
     errors;
   const { session } = stores();
 
   function addTag(input) {
-    console.log(article)
     article.tagList = article.tagList.concat(input.value);
     input.value = '';
   }
@@ -66,7 +64,6 @@
   function publish() {
 
     inProgress = true;
-    console.log(!params.slug, $session.user);
     const promise = !params.slug  ?
       api.post('articles', { article }, $session.user && $session.user.token) :
       api.put(`articles/${params.slug}`, { article }, $session.user && $session.user.token);
@@ -77,7 +74,7 @@
       }
     });
   }
-    
+
 
   function enter(node, callback) {
     function onkeydown(event) {

src/server.js

@@ -1,15 +1,18 @@
-import express from 'express';
+import sirv from 'sirv';
+import polka from 'polka';
 import compression from 'compression';
-import serve from 'serve-static';
 import bodyParser from 'body-parser';
 import session from 'express-session';
 import sessionFileStore from 'session-file-store';
 import * as sapper from '@sapper/server';
-// import { Store } from 'svelte/store.js';
 
 const FileStore = sessionFileStore(session);
 
-express()
+
+const { PORT, NODE_ENV } = process.env;
+const dev = NODE_ENV === 'development';
+
+polka()
 	.use(bodyParser.json())
 	.use(session({
 		secret: 'conduit',
@@ -24,11 +27,13 @@ express()
 	}))
 	.use(
 		compression({ threshold: 0 }),
-		serve('static'),
+		sirv('static', { dev }),
 		sapper.middleware({
 			session: req => ({
 				user: req.session && req.session.user
 			})
 		})
 	)
-	.listen(process.env.PORT);
+	.listen(PORT, err => {
+		if (err) console.log('error', err);
+	});