🎨 fix admin and theme caching issues #8058

acburdine · 2017-02-27T15:17:06Z

fixes boolean logic wrt to theme cache value from config
disable cache for admin assets in development
only add asset hash in production

core/server/admin/app.js

@@ -38,7 +38,7 @@ module.exports = function setupAdminApp() {
    // @TODO ensure this gets a local 404 error handler
    adminApp.use('/assets', serveStatic(
        config.get('paths').clientAssets,
-        {maxAge: utils.ONE_YEAR_MS, fallthrough: false}
+        {maxAge: (config.get('env') === 'production') ? utils.ONE_YEAR_MS : 0, fallthrough: false}


core/server/data/meta/asset_url.js

-        if (!config.get('assetHash')) {
-            config.set('assetHash', utils.generateAssetHash());
-        }
+        if (config.get('env') === 'production') {


core/server/middleware/static-theme.js

        express.static(path.join(config.getContentPath('themes'), req.app.get('activeTheme')),
-            {maxAge: config.get('caching:theme:maxAge') || utils.ONE_YEAR_MS}
+            {maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : utils.ONE_YEAR_MS}


refs TryGhost#7812, closes TryGhost#7958 - fixes boolean logic wrt to theme cache value from config - disable cache for admin assets in development - only add asset hash in production

acburdine requested a review from kirrg001 February 27, 2017 15:17

acburdine commented Feb 27, 2017

View reviewed changes

kirrg001 self-assigned this Feb 27, 2017

🎨 fix admin and theme caching issues

2511960

refs TryGhost#7812, closes TryGhost#7958 - fixes boolean logic wrt to theme cache value from config - disable cache for admin assets in development - only add asset hash in production

acburdine force-pushed the fix-caching branch from 29b6c2e to 2511960 Compare February 28, 2017 01:01

kirrg001 approved these changes Mar 2, 2017

View reviewed changes

kirrg001 merged commit 144544e into TryGhost:master Mar 2, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🎨 fix admin and theme caching issues #8058

🎨 fix admin and theme caching issues #8058

acburdine commented Feb 27, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

🎨 fix admin and theme caching issues #8058

🎨 fix admin and theme caching issues #8058

Conversation

acburdine commented Feb 27, 2017

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.