Add v3.42.7

core/server/api/canary/config.js

@@ -23,7 +23,8 @@ module.exports = {
                 enableDeveloperExperiments: config.get('enableDeveloperExperiments') || false,
                 stripeDirect: config.get('stripeDirect'),
                 mailgunIsConfigured: config.get('bulkEmail') && config.get('bulkEmail').mailgun,
-                emailAnalytics: config.get('emailAnalytics')
+                emailAnalytics: config.get('emailAnalytics'),
+                forceUpgrade: config.get('host_settings:forceUpgrade') || false
             };
             if (billingUrl) {
                 response.billingUrl = billingUrl;

core/server/api/v3/config.js

@@ -23,7 +23,8 @@ module.exports = {
                 enableDeveloperExperiments: config.get('enableDeveloperExperiments') || false,
                 stripeDirect: config.get('stripeDirect'),
                 mailgunIsConfigured: config.get('bulkEmail') && config.get('bulkEmail').mailgun,
-                emailAnalytics: config.get('emailAnalytics')
+                emailAnalytics: config.get('emailAnalytics'),
+                forceUpgrade: config.get('host_settings:forceUpgrade') || false
             };
             if (billingUrl) {
                 response.billingUrl = billingUrl;

core/server/web/admin/controller.js

@@ -1,5 +1,7 @@
 const debug = require('ghost-ignition').debug('web:admin:controller');
 const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto');
 const config = require('../../../shared/config');
 const updateCheck = require('../../update-check');
 const logging = require('../../../shared/logging');
@@ -25,6 +27,15 @@ module.exports = function adminController(req, res) {
     const templatePath = path.resolve(config.get('paths').adminViews, defaultTemplate);
     const headers = {};
 
+    // Generate our own ETag header
+    //   `sendFile` by default uses filesize+lastmod date to generate an etag.
+    //   That doesn't work for admin templates because the filesize doesn't change between versions
+    //   and `npm pack` sets a fixed lastmod date for every file meaning the default etag never changes
+    const fileBuffer = fs.readFileSync(templatePath);
+    const hashSum = crypto.createHash('md5');
+    hashSum.update(fileBuffer);
+    headers.ETag = hashSum.digest('hex');
+
     if (config.get('adminFrameProtection')) {
         headers['X-Frame-Options'] = 'sameorigin';
     }

core/server/web/admin/views/default-prod.html

@@ -53,7 +53,7 @@
 
 
                 <script src="assets/vendor.min-1ea21c7abed44258b1662cf1b103c007.js"></script>
-                <script src="assets/ghost.min-fc6277154fa6217cd103de2019eb4352.js"></script>
+                <script src="assets/ghost.min-c2286c1da1671730ae28b70205449d2f.js"></script>
 
 </body>
 </html>

core/server/web/admin/views/default.html

@@ -53,7 +53,7 @@
 
 
                 <script src="assets/vendor.min-1ea21c7abed44258b1662cf1b103c007.js"></script>
-                <script src="assets/ghost.min-fc6277154fa6217cd103de2019eb4352.js"></script>
+                <script src="assets/ghost.min-c2286c1da1671730ae28b70205449d2f.js"></script>
 
 </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "3.42.6",
+  "version": "3.42.7",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",