ghost 5.96.0 → 5.96.2

package/core/bridge.js

@@ -16,10 +16,7 @@ const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
 const themeEngine = require('./frontend/services/theme-engine');
 const appService = require('./frontend/services/apps');
-const cardAssetService = require('./frontend/services/card-assets');
-const commentCountsAssetService = require('./frontend/services/comment-counts-assets');
-const adminAuthAssetService = require('./frontend/services/admin-auth-assets');
-const memberAttributionAssetService = require('./frontend/services/member-attribution-assets');
+const {adminAuthAssets, cardAssets,commentCountsAssets, memberAttributionAssets} = require('./frontend/services/assets-minification');
 const routerManager = require('./frontend/services/routing').routerManager;
 const settingsCache = require('./shared/settings-cache');
 const urlService = require('./server/services/url');
@@ -54,6 +51,10 @@ class Bridge {
         return themeEngine.getActive();
     }
 
+    ensureAdminAuthAssetsMiddleware() {
+        return adminAuthAssets.serveMiddleware();
+    }
+
     async activateTheme(loadedTheme, checkedTheme) {
         let settings = {
             locale: settingsCache.get('locale')
@@ -63,15 +64,17 @@ class Bridge {
         try {
             themeEngine.setActive(settings, loadedTheme, checkedTheme);
 
+            logging.info('Invalidating assets for regeneration');
+
             const cardAssetConfig = this.getCardAssetConfig();
             debug('reload card assets config', cardAssetConfig);
-            await cardAssetService.load(cardAssetConfig);
+            cardAssets.invalidate(cardAssetConfig);
 
             // TODO: is this in the right place?
             // rebuild asset files
-            await commentCountsAssetService.load();
-            await adminAuthAssetService.load();
-            await memberAttributionAssetService.load();
+            commentCountsAssets.invalidate();
+            adminAuthAssets.invalidate();
+            memberAttributionAssets.invalidate();
         } catch (err) {
             logging.error(new errors.InternalServerError({
                 message: tpl(messages.activateFailed, {theme: loadedTheme.name}),