186526
/
unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into firebase-hosting

This commit is contained in:
Michael Jackson 2019-01-07 20:29:16 -08:00
parent c0f55f4807 e83103c6b5
commit 0baa63d525
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/actions/serveHTMLModule.js
View File

@ -20,7 +20,7 @@ export default function serveHTMLModule(req, res) {
.set({
'Content-Length': Buffer.byteLength(code),
'Content-Type': getContentTypeHeader(req.entry.contentType),
'Cache-Control': 'public, max-age=31536000, immutable', // 1 year
'Cache-Control': 'public, max-age=31536000', // 1 year
ETag: etag(code),
'Cache-Tag': 'file, html-file, html-module'
})

2
modules/actions/serveJavaScriptModule.js
View File

@ -14,7 +14,7 @@ export default function serveJavaScriptModule(req, res) {
.set({
'Content-Length': Buffer.byteLength(code),
'Content-Type': getContentTypeHeader(req.entry.contentType),
'Cache-Control': 'public, max-age=31536000, immutable', // 1 year
'Cache-Control': 'public, max-age=31536000', // 1 year
ETag: etag(code),
'Cache-Tag': 'file, js-file, js-module'
})

2
modules/actions/serveMetadata.js
View File

@ -35,7 +35,7 @@ export default function serveMetadata(req, res) {
res
.set({
'Cache-Control': 'public, max-age=31536000, immutable', // 1 year
'Cache-Control': 'public, max-age=31536000', // 1 year
'Cache-Tag': 'meta'
})
.send(metadata);

2
modules/actions/serveStaticFile.js
View File

@ -15,7 +15,7 @@ export default function serveStaticFile(req, res) {
.set({
'Content-Length': req.entry.size,
'Content-Type': getContentTypeHeader(req.entry.contentType),
'Cache-Control': 'public, max-age=31536000, immutable', // 1 year
'Cache-Control': 'public, max-age=31536000', // 1 year
'Last-Modified': req.entry.lastModified,
ETag: etag(req.entry.content),
'Cache-Tag': tags.join(', ')

8
modules/middleware/fetchPackage.js
View File

@ -9,10 +9,9 @@ import getNpmPackageInfo from '../utils/getNpmPackageInfo';
function tagRedirect(req, res) {
const version = req.packageInfo['dist-tags'][req.packageVersion];
// Cache tag redirects for 1 minute.
res
.set({
'Cache-Control': 'public, max-age=60',
'Cache-Control': 'public, max-age=300', // 5 minutes
'Cache-Tag': 'redirect, tag-redirect'
})
.redirect(
@ -28,10 +27,9 @@ function semverRedirect(req, res) {
);
if (maxVersion) {
// Cache semver redirects for 1 minute.
res
.set({
'Cache-Control': 'public, max-age=60',
'Cache-Control': 'public, max-age=300', // 5 minutes
'Cache-Tag': 'redirect, semver-redirect'
})
.redirect(
@ -92,7 +90,7 @@ function filenameRedirect(req, res) {
// and URLs resolve correctly.
res
.set({
'Cache-Control': 'public, max-age=31536000, immutable', // 1 year
'Cache-Control': 'public, max-age=31536000', // 1 year
'Cache-Tag': 'redirect, filename-redirect'
})
.redirect(

34
modules/middleware/findFile.js
View File

@ -12,7 +12,7 @@ function indexRedirect(req, res, entry) {
// resolve correctly.
res
.set({
'Cache-Control': 'public, max-age=31536000, immutable', // 1 year
'Cache-Control': 'public, max-age=31536000', // 1 year
'Cache-Tag': 'redirect, index-redirect'
})
.redirect(
@ -94,24 +94,26 @@ function searchEntries(tarballStream, entryName, wantsIndex) {
const chunks = [];
stream.on('data', chunk => chunks.push(chunk)).on('end', () => {
const content = Buffer.concat(chunks);
stream
.on('data', chunk => chunks.push(chunk))
.on('end', () => {
const content = Buffer.concat(chunks);
// Set some extra properties for files that we will
// need to serve them and for ?meta listings.
entry.contentType = getContentType(entry.name);
entry.integrity = getIntegrity(content);
entry.lastModified = header.mtime.toUTCString();
entry.size = content.length;
// Set some extra properties for files that we will
// need to serve them and for ?meta listings.
entry.contentType = getContentType(entry.name);
entry.integrity = getIntegrity(content);
entry.lastModified = header.mtime.toUTCString();
entry.size = content.length;
// Set the content only for the foundEntry and
// discard the buffer for all others.
if (entry === foundEntry) {
entry.content = content;
}
// Set the content only for the foundEntry and
// discard the buffer for all others.
if (entry === foundEntry) {
entry.content = content;
}
next();
});
next();
});
});
});
}