Merge pull request #2476 from sveltejs/site/caching

Site: Default Cache-Control value
sveltejs · Apr 22, 2019 · aa0abb1 · aa0abb1
2 parents 86f6e73 + 85481a4
commit aa0abb1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 28 deletions.
diff --git a/site/package-lock.json b/site/package-lock.json
diff --git a/site/package.json b/site/package.json
@@ -30,7 +30,7 @@
     "prismjs": "^1.15.0",
     "session-file-store": "^1.2.0",
     "shelljs": "^0.8.3",
-    "sirv": "^0.2.2",
+    "sirv": "^0.3.1",
     "yootils": "0.0.14"
   },
   "devDependencies": {

diff --git a/site/src/server.js b/site/src/server.js
@@ -1,11 +1,11 @@
 import 'dotenv/config';
+import sirv from 'sirv';
 import express from 'express';
 import compression from 'compression';
 import session from 'express-session';
 import passport from 'passport';
 import { Strategy } from 'passport-github';
 import sessionFileStore from 'session-file-store';
-import serve from 'serve-static';
 import devalue from 'devalue';
 import * as sapper from '@sapper/server';
 
@@ -94,7 +94,12 @@ if (process.env.GITHUB_CLIENT_ID) {
 
 app.use(
 	compression({ threshold: 0 }),
-	serve('static', { setHeaders: res => res.setHeader('Access-Control-Allow-Origin', '*') }),
+	sirv('static', {
+		setHeaders(res) {
+			res.setHeader('Access-Control-Allow-Origin', '*');
+			res.hasHeader('Cache-Control') || res.setHeader('Cache-Control', 'max-age=600'); // 10min default
+		}
+	}),
 	sapper.middleware({
 		// TODO update Sapper so that we can pass props to the client
 		props: req => {
@@ -111,4 +116,4 @@ app.use(
 			};
 		}
 	})
-).listen(process.env.PORT);
+).listen(process.env.PORT);