From e553713e9a12d0c65a90a75ca35e542296c6deb7 Mon Sep 17 00:00:00 2001 From: David Grimason Date: Mon, 8 Apr 2019 13:38:28 +0900 Subject: [PATCH 1/2] Prevent fall-through on missing static file handling. Fix maxAge and setHeaders for static files. --- core/scripts/server.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/scripts/server.js b/core/scripts/server.js index a2f3fc4160..dac9d2fb6a 100755 --- a/core/scripts/server.js +++ b/core/scripts/server.js @@ -103,15 +103,18 @@ function invalidateCache (req, res) { } const serve = (path, cache, options) => express.static(resolve(path), Object.assign({ - maxAge: cache && isProd ? 60 * 60 * 24 * 30 : 0 + maxAge: cache && isProd ? 2592000000 : 0, // 1 month in milliseconds = 1000 * 60 * 60 * 24 * 30 = 2592000000 + fallthrough: false }, options)) const themeRoot = require('../build/theme-path') app.use('/dist', serve('dist', true)) app.use('/assets', serve(themeRoot + '/assets', true)) -app.use('/service-worker.js', serve('dist/service-worker.js', { - setHeaders: {'Content-Type': 'text/javascript; charset=UTF-8'} +app.use('/service-worker.js', serve('dist/service-worker.js', false, { + setHeaders: function (res, path, stat) { + res.set('Content-Type', 'text/javascript; charset=UTF-8') + } })) const serverExtensions = require(resolve('src/server')) From a9358f04002cc02fdf2db98a544d0b61f85f193d Mon Sep 17 00:00:00 2001 From: David Grimason Date: Mon, 8 Apr 2019 13:50:41 +0900 Subject: [PATCH 2/2] CHANGELOG update for #2687 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbda748c63..c963eddb4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Checkout copy address data will sync on later change - @haukebri (#2661) - Fixed Safari style for sort-by select - @haukebri (#2642) - fixed My orders in My Profile not refreshed after putting an order - @filrak (#2559) +- Fixed static file handler to immediately return 404 status for missing files - @grimason (#2685) +- Fixed maxAge Response Header for static files and Content-Type for Service Worker - @grimason (#2686) ## [1.9.0-rc.1] - 2019.03.07