npm - ghost - Versions diffs - 5.6.0 → 5.8.0 - Mend

ghost 5.6.0 → 5.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (450) hide show

package/core/built/{assets/vendor.min-4a6661c574707ceca220aa2e76558995.css → admin/assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css} RENAMED Viewed

@@ -1,20 +1,27 @@
 .ember-basic-dropdown {
-  position: relative; }
+  position: relative;
+}
-.ember-basic-dropdown, .ember-basic-dropdown-content, .ember-basic-dropdown-content * {
-  box-sizing: border-box; }
+.ember-basic-dropdown,
+.ember-basic-dropdown-content,
+.ember-basic-dropdown-content * {
+  box-sizing: border-box;
+}
 .ember-basic-dropdown-content {
   position: absolute;
   width: auto;
   z-index: 1000;
-  background-color: #FFF; }
+  background-color: #fff;
+}
 .ember-basic-dropdown-content--left {
-  left: 0; }
+  left: 0;
+}
 .ember-basic-dropdown-content--right {
-  right: 0; }
+  right: 0;
+}
 .ember-basic-dropdown-overlay {
   position: fixed;
@@ -24,11 +31,12 @@
   z-index: 10;
   top: 0;
   left: 0;
-  pointer-events: none; }
+  pointer-events: none;
+}
 .ember-basic-dropdown-content-wormhole-origin {
-  display: inline; }
+  display: inline;
+}
 .ember-basic-dropdown {
   position: relative; }

package/core/{server/web/admin/views/default.html → built/admin/index.html} RENAMED Viewed

@@ -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%2F%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.6%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.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="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -36,28 +36,26 @@
         }
     </style>
-                <link rel="stylesheet" href="assets/vendor.min-4a6661c574707ceca220aa2e76558995.css">
-                <link rel="stylesheet" href="assets/ghost.min-b0576e0e36343533e70992f3e5bb02bb.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css">
+    <link integrity="" rel="stylesheet" href="assets/ghost-365d87dc3d1d5ee26cba6d952dc52d5b.css" title="light">
 </head>
 <body>
-<div class="ember-load-indicator">
-    <div class="gh-loading-content">
-        <div class="gh-loading-spinner"></div>
+    <div class="ember-load-indicator">
+        <div class="gh-loading-content">
+            <div class="gh-loading-spinner"></div>
+        </div>
     </div>
-</div>
-<div id="ember-basic-dropdown-wormhole"></div>
+    <div id="ember-basic-dropdown-wormhole"></div>
-                <script src="assets/vendor.min-3dd40d3052381526f38fd290d13baa47.js"></script>
-                <script src="assets/ghost.min-31bd482d1bcfe706448bc6f401481a28.js"></script>
+    <script src="assets/vendor-46baf13852f545c6c89756c8e0ccbff2.js"></script>
+<script src="assets/chunk.351.cbc224ca65c14ef5322d.js"></script>
+<script src="assets/chunk.143.85b848fc430f289d64b8.js"></script>
+    <script src="assets/ghost-50d38cd0f3736f23fc59ca91bb176d54.js"></script>
 </body>
 </html>

package/core/frontend/helpers/comment_count.js CHANGED Viewed

@@ -1,25 +1,31 @@
 const {SafeString} = require('../services/handlebars');
 const {labs} = require('../services/proxy');
