better long-term caching

wdjungst · Mar 14, 2016 · ff062a4 · ff062a4
1 parent 4ea3a04
commit ff062a4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## 0.0.25
+
+- Better long term caching
+
 ## 0.0.24
 
 - Fixed server route regression

diff --git a/create-react-project/blueprint/webpack.config.js b/create-react-project/blueprint/webpack.config.js
@@ -1 +1,2 @@
-module.exports =  require('react-project/webpack')
+module.exports = require('react-project/webpack')
+
diff --git a/modules/PublicServerAPI.js b/modules/PublicServerAPI.js
@@ -28,8 +28,6 @@ import { log } from './LogUtils'
 import { PORT, APP_PATH, PUBLIC_DIR, SERVER_RENDERING } from './Constants'
 import ErrorMessage from './ErrorMessage'
 
-const PROD = process.env.NODE_ENV === 'production'
-
 export function createServer(getApp) {
   const server = express()
   const webpackStats = getWebpackStats()
@@ -73,16 +71,11 @@ export function createServer(getApp) {
   return server
 }
 
-function addProductionOnlyMiddleware(server) {
-  if (PROD) {
-  }
-}
-
 function addMiddleware(server) {
   if (process.env.NODE_ENV === 'production') {
     server.use(morgan('combined'))
     server.use(compression())
-    server.use(express.static(PUBLIC_DIR))
+    server.use(express.static(PUBLIC_DIR, { maxAge: 31536000 }))
   } else {
     server.use(morgan('dev'))
   }

diff --git a/modules/webpack.client.config.js b/modules/webpack.client.config.js
@@ -10,7 +10,7 @@ const REFRESH = process.env.AUTO_RELOAD === 'refresh'
 const PROD = process.env.NODE_ENV === 'production'
 // can't do HMR with SERVER_RENDERING because of ExtractTextPlugin
 const HOT = !PROD && !SERVER_RENDERING && process.env.AUTO_RELOAD === 'hot'
-const HASH8 = '[hash:8]'
+const HASH = '[chunkHash]'
 
 function getPublicPath() {
   return PROD ? PUBLIC_PATH : `http://${DEV_HOST}:${DEV_PORT}/`
@@ -83,7 +83,7 @@ function getCSSLoader() {
 }
 
 function getFileName() {
-  return PROD ? `${HASH8}.js` : '[name].js'
+  return PROD ? `${HASH}.js` : '[name].js'
 }
 
 function getDevTool() {
@@ -127,12 +127,12 @@ function getEntry() {
 function getPlugins() {
 
   const plugins = [
-    new webpack.optimize.CommonsChunkPlugin('_vendor', 'vendor.js')
+    new webpack.optimize.CommonsChunkPlugin('_vendor', PROD ? `vendor-${HASH}.js` : 'vendor.js')
   ]
 
   if (PROD) {
     plugins.push(
-      new ExtractTextPlugin(`${HASH8}.css`),
+      new ExtractTextPlugin(`${HASH}.css`),
       new webpack.optimize.DedupePlugin(),
       new webpack.optimize.OccurrenceOrderPlugin(),
       new webpack.optimize.UglifyJsPlugin()