Add v3.19.2

YannickRe · Jun 11, 2020 · fe1d701 · fe1d701
1 parent 7a205f0
commit fe1d701
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 27 deletions.
diff --git a/...t.min-3e43926526dc5c1003730fa0172fee77.js → ...t.min-2a2df1cc442a623e583838acf61232c2.js b/...t.min-3e43926526dc5c1003730fa0172fee77.js → ...t.min-2a2df1cc442a623e583838acf61232c2.js
diff --git a/core/frontend/helpers/ghost_head.js b/core/frontend/helpers/ghost_head.js
@@ -2,7 +2,7 @@
 // Usage: `{{ghost_head}}`
 //
 // Outputs scripts and other assets at the top of a Ghost theme
-const {metaData, escapeExpression, SafeString, logging, settingsCache, members, config, blogIcon, labs} = require('../services/proxy');
+const {metaData, escapeExpression, SafeString, logging, settingsCache, config, blogIcon, labs} = require('../services/proxy');
 const _ = require('lodash');
 const debug = require('ghost-ignition').debug('ghost_head');
 
@@ -37,11 +37,19 @@ function finaliseStructuredData(metaData) {
 }
 
 function getMembersHelper() {
+    const stripePaymentProcessor = settingsCache.get('members_subscription_settings').paymentProcessors.find(
+        paymentProcessor => paymentProcessor.adapter === 'stripe'
+    );
+    const stripeSecretToken = stripePaymentProcessor.config.secret_token;
+    const stripePublicToken = stripePaymentProcessor.config.public_token;
+
+    const stripeConnectIntegration = settingsCache.get('stripe_connect_integration');
+
     let membersHelper = `<script defer src="${getAssetUrl('public/members.js', true)}"></script>`;
     if (config.get('enableDeveloperExperiments')) {
         membersHelper = `<script defer src="https://unpkg.com/@tryghost/members-js@latest/umd/members.min.js"></script>`;
     }
-    if (members.config.isStripeConnected()) {
+    if ((!!stripeSecretToken && !!stripePublicToken) || !!stripeConnectIntegration.account_id) {
         membersHelper += '<script src="https://js.stripe.com/v3/"></script>';
     }
     return membersHelper;

diff --git a/core/frontend/services/proxy.js b/core/frontend/services/proxy.js
@@ -27,9 +27,6 @@ module.exports = {
     // TODO: Only expose "get"
     settingsCache: settingsCache,
 
-    // TODO: Rethink how we get config in
-    members: require('../../server/services/members'),
-
     // These 3 are kind of core and required all the time
     errors,
     i18n,

diff --git a/core/server/web/admin/views/default-prod.html b/core/server/web/admin/views/default-prod.html
@@ -53,7 +53,7 @@
 
 
                 <script src="assets/vendor.min-5617e1540786def6dcdc08a402e4e90e.js"></script>
-                <script src="assets/ghost.min-3e43926526dc5c1003730fa0172fee77.js"></script>
+                <script src="assets/ghost.min-2a2df1cc442a623e583838acf61232c2.js"></script>
 
 </body>
 </html>
diff --git a/core/server/web/admin/views/default.html b/core/server/web/admin/views/default.html
@@ -53,7 +53,7 @@
 
 
                 <script src="assets/vendor.min-5617e1540786def6dcdc08a402e4e90e.js"></script>
-                <script src="assets/ghost.min-3e43926526dc5c1003730fa0172fee77.js"></script>
+                <script src="assets/ghost.min-2a2df1cc442a623e583838acf61232c2.js"></script>
 
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "3.19.1",
+  "version": "3.19.2",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -49,8 +49,8 @@
     "@tryghost/kg-card-factory": "2.1.1",
     "@tryghost/kg-default-atoms": "2.0.1",
     "@tryghost/kg-default-cards": "2.1.0",
-    "@tryghost/kg-markdown-html-renderer": "2.0.0",
-    "@tryghost/kg-mobiledoc-html-renderer": "3.0.0",
+    "@tryghost/kg-markdown-html-renderer": "2.0.1",
+    "@tryghost/kg-mobiledoc-html-renderer": "3.0.1",
     "@tryghost/magic-link": "^0.4.8",
     "@tryghost/members-api": "0.20.1",
     "@tryghost/members-ssr": "0.8.1",

diff --git a/yarn.lock b/yarn.lock
@@ -451,17 +451,7 @@
     "@tryghost/kg-markdown-html-renderer" "^2.0.1"
     "@tryghost/url-utils" "^0.6.14"
 
-"@tryghost/[email protected]":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-2.0.0.tgz#a54e571dff69aa25a4af4345fd290eb7f60848a9"
-  integrity sha512-bIh0te/NBgb9ZP12a6CDYQR92zD7mFINNW8MJEleYQEinJT38PSRborKDtcXID4yTVCY44n2ux5FnSSFi1XChg==
-  dependencies:
-    markdown-it "^11.0.0"
-    markdown-it-footnote "^3.0.2"
-    markdown-it-lazy-headers "^0.1.3"
-    markdown-it-mark "^3.0.0"
-
-"@tryghost/kg-markdown-html-renderer@^2.0.1":
+"@tryghost/[email protected]", "@tryghost/kg-markdown-html-renderer@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-2.0.1.tgz#2932b540c743aa59554f427b7debee527763d700"
   integrity sha512-NWRMnpcmqsLsjylqS6+EclLP0+mlAmCT1pjwcehlp+P8UWfWopwdOEOgfQO0lYOxlq3LIj2vfarXxEJoTV43GA==
@@ -471,10 +461,10 @@
     markdown-it-lazy-headers "^0.1.3"
     markdown-it-mark "^3.0.0"
 
-"@tryghost/[email protected].0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-3.0.0.tgz#06e529bc83aeeae658a5d98d8c7011e8461ad5c9"
-  integrity sha512-ziatszJCXvYA30xFtuNxm7PDvZfIMHEjU+iUoMfn4WznkC2rYyHYMemCFzt6v4WcjAZV1aZW8mQ1vQQ5AXV1cQ==
+"@tryghost/[email protected].1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-3.0.1.tgz#b9aef8dec965f5f90eab8a530f44cc4e26cd305a"
+  integrity sha512-ss4EIv/g9Ezn7wuPyI0tyEgZK2lDbKZ0WLQDM2HjnQwayKCMna/p6DQNPNXneYOj3qN4xx/9dvd/+oJlS0fnFA==
   dependencies:
     mobiledoc-dom-renderer "^0.7.0"
     simple-dom "^1.4.0"