+const {html} = require('common-tags');
 function commentCount(options) {
-    return new SafeString(`
-       <span data-ghost-comment-count="${this.id}" style="display:none">
-           ${options.fn(this)}
-       </span>`
-    );
+    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;
+    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}"
+        >
+        </script>
+    `);
 }
-module.exports = async function commentsLabsWrapper() {
+module.exports = function commentsLabsWrapper() {
     const self = this;
     const args = arguments;
     return labs.enabledHelper({
         flagKey: 'comments',
         flagName: 'Comments',
-        helperName: 'comments'
+        helperName: 'comment_count'
     }, () => {
         return commentCount.apply(self, args);
     });
 };
-module.exports.async = true;

package/core/frontend/helpers/img_url.js CHANGED Viewed

@@ -12,6 +12,7 @@ const url = require('url');
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
+const imageTransform = require('@tryghost/image-transform');
 const messages = {
     attrIsRequired: 'Attribute is required e.g. {{img_url feature_image}}'
@@ -41,15 +42,26 @@ module.exports = function imgUrl(requestedImageUrl, options) {
     // CASE: if you pass an external image, there is nothing we want to do to it!
     const isInternalImage = detectInternalImage(requestedImageUrl);
+    const sizeOptions = getImageSizeOptions(options);
     if (!isInternalImage) {
+        // Detect Unsplash width and format
+        const isUnsplashImage = /images\.unsplash\.com/.test(requestedImageUrl);
+        if (isUnsplashImage) {
+            try {
+                return getUnsplashImage(requestedImageUrl, sizeOptions);
+            } catch (e) {
+                // ignore errors and just return the original URL
+            }
+        }
         return requestedImageUrl;
     }
-    const {requestedSize, imageSizes} = getImageSizeOptions(options);
     const absoluteUrlRequested = getAbsoluteOption(options);
     function applyImageSizes(image) {
-        return getImageWithSize(image, requestedSize, imageSizes);
+        return getImageWithSize(image, sizeOptions);
     }
     function getImageUrl(image) {
@@ -79,10 +91,12 @@ function getAbsoluteOption(options) {
 function getImageSizeOptions(options) {
     const requestedSize = options && options.hash && options.hash.size;
     const imageSizes = options && options.data && options.data.config && options.data.config.image_sizes;
+    const requestedFormat = options && options.hash && options.hash.format;
     return {
         requestedSize,
-        imageSizes
+        imageSizes,
+        requestedFormat
     };
 }
@@ -99,12 +113,58 @@ function detectInternalImage(requestedImageUrl) {
     return isAbsoluteInternalImage || isRelativeInternalImage;
 }
-function getImageWithSize(imagePath, requestedSize, imageSizes) {
+function getUnsplashImage(imagePath, sizeOptions) {
+    const parsedUrl = new URL(imagePath);
+    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
+    if (requestedFormat) {
+        const supportedFormats = ['avif', 'gif', 'jpg', 'png', 'webp'];
+        if (supportedFormats.includes(requestedFormat)) {
+            parsedUrl.searchParams.set('fm', requestedFormat);
+        } else if (requestedFormat === 'jpeg') {
+            // Map to alias
+            parsedUrl.searchParams.set('fm', 'jpg');
+        }
+    }
+    if (!imageSizes || !imageSizes[requestedSize]) {
+        return parsedUrl.toString();
+    }
+    const {width, height} = imageSizes[requestedSize];
+    if (!width && !height) {
+        return parsedUrl.toString();
+    }
+    parsedUrl.searchParams.delete('w');
+    parsedUrl.searchParams.delete('h');
+    if (width) {
+        parsedUrl.searchParams.set('w', width);
+    }
+    if (height) {
+        parsedUrl.searchParams.set('h', height);
+    }
+    return parsedUrl.toString();
+}
+/**
+ *
+ * @param {string} imagePath
+ * @param {Object} sizeOptions
+ * @param {string} sizeOptions.requestedSize
+ * @param {Object[]} sizeOptions.imageSizes
+ * @param {string} [sizeOptions.requestedFormat]
+ * @returns
+ */
+function getImageWithSize(imagePath, sizeOptions) {
     const hasLeadingSlash = imagePath[0] === '/';
     if (hasLeadingSlash) {
-        return '/' + getImageWithSize(imagePath.slice(1), requestedSize, imageSizes);
+        return '/' + getImageWithSize(imagePath.slice(1), sizeOptions);
     }
+    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
     if (!requestedSize) {
         return imagePath;
@@ -123,8 +183,9 @@ function getImageWithSize(imagePath, requestedSize, imageSizes) {
     const [imgBlogUrl, imageName] = imagePath.split(STATIC_IMAGE_URL_PREFIX);
     const sizeDirectoryName = prefixIfPresent('w', width) + prefixIfPresent('h', height);
+    const formatPrefix = requestedFormat && imageTransform.canTransformToFormat(requestedFormat) ? `/format/${requestedFormat}` : '';
-    return [imgBlogUrl, STATIC_IMAGE_URL_PREFIX, `/size/${sizeDirectoryName}`, imageName].join('');
+    return [imgBlogUrl, STATIC_IMAGE_URL_PREFIX, `/size/${sizeDirectoryName}`, formatPrefix, imageName].join('');
 }
 function prefixIfPresent(prefix, string) {

package/core/frontend/helpers/title.js CHANGED Viewed

@@ -1,7 +1,7 @@
 // # Title Helper
 // Usage: `{{title}}`
 //
-// Overrides the standard behaviour of `{[title}}` to ensure the content is correctly escaped
+// Overrides the standard behavior of `{[title}}` to ensure the content is correctly escaped
 const {SafeString, escapeExpression} = require('../services/handlebars');

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

	@@ -1 +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}
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}

package/core/frontend/services/admin-auth-assets/service.js CHANGED Viewed

@@ -4,6 +4,7 @@ const path = require('path');
 const fs = require('fs').promises;
 const logging = require('@tryghost/logging');
 const config = require('../../../shared/config');
+const urlUtils = require('../../../shared/url-utils');
 class AdminAuthAssetsService {
     constructor(options = {}) {
@@ -24,13 +25,27 @@ class AdminAuthAssetsService {
         };
     }
+    /**
+     * @private
+     */
+    generateReplacements() {
+        // Clean the URL, only keep schema, host and port (without trailing slashes or subdirectory)
+        const url = new URL(urlUtils.getSiteUrl());
+        const origin = url.origin;
+        return {
+            // Properly encode the origin
+            '\'{{SITE_ORIGIN}}\'': JSON.stringify(origin)
+        };
+    }
     /**
      * @private
      * @returns {Promise<void>}
      */
-    async minify(globs) {
+    async minify(globs, options) {
         try {
-            await this.minifier.minify(globs);
+            await this.minifier.minify(globs, options);
         } catch (error) {
             if (error.code === 'EACCES') {
                 logging.error('Ghost was not able to write admin-auth asset files due to permissions.');
@@ -84,8 +99,9 @@ class AdminAuthAssetsService {
      */
     async load() {
         const globs = this.generateGlobs();
+        const replacements = this.generateReplacements();
         await this.clearFiles();
-        await this.minify(globs);
+        await this.minify(globs, {replacements});
         await this.copyStatic();
     }
 }

package/core/frontend/src/admin-auth/message-handler.js CHANGED Viewed

@@ -1,8 +1,12 @@
 const adminUrl = window.location.href.replace('auth-frame/', '');
+// At compile time, we'll replace the value with the actual origin.
+const siteOrigin = '{{SITE_ORIGIN}}';
 window.addEventListener('message', async function (event) {
-    if (event.origin !== '*') {
-        // return;
+    if (event.origin !== siteOrigin) {
+        console.warn('Ignored message to admin auth iframe because of mismatch in origin', 'expected', siteOrigin, 'got', event.origin, 'with data', event.data);
+        return;
     }
     let data = null;
     try {
@@ -16,7 +20,7 @@ window.addEventListener('message', async function (event) {
             uid: data.uid,
             error: error,
             result: result
-        }), '*');
+        }), siteOrigin);
     }
     if (data.action === 'getUser') {

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

@@ -27,8 +27,23 @@
         for (const [id, count] of Object.entries(countsMap)) {
             const countElems = document.querySelectorAll(`[data-ghost-comment-count="${id}"]`);
             countElems.forEach((e) => {
-                e.innerHTML = e.innerHTML.replace('#', count);
-                e.style.display = '';
+                let text = e.dataset.ghostCommentCountEmpty;
+                if (count === 1) {
+                    if (e.dataset.ghostCommentCountSingular) {
+                        text = `${count} ${e.dataset.ghostCommentCountSingular}`;
+                    } else {
+                        text = count;
+                    }
+                }
+                if (count > 1) {
+                    if (e.dataset.ghostCommentCountPlural) {
+                        text = `${count} ${e.dataset.ghostCommentCountPlural}`;
+                    } else {
+                        text = count;
+                    }
+                }
+                e.insertAdjacentText('afterend', text);
+                e.remove();
             });
         }
     };

package/core/frontend/web/middleware/handle-image-sizes.js CHANGED Viewed

@@ -58,11 +58,6 @@ module.exports = function (req, res, next) {
     const themeImageSizes = activeTheme.get().config('image_sizes');
     const imageSizes = _.merge({}, themeImageSizes, internalImageSizes, contentImageSizes);
-    // CASE: no image_sizes config (NOTE - unlikely to be reachable now we have content sizes)
-    if (!imageSizes) {
-        return redirectToOriginal();
-    }
     // build a new object with keys that match the strings used in size paths like "w640h480"
     const imageDimensions = {};
     Object.keys(imageSizes).forEach((size) => {
@@ -106,16 +101,16 @@ module.exports = function (req, res, next) {
         return redirectToOriginal();
     }
+    // exit early if sharp isn't installed to avoid extra file reads
+    if (!imageTransform.canTransformFiles()) {
+        return redirectToOriginal();
+    }
     storageInstance.exists(req.url).then((exists) => {
         if (exists) {
             return;
         }
-        // exit early if sharp isn't installed to avoid extra file reads
-        if (!imageTransform.canTransformFiles()) {
-            return redirectToOriginal();
-        }
         const {dir, name, ext} = path.parse(imagePath);
         const [imageNameMatched, imageName, imageNumber] = name.match(/^(.+?)(-\d+)?$/) || [null];
@@ -148,7 +143,8 @@ module.exports = function (req, res, next) {
     }).then(() => {
         if (format) {
             // File extension won't match the new format, so we need to update the Content-Type header manually here
-            res.type(format);
+            // Express JS still uses an out of date mime package, which doesn't support avif
+            res.type(format === 'avif' ? 'image/avif' : format);
         }
         next();
     }).catch(function (err) {

package/core/server/adapters/cache/Base.js ADDED Viewed

@@ -0,0 +1,12 @@
+class Cache {
+    constructor() {
+        Object.defineProperty(this, 'requiredFns', {
+            // NOTE: "keys" method is only here to provide smooth migration from deprecated "getAll" method
+            //       once use of "getAll" is eradicated, can also remove the "keys" method form the interface
+            value: ['get', 'set', 'reset', 'keys'],
+            writable: false
+        });
+    }
+}
+module.exports = Cache;

package/core/server/adapters/cache/Memory.js ADDED Viewed

@@ -0,0 +1,36 @@
+const Base = require('./Base');
+class MemoryCache extends Base {
+    constructor() {
+        super();
+        this._data = {};
+    }
+    get(key) {
+        return this._data[key];
+    }
+    /**
+     *
+     * @param {String} key
+     * @param {*} value
+     */
+    set(key, value) {
+        this._data[key] = value;
+    }
+    reset() {
+        this._data = {};
+    }
+    /**
+     * Helper method to assist "getAll" type of operations
+     * @returns {Array<String>} all keys present in the cache
+     */
+    keys() {
+        return Object.keys(this._data);
+    }
+}
+module.exports = MemoryCache;

package/core/server/adapters/cache/index.js ADDED Viewed

@@ -0,0 +1,17 @@
+const adapterManager = require('../../services/adapter-manager');
+/**
+ * @param {'settings'|'theme'|'urls'} [feature] - name for the "feature" to enable through adapter, e.g.: settings cache
+ * @returns {Object} cache adapter instance
+ */
+function getCache(feature) {
+    let adapterName = 'cache';
+    if (feature) {
+        adapterName += `:${feature}`;
+    }
+    return adapterManager.getAdapter(adapterName);
+}
+module.exports.getCache = getCache;

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

@@ -2,9 +2,8 @@ const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
-const db = require('../../data/db');
 const commentsService = require('../../services/comments');
-const ALLOWED_INCLUDES = ['post', 'member', 'likes', 'replies'];
+const ALLOWED_INCLUDES = ['post', 'member', 'likes', 'replies', 'parent'];
 const UNSAFE_ATTRS = ['status'];
 const messages = {
@@ -123,23 +122,7 @@ module.exports = {
     counts: {
         permissions: false,
         async query(frame) {
-            const query = db.knex('comments')
-                .select(db.knex.raw(`COUNT(*) AS count, post_id`))
-                .groupBy('post_id');
-            if (Array.isArray(frame?.data?.ids)) {
-                query.whereIn('post_id', frame.data.ids);
-            }
-            const results = await query;
-            const counts = {};
-            for (const row of results) {
-                counts[row.post_id] = row.count;
-            }
-            return counts;
+            return commentsService.controller.count(frame);
         }
     },

package/core/server/api/endpoints/integrations.js CHANGED Viewed

@@ -53,10 +53,12 @@ module.exports = {
         },
         query({data, options}) {
             return models.Integration.findOne(data, Object.assign(options, {require: true}))
-                .catch(models.Integration.NotFoundError, () => {
-                    throw new errors.NotFoundError({
-                        message: tpl(messages.resourceNotFound, {resource: 'Integration'})
-                    });
+                .catch((e) => {
+                    if (e instanceof models.Integration.NotFoundError) {
+                        throw new errors.NotFoundError({
+                            message: tpl(messages.resourceNotFound, {resource: 'Integration'})
+                        });
+                    }
                 });
         }
     },
@@ -136,10 +138,12 @@ module.exports = {
         },
         query({options}) {
             return models.Integration.destroy(Object.assign(options, {require: true}))
-                .catch(models.Integration.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.resourceNotFound, {resource: 'Integration'})
-                    }));
+                .catch((e) => {
+                    if (e instanceof models.Integration.NotFoundError) {
+                        return Promise.reject(new errors.NotFoundError({
+                            message: tpl(messages.resourceNotFound, {resource: 'Integration'})
+                        }));
+                    }
                 });
         }
     }

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

@@ -1,4 +1,5 @@
 const localUtils = require('../../index');
+const labs = require('../../../../../../shared/labs');
 const forceActiveFilter = (frame) => {
     if (frame.options.filter) {
@@ -22,6 +23,10 @@ function convertTierInput(input) {
         visibility: input.visibility
     };
+    if (labs.isSet('freeTrial')) {
+        converted.trial_days = input.trial_days;
+    }
     if (input.monthly_price && input.currency) {
         converted.monthly_price = {
             amount: input.monthly_price,

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

@@ -50,7 +50,7 @@ const commentMapper = (model, frame) => {
     }
     if (jsonModel.post) {
-        // We could use the post mapper here, but we need less field + don't need al the async behaviour support
+        // We could use the post mapper here, but we need less field + don't need al the async behavior support
         url.forPost(jsonModel.post.id, jsonModel.post, frame);
         response.post = _.pick(jsonModel.post, postFields);
     }

package/core/server/api/endpoints/utils/serializers/output/tiers.js CHANGED Viewed

@@ -4,6 +4,7 @@ const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output
 const allowedIncludes = ['monthly_price', 'yearly_price'];
 const localUtils = require('../../index');
 const utils = require('../../../../shared/utils');
+const labs = require('../../../../../../shared/labs');
 module.exports = {
     browse: createSerializer('browse', paginatedTiers),
@@ -69,6 +70,10 @@ function serializeTier(tier, options, frame) {
         benefits: null
     };
+    if (labs.isSet('freeTrial')) {
+        serialized.trial_days = json.trial_days;
+    }
     if (Array.isArray(json.benefits)) {
         serialized.benefits = json.benefits.map(benefit => benefit.name);
     } else {