From 6abeb06d7d582b681a36b50d0cf56d93718c7e0a Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Mar 2018 19:42:12 -0400 Subject: [PATCH] switch to polka --- app/server.js | 23 +++++++---------------- package.json | 4 ++-- routes/blog.json.js | 2 +- routes/blog/[slug].json.js | 2 +- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/app/server.js b/app/server.js index 0af7864..13ba886 100644 --- a/app/server.js +++ b/app/server.js @@ -1,29 +1,20 @@ import fs from 'fs'; -import express from 'express'; +import polka from 'polka'; import compression from 'compression'; import sapper from 'sapper'; import serve from 'serve-static'; import fetch from 'node-fetch'; import { routes } from './manifest/server.js'; -const app = express(); - -const { PORT = 3000 } = process.env; - // this allows us to do e.g. `fetch('/api/blog-posts')` on the server global.fetch = (url, opts) => { if (url[0] === '/') url = `http://localhost:${PORT}${url}`; return fetch(url, opts); }; -app.use(compression({ threshold: 0 })); - -app.use(serve('assets')); - -app.use(sapper({ - routes -})); - -app.listen(PORT, () => { - console.log(`listening on port ${PORT}`); -}); \ No newline at end of file +// you can also use Express +polka() + .use(compression({ threshold: 0 })) + .use(serve('assets')) + .use(sapper({ routes })) + .listen(process.env.PORT); \ No newline at end of file diff --git a/package.json b/package.json index 98ce2af..598562d 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "dependencies": { "compression": "^1.7.1", "cross-env": "^5.1.3", - "express": "^4.16.2", "node-fetch": "^2.0.0", "npm-run-all": "^4.1.2", - "sapper": "^0.8.1", + "polka": "^0.3.4", + "sapper": "^0.9.4", "serve-static": "^1.13.1", "svelte": "^1.56.0", "svelte-loader": "^2.3.3", diff --git a/routes/blog.json.js b/routes/blog.json.js index 7120e67..0556da5 100644 --- a/routes/blog.json.js +++ b/routes/blog.json.js @@ -8,7 +8,7 @@ const contents = JSON.stringify(posts.map(post => { })); export function get(req, res) { - res.set({ + res.writeHead(200, { 'Content-Type': 'application/json' }); diff --git a/routes/blog/[slug].json.js b/routes/blog/[slug].json.js index 33fc51e..cd8ab53 100644 --- a/routes/blog/[slug].json.js +++ b/routes/blog/[slug].json.js @@ -11,7 +11,7 @@ export function get(req, res, next) { const { slug } = req.params; if (lookup.has(slug)) { - res.set({ + res.writeHead(200, { 'Content-Type': 'application/json' });