ghost 4.32.2 → 4.32.3

package/core/built/assets/{vendor.min-df1ba725edbc456aa45af07d3443403e.js → vendor.min-8556ef9dba3da78758b86c913b517c66.js}

@@ -18561,7 +18561,7 @@ if(!((n=e.src.charCodeAt(o++))>=48&&n<=57)){if(41===n||46===n)break
 return-1}if(o-i>=10)return-1}return o<a&&(n=e.src.charCodeAt(o),!r(n))?-1:o}e.exports=function(e,t,n,r){var a,s,l,u,c,d,h,p,f,m,g,b,v,y,_,w,M,k,E,A,j,x,O,C,T,S,L,P,z=!1,R=!0
 if(e.sCount[t]-e.blkIndent>=4)return!1
 if(e.listIndent>=0&&e.sCount[t]-e.listIndent>=4&&e.sCount[t]<e.blkIndent)return!1
-if(r&&"paragraph"===e.parentType&&e.tShift[t]>=e.blkIndent&&(z=!0),(O=o(e,t))>=0){if(h=!0,T=e.bMarks[t]+e.tShift[t],v=Number(e.src.slice(T,O-1)),z&&1!==v)return!1}else{if(!((O=i(e,t))>=0))return!1
+if(r&&"paragraph"===e.parentType&&e.sCount[t]>=e.blkIndent&&(z=!0),(O=o(e,t))>=0){if(h=!0,T=e.bMarks[t]+e.tShift[t],v=Number(e.src.slice(T,O-1)),z&&1!==v)return!1}else{if(!((O=i(e,t))>=0))return!1
 h=!1}if(z&&e.skipSpaces(O)>=e.eMarks[t])return!1
 if(b=e.src.charCodeAt(O-1),r)return!0
 for(g=e.tokens.length,h?(P=e.push("ordered_list_open","ol",1),1!==v&&(P.attrs=[["start",v]])):P=e.push("bullet_list_open","ul",1),P.map=m=[t,0],P.markup=String.fromCharCode(b),_=t,C=!1,L=e.md.block.ruler.getRules("list"),k=e.parentType,e.parentType="list";_<n;){for(x=O,y=e.eMarks[_],d=w=e.sCount[_]+O-(e.bMarks[t]+e.tShift[t]);x<y;){if(9===(a=e.src.charCodeAt(x)))w+=4-(w+e.bsCount[_])%4
@@ -18642,10 +18642,13 @@ function r(e){switch(e){case 10:case 33:case 35:case 36:case 37:case 38:case 42:
 default:return!1}}e.exports=function(e,t){for(var n=e.pos;n<e.posMax&&!r(e.src.charCodeAt(n));)n++
 return n!==e.pos&&(t||(e.pending+=e.src.slice(e.pos,n)),e.pos=n,!0)}},function(e,t,n){"use strict"
 var r=n(2).isSpace
-e.exports=function(e,t){var n,i,o=e.pos
-if(10!==e.src.charCodeAt(o))return!1
-for(n=e.pending.length-1,i=e.posMax,t||(n>=0&&32===e.pending.charCodeAt(n)?n>=1&&32===e.pending.charCodeAt(n-1)?(e.pending=e.pending.replace(/ +$/,""),e.push("hardbreak","br",0)):(e.pending=e.pending.slice(0,-1),e.push("softbreak","br",0)):e.push("softbreak","br",0)),o++;o<i&&r(e.src.charCodeAt(o));)o++
-return e.pos=o,!0}},function(e,t,n){"use strict"
+e.exports=function(e,t){var n,i,o,a=e.pos
+if(10!==e.src.charCodeAt(a))return!1
+if(n=e.pending.length-1,i=e.posMax,!t)if(n>=0&&32===e.pending.charCodeAt(n))if(n>=1&&32===e.pending.charCodeAt(n-1)){for(o=n-1;o>=1&&32===e.pending.charCodeAt(o-1);)o--
+e.pending=e.pending.slice(0,o),e.push("hardbreak","br",0)}else e.pending=e.pending.slice(0,-1),e.push("softbreak","br",0)
+else e.push("softbreak","br",0)
+for(a++;a<i&&r(e.src.charCodeAt(a));)a++
+return e.pos=a,!0}},function(e,t,n){"use strict"
 for(var r=n(2).isSpace,i=[],o=0;o<256;o++)i.push(0)
 "\\!\"#$%&'()*+,./:;<=>?@[]^_`{|}~-".split("").forEach((function(e){i[e.charCodeAt(0)]=1})),e.exports=function(e,t){var n,o=e.pos,a=e.posMax
 if(92!==e.src.charCodeAt(o))return!1
@@ -19523,4 +19526,4 @@ if(!i)return v(e)
 if(!b(i)||v(i).isOlderThan(4)){var o=v(e).getStackTop()
 y(i,new p(o.client,c.a.clone(o.scope)))}return v(i)}catch(t){return v(e)}}(e):v(e)}function b(e){return!!(e&&e.__SENTRY__&&e.__SENTRY__.hub)}function v(e){return e&&e.__SENTRY__&&e.__SENTRY__.hub||(e.__SENTRY__=e.__SENTRY__||{},e.__SENTRY__.hub=new p),e.__SENTRY__.hub}function y(e,t){return!!e&&(e.__SENTRY__=e.__SENTRY__||{},e.__SENTRY__.hub=t,!0)}}]])
 
