Merge pull request #2476 from sveltejs/site/caching

Site: Default Cache-Control value
pull/2481/head
Rich Harris 5 years ago committed by GitHub
commit aa0abb13cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3286,16 +3286,6 @@
"integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
"dev": true
},
"globalyzer": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.4.tgz",
"integrity": "sha512-LeguVWaxgHN0MNbWC6YljNMzHkrCny9fzjmEUdnF1kQ7wATFD1RHFRqA1qxaX2tgxGENlcxjOflopBwj3YZiXA=="
},
"globrex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
},
"golden-fleece": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/golden-fleece/-/golden-fleece-1.0.9.tgz",
@ -5267,13 +5257,12 @@
"dev": true
},
"sirv": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/sirv/-/sirv-0.2.4.tgz",
"integrity": "sha512-0YaLzpD6dPiJZUqDEwDqk9NLGZDm/nNWvpg8Rym+3hdt5pWGRrlggjjt1KtF0+tZgGtyI4F5f5JZ9XTCp53Oqw==",
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/sirv/-/sirv-0.3.1.tgz",
"integrity": "sha512-03p4fuXPfhlNrDjUBw5bGF//4i0Rjwf7hVm8XhuKgeguHGQPr4pV+lgAJZKSP9BaJKn+QG9QvTxLX1wSYshccg==",
"requires": {
"@polka/url": "^0.5.0",
"mime": "^2.3.1",
"tiny-glob": "^0.2.0"
"mime": "^2.3.1"
},
"dependencies": {
"mime": {
@ -5657,15 +5646,6 @@
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
"optional": true
},
"tiny-glob": {
"version": "0.2.6",
"resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.6.tgz",
"integrity": "sha512-A7ewMqPu1B5PWwC3m7KVgAu96Ch5LA0w4SnEN/LbDREj/gAD0nPWboRbn8YoP9ISZXqeNAlMvKSKoEuhcfK3Pw==",
"requires": {
"globalyzer": "^0.1.0",
"globrex": "^0.1.1"
}
},
"tinycolor2": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",

@ -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": {

@ -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);

Loading…
Cancel
Save