ghost 4.34.2 → 4.36.1

package/core/server/services/posts/posts-service.js

@@ -1,8 +1,10 @@
+const nql = require('@nexes/nql');
 const {BadRequestError} = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 
 const messages = {
-    invalidEmailRecipientFilter: 'Invalid filter in email_recipient_filter param.'
+    invalidEmailRecipientFilter: 'Invalid filter in email_recipient_filter param.',
+    invalidVisibilityFilter: 'Invalid visibility filter.'
 };
 
 class PostsService {
@@ -78,6 +80,28 @@ class PostsService {
         return model;
     }
 
+    async getProductsFromVisibilityFilter(visibilityFilter) {
+        try {
+            const allProducts = await this.models.Product.findAll();
+            const visibilityFilterJson = nql(visibilityFilter).toJSON();
+            const productsData = (visibilityFilterJson.product ? [visibilityFilterJson] : visibilityFilterJson.$or) || [];
+            const tiers = productsData
+                .map((data) => {
+                    return allProducts.find((p) => {
+                        return p.get('slug') === data.product;
+                    });
+                }).filter(p => !!p).map((d) => {
+                    return d.toJSON();
+                });
+            return tiers;
+        } catch (err) {
+            return Promise.reject(new BadRequestError({
+                message: tpl(messages.invalidVisibilityFilter),
+                context: err.message
+            }));
+        }
+    }
+
     /**
      * Calculates if the email should be tried to be sent out
      * @private

package/core/server/web/admin/views/default-prod.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%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%224.34%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%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%224.36%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-b1d3e45166f2023dd56b35f720636979.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-46e075517808b53170b8d9ab0b96d796.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-079fa61c64e24f0984f2cd7d2ebbf3c3.js"></script>
-                <script src="assets/ghost.min-4886fb099a526cb6ca5b733bbfbb5d3a.js"></script>
+                <script src="assets/vendor.min-3aa87b4d7b43675386a96b869ed00493.js"></script>
+                <script src="assets/ghost.min-f10401ea8fdfee5dcc88cf4dff785a88.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.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%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%224.34%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%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%224.36%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-b1d3e45166f2023dd56b35f720636979.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-46e075517808b53170b8d9ab0b96d796.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-079fa61c64e24f0984f2cd7d2ebbf3c3.js"></script>
-                <script src="assets/ghost.min-4886fb099a526cb6ca5b733bbfbb5d3a.js"></script>
+                <script src="assets/vendor.min-3aa87b4d7b43675386a96b869ed00493.js"></script>
+                <script src="assets/ghost.min-f10401ea8fdfee5dcc88cf4dff785a88.js"></script>
             
 </body>
 </html>

package/core/shared/labs.js

@@ -27,12 +27,13 @@ const BETA_FEATURES = [
 const ALPHA_FEATURES = [
     'oauthLogin',
     'membersActivity',
-    'cardSettingsPanel',
     'urlCache',
     'beforeAfterCard',
     'tweetGridCard',
     'membersActivityFeed',
-    'tierWelcomePages'
+    'improvedOnboarding',
+    'tierWelcomePages',
+    'tierName'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/jsconfig.json

@@ -1,5 +1,5 @@
 {
-  "include": ["core/**/*.js"],
+  "include": ["core/**/*.js", "test/**/*.js"],
   "compilerOptions": {
      "checkJs": true,
      "module": "commonjs",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.34.2",
+  "version": "4.36.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -32,7 +32,7 @@
     "test:unit": "c8 --reporter text-summary --reporter cobertura mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
     "test:integration": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/integration' --timeout=5000",
     "test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' './test/e2e-server' --timeout=10000",
-    "test:regression": "mocha --require=./test/utils/overrides.js --require=./test/utils/snapshots.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",
+    "test:regression": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",
     "test:unit:slow": "yarn test:unit --reporter=mocha-slow-test-reporter",
     "test:int:slow": "yarn test:integration --reporter=mocha-slow-test-reporter",
     "test:e2e:slow": "yarn test:e2e --reporter=mocha-slow-test-reporter",
@@ -54,58 +54,58 @@
   },
   "dependencies": {
     "@nexes/nql": "0.6.0",
-    "@sentry/node": "6.17.2",
+    "@sentry/node": "6.17.6",
     "@tryghost/adapter-manager": "0.2.27",
-    "@tryghost/admin-api-schema": "2.7.0",
-    "@tryghost/bookshelf-plugins": "0.3.7",
+    "@tryghost/admin-api-schema": "2.9.0",
+    "@tryghost/bookshelf-plugins": "0.3.8",
     "@tryghost/bootstrap-socket": "0.2.16",
-    "@tryghost/color-utils": "0.1.6",
+    "@tryghost/color-utils": "0.1.7",
     "@tryghost/config-url-helpers": "0.1.4",
     "@tryghost/constants": "1.0.1",
     "@tryghost/custom-theme-settings-service": "0.3.1",
     "@tryghost/database-info": "0.1.0",
-    "@tryghost/debug": "0.1.11",
+    "@tryghost/debug": "0.1.12",
     "@tryghost/email-analytics-provider-mailgun": "1.0.7",
     "@tryghost/email-analytics-service": "1.0.5",
     "@tryghost/errors": "1.2.1",
     "@tryghost/express-dynamic-redirects": "0.2.4",
-    "@tryghost/helpers": "1.1.55",
+    "@tryghost/helpers": "1.1.56",
     "@tryghost/image-transform": "1.0.27",
-    "@tryghost/job-manager": "0.8.18",
-    "@tryghost/kg-card-factory": "3.1.1",
+    "@tryghost/job-manager": "0.8.19",
+    "@tryghost/kg-card-factory": "3.1.2",
     "@tryghost/kg-default-atoms": "3.1.1",
-    "@tryghost/kg-default-cards": "5.15.12",
-    "@tryghost/kg-markdown-html-renderer": "5.1.1",
-    "@tryghost/kg-mobiledoc-html-renderer": "5.3.2",
+    "@tryghost/kg-default-cards": "5.16.1",
+    "@tryghost/kg-markdown-html-renderer": "5.1.4",
+    "@tryghost/kg-mobiledoc-html-renderer": "5.3.4",
     "@tryghost/limit-service": "1.0.9",
-    "@tryghost/logging": "2.0.2",
+    "@tryghost/logging": "2.0.3",
     "@tryghost/magic-link": "1.0.17",
-    "@tryghost/members-api": "4.8.4",
+    "@tryghost/members-api": "4.8.15",
     "@tryghost/members-importer": "0.5.0",
     "@tryghost/members-offers": "0.10.6",
     "@tryghost/members-ssr": "1.0.19",
-    "@tryghost/members-stripe-service": "0.6.5",
-    "@tryghost/metrics": "1.0.3",
+    "@tryghost/members-stripe-service": "0.7.0",
+    "@tryghost/metrics": "1.0.5",
     "@tryghost/minifier": "0.1.10",
     "@tryghost/mw-error-handler": "0.1.2",
     "@tryghost/mw-session-from-token": "0.1.27",
-    "@tryghost/nodemailer": "0.3.10",
+    "@tryghost/nodemailer": "0.3.11",
     "@tryghost/package-json": "1.0.15",
     "@tryghost/promise": "0.1.14",
-    "@tryghost/request": "0.1.12",
-    "@tryghost/root-utils": "0.3.9",
+    "@tryghost/request": "0.1.14",
+    "@tryghost/root-utils": "0.3.10",
     "@tryghost/security": "0.2.14",
     "@tryghost/session-service": "0.1.37",
     "@tryghost/settings-path-manager": "0.1.3",
     "@tryghost/social-urls": "0.1.28",
     "@tryghost/string": "0.1.22",
-    "@tryghost/tpl": "0.1.10",
-    "@tryghost/update-check-service": "0.3.0",
+    "@tryghost/tpl": "0.1.11",
+    "@tryghost/update-check-service": "0.3.1",
     "@tryghost/url-utils": "2.0.5",
-    "@tryghost/validator": "0.1.11",
-    "@tryghost/verification-trigger": "0.1.0",
-    "@tryghost/version": "0.1.9",
-    "@tryghost/vhost-middleware": "1.0.20",
+    "@tryghost/validator": "0.1.12",
+    "@tryghost/verification-trigger": "0.1.3",
+    "@tryghost/version": "0.1.10",
+    "@tryghost/vhost-middleware": "1.0.21",
     "@tryghost/zip": "1.1.19",
     "amperize": "0.6.1",
     "analytics-node": "6.0.0",
@@ -148,28 +148,28 @@
     "lodash": "4.17.21",
     "luxon": "2.3.0",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.25.7",
-    "metascraper-author": "5.25.7",
-    "metascraper-description": "5.25.7",
-    "metascraper-image": "5.25.7",
-    "metascraper-logo": "5.25.7",
-    "metascraper-logo-favicon": "5.25.7",
-    "metascraper-publisher": "5.25.7",
-    "metascraper-title": "5.25.7",
-    "metascraper-url": "5.25.7",
+    "metascraper": "5.25.8",
+    "metascraper-author": "5.25.8",
+    "metascraper-description": "5.25.8",
+    "metascraper-image": "5.25.8",
+    "metascraper-logo": "5.25.8",
+    "metascraper-logo-favicon": "5.25.8",
+    "metascraper-publisher": "5.25.8",
+    "metascraper-title": "5.25.8",
+    "metascraper-url": "5.25.8",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.4",
     "mysql": "2.18.1",
     "nconf": "0.11.3",
-    "node-jose": "2.0.0",
+    "node-jose": "2.1.0",
     "oembed-parser": "1.4.9",
     "passport": "0.5.2",
     "passport-google-oauth": "2.0.0",
     "path-match": "1.2.4",
     "probe-image-size": "5.0.0",
     "rss": "1.2.2",
-    "sanitize-html": "2.6.1",
+    "sanitize-html": "2.7.0",
     "semver": "7.3.5",
     "stoppable": "1.1.0",
     "tough-cookie": "4.0.0",
@@ -181,15 +181,14 @@
     "sqlite3": "5.0.2"
   },
   "devDependencies": {
-    "@ethanresnick/chai-jest-snapshot": "3.0.0",
     "@lodder/grunt-postcss": "3.1.1",
+    "@tryghost/express-test": "0.4.1",
+    "@tryghost/jest-snapshot": "0.3.1",
     "c8": "7.11.0",
-    "chai": "4.3.6",
     "coffeescript": "2.6.1",
-    "cssnano": "5.0.16",
-    "eslint": "7.32.0",
+    "cssnano": "5.0.17",
+    "eslint": "8.8.0",
     "eslint-plugin-ghost": "2.12.0",
-    "expect": "27.4.6",
     "grunt": "1.4.1",
     "grunt-bg-shell": "2.3.3",
     "grunt-contrib-clean": "2.0.0",
@@ -205,17 +204,17 @@
     "mocha": "9.2.0",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "0.4.10",
-    "nock": "13.2.2",
+    "nock": "13.2.4",
     "papaparse": "5.3.1",
-    "postcss": "8.4.5",
-    "rewire": "5.0.0",
+    "postcss": "8.4.6",
+    "rewire": "6.0.0",
     "should": "13.2.3",
-    "sinon": "11.1.2",
+    "sinon": "13.0.1",
     "supertest": "6.2.2",
     "tmp": "0.2.1"
   },
   "resolutions": {
-    "@tryghost/logging": "2.0.2",
+    "@tryghost/logging": "2.0.3",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }