ghost 4.22.1 → 4.23.0

package/core/frontend/apps/amp/lib/views/amp.hbs

@@ -457,6 +457,110 @@
         margin: 0 .5em;
     }
 
+    .kg-nft-card-container {
+        position: relative;
+        display: flex;
+        flex: auto;
+        flex-direction: column;
+        text-decoration: none;
+        font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,sans-serif;
+        font-size: 1.4rem;
+        font-weight: 400;
+        box-shadow: 0 2px 6px -2px rgb(0 0 0 / 10%), 0 0 1px rgb(0 0 0 / 40%);
+        width: 100%;
+        max-width: 512px;
+        color: #15212A;
+        background: #fff;
+        border-radius: 5px;
+        transition: none;
+        margin: 0 auto; 
+    }
+
+    .kg-nft-metadata {
+        padding: 2.0rem;
+    }
+
+    .kg-nft-image-container {
+        position: relative;
+    }
+
+    .kg-nft-image {
+        display: flex;
+        border-radius: 5px 5px 0 0;
+    }
+
+    .kg-nft-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        gap: 20px;
+    }
+
+    .kg-nft-header h4.kg-nft-title {
+        font-size: 1.9rem;
+        font-weight: 700;
+        margin: 0;
+        color: #15212A;
+    }
+
+    .kg-nft-header amp-img {
+        max-width: 114px;
+        max-height: 26px;
+    }
+
+    .kg-nft-opensea-logo {
+        margin-top: 2px;
+        width: 100px;
+    }
+
+    .kg-nft-creator {
+        font-family: inherit;
+        color: #95A1AD;
+    }
+
+    .kg-nft-creator span {
+        font-weight: 500;
+        color: #15212A;
+    }
+
+    .kg-nft-card p.kg-nft-description {
+        font-size: 1.4rem;
+        line-height: 1.4em;
+        margin: 2.0rem 0 0;
+        color: #222;
+    }
+
+    .kg-button-card {
+        display: flex;
+        position: static;
+        align-items: center;
+        width: 100%;
+        justify-content: center;
+    }
+
+    .kg-btn {
+        display: flex;
+        position: static;
+        align-items: center;
+        padding: 0 2.0rem;
+        height: 4.0rem;
+        line-height: 4.0rem;
+        font-size: 1.65rem;
+        font-weight: 600;
+        text-decoration: none;
+        border-radius: 5px;
+        transition: opacity 0.2s ease-in-out;
+    }
+
+    .kg-btn:hover {
+        opacity: 0.85;
+    }
+
+    .kg-btn-accent {
+        background-color: var(--ghost-accent-color, #1292EE);
+        color: #fff;
+    }
+
     .kg-width-full.kg-card-hascaption {
         display: grid;
         grid-template-columns: inherit;

package/core/frontend/apps/private-blogging/lib/router.js

@@ -36,7 +36,7 @@ privateRouter
     .post(
         bodyParser.urlencoded({extended: true}),
         middleware.redirectPrivateToHomeIfLoggedIn,
-        web.shared.middlewares.brute.privateBlog,
+        web.shared.middleware.brute.privateBlog,
         middleware.doLoginToPrivateSite,
         _renderer
     );

package/core/frontend/services/card-assets/service.js

@@ -2,12 +2,13 @@ const Minifier = require('@tryghost/minifier');
 const _ = require('lodash');
 const path = require('path');
 const fs = require('fs').promises;
+const logging = require('@tryghost/logging');
+const config = require('../../../shared/config');
 
 class CardAssetService {
     constructor(options = {}) {
-        // @TODO: use our config paths concept
-        this.src = options.src || path.join(__dirname, '../../src/cards');
-        this.dest = options.dest || path.join(__dirname, '../../public');
+        this.src = options.src || path.join(config.get('paths').assetSrc, 'cards');
+        this.dest = options.dest || config.getContentPath('public');
         this.minifier = new Minifier({src: this.src, dest: this.dest});
 
         if ('config' in options) {
@@ -49,7 +50,14 @@ class CardAssetService {
     }
 
     async minify(globs) {
-        return await this.minifier.minify(globs);
+        try {
+            return await this.minifier.minify(globs);
+        } catch (err) {
+            // @TODO: Convert this back to a proper error once the underlying bug is fixed
+            if (err.code === 'EACCES') {
+                logging.warn('Ghost was not able to write card asset files due to permissions.');
+            }
+        }
     }
 
     async clearFiles() {
@@ -59,8 +67,8 @@ class CardAssetService {
         try {
             await fs.unlink(path.join(this.dest, 'cards.min.css'));
         } catch (error) {
-            // Don't worry if the file didn't exist
-            if (error.code !== 'ENOENT') {
+            // Don't worry if the file didn't exist or we don't have perms here
+            if (error.code !== 'ENOENT' && error.code !== 'EACCES') {
                 throw error;
             }
         }
@@ -68,8 +76,8 @@ class CardAssetService {
         try {
             await fs.unlink(path.join(this.dest, 'cards.min.js'));
         } catch (error) {
-            // Don't worry if the file didn't exist
-            if (error.code !== 'ENOENT') {
+            // Don't worry if the file didn't exist or we don't have perms here
+            if (error.code !== 'ENOENT' && error.code !== 'EACCES') {
                 throw error;
             }
         }
@@ -82,19 +90,19 @@ class CardAssetService {
     /**
      * A theme can declare which cards it supports, and we'll do the rest
      *
-     * @param {Array|boolean} config
+     * @param {Array|boolean} cardAssetConfig
      * @returns
      */
-    async load(config) {
-        if (config) {
-            this.config = config;
+    async load(cardAssetConfig) {
+        if (cardAssetConfig) {
+            this.config = cardAssetConfig;
         }
 
         await this.clearFiles();
 
         const globs = this.generateGlobs();
 
-        this.files = await this.minify(globs);
+        this.files = await this.minify(globs) || [];
     }
 }
 

package/core/frontend/services/routing/CollectionRouter.js

@@ -3,7 +3,7 @@ const urlUtils = require('../../../shared/url-utils');
 const ParentRouter = require('./ParentRouter');
 
 const controllers = require('./controllers');
-const middlewares = require('./middlewares');
+const middleware = require('./middleware');
 const RSSRouter = require('./RSSRouter');
 
 /**
@@ -27,7 +27,6 @@ class CollectionRouter extends ParentRouter {
         this.rss = object.rss !== false;
 
         this.permalinks = {
-            originalValue: object.permalink,
             value: object.permalink
         };
 
@@ -71,7 +70,7 @@ class CollectionRouter extends ParentRouter {
         this.mountRoute(this.route.value, controllers.collection);
 
         // REGISTER: enable pagination by default
-        this.router().param('page', middlewares.pageParam);
+        this.router().param('page', middleware.pageParam);
         this.mountRoute(urlUtils.urlJoin(this.route.value, 'page', ':page(\\d+)'), controllers.collection);
 
         // REGISTER: is rss enabled?
@@ -93,7 +92,7 @@ class CollectionRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare index context for further middlewares/controllers.
+     * @description Prepare index context for further middleware/controllers.
      */
     _prepareEntriesContext(req, res, next) {
         res.routerOptions = {
@@ -116,7 +115,7 @@ class CollectionRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare entry context for further middlewares/controllers.
+     * @description Prepare entry context for further middleware/controllers.
      */
     _prepareEntryContext(req, res, next) {
         res.routerOptions.context = ['post'];

package/core/frontend/services/routing/EmailRouter.js

@@ -30,7 +30,7 @@ class EmailRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for further middlewares/controllers.
+     * @description Prepare context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/ParentRouter.js

@@ -180,14 +180,6 @@ class ParentRouter {
         return this.permalinks;
     }
 
-    /**
-     * @description Get configured filter of this router.
-     * @returns {String}
-     */
-    getFilter() {
-        return this.filter;
-    }
-
     /**
      * @description Get main route of this router.
      *

package/core/frontend/services/routing/PreviewRouter.js

@@ -30,7 +30,7 @@ class PreviewRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for further middlewares/controllers.
+     * @description Prepare context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/StaticPagesRouter.js

@@ -52,7 +52,7 @@ class StaticPagesRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for futher middlewares/controllers.
+     * @description Prepare context for futher middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/StaticRoutesRouter.js

@@ -3,7 +3,7 @@ const errors = require('@tryghost/errors');
 const urlUtils = require('../../../shared/url-utils');
 const RSSRouter = require('./RSSRouter');
 const controllers = require('./controllers');
-const middlewares = require('./middlewares');
+const middleware = require('./middleware');
 const ParentRouter = require('./ParentRouter');
 
 /**
@@ -59,14 +59,14 @@ class StaticRoutesRouter extends ParentRouter {
         this.mountRoute(this.route.value, controllers[this.controller]);
 
         // REGISTER: pagination
-        this.router().param('page', middlewares.pageParam);
+        this.router().param('page', middleware.pageParam);
         this.mountRoute(urlUtils.urlJoin(this.route.value, 'page', ':page(\\d+)'), controllers[this.controller]);
 
         this.routerCreated(this);
     }
 
     /**
-     * @description Prepare channel context for further middlewares/controllers.
+     * @description Prepare channel context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next
@@ -102,7 +102,7 @@ class StaticRoutesRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare static route context for further middlewares/controllers.
+     * @description Prepare static route context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/TaxonomyRouter.js

@@ -4,7 +4,7 @@ const ParentRouter = require('./ParentRouter');
 const RSSRouter = require('./RSSRouter');
 const urlUtils = require('../../../shared/url-utils');
 const controllers = require('./controllers');
-const middlewares = require('./middlewares');
+const middleware = require('./middleware');
 
 /**
  * @description Taxonomies are groupings of posts based on a common relation.
@@ -51,7 +51,7 @@ class TaxonomyRouter extends ParentRouter {
         this.mountRoute(this.permalinks.getValue(), controllers.channel);
 
         // REGISTER: enable pagination for each taxonomy by default
-        this.router().param('page', middlewares.pageParam);
+        this.router().param('page', middleware.pageParam);
         this.mountRoute(urlUtils.urlJoin(this.permalinks.value, 'page', ':page(\\d+)'), controllers.channel);
 
         // REGISTER: edit redirect to admin client e.g. /tag/:slug/edit
@@ -63,7 +63,7 @@ class TaxonomyRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for routing middlewares/controllers.
+     * @description Prepare context for routing middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/router-manager.js

@@ -43,7 +43,12 @@ class RouterManager {
             return;
         }
 
-        this.urlService.onRouterAddedType(router);
+        this.urlService.onRouterAddedType(
+            router.identifier,
+            router.filter,
+            router.getResourceType(),
+            router.getPermalinks().getValue()
+        );
     }
 
     /**
@@ -179,7 +184,7 @@ class RouterManager {
         if (collectionRouter.getPermalinks().getValue().match(/:year|:month|:day/)) {
             debug('handleTimezoneEdit: trigger regeneration');
 
-            this.urlService.onRouterUpdated(collectionRouter);
+            this.urlService.onRouterUpdated(collectionRouter.identifier);
         }
     }
 }

package/core/frontend/services/rss/generate-feed.js

@@ -1,6 +1,5 @@
 const downsize = require('downsize');
 const Promise = require('bluebird');
-const cheerio = require('cheerio');
 const RSS = require('rss');
 const urlUtils = require('../../../shared/url-utils');
 const {routerManager} = require('../routing');
@@ -19,6 +18,8 @@ const generateTags = function generateTags(data) {
 };
 
 const generateItem = function generateItem(post, secure) {
+    const cheerio = require('cheerio');
+
     const itemUrl = routerManager.getUrlByResourceId(post.id, {secure, absolute: true});
     const htmlContent = cheerio.load(post.html || '');
     const item = {

package/core/frontend/src/cards/css/bookmark.css

@@ -1,83 +1,101 @@
-/* style.css */
-
-.kg-bookmark-card {
-    width: 100%;
+.kg-bookmark-card,
+.kg-bookmark-publisher {
     position: relative;
+    width: 100%;
 }
 
-.kg-bookmark-container {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row-reverse;
-    color: currentColor;
-    font-family: inherit;
-    text-decoration: none;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-}
-
+.kg-bookmark-container,
 .kg-bookmark-container:hover {
+    display: flex;
     text-decoration: none;
+    border-radius: 4px;
+    box-shadow: inset 0 0 0 1px rgb(124 139 154 / 25%);
+    overflow: hidden;
 }
 
 .kg-bookmark-content {
-    flex-basis: 0;
-    flex-grow: 999;
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    flex-basis: 100%;
+    align-items: flex-start;
+    justify-content: flex-start;
     padding: 20px;
-    order: 1;
 }
 
 .kg-bookmark-title {
+    font-size: 1.5rem;
+    line-height: 1.4em;
     font-weight: 600;
 }
 
-.kg-bookmark-metadata,
 .kg-bookmark-description {
-    margin-top: .5em;
+    display: -webkit-box;
+    font-size: 1.4rem;
+    line-height: 1.5em;
+    margin-top: 3px;
+    font-weight: 400;
+    max-height: 44px;
+    overflow-y: hidden;
+    opacity: 0.7;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
 }
 
 .kg-bookmark-metadata {
+    display: flex;
     align-items: center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    margin-top: 22px;
+    width: 100%;
+    font-size: 1.4rem;
+    font-weight: 500;
 }
 
-.kg-bookmark-description {
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
+.kg-bookmark-metadata > *:not(img) {
+    opacity: 0.7;
 }
 
 .kg-bookmark-icon {
-    display: inline-block;
-    width: 1em;
-    height: 1em;
-    vertical-align: text-bottom;
-    margin-right: .5em;
-    margin-bottom: .05em;
+    width: 20px;
+    height: 20px;
+    margin-right: 6px;
 }
 
-.kg-bookmark-thumbnail {
-    display: flex;
-    flex-basis: 24rem;
-    flex-grow: 1;
+.kg-bookmark-author,
+.kg-bookmark-publisher {
+    display: inline;
 }
 
-.kg-bookmark-thumbnail img {
-    max-width: 100%;
-    height: auto;
-    vertical-align: bottom;
-    object-fit: cover;
-}
-
-.kg-bookmark-author {
-    white-space: nowrap;
+.kg-bookmark-publisher {
     text-overflow: ellipsis;
     overflow: hidden;
+    max-width: 240px;
+    white-space: nowrap;
+    display: block;
+    line-height: 1.65em;
+}
+
+.kg-bookmark-metadata > span:nth-of-type(2) {
+    font-weight: 400;
 }
 
-.kg-bookmark-publisher::before {
+.kg-bookmark-metadata > span:nth-of-type(2):before {
     content: "•";
-    margin: 0 .5em;
+    margin: 0 6px;
+}
+
+.kg-bookmark-thumbnail {
+    position: relative;
+    flex-grow: 1;
+    min-width: 33%;
+}
+
+.kg-bookmark-thumbnail img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-radius: 0 4px 4px 0;
 }

package/core/frontend/src/cards/css/button.css

@@ -0,0 +1,30 @@
+.kg-button-card {
+    display: flex;
+    position: static;
+    align-items: center;
+    width: 100%;
+    justify-content: center;
+}
+
+a.kg-btn {
+    display: flex;
+    position: static;
+    align-items: center;
+    padding: 0 2.0rem;
+    height: 4.0rem;
+    line-height: 4.0rem;
+    font-size: 1.65rem;
+    font-weight: 600;
+    text-decoration: none;
+    border-radius: 5px;
+    transition: opacity 0.2s ease-in-out;
+}
+
+a.kg-btn:hover {
+    opacity: 0.85;
+}
+
+a.kg-btn-accent {
+    background-color: var(--ghost-accent-color);
+    color: #fff;
+}

package/core/frontend/src/cards/css/callout.css

@@ -0,0 +1,50 @@
+.kg-card-callout {
+    display: flex;
+    align-items: center;
+    padding: 20px 28px;
+    border-radius: 3px;
+}
+
+.kg-card-callout-grey {
+    background: rgba(124, 139, 154, 0.13);
+}
+
+.kg-card-callout-white {
+    background: transparent;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+}
+
+.kg-card-callout-blue {
+    background: rgba(33, 172, 232, 0.12);
+}
+
+.kg-card-callout-green {
+    background: rgba(52, 183, 67, 0.12);
+}
+
+.kg-card-callout-yellow {
+    background: rgba(240, 165, 15, 0.13);
+}
+
+.kg-card-callout-red {
+    background: rgba(209, 46, 46, 0.11);
+}
+
+.kg-card-callout-pink {
+    background: rgba(225, 71, 174, 0.11);
+}
+
+.kg-card-callout-purple {
+    background: rgba(135, 85, 236, 0.12);
+}
+
+.kg-card-callout-accent {
+    background: var(--ghost-accent-color);
+    color: #fff;
+}
+
+.kg-callout-emoji {
+    padding-right: 12px;
+    line-height: 1.6;
+    font-size: 2rem;
+}

package/core/frontend/src/cards/css/gallery.css

@@ -1,17 +1,12 @@
-.kg-gallery-card {
-    margin: 0 0 1.5em;
-}
-
-.kg-gallery-card figcaption {
-    margin: -1.0em 0 1.5em;
+.kg-image-card:not(.kg-card-hascaption) + .kg-image-card,
+.kg-image-card:not(.kg-card-hascaption) + .kg-gallery-card,
+.kg-gallery-card:not(.kg-card-hascaption) + .kg-image-card,
+.kg-gallery-card:not(.kg-card-hascaption) + .kg-gallery-card {
+    margin-top: 1.2rem;
 }
 
 .kg-gallery-container {
-    display: flex;
-    flex-direction: column;
-    margin: 1.5em auto;
-    max-width: 1040px;
-    width: 100vw;
+    position: relative;
 }
 
 .kg-gallery-row {
@@ -28,9 +23,9 @@
 }
 
 .kg-gallery-row:not(:first-of-type) {
-    margin: 0.75em 0 0 0;
+    margin: 1.2rem 0 0;
 }
 
 .kg-gallery-image:not(:first-of-type) {
-    margin: 0 0 0 0.75em;
+    margin: 0 0 0 1.2rem;
 }