-//# sourceMappingURL=vendor.min-df1ba725edbc456aa45af07d3443403e.map
+//# sourceMappingURL=vendor.min-8556ef9dba3da78758b86c913b517c66.map

package/core/frontend/services/routing/config/canary.js

@@ -54,7 +54,7 @@ module.exports.TAXONOMIES = {
     },
     author: {
         filter: 'authors:\'%s\'',
-        editRedirect: '#/staff/:slug/',
+        editRedirect: '#/settings/staff/:slug/',
         resource: 'authors'
     }
 };

package/core/frontend/services/routing/config/v4.js

@@ -54,7 +54,7 @@ module.exports.TAXONOMIES = {
     },
     author: {
         filter: 'authors:\'%s\'',
-        editRedirect: '#/staff/:slug/',
+        editRedirect: '#/settings/staff/:slug/',
         resource: 'authors'
     }
 };

package/core/frontend/web/site.js

@@ -125,7 +125,11 @@ module.exports = function setupSiteApp(options = {}) {
     siteApp.use(membersService.middleware.loadMemberSession);
 
     // /member/.well-known/* serves files (e.g. jwks.json) so it needs to be mounted before the prettyUrl mw to avoid trailing slashes
-    siteApp.use('/members/.well-known', (req, res, next) => membersService.api.middleware.wellKnown(req, res, next));
+    siteApp.use(
+        '/members/.well-known',
+        shared.middleware.cacheControl('public', {maxAge: 60 * 60 * 24}),
+        (req, res, next) => membersService.api.middleware.wellKnown(req, res, next)
+    );
 
     // setup middleware for internal apps
     // @TODO: refactor this to be a proper app middleware hook for internal apps

package/core/server/models/tag.js

@@ -100,6 +100,14 @@ Tag = ghostBookshelf.Model.extend({
 
         ghostBookshelf.Model.prototype.onSaving.apply(this, arguments);
 
+        // Support tag creation with `posts: [{..., tags: [{slug: 'new'}]}]`
+        // In that situation we have a slug but no name so validation will fail
+        // unless we set one automatically. Re-using slug for name matches our
+        // opposite name->slug behaviour.
+        if (!newTag.get('name') && newTag.get('slug')) {
+            this.set('name', newTag.get('slug'));
+        }
+
         // name: #later slug: hash-later
         if (/^#/.test(newTag.get('name'))) {
             this.set('visibility', 'internal');

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

@@ -21,16 +21,13 @@
     <meta name="apple-mobile-web-app-title" content="Ghost" />
 
     <link rel="shortcut icon" href="assets/img/favicon.ico" />
-    <link rel="apple-touch-icon-precomposed" href="assets/img/touch-icon-iphone-d2790931c3477664981061ed9fa5242e.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="assets/img/touch-icon-ipad-3117c0fa950d0fc43c95becef61f4167.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="assets/img/small-42ff134f320b8b5a6eca3781c4e4b2db.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="assets/img/medium-7359075af28d69523987ff4c0e2067c5.png" />
+    <link rel="apple-touch-icon" href="assets/img/apple-touch-icon-74680e326a7e87b159d366c7d4fb3d4b.png" />
 
     <meta name="application-name" content="Ghost" />
-    <meta name="msapplication-TileColor" content="#ffffff" />
-    <meta name="msapplication-square70x70logo" content="assets/img/small-42ff134f320b8b5a6eca3781c4e4b2db.png" />
-    <meta name="msapplication-square150x150logo" content="assets/img/medium-7359075af28d69523987ff4c0e2067c5.png" />
-    <meta name="msapplication-square310x310logo" content="assets/img/large-bf46e150380a4979a7389b45f5bb479d.png" />
+    <meta name="msapplication-TileColor" content="#15171A" />
+    <meta name="msapplication-square70x70logo" content="assets/img/small-b90396925485f17b2ca82c31be42de5f.png" />
+    <meta name="msapplication-square150x150logo" content="assets/img/medium-fef07013cffd5c45a655a250912a0ad7.png" />
+    <meta name="msapplication-square310x310logo" content="assets/img/large-ac90af7c93a4b47e8d956fa9fef31d9d.png" />
 
     <!-- variables that we don't want postcss-custom-properties to remove -->
     <style>
@@ -41,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-2d5f48403647d1e11805691cc7ad0835.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-5f48095976420b523ec7abc41180fbb8.css" title="light">
             
 
     
@@ -59,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-df1ba725edbc456aa45af07d3443403e.js"></script>
-                <script src="assets/ghost.min-1f04d5d6f5f8f3739a86d5bc807cbe1c.js"></script>
+                <script src="assets/vendor.min-8556ef9dba3da78758b86c913b517c66.js"></script>
+                <script src="assets/ghost.min-9a259cab83f12017b28661fe40955399.js"></script>
             
 </body>
 </html>

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

@@ -21,16 +21,13 @@
     <meta name="apple-mobile-web-app-title" content="Ghost" />
 
     <link rel="shortcut icon" href="assets/img/favicon.ico" />
-    <link rel="apple-touch-icon-precomposed" href="assets/img/touch-icon-iphone-d2790931c3477664981061ed9fa5242e.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="assets/img/touch-icon-ipad-3117c0fa950d0fc43c95becef61f4167.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="assets/img/small-42ff134f320b8b5a6eca3781c4e4b2db.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="assets/img/medium-7359075af28d69523987ff4c0e2067c5.png" />
+    <link rel="apple-touch-icon" href="assets/img/apple-touch-icon-74680e326a7e87b159d366c7d4fb3d4b.png" />
 
     <meta name="application-name" content="Ghost" />
-    <meta name="msapplication-TileColor" content="#ffffff" />
-    <meta name="msapplication-square70x70logo" content="assets/img/small-42ff134f320b8b5a6eca3781c4e4b2db.png" />
-    <meta name="msapplication-square150x150logo" content="assets/img/medium-7359075af28d69523987ff4c0e2067c5.png" />
-    <meta name="msapplication-square310x310logo" content="assets/img/large-bf46e150380a4979a7389b45f5bb479d.png" />
+    <meta name="msapplication-TileColor" content="#15171A" />
+    <meta name="msapplication-square70x70logo" content="assets/img/small-b90396925485f17b2ca82c31be42de5f.png" />
+    <meta name="msapplication-square150x150logo" content="assets/img/medium-fef07013cffd5c45a655a250912a0ad7.png" />
+    <meta name="msapplication-square310x310logo" content="assets/img/large-ac90af7c93a4b47e8d956fa9fef31d9d.png" />
 
     <!-- variables that we don't want postcss-custom-properties to remove -->
     <style>
@@ -41,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-2d5f48403647d1e11805691cc7ad0835.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-5f48095976420b523ec7abc41180fbb8.css" title="light">
             
 
     
@@ -59,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-df1ba725edbc456aa45af07d3443403e.js"></script>
-                <script src="assets/ghost.min-1f04d5d6f5f8f3739a86d5bc807cbe1c.js"></script>
+                <script src="assets/vendor.min-8556ef9dba3da78758b86c913b517c66.js"></script>
+                <script src="assets/ghost.min-9a259cab83f12017b28661fe40955399.js"></script>
             
 </body>
 </html>

package/core/server/web/members/app.js

@@ -38,7 +38,7 @@ module.exports = function setupMembersApp() {
     membersApp.get('/api/session', middleware.getIdentityToken);
     membersApp.get('/api/offers/:id', middleware.getOfferData);
     membersApp.delete('/api/session', middleware.deleteSession);
-    membersApp.get('/api/site', middleware.getMemberSiteData);
+    membersApp.get('/api/site', shared.middleware.cacheControl('public', {maxAge: 30}), middleware.getMemberSiteData);
 
     // NOTE: this is wrapped in a function to ensure we always go via the getter
     membersApp.post('/api/send-magic-link', bodyParser.json(), shared.middleware.brute.membersAuth, (req, res, next) => membersService.api.middleware.sendMagicLink(req, res, next));

package/core/server/web/shared/middleware/cache-control.js

@@ -8,6 +8,11 @@
 
 const isString = require('lodash/isString');
 
+/**
+ * @param {'public'|'private'} profile Use "private" if you do not want caching
+ * @param {object} [options]
+ * @param {number} [options.maxAge] The max-age in seconds to use when profile is "public"
+ */
 const cacheControl = (profile, options = {maxAge: 0}) => {
     const profiles = {
         public: `public, max-age=${options.maxAge}`,
@@ -20,6 +25,13 @@ const cacheControl = (profile, options = {maxAge: 0}) => {
         output = profiles[profile];
     }
 
+    /**
+     * @param {import('express').Request} req
+     * @param {import('express').Response} res
+     * @param {() => void} next
+     *
+     * @returns {void}
+     */
     return function cacheControlHeaders(req, res, next) {
         if (output) {
             res.set({'Cache-Control': output});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.32.2",
+  "version": "4.32.3",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -57,52 +57,52 @@
     "@sentry/node": "6.16.1",
     "@tryghost/adapter-manager": "0.2.26",
     "@tryghost/admin-api-schema": "2.6.1",
-    "@tryghost/bookshelf-plugins": "0.3.5",
+    "@tryghost/bookshelf-plugins": "0.3.6",
     "@tryghost/bootstrap-socket": "0.2.15",
     "@tryghost/color-utils": "0.1.5",
     "@tryghost/config-url-helpers": "0.1.3",
     "@tryghost/constants": "1.0.0",
     "@tryghost/custom-theme-settings-service": "0.3.1",
-    "@tryghost/debug": "0.1.9",
+    "@tryghost/debug": "0.1.10",
     "@tryghost/email-analytics-provider-mailgun": "1.0.7",
     "@tryghost/email-analytics-service": "1.0.5",
     "@tryghost/errors": "1.2.0",
-    "@tryghost/express-dynamic-redirects": "0.2.2",
+    "@tryghost/express-dynamic-redirects": "0.2.3",
     "@tryghost/helpers": "1.1.54",
     "@tryghost/image-transform": "1.0.26",
     "@tryghost/job-manager": "0.8.17",
-    "@tryghost/kg-card-factory": "3.1.0",
-    "@tryghost/kg-default-atoms": "3.1.0",
-    "@tryghost/kg-default-cards": "5.15.11",
-    "@tryghost/kg-markdown-html-renderer": "5.1.0",
-    "@tryghost/kg-mobiledoc-html-renderer": "5.3.1",
+    "@tryghost/kg-card-factory": "3.1.1",
+    "@tryghost/kg-default-atoms": "3.1.1",
+    "@tryghost/kg-default-cards": "5.15.12",
+    "@tryghost/kg-markdown-html-renderer": "5.1.1",
+    "@tryghost/kg-mobiledoc-html-renderer": "5.3.2",
     "@tryghost/limit-service": "1.0.8",
-    "@tryghost/logging": "2.0.0",
-    "@tryghost/magic-link": "1.0.14",
-    "@tryghost/members-api": "3.0.0",
+    "@tryghost/logging": "2.0.1",
+    "@tryghost/magic-link": "1.0.15",
+    "@tryghost/members-api": "3.0.1",
     "@tryghost/members-csv": "1.2.2",
     "@tryghost/members-importer": "0.3.7",
-    "@tryghost/members-offers": "0.10.3",
-    "@tryghost/members-ssr": "1.0.16",
-    "@tryghost/metrics": "1.0.1",
+    "@tryghost/members-offers": "0.10.4",
+    "@tryghost/members-ssr": "1.0.17",
+    "@tryghost/metrics": "1.0.2",
     "@tryghost/minifier": "0.1.9",
     "@tryghost/mw-error-handler": "0.1.1",
     "@tryghost/mw-session-from-token": "0.1.26",
-    "@tryghost/nodemailer": "0.3.8",
+    "@tryghost/nodemailer": "0.3.9",
     "@tryghost/package-json": "1.0.14",
     "@tryghost/promise": "0.1.13",
-    "@tryghost/request": "0.1.10",
-    "@tryghost/root-utils": "0.3.7",
+    "@tryghost/request": "0.1.11",
+    "@tryghost/root-utils": "0.3.8",
     "@tryghost/security": "0.2.13",
     "@tryghost/session-service": "0.1.36",
     "@tryghost/settings-path-manager": "0.1.2",
     "@tryghost/social-urls": "0.1.27",
     "@tryghost/string": "0.1.21",
-    "@tryghost/tpl": "0.1.8",
+    "@tryghost/tpl": "0.1.9",
     "@tryghost/update-check-service": "0.3.0",
     "@tryghost/url-utils": "2.0.4",
-    "@tryghost/validator": "0.1.9",
-    "@tryghost/version": "0.1.7",
+    "@tryghost/validator": "0.1.10",
+    "@tryghost/version": "0.1.8",
     "@tryghost/vhost-middleware": "1.0.19",
     "@tryghost/zip": "1.1.18",
     "amperize": "0.6.1",
@@ -131,9 +131,9 @@
     "ghost-storage-base": "1.0.0",
     "glob": "7.2.0",
     "got": "9.6.0",
-    "gscan": "4.20.2",
+    "gscan": "4.22.0",
     "html-to-text": "5.1.1",
-    "image-size": "1.0.0",
+    "image-size": "1.0.1",
     "intl": "1.2.5",
     "intl-messageformat": "5.4.3",
     "js-yaml": "4.1.0",
@@ -175,7 +175,7 @@
     "xml": "1.0.1"
   },
   "optionalDependencies": {
-    "@tryghost/html-to-mobiledoc": "1.8.2",
+    "@tryghost/html-to-mobiledoc": "1.8.3",
     "sqlite3": "5.0.2"
   },
   "devDependencies": {
@@ -184,7 +184,7 @@
     "c8": "7.11.0",
     "chai": "4.3.4",
     "coffeescript": "2.6.1",
-    "cssnano": "5.0.14",
+    "cssnano": "5.0.15",
     "eslint": "7.32.0",
     "eslint-plugin-ghost": "2.11.0",
     "expect": "27.4.6",
@@ -203,17 +203,17 @@
     "mocha": "9.1.3",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "0.4.10",
-    "nock": "13.2.1",
+    "nock": "13.2.2",
     "papaparse": "5.3.1",
     "postcss": "8.4.5",
     "rewire": "5.0.0",
     "should": "13.2.3",
     "sinon": "11.1.2",
-    "supertest": "6.1.6",
+    "supertest": "6.2.1",
     "tmp": "0.2.1"
   },
   "resolutions": {
-    "@tryghost/logging": "2.0.0",
+    "@tryghost/logging": "2.0.1",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }