Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Site: Default Cache-Control value #2476

Merged
merged 4 commits into from
Apr 22, 2019
Merged

Site: Default Cache-Control value #2476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02f89bc
fix: set default Cache-Control value when unset
lukeed Apr 22, 2019
ece8224
chore: bump & attach `sirv` dep
lukeed Apr 22, 2019
5928378
fix: remove unused arg
lukeed Apr 22, 2019
85481a4
fix: serve -> sirv typo
lukeed Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 4 additions & 24 deletions site/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
11 changes: 8 additions & 3 deletions site/src/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -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 => {
Expand All @@ -111,4 +116,4 @@ app.use(
};
}
})
).listen(process.env.PORT);
).listen(process.env.PORT);