Skip to content

Commit 5c2eb5a

Browse files
committed
tweak static assets serving
1 parent d277c39 commit 5c2eb5a

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"html-webpack-plugin": "^2.24.1",
2323
"lru-cache": "^4.0.1",
2424
"serialize-javascript": "^1.3.0",
25-
"serve-favicon": "^2.3.0",
2625
"vue": "^2.0.0",
2726
"vue-router": "^2.0.0",
2827
"vue-server-renderer": "^2.0.0",

server.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const isProd = process.env.NODE_ENV === 'production'
44
const fs = require('fs')
55
const path = require('path')
66
const express = require('express')
7+
const favicon = require('serve-favicon')
78
const compression = require('compression')
89
const serialize = require('serialize-javascript')
910
const resolve = file => path.resolve(__dirname, file)
@@ -48,12 +49,16 @@ function parseIndex (template) {
4849
}
4950
}
5051

52+
const serve = (path, cache) => express.static(resolve(path), {
53+
maxAge: cache && isProd ? 60 * 60 * 24 * 30 : 0
54+
})
55+
5156
app.use(compression({ threshold: 0 }))
52-
app.use('/service-worker.js', express.static(resolve('./dist/service-worker.js')))
53-
app.use('/manifest.json', express.static(resolve('./manifest.json')))
54-
const cacheConfig = { maxAge: isProd ? 60 * 60 * 24 * 30 : 0 }
55-
app.use('/logo.png', express.static(resolve('./src/assets/logo.png'), cacheConfig))
56-
app.use('/dist', express.static(resolve('./dist'), cacheConfig))
57+
app.use(favicon('./src/assets/logo.png'))
58+
app.use('/service-worker.js', serve('./dist/service-worker.js'))
59+
app.use('/manifest.json', serve('./manifest.json'))
60+
app.use('/logo.png', serve('./src/assets/logo.png'))
61+
app.use('/dist', serve('./dist'))
5762

5863
app.get('*', (req, res) => {
5964
if (!renderer) {

0 commit comments

Comments
 (0)