ghost 5.8.1 → 5.9.0

package/core/built/admin/assets/{vendor-46baf13852f545c6c89756c8e0ccbff2.js → vendor-516c9e43b4aeb92079dc1ab92c9ce492.js}

@@ -9020,8 +9020,8 @@ const o=++m
 r.recycle(u(e,o),o),this._appendComponent(r),t.push(r)}for(;O>M;){let r
 r=!0===i&&n.pop()||new l
 const o=--O
-r.recycle(u(e,o),o),this._prependComponent(r),t.unshift(r)}if(n.length>0)if(!0===i)for(let l=n.length-1;l>=0;l--){const t=n[l]
-u(e,t.index)?d(this._domPool,null,t.realUpperBound,t.realLowerBound):(Ember.run((()=>{r.removeObject(t)})),n.splice(l,1))}else r.removeObjects(n),n.length=0
+r.recycle(u(e,o),o),this._prependComponent(r),t.unshift(r)}if(n.length>0)if(!0===i)for(let l=0;l<n.length;l++){const e=n[l]
+d(this._domPool,null,e.realUpperBound,e.realLowerBound)}else r.removeObjects(n),n.length=0
 const A=M,g=b-h-1,v=1===A?"item":"items",y=1===g?"item":"items"
 p.style.height=`${Math.max(z,0)}px`,p.innerHTML=A>0?`And ${A} ${v} before`:"",c.style.height=`${Math.max(f,0)}px`,c.innerHTML=g>0?`And ${g} ${y} after`:""}_appendComponent(e){const{virtualComponents:t,_occludedContentAfter:r,_appendComponentPool:n,shouldRecycle:i,_itemContainer:o}=this,a=r.realUpperBound
 !0===e.rendered?d(o,a,e.realUpperBound,e.realLowerBound):(t.insertAt(t.get("length")-1,e),e.rendered=!0,i||(n.unshift(e),null===this._nextLayout&&(this._nextLayout=this.schedule("layout",(()=>{for(this._nextLayout=null;n.length>0;){const e=n.pop(),t=r.realUpperBound
@@ -13818,4 +13818,4 @@ return void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),n}dirtyStor
 r&&(0,t.setValue)(r,null)}constructor(e){o(this,"storages",new WeakMap),o(this,"vals",void 0),this.vals=new WeakSet(e)}has(e){return(0,t.getValue)(this.storageFor(e)),this.vals.has(e)}add(e){return this.vals.add(e),this.dirtyStorageFor(e),this}delete(e){return this.dirtyStorageFor(e),this.vals.delete(e)}get[i](){return this.vals[Symbol.toStringTag]}}e.TrackedWeakSet=s,Object.setPrototypeOf(s.prototype,WeakSet.prototype)})),define("tracked-built-ins/index",["exports","tracked-built-ins/-private/decorator","tracked-built-ins/-private/array","tracked-built-ins/-private/object","tracked-built-ins/-private/map","tracked-built-ins/-private/set"],(function(e,t,r,n,i,o){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"TrackedArray",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return i.TrackedMap}}),Object.defineProperty(e,"TrackedObject",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return o.TrackedSet}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return i.TrackedWeakMap}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return o.TrackedWeakSet}}),Object.defineProperty(e,"tracked",{enumerable:!0,get:function(){return t.default}})}))
 
-//# sourceMappingURL=vendor-46baf13852f545c6c89756c8e0ccbff2.map
+//# sourceMappingURL=vendor-516c9e43b4aeb92079dc1ab92c9ce492.map

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.8%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.9%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-b469423d0fbe5e40af17b560f7e3cead.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-686c383caa6a3469cefb939ab10e21b6.css" title="light">
 
     
 </head>
@@ -53,9 +53,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-46baf13852f545c6c89756c8e0ccbff2.js"></script>
-<script src="assets/chunk.351.cbc224ca65c14ef5322d.js"></script>
-<script src="assets/chunk.143.904e017ad397bb681e9d.js"></script>
-    <script src="assets/ghost-a66a04418efe85083a3adca0fb16bb52.js"></script>
+    <script src="assets/vendor-516c9e43b4aeb92079dc1ab92c9ce492.js"></script>
+<script src="assets/chunk.351.73f27952f867334a8228.js"></script>
+<script src="assets/chunk.143.e35fdb482bc822313f0c.js"></script>
+    <script src="assets/ghost-eca1a709a74b1af277e48aad4e16c9db.js"></script>
 </body>
 </html>

package/core/frontend/helpers/comment_count.js

@@ -1,31 +1,23 @@
 const {SafeString} = require('../services/handlebars');
-const {labs} = require('../services/proxy');
 const {html} = require('common-tags');
 
