ghost 5.17.2 → 5.19.0

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.17%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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.19%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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" />
@@ -36,8 +36,8 @@
         }
     </style>
 
-    <link integrity="" rel="stylesheet" href="assets/vendor-733135cd6cbca8126c6fa223d63a5bf3.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-597fb8e8b1b91dd0ac4d9f2d75bd67fb.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
+    <link integrity="" rel="stylesheet" href="assets/ghost-982146a4ada3a5af1981d1919ae01d08.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-325e038b8609f0979f6578cae7a87f9e.js"></script>
-<script src="assets/chunk.579.a9bccec4d650a7be727a.js"></script>
-<script src="assets/chunk.143.3f2f5cbbd1ef4b1425d9.js"></script>
-    <script src="assets/ghost-3577dfa3f54651db5ae5b9fd3d9b2824.js"></script>
+    <script src="assets/vendor-5c7d7063620bec13668c4370145cd4b4.js"></script>
+<script src="assets/chunk.613.f1d519ad47e7f9024263.js"></script>
+<script src="assets/chunk.143.eaf838fbf1470f018bf3.js"></script>
+    <script src="assets/ghost-5ce6f5a730c83c91fc258b12c537ea35.js"></script>
 </body>
 </html>

package/core/frontend/helpers/t.js

@@ -11,8 +11,20 @@
 // {{tags prefix=(t " on ")}}
 
 const {themeI18n} = require('../services/handlebars');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    oopsErrorTemplateHasError: 'Oops, seems there is an error in the template.'