-function commentCount(options) {
+module.exports = function commentCount(options) {
     const empty = options.hash.empty === undefined ? '' : options.hash.empty;
     const singular = options.hash.singular === undefined ? 'comment' : options.hash.singular;
     const plural = options.hash.plural === undefined ? 'comments' : options.hash.plural;
+    const autowrap = options.hash.autowrap !== 'false';
+    const tag = autowrap ? options.hash.autowrap || 'span' : 'script';
+    const className = options.hash.class;
     return new SafeString(html`
         <script
             data-ghost-comment-count="${this.id}"
             data-ghost-comment-count-empty="${empty}"
             data-ghost-comment-count-singular="${singular}"
             data-ghost-comment-count-plural="${plural}"
+            data-ghost-comment-count-tag="${tag}"
+            data-ghost-comment-count-class-name="${className}"
+            data-ghost-comment-count-autowrap="${autowrap ? 'true' : 'false'}"
         >
         </script>
     `);
-}
-
-module.exports = function commentsLabsWrapper() {
-    const self = this;
-    const args = arguments;
-
-    return labs.enabledHelper({
-        flagKey: 'comments',
-        flagName: 'Comments',
-        helperName: 'comment_count'
-    }, () => {
-        return commentCount.apply(self, args);
-    });
 };

package/core/frontend/helpers/comments.js

@@ -1,8 +1,8 @@
 const {SafeString} = require('../services/handlebars');
-const {urlUtils, getFrontendKey, labs, settingsCache} = require('../services/proxy');
+const {urlUtils, getFrontendKey, settingsCache} = require('../services/proxy');
 const {getFrontendAppConfig, getDataAttributes} = require('../utils/frontend-apps');
 
-async function comments(options) {
+module.exports = async function comments(options) {
     // todo: For now check on the comment id to exclude normal pages (we probably have a better way to do this)
 
     const commentId = this.comment_id;
@@ -66,7 +66,8 @@ async function comments(options) {
         'avatar-saturation': avatarSaturation,
         'accent-color': accentColor,
         'app-version': appVersion,
-        'comments-enabled': commentsEnabled
+        'comments-enabled': commentsEnabled,
+        publication: settingsCache.get('title')
     };
 
     const dataAttributes = getDataAttributes(data);
@@ -74,19 +75,6 @@ async function comments(options) {
     return new SafeString(`
         <script defer src="${scriptUrl}" ${dataAttributes} crossorigin="anonymous"></script>
     `);
-}
-
-module.exports = async function commentsLabsWrapper() {
-    const self = this;
-    const args = arguments;
-
-    return labs.enabledHelper({
-        flagKey: 'comments',
-        flagName: 'Comments',
-        helperName: 'comments'
-    }, () => {
-        return comments.apply(self, args);
-    });
 };
 
 module.exports.async = true;

package/core/frontend/helpers/ghost_head.js

@@ -229,7 +229,7 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                 head.push(`<link rel="stylesheet" type="text/css" href="${getAssetUrl('public/cards.min.css')}">`);
             }
 
-            if (labs.isSet('comments') && settingsCache.get('enable_comments') !== 'off') {
+            if (settingsCache.get('enable_comments') !== 'off') {
                 head.push(`<script defer src="${getAssetUrl('public/comment-counts.min.js')}" data-ghost-comments-counts-api="${urlUtils.getSiteUrl(true)}members/api/comments/counts/"></script>`);
             }
 

package/core/frontend/public/ghost.min.css

@@ -1 +1 @@
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-family:sans-serif}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}.black{color:#15171a}.darkgrey{color:#394047}.midgrey{color:#7c8b9a}.lightgrey{color:#ced4d9}.blue{color:#14b8ff}.red{color:#f50b23}.orange{color:#ffb41f}.green{color:#30cf43}.darkgrey-hover:hover{color:#394047}.midgrey-hover:hover{color:#7c8b9a}.lightgrey-hover:hover{color:#ced4d9}.blue-hover:hover{color:#14b8ff}.red-hover:hover{color:#f50b23}.orange-hover:hover{color:#ffb41f}.green-hover:hover{color:#30cf43}*,:after,:before{box-sizing:border-box}html{-webkit-tap-highlight-color:rgba(0,0,0,0);font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;font-size:62.5%;letter-spacing:.2px;line-height:1.65;overflow:hidden}body,html{height:100%;width:100%}body{color:#343f44;font-size:1.4rem;overflow:auto;overflow-x:hidden}.gh-view{-ms-flex-positive:1;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;flex-grow:1}h1,h2{text-rendering:optimizeLegibility;color:#343f44;font-size:2.9rem;line-height:1.15em;margin:0 0 .3em;text-indent:-1px}@media (max-width:500px){h1{font-size:2.4rem}}.gh-input{-webkit-appearance:none;border:1px solid #d6e3eb;border-radius:4px;color:#4b5b62;display:block;font-size:1.6rem;font-weight:300;height:40px;line-height:1em;padding:10px 12px;transition:border-color .15s linear;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;width:100%}.gh-input:focus{border-color:#b4cbda;outline:0}.gh-btn{fill:#829aa8;-webkit-font-smoothing:subpixel-antialiased;border:1px solid #d6e3eb;border-radius:5px;color:#829aa8;display:inline-block;outline:none;text-decoration:none!important;transition:all .2s ease;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.gh-btn span{border-radius:4px;display:block;font-size:1.3rem;font-weight:400;height:33px;letter-spacing:.2px;line-height:33px;padding:0 12px;text-align:center}.gh-btn:hover{border-color:#b4cbda}.gh-btn-hover-blue:hover{border-color:#3eb0ef;color:#3eb0ef}.gh-btn-blue{fill:#fff;background:linear-gradient(#3da1d6,#2288bf);border:0;box-shadow:0 1px 0 rgba(0,0,0,.12);color:#fff;padding:1px;text-shadow:0 -1px 0 rgba(0,0,0,.1);transition:none!important}.gh-btn-blue span{background:linear-gradient(#4ab6f0,#2fa5e4 60%,#2fa5e4 90%,#38a9e5);box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1)}.gh-btn-blue:active,.gh-btn-blue:focus{background:#1e78a9}.gh-btn-blue:active span,.gh-btn-blue:focus span{background:#29a0e0;box-shadow:none}.gh-btn-block{display:block;width:100%}.gh-input-icon{display:block;position:relative}.gh-input-icon svg{fill:color(var(--midgrey) l(15%));height:14px;left:10px;position:absolute;top:50%;transform:translateY(-7px);width:auto;z-index:2}.gh-input-icon input{padding-left:35px}.gh-app{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%;overflow:hidden}.gh-viewport{max-height:100%;overflow:hidden}.gh-main,.gh-viewport{-ms-flex-positive:1;display:-ms-flexbox;display:flex;flex-grow:1}.gh-main{background:#fff;overflow-y:auto;position:relative}.gh-flow{background:linear-gradient(315deg,#efefef,#fff);min-height:100%;overflow-y:auto}.gh-flow,.gh-flow-content-wrap{display:flex;flex-direction:column;flex-grow:1}.gh-flow-content-wrap{align-items:center;flex-shrink:0;justify-content:center;margin:0 24px;padding-bottom:8vh}.gh-flow-content-wrap .site-icon{border-radius:3px;height:70px;width:70px}.gh-flow-content{background:#fff;border-radius:3px;box-shadow:0 2.8px 2.2px rgba(0,0,0,.02),0 6.7px 5.3px rgba(0,0,0,.02),0 12.5px 10px rgba(0,0,0,.02),0 22.3px 17.9px rgba(0,0,0,.03),0 41.8px 33.4px rgba(0,0,0,.03),0 100px 80px rgba(0,0,0,.05);color:var(--darkgrey);display:flex;flex-direction:column;font-size:1.9rem;font-weight:300;line-height:1.5em;margin:4rem 0 6rem;max-width:520px;padding:40px;width:100%}.gh-flow-content.unsubscribe{align-items:center;justify-content:center;margin:4rem 0;max-width:560px;min-height:200px;text-align:center}@media (max-width:500px){.gh-flow-content{background:transparent;box-shadow:none;padding:0}}.gh-flow-content header{align-items:center;display:flex;flex-direction:column}.gh-flow-content h1{color:#15171a;font-size:4.1rem;font-weight:700;line-height:1.15em;margin-bottom:24px}.gh-flow-content.unsubscribe h1{font-size:3.2rem}@media (max-width:600px){.gh-flow-content h1,.gh-flow-content.unsubscribe h1{font-size:6vw}}.gh-flow-content.unsubscribe p{color:#394047;font-size:1.8rem;margin:0 0 .4em}@media (max-width:500px){.gh-flow-content.unsubscribe p{font-size:1.6rem;line-height:1.5}}.gh-flow-content .gh-btn{display:block;margin:20px auto 0;max-width:400px}.gh-flow-content .form-group{margin-bottom:2.5rem;position:relative}.gh-flow-content .form-group.error .gh-input{border-color:#f50b23;box-shadow:0 0 0 3px rgba(239,24,24,.15)}.gh-flow-content .main-error{color:#7c8b9a;font-size:1.35rem;font-weight:400;margin:0;position:absolute;right:0;text-align:center;user-select:text}.gh-flow-em{font-weight:500}.unsubscribe-footer{font-size:1.5rem;text-align:center}@media (max-width:500px){.unsubscribe-footer{font-size:1.4rem;line-height:1.4em;padding:0 24px}}.unsubscribe-footer p{color:#7c8b9a;margin:0 0 .4rem}.unsubscribe-footer a{color:#15171a;text-decoration:none}.unsubscribe-footer a:hover{text-decoration:underline}.gh-signin{margin-bottom:1.5rem}.gh-signin .gh-input,.gh-signin .gh-input:-webkit-autofill:first-line{border-radius:8px;font-size:1.8rem;height:54px;padding:12px 16px}.gh-signin .gh-input::placeholder{color:#abb4be;font-weight:400;opacity:1}.gh-signin .gh-input::-webkit-input-placeholder{color:#abb4be;font-weight:400}.gh-signin .gh-input:-ms-input-placeholder{color:#abb4be;font-weight:400}.gh-signin .gh-input::-moz-placeholder{color:#abb4be;font-weight:400;opacity:1}.gh-signin .gh-input:focus{border-color:#30cf43;box-shadow:0 0 0 3px rgba(26,170,96,.15)}.gh-signin .gh-btn{-webkit-font-smoothing:subpixel-antialiased;background:#15171a;border-radius:8px;font-weight:300;height:54px;line-height:54px;margin:0;margin-top:32px;max-width:unset;transition:all .4s ease;width:100%}.gh-signin .gh-btn span{color:#fff;font-size:1.8rem}.error-content{flex-grow:1;justify-content:center;padding:8vw;user-select:text}.error-content,.error-details{align-items:center;display:flex}.error-details{margin-bottom:4rem}.error-ghost{height:115px;margin:15px}@media (max-width:630px){.error-ghost{display:none}}.error-code{color:#c5d2d9;font-size:10vw;font-weight:600;letter-spacing:-.4vw;line-height:.9em;margin:0}.error-description{border:none;color:#54666d;font-size:2.3rem;font-weight:300;line-height:1.3em;margin:0;padding:0}.error-message{align-items:center;display:flex;flex-direction:column;margin:15px}.error-message a{font-size:1.4rem;line-height:1;margin:8px 0}.error-link{background-color:transparent;color:#5ba4e5;text-decoration:none;transition:background .3s,color .3s}.error-stack{background-color:hsla(0,0%,100%,.3);margin:1rem auto;max-width:800px;padding:2rem}.error-stack-list{list-style-type:none;margin:0;padding:0}.error-stack-list li{display:block}.error-stack-list li:before{color:#bbb;content:"\21AA";display:inline-block;font-size:1.2rem;margin-right:.5rem}.error-stack-function{font-weight:700}
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}.black{color:#15171a}.darkgrey{color:#394047}.midgrey{color:#7c8b9a}.lightgrey{color:#ced4d9}.blue{color:#14b8ff}.red{color:#f50b23}.orange{color:#ffb41f}.green{color:#30cf43}.darkgrey-hover:hover{color:#394047}.midgrey-hover:hover{color:#7c8b9a}.lightgrey-hover:hover{color:#ced4d9}.blue-hover:hover{color:#14b8ff}.red-hover:hover{color:#f50b23}.orange-hover:hover{color:#ffb41f}.green-hover:hover{color:#30cf43}*,:after,:before{box-sizing:border-box}html{overflow:hidden;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;font-size:62.5%;line-height:1.65;letter-spacing:.2px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body,html{width:100%;height:100%}body{overflow:auto;overflow-x:hidden;color:#343f44;font-size:1.4rem}.gh-view{-ms-flex-positive:1;flex-grow:1;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}h1,h2{margin:0 0 .3em;color:#343f44;line-height:1.15em;text-rendering:optimizeLegibility;text-indent:-1px;font-size:2.9rem}@media (max-width:500px){h1{font-size:2.4rem}}.gh-input{display:block;padding:10px 12px;width:100%;height:40px;border:1px solid #d6e3eb;border-radius:4px;color:#4b5b62;font-size:1.6rem;line-height:1em;font-weight:300;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;transition:border-color .15s linear;-webkit-appearance:none}.gh-input:focus{outline:0;border-color:#b4cbda}.gh-btn{display:inline-block;outline:none;border:1px solid #d6e3eb;color:#829aa8;text-decoration:none!important;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;fill:#829aa8;border-radius:5px;transition:all .2s ease;-webkit-font-smoothing:subpixel-antialiased}.gh-btn span{display:block;padding:0 12px;height:33px;font-size:1.3rem;line-height:33px;font-weight:400;text-align:center;letter-spacing:.2px;border-radius:4px}.gh-btn:hover{border-color:#b4cbda}.gh-btn-hover-blue:hover{border-color:#3eb0ef;color:#3eb0ef}.gh-btn-blue{padding:1px;border:0;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.1);fill:#fff;background:linear-gradient(#3da1d6,#2288bf);box-shadow:0 1px 0 rgba(0,0,0,.12);transition:none!important}.gh-btn-blue span{background:linear-gradient(#4ab6f0,#2fa5e4 60%,#2fa5e4 90%,#38a9e5);box-shadow:inset 0 1px 0 hsla(0,0%,100%,.1)}.gh-btn-blue:active,.gh-btn-blue:focus{background:#1e78a9}.gh-btn-blue:active span,.gh-btn-blue:focus span{background:#29a0e0;box-shadow:none}.gh-btn-block{display:block;width:100%}.gh-input-icon{position:relative;display:block}.gh-input-icon svg{position:absolute;top:50%;left:10px;z-index:2;height:14px;width:auto;fill:color(var(--midgrey) l(15%));transform:translateY(-7px)}.gh-input-icon input{padding-left:35px}.gh-app{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;overflow:hidden;height:100%}.gh-viewport{overflow:hidden;max-height:100%}.gh-main,.gh-viewport{-ms-flex-positive:1;flex-grow:1;display:-ms-flexbox;display:flex}.gh-main{position:relative;background:#fff;overflow-y:auto}.gh-flow{overflow-y:auto;min-height:100%;background:linear-gradient(315deg,#efefef,#fff)}.gh-flow,.gh-flow-content-wrap{flex-grow:1;display:flex;flex-direction:column}.gh-flow-content-wrap{flex-shrink:0;justify-content:center;align-items:center;margin:0 24px;padding-bottom:8vh}.gh-flow-content-wrap .site-icon{width:70px;height:70px;border-radius:3px}.gh-flow-content{display:flex;flex-direction:column;max-width:520px;width:100%;margin:4rem 0 6rem;padding:40px;background:#fff;color:var(--darkgrey);font-size:1.9rem;line-height:1.5em;font-weight:300;border-radius:3px;box-shadow:0 2.8px 2.2px rgba(0,0,0,.02),0 6.7px 5.3px rgba(0,0,0,.02),0 12.5px 10px rgba(0,0,0,.02),0 22.3px 17.9px rgba(0,0,0,.03),0 41.8px 33.4px rgba(0,0,0,.03),0 100px 80px rgba(0,0,0,.05)}.gh-flow-content.unsubscribe{align-items:center;justify-content:center;max-width:560px;min-height:200px;margin:4rem 0;text-align:center}@media (max-width:500px){.gh-flow-content{padding:0;background:transparent;box-shadow:none}}.gh-flow-content header{display:flex;flex-direction:column;align-items:center}.gh-flow-content h1{margin-bottom:24px;color:#15171a;font-size:4.1rem;font-weight:700;line-height:1.15em}.gh-flow-content.unsubscribe h1{font-size:3.2rem}@media (max-width:600px){.gh-flow-content.unsubscribe h1,.gh-flow-content h1{font-size:6vw}}.gh-flow-content.unsubscribe p{margin:0 0 .4em;color:#394047;font-size:1.8rem}@media (max-width:500px){.gh-flow-content.unsubscribe p{font-size:1.6rem;line-height:1.5}}.gh-flow-content .gh-btn{display:block;margin:20px auto 0;max-width:400px}.gh-flow-content .form-group{position:relative;margin-bottom:2.5rem}.gh-flow-content .form-group.error .gh-input{border-color:#f50b23;box-shadow:0 0 0 3px rgba(239,24,24,.15)}.gh-flow-content .main-error{position:absolute;right:0;margin:0;color:#7c8b9a;font-size:1.35rem;font-weight:400;text-align:center;user-select:text}.gh-flow-em{font-weight:500}.unsubscribe-footer{text-align:center;font-size:1.5rem}@media (max-width:500px){.unsubscribe-footer{padding:0 24px;font-size:1.4rem;line-height:1.4em}}.unsubscribe-footer p{color:#7c8b9a;margin:0 0 .4rem}.unsubscribe-footer a{color:#15171a;text-decoration:none}.unsubscribe-footer a:hover{text-decoration:underline}.gh-signin{margin-bottom:1.5rem}.gh-signin .gh-input,.gh-signin .gh-input:-webkit-autofill:first-line{height:54px;padding:12px 16px;font-size:1.8rem;border-radius:8px}.gh-signin .gh-input::placeholder{color:#abb4be;font-weight:400;opacity:1}.gh-signin .gh-input::-webkit-input-placeholder{color:#abb4be;font-weight:400}.gh-signin .gh-input:-ms-input-placeholder{color:#abb4be;font-weight:400}.gh-signin .gh-input::-moz-placeholder{color:#abb4be;font-weight:400;opacity:1}.gh-signin .gh-input:focus{border-color:#30cf43;box-shadow:0 0 0 3px rgba(26,170,96,.15)}.gh-signin .gh-btn{margin:0;width:100%;height:54px;max-width:unset;margin-top:32px;background:#15171a;font-weight:300;line-height:54px;border-radius:8px;transition:all .4s ease;-webkit-font-smoothing:subpixel-antialiased}.gh-signin .gh-btn span{color:#fff;font-size:1.8rem}.error-content{flex-grow:1;justify-content:center;user-select:text;padding:8vw}.error-content,.error-details{display:flex;align-items:center}.error-details{margin-bottom:4rem}.error-ghost{margin:15px;height:115px}@media (max-width:630px){.error-ghost{display:none}}.error-code{margin:0;color:#c5d2d9;font-size:10vw;font-weight:600;line-height:.9em;letter-spacing:-.4vw}.error-description{margin:0;padding:0;border:none;color:#54666d;font-size:2.3rem;font-weight:300;line-height:1.3em}.error-message{display:flex;flex-direction:column;margin:15px;align-items:center}.error-message a{font-size:1.4rem;line-height:1;margin:8px 0}.error-link{background-color:transparent;color:#5ba4e5;transition:background .3s,color .3s;text-decoration:none}.error-stack{margin:1rem auto;padding:2rem;max-width:800px;background-color:hsla(0,0%,100%,.3)}.error-stack-list{margin:0;padding:0;list-style-type:none}.error-stack-list li{display:block}.error-stack-list li:before{content:"\21AA";display:inline-block;margin-right:.5rem;color:#bbb;font-size:1.2rem}.error-stack-function{font-weight:700}

package/core/frontend/src/comment-counts/js/comment-counts.js

@@ -42,7 +42,18 @@
                         text = count;
                     }
                 }
-                e.insertAdjacentText('afterend', text);
+                if (text) {
+                    if (e.dataset.ghostCommentCountAutowrap !== 'false') {
+                        const el = document.createElement(e.dataset.ghostCommentCountTag);
+                        if (e.dataset.ghostCommentCountClassName) {
+                            el.classList.add(e.dataset.ghostCommentCountClassName);
+                        }
+                        el.textContent = text;
+                        e.insertAdjacentElement('afterend', el);
+                    } else {
+                        e.insertAdjacentText('afterend', text);
+                    }
+                }
                 e.remove();
             });
         }

package/core/server/api/endpoints/comments-members.js

@@ -3,7 +3,7 @@ const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
 const commentsService = require('../../services/comments');
-const ALLOWED_INCLUDES = ['post', 'member', 'likes', 'replies', 'parent'];
+const ALLOWED_INCLUDES = ['member', 'replies', 'replies.member', 'replies.count.likes', 'replies.liked', 'count.replies', 'count.likes', 'liked', 'post', 'parent'];
 const UNSAFE_ATTRS = ['status'];
 
 const messages = {
@@ -37,6 +37,28 @@ module.exports = {
         }
     },
 
+    replies: {
+        options: [
+            'include',
+            'page',
+            'limit',
+            'fields',
+            'filter',
+            'order',
+            'debug',
+            'id'
+        ],
+        validation: {
+            options: {
+                include: ALLOWED_INCLUDES
+            }
+        },
+        permissions: 'browse',
+        query(frame) {
+            return commentsService.controller.replies(frame);
+        }
+    },
+
     read: {
         options: [
             'include'

package/core/server/api/endpoints/index.js

@@ -1,4 +1,4 @@
-const shared = require('../shared');
+const apiFramework = require('@tryghost/api-framework');
 const localUtils = require('./utils');
 
 // ESLint Override Notice
@@ -9,19 +9,19 @@ const localUtils = require('./utils');
 
 module.exports = {
     get authentication() {
-        return shared.pipeline(require('./authentication'), localUtils);
+        return apiFramework.pipeline(require('./authentication'), localUtils);
     },
 
     get db() {
-        return shared.pipeline(require('./db'), localUtils);
+        return apiFramework.pipeline(require('./db'), localUtils);
     },
 
     get identities() {
-        return shared.pipeline(require('./identities'), localUtils);
+        return apiFramework.pipeline(require('./identities'), localUtils);
     },
 
     get integrations() {
-        return shared.pipeline(require('./integrations'), localUtils);
+        return apiFramework.pipeline(require('./integrations'), localUtils);
     },
 
     // @TODO: transform
@@ -30,147 +30,147 @@ module.exports = {
     },
 
     get schedules() {
-        return shared.pipeline(require('./schedules'), localUtils);
+        return apiFramework.pipeline(require('./schedules'), localUtils);
     },
 
     get pages() {
-        return shared.pipeline(require('./pages'), localUtils);
+        return apiFramework.pipeline(require('./pages'), localUtils);
     },
 
     get redirects() {
-        return shared.pipeline(require('./redirects'), localUtils);
+        return apiFramework.pipeline(require('./redirects'), localUtils);
     },
 
     get roles() {
-        return shared.pipeline(require('./roles'), localUtils);
+        return apiFramework.pipeline(require('./roles'), localUtils);
     },
 
     get slugs() {
-        return shared.pipeline(require('./slugs'), localUtils);
+        return apiFramework.pipeline(require('./slugs'), localUtils);
     },
 
     get webhooks() {
-        return shared.pipeline(require('./webhooks'), localUtils);
+        return apiFramework.pipeline(require('./webhooks'), localUtils);
     },
 
     get posts() {
-        return shared.pipeline(require('./posts'), localUtils);
+        return apiFramework.pipeline(require('./posts'), localUtils);
     },
 
     get invites() {
-        return shared.pipeline(require('./invites'), localUtils);
+        return apiFramework.pipeline(require('./invites'), localUtils);
     },
 
     get mail() {
-        return shared.pipeline(require('./mail'), localUtils);
+        return apiFramework.pipeline(require('./mail'), localUtils);
     },
 
     get notifications() {
-        return shared.pipeline(require('./notifications'), localUtils);
+        return apiFramework.pipeline(require('./notifications'), localUtils);
     },
 
     get settings() {
-        return shared.pipeline(require('./settings'), localUtils);
+        return apiFramework.pipeline(require('./settings'), localUtils);
     },
 
     get membersStripeConnect() {
-        return shared.pipeline(require('./members-stripe-connect'), localUtils);
+        return apiFramework.pipeline(require('./members-stripe-connect'), localUtils);
     },
 
     get members() {
-        return shared.pipeline(require('./members'), localUtils);
+        return apiFramework.pipeline(require('./members'), localUtils);
     },
 
     get offers() {
-        return shared.pipeline(require('./offers'), localUtils);
+        return apiFramework.pipeline(require('./offers'), localUtils);
     },
 
     get tiers() {
-        return shared.pipeline(require('./tiers'), localUtils);
+        return apiFramework.pipeline(require('./tiers'), localUtils);
     },
 
     get memberSigninUrls() {
-        return shared.pipeline(require('./member-signin-urls.js'), localUtils);
+        return apiFramework.pipeline(require('./member-signin-urls.js'), localUtils);
     },
 
     get labels() {
-        return shared.pipeline(require('./labels'), localUtils);
+        return apiFramework.pipeline(require('./labels'), localUtils);
     },
 
     get images() {
-        return shared.pipeline(require('./images'), localUtils);
+        return apiFramework.pipeline(require('./images'), localUtils);
     },
 
     get media() {
-        return shared.pipeline(require('./media'), localUtils);
+        return apiFramework.pipeline(require('./media'), localUtils);
     },
 
     get files() {
-        return shared.pipeline(require('./files'), localUtils);
+        return apiFramework.pipeline(require('./files'), localUtils);
     },
 
     get tags() {
-        return shared.pipeline(require('./tags'), localUtils);
+        return apiFramework.pipeline(require('./tags'), localUtils);
     },
 
     get users() {
-        return shared.pipeline(require('./users'), localUtils);
+        return apiFramework.pipeline(require('./users'), localUtils);
     },
 
     get previews() {
-        return shared.pipeline(require('./previews'), localUtils);
+        return apiFramework.pipeline(require('./previews'), localUtils);
     },
 
     get emailPost() {
-        return shared.pipeline(require('./email-post'), localUtils);
+        return apiFramework.pipeline(require('./email-post'), localUtils);
     },
 
     get oembed() {
-        return shared.pipeline(require('./oembed'), localUtils);
+        return apiFramework.pipeline(require('./oembed'), localUtils);
     },
 
     get slack() {
-        return shared.pipeline(require('./slack'), localUtils);
+        return apiFramework.pipeline(require('./slack'), localUtils);
     },
 
     get config() {
-        return shared.pipeline(require('./config'), localUtils);
+        return apiFramework.pipeline(require('./config'), localUtils);
     },
 
     get explore() {
-        return shared.pipeline(require('./explore'), localUtils);
+        return apiFramework.pipeline(require('./explore'), localUtils);
     },
 
     get themes() {
-        return shared.pipeline(require('./themes'), localUtils);
+        return apiFramework.pipeline(require('./themes'), localUtils);
     },
 
     get actions() {
-        return shared.pipeline(require('./actions'), localUtils);
+        return apiFramework.pipeline(require('./actions'), localUtils);
     },
 
     get email_previews() {
-        return shared.pipeline(require('./email-previews'), localUtils);
+        return apiFramework.pipeline(require('./email-previews'), localUtils);
     },
 
     get emails() {
-        return shared.pipeline(require('./emails'), localUtils);
+        return apiFramework.pipeline(require('./emails'), localUtils);
     },
 
     get site() {
-        return shared.pipeline(require('./site'), localUtils);
+        return apiFramework.pipeline(require('./site'), localUtils);
     },
 
     get snippets() {
-        return shared.pipeline(require('./snippets'), localUtils);
+        return apiFramework.pipeline(require('./snippets'), localUtils);
     },
 
     get stats() {
-        return shared.pipeline(require('./stats'), localUtils);
+        return apiFramework.pipeline(require('./stats'), localUtils);
     },
 
     get customThemeSettings() {
-        return shared.pipeline(require('./custom-theme-settings'), localUtils);
+        return apiFramework.pipeline(require('./custom-theme-settings'), localUtils);
     },
 
     get serializers() {
@@ -178,11 +178,11 @@ module.exports = {
     },
 
     get newsletters() {
-        return shared.pipeline(require('./newsletters'), localUtils);
+        return apiFramework.pipeline(require('./newsletters'), localUtils);
     },
 
     get comments() {
-        return shared.pipeline(require('./comments'), localUtils);
+        return apiFramework.pipeline(require('./comments'), localUtils);
     },
 
     /**
@@ -194,38 +194,38 @@ module.exports = {
      * `api.admin` soon. Need to figure out how serializers & validation works then.
      */
     get pagesPublic() {
-        return shared.pipeline(require('./pages-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./pages-public'), localUtils, 'content');
     },
 
     get tagsPublic() {
-        return shared.pipeline(require('./tags-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./tags-public'), localUtils, 'content');
     },
 
     get publicSettings() {
-        return shared.pipeline(require('./settings-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./settings-public'), localUtils, 'content');
     },
 
     get postsPublic() {
-        return shared.pipeline(require('./posts-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./posts-public'), localUtils, 'content');
     },
 
     get authorsPublic() {
-        return shared.pipeline(require('./authors-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./authors-public'), localUtils, 'content');
     },
 
     get tiersPublic() {
-        return shared.pipeline(require('./tiers-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./tiers-public'), localUtils, 'content');
     },
 
     get newslettersPublic() {
-        return shared.pipeline(require('./newsletters-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./newsletters-public'), localUtils, 'content');
     },
 
     get offersPublic() {
-        return shared.pipeline(require('./offers-public'), localUtils, 'content');
+        return apiFramework.pipeline(require('./offers-public'), localUtils, 'content');
     },
 
     get commentsMembers() {
-        return shared.pipeline(require('./comments-members'), localUtils, 'members');
+        return apiFramework.pipeline(require('./comments-members'), localUtils, 'members');
     }
 };

package/core/server/api/endpoints/utils/serializers/input/comments.js

@@ -0,0 +1,18 @@
+module.exports = {
+    all(_apiConfig, frame) {
+        if (!frame.options.withRelated || frame.options.withRelated.length === 0) {
+            return;
+        }
+
+        // Map the 'liked' relation to 'count.liked'
+        frame.options.withRelated = frame.options.withRelated.map((relation) => {
+            if (relation === 'liked') {
+                return 'count.liked';
+            }
+            if (relation === 'replies.liked') {
+                return 'replies.count.liked';
+            }
+            return relation;
+        });
+    }
+};

package/core/server/api/endpoints/utils/serializers/input/db.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:input:db');
-const optionsUtil = require('../../../../shared/utils/options');
+const optionsUtil = require('@tryghost/api-framework').utils.options;
 
 const INTERNAL_OPTIONS = ['transacting', 'forUpdate'];
 

package/core/server/api/endpoints/utils/serializers/input/index.js

@@ -45,5 +45,9 @@ module.exports = {
 
     get webhooks() {
         return require('./webhooks');
+    },
+
+    get comments() {
+        return require('./comments');
     }
 };

package/core/server/api/endpoints/utils/serializers/input/integrations.js

@@ -3,9 +3,9 @@ const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:input:
 
 function setDefaultFilter(frame) {
     if (frame.options.filter) {
-        frame.options.filter = `(${frame.options.filter})+type:[custom,builtin]`;
+        frame.options.filter = `(${frame.options.filter})+type:[custom,builtin,core]`;
     } else {
-        frame.options.filter = 'type:[custom,builtin]';
+        frame.options.filter = 'type:[custom,builtin,core]';
     }
 }
 

package/core/server/api/endpoints/utils/serializers/input/tiers.js

@@ -24,7 +24,7 @@ function convertTierInput(input) {
     };
 
     if (labs.isSet('freeTrial')) {
-        converted.trial_days = input.trial_days;
+        converted.trial_days = input.trial_days || 0;
     }
 
     if (input.monthly_price && input.currency) {

package/core/server/api/endpoints/utils/serializers/output/mappers/comments.js

@@ -25,6 +25,11 @@ const postFields = [
     'url'
 ];
 
+const countFields = [
+    'replies',
+    'likes'
+];
+
 const commentMapper = (model, frame) => {
     const jsonModel = model.toJSON ? model.toJSON(frame.options) : model;
 
@@ -36,12 +41,6 @@ const commentMapper = (model, frame) => {
         response.member = null;
     }
 
-    if (jsonModel.likes) {
-        response.likes_count = jsonModel.likes.length;
-    } else {
-        response.likes_count = 0;
-    }
-
     if (jsonModel.replies) {
         response.replies = jsonModel.replies.map(reply => commentMapper(reply, frame));
     }
@@ -56,11 +55,12 @@ const commentMapper = (model, frame) => {
         response.post = _.pick(jsonModel.post, postFields);
     }
 
-    // todo
-    response.liked = false;
-    if (jsonModel.likes && frame.original.context.member && frame.original.context.member.id) {
-        const id = frame.original.context.member.id;
-        response.liked = !!jsonModel.likes.find(l => l.member_id === id);
+    if (jsonModel.count && jsonModel.count.liked !== undefined) {
+        response.liked = jsonModel.count.liked > 0;
+    }
+
+    if (jsonModel.count) {
+        response.count = _.pick(jsonModel.count, countFields);
     }
 
     if (utils.isMembersAPI(frame)) {
@@ -68,7 +68,7 @@ const commentMapper = (model, frame) => {
             response.html = null;
         }
     }
-
+    
     return response;
 };