+};
 
 module.exports = function t(text, options) {
+    if (text === undefined && options === undefined) {
+        throw new errors.IncorrectUsageError({
+            message: tpl(messages.oopsErrorTemplateHasError)
+        });
+    }
+
     const bindings = {};
     let prop;
     for (prop in options.hash) {

package/core/frontend/helpers/tpl/content-cta.hbs

@@ -11,7 +11,7 @@
             <h2>This {{#is "page"}}page{{else}}post{{/is}} is for subscribers on the {{tiers}} only </h2>
         {{/has}}
         {{#if @member}}
-            <a class="gh-btn" data-portal="account/plans" style="color:{{@site.accentColor}}">Upgrade your account</a>
+            <a class="gh-btn" data-portal="account/plans" style="color:{{@site.accent_color}}">Upgrade your account</a>
         {{else}}
             <a class="gh-btn" data-portal="signup" style="color:{{@site.accent_color}}">Subscribe now</a>
             <p><small>Already have an account? <a data-portal="signin">Sign in</a></small></p>

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

@@ -1 +1 @@
-/*! 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}
+/*! 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{color:#343f44;font-size:2.9rem;line-height:1.15em;margin:0 0 .3em;text-indent:-1px;text-rendering:optimizeLegibility}@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}

package/core/frontend/public/robots.txt

@@ -3,3 +3,4 @@ Sitemap: {{blog-url}}/sitemap.xml
 Disallow: /ghost/
 Disallow: /p/
 Disallow: /email/
+Disallow: /r/

package/core/frontend/services/sitemap/handler.js

@@ -30,7 +30,7 @@ module.exports = function handler(siteApp) {
         const content = manager.getSiteMapXml(type, page);
         // Prevent x-1.xml as it is a duplicate of x.xml and empty sitemaps
         // (except for the first page so that at least one sitemap exists per type)
-        if (pageParam === '1' || (!content && page !== 1)) {
+        if (pageParam === '1' || content === null) {
             return res.sendStatus(404);
         }
 

package/core/frontend/services/sitemap/index-generator.js

@@ -31,10 +31,8 @@ class SiteMapIndexGenerator {
 
     generateSiteMapUrlElements() {
         return _.map(this.types, (resourceType) => {
-            // `|| 1` = even if there are no items we still have an empty sitemap file
-            const noOfPages = Math.ceil(Object.keys(resourceType.nodeLookup).length / this.maxPerPage) || 1;
+            const noOfPages = Math.ceil(Object.keys(resourceType.nodeLookup).length / this.maxPerPage);
             const pages = [];
-
             for (let i = 0; i < noOfPages; i++) {
                 const page = i === 0 ? '' : `-${i + 1}`;
                 const url = urlUtils.urlFor({relativeUrl: '/sitemap-' + resourceType.name + page + '.xml'}, true);

package/core/frontend/web/middleware/static-theme.js

@@ -32,6 +32,8 @@ function forwardToExpressStatic(req, res, next) {
 
     const configMaxAge = config.get('caching:theme:maxAge');
 
+    // @NOTE: the maxAge config passed below are in milliseconds and the config
+    //        is specified in seconds. See https://github.com/expressjs/serve-static/issues/150 for more context
     express.static(themeEngine.getActive().path, {
         maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : constants.ONE_YEAR_MS
     }

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

@@ -0,0 +1,23 @@
+const feedbackService = require('../../services/audience-feedback');
+
+module.exports = {
+    docName: 'feedback',
+
+    add: {
+        statusCode: 201,
+        validation: {
+            data: {
+                post_id: {
+                    required: true
+                },
+                score: {
+                    required: true
+                }
+            }
+        },
+        permissions: false,
+        query(frame) {
+            return feedbackService.controller.add(frame);
+        }
+    }
+};

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

@@ -231,5 +231,9 @@ module.exports = {
 
     get commentsMembers() {
         return apiFramework.pipeline(require('./comments-members'), localUtils, 'members');
-    }
+    },
+
+    get feedbackMembers() {
+        return apiFramework.pipeline(require('./feedback-members'), localUtils, 'members');
+    }   
 };

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

@@ -25,10 +25,10 @@ function defaultRelations(frame) {
         return false;
     }
 
-    if (labs.isSet('emailClicks')) {
-        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions', 'count.clicks'];
+    if (labs.isSet('audienceFeedback')) {
+        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions', 'count.clicks', 'count.sentiment', 'count.positive_feedback'];
     } else {
-        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions'];
+        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions', 'count.clicks'];
     }
 }
 

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

@@ -10,7 +10,6 @@ const extraAttrs = require('../utils/extra-attrs');
 const gating = require('../utils/post-gating');
 const url = require('../utils/url');
 
-const labs = require('../../../../../../../shared/labs');
 const utils = require('../../../index');
 
 const postsMetaSchema = require('../../../../../../data/schema').tables.posts_meta;
@@ -110,20 +109,22 @@ module.exports = async (model, frame, options = {}) => {
         });
     }
 
-    if (labs.isSet('emailClicks')) {
-        if (jsonModel.email && jsonModel.count) {
-            jsonModel.email.opened_count = Math.min(
-                Math.max(
-                    jsonModel.email.opened_count || 0,
-                    jsonModel.count.clicks || 0
-                ),
-                jsonModel.email.email_count
-            );
-        }
+    if (jsonModel.email && jsonModel.count) {
+        jsonModel.email.opened_count = Math.min(
+            Math.max(
+                jsonModel.email.opened_count || 0,
+                jsonModel.count.clicks || 0
+            ),
+            jsonModel.email.email_count
+        );
+    }
+
+    if (jsonModel.count && !jsonModel.count.sentiment) {
+        jsonModel.count.sentiment = 0;
     }
 
-    if (!labs.isSet('memberAttribution') && !labs.isSet('emailClicks')) {
-        delete jsonModel.count;
+    if (jsonModel.count && !jsonModel.count.positive_feedback) {
+        jsonModel.count.positive_feedback = 0;
     }
 
     return jsonModel;

package/core/server/data/exporter/table-lists.js

@@ -20,6 +20,7 @@ const BACKUP_TABLES = [
     'webhooks',
     'tokens',
     'sessions',
+    'subscriptions',
     'mobiledoc_revisions',
     'post_revisions',
     'email_batches',
@@ -40,7 +41,8 @@ const BACKUP_TABLES = [
     'comment_reports',
     'jobs',
     'redirects',
-    'members_click_events'
+    'members_click_events',
+    'members_feedback'
 ];
 
 // NOTE: exposing only tables which are going to be included in a "default" export file

package/core/server/data/importer/handlers/json.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const fs = require('fs-extra');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
@@ -17,36 +16,35 @@ JSONHandler = {
     contentTypes: ['application/octet-stream', 'application/json'],
     directories: [],
 
-    loadFile: function (files, startDir) { // eslint-disable-line no-unused-vars
+    loadFile: async function (files, startDir) { // eslint-disable-line no-unused-vars
         // @TODO: Handle multiple JSON files
         const filePath = files[0].path;
 
-        return fs.readFile(filePath).then(function (fileData) {
-            let importData;
+        const fileData = await fs.readFile(filePath);
+        let importData;
 
-            try {
-                importData = JSON.parse(fileData);
+        try {
+            importData = JSON.parse(fileData);
 
-                // if importData follows JSON-API format `{ db: [exportedData] }`
-                if (_.keys(importData).length === 1) {
-                    if (!importData.db || !Array.isArray(importData.db)) {
-                        throw new errors.InternalServerError({
-                            message: tpl(messages.invalidJsonFormat)
-                        });
-                    }
-
-                    importData = importData.db[0];
+            // if importData follows JSON-API format `{ db: [exportedData] }`
+            if (_.keys(importData).length === 1) {
+                if (!importData.db || !Array.isArray(importData.db)) {
+                    throw new errors.InternalServerError({
+                        message: tpl(messages.invalidJsonFormat)
+                    });
                 }
 
-                return importData;
-            } catch (err) {
-                return Promise.reject(new errors.BadRequestError({
-                    err: err,
-                    message: err.message,
-                    help: tpl(messages.checkImportJsonIsValid)
-                }));
+                importData = importData.db[0];
             }
-        });
+
+            return importData;
+        } catch (err) {
+            throw new errors.BadRequestError({
+                err,
+                message: err.message,
+                help: tpl(messages.checkImportJsonIsValid)
+            });
+        }
     }
 };
 

package/core/server/data/importer/importers/data/base.js

@@ -1,7 +1,7 @@
 const debug = require('@tryghost/debug')('importer:base');
 const _ = require('lodash');
 const Promise = require('bluebird');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const {sequence} = require('@tryghost/promise');
 const models = require('../../../../models');

package/core/server/data/migrations/versions/4.0/05-add-members-subscribe-events-table.js

@@ -3,7 +3,7 @@ const {addTable} = require('../../utils');
 module.exports = addTable('members_subscribe_events', {
     id: {type: 'string', maxlength: 24, nullable: false, primary: true},
     member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
-    subscribed: {type: 'bool', nullable: false, defaultTo: true},
+    subscribed: {type: 'boolean', nullable: false, defaultTo: true},
     created_at: {type: 'dateTime', nullable: false},
     source: {type: 'string', maxlength: 50, nullable: true}
 });

package/core/server/data/migrations/versions/4.0/06-populate-members-subscribe-events-table.js

@@ -1,5 +1,5 @@
 const {chunk} = require('lodash');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {createTransactionalMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.0/11-add-members-paid-subscription-events-table.js

@@ -5,7 +5,7 @@ module.exports = addTable('members_paid_subscription_events', {
     member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
     from_plan: {type: 'string', maxlength: 255, nullable: true},
     to_plan: {type: 'string', maxlength: 255, nullable: true},
-    currency: {type: 'string', maxLength: 3, nullable: false},
+    currency: {type: 'string', maxlength: 191, nullable: false},
     source: {type: 'string', maxlength: 50, nullable: false},
     mrr_delta: {type: 'integer', nullable: false},
     created_at: {type: 'dateTime', nullable: false}

package/core/server/data/migrations/versions/4.0/13-add-members-payment-events-table.js

@@ -4,7 +4,7 @@ module.exports = addTable('members_payment_events', {
     id: {type: 'string', maxlength: 24, nullable: false, primary: true},
     member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
     amount: {type: 'integer', nullable: false},
-    currency: {type: 'string', maxLength: 3, nullable: false},
+    currency: {type: 'string', maxlength: 191, nullable: false},
     source: {type: 'string', maxlength: 50, nullable: false},
     created_at: {type: 'dateTime', nullable: false}
 });

package/core/server/data/migrations/versions/4.0/17-populate-members-status-events-table.js

@@ -1,5 +1,5 @@
 const {chunk} = require('lodash');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.0/22-solve-orphaned-webhooks.js

@@ -1,6 +1,6 @@
 const {createIrreversibleMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const security = require('@tryghost/security');
 
 module.exports = createIrreversibleMigration(

package/core/server/data/migrations/versions/4.0/25-populate-members-paid-subscription-events-table.js

@@ -1,5 +1,5 @@
 const {chunk} = require('lodash');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {createTransactionalMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');

package/core/server/data/migrations/versions/4.11/02-add-email-verification-required-setting.js

@@ -1,4 +1,4 @@
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.12/01-add-email-only-column-to-posts-meta-table.js

@@ -1,7 +1,7 @@
 const {createAddColumnMigration} = require('../../utils');
 
 module.exports = createAddColumnMigration('posts_meta', 'email_only', {
-    type: 'bool',
+    type: 'boolean',
     nullable: false,
     defaultTo: false
 });

package/core/server/data/migrations/versions/4.3/03-add-default-product.js

@@ -1,5 +1,5 @@
 const {createTransactionalMigration} = require('../../utils');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {slugify} = require('@tryghost/string');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.3/04-attach-members-to-product.js

@@ -1,5 +1,5 @@
 const {createTransactionalMigration} = require('../../utils');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {chunk} = require('lodash');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.3/06-add-stripe-prices-table.js

@@ -4,9 +4,9 @@ module.exports = addTable('stripe_prices', {
     id: {type: 'string', maxlength: 24, nullable: false, primary: true},
     stripe_price_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
     stripe_product_id: {type: 'string', maxlength: 255, nullable: false, unique: false, references: 'stripe_products.stripe_product_id', cascadeDelete: true},
-    active: {type: 'bool', nullable: false},
+    active: {type: 'boolean', nullable: false},
     nickname: {type: 'string', maxlength: 50, nullable: true},
-    currency: {type: 'string', maxLength: 3, nullable: false},
+    currency: {type: 'string', maxlength: 191, nullable: false},
     amount: {type: 'integer', nullable: false},
     type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'recurring', validations: {isIn: [['recurring', 'one_time']]}},
     interval: {type: 'string', maxlength: 50, nullable: true},

package/core/server/data/migrations/versions/4.3/08-migrate-members-signup-setting.js

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 
 module.exports = createTransactionalMigration(
     async function up(connection) {

package/core/server/data/migrations/versions/4.33/2022-01-14-11-51-add-default-free-tier.js

@@ -1,5 +1,5 @@
 const {createTransactionalMigration} = require('../../utils');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {slugify} = require('@tryghost/string');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.42/2022-03-21-17-17-add.js

@@ -12,7 +12,7 @@ module.exports = addTable('newsletters', {
     sender_name: {type: 'string', maxlength: 191, nullable: false},
     sender_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
     sender_reply_to: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
-    default: {type: 'bool', nullable: false, defaultTo: false},
+    default: {type: 'boolean', nullable: false, defaultTo: false},
     status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'active'},
     recipient_filter: {
         type: 'text',
@@ -20,6 +20,6 @@ module.exports = addTable('newsletters', {
         nullable: false,
         defaultTo: ''
     },
-    subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: false},
+    subscribe_on_signup: {type: 'boolean', nullable: false, defaultTo: false},
     sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
 });

package/core/server/data/migrations/versions/4.43/2022-03-28-19-26-recreate-newsletter-table.js

@@ -15,15 +15,15 @@ module.exports = recreateTable('newsletters', {
         nullable: false,
         defaultTo: 'members'
     },
-    subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: true},
+    subscribe_on_signup: {type: 'boolean', nullable: false, defaultTo: true},
     sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
     header_image: {type: 'string', maxlength: 2000, nullable: true},
-    show_header_icon: {type: 'bool', nullable: false, defaultTo: true},
-    show_header_title: {type: 'bool', nullable: false, defaultTo: true},
+    show_header_icon: {type: 'boolean', nullable: false, defaultTo: true},
+    show_header_title: {type: 'boolean', nullable: false, defaultTo: true},
     title_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
     title_alignment: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'center', validations: {isIn: [['center', 'left']]}},
-    show_feature_image: {type: 'bool', nullable: false, defaultTo: true},
+    show_feature_image: {type: 'boolean', nullable: false, defaultTo: true},
     body_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
     footer_content: {type: 'text', maxlength: 1000000000, nullable: true},
-    show_badge: {type: 'bool', nullable: false, defaultTo: true}
+    show_badge: {type: 'boolean', nullable: false, defaultTo: true}
 });

package/core/server/data/migrations/versions/4.46/2022-04-13-13-00-add-default-newsletter.js

@@ -1,4 +1,4 @@
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 const uuid = require('uuid');
 const logging = require('@tryghost/logging');
 const startsWith = require('lodash/startsWith');

package/core/server/data/migrations/versions/4.46/2022-04-20-08-39-map-subscribers-to-default-newsletter.js

@@ -1,5 +1,5 @@
 const logging = require('@tryghost/logging');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.7/03-add-labs-setting.js

@@ -1,4 +1,4 @@
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.8/03-add-default-product-portal-products.js

@@ -1,4 +1,4 @@
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {createTransactionalMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.8/04-migrate-show-newsletter-header-setting.js

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 
 // newsletter_show_header = false ->
 //   newsletter_show_header_title = false

package/core/server/data/migrations/versions/5.0/2022-05-06-13-22-add-frontend-integration.js

@@ -1,5 +1,5 @@
 const logging = require('@tryghost/logging');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const security = require('@tryghost/security');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/5.17/2022-09-29-12-39-add-track-clicks-column-to-emails.js

@@ -1,7 +1,7 @@
 const {createAddColumnMigration} = require('../../utils');
 
 module.exports = createAddColumnMigration('emails', 'track_clicks', {
-    type: 'bool', 
-    nullable: false, 
+    type: 'boolean',
+    nullable: false,
     defaultTo: false
 });

package/core/server/data/migrations/versions/5.19/2022-09-02-20-25-add-columns-to-products-table.js

@@ -0,0 +1,19 @@
+const {createAddColumnMigration, combineNonTransactionalMigrations} = require('../../utils');
+
+module.exports = combineNonTransactionalMigrations(
+    createAddColumnMigration('products', 'monthly_price', {
+        type: 'integer',
+        unsigned: true,
+        nullable: true
+    }),
+    createAddColumnMigration('products', 'yearly_price', {
+        type: 'integer',
+        unsigned: true,
+        nullable: true
+    }),
+    createAddColumnMigration('products', 'currency', {
+        type: 'string',
+        maxlength: 50,
+        nullable: true
+    })
+);