ghost 4.32.3 → 4.33.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 (35) hide show
  1. package/core/boot.js +3 -0
  2. package/core/built/assets/{ghost-dark-2667b983b446ac6f511fb82b56fada06.css → ghost-dark-661a50922267648a0362c3d367a22013.css} +1 -1
  3. package/core/built/assets/{ghost.min-5f48095976420b523ec7abc41180fbb8.css → ghost.min-1f0218f33e08f8d69b2159977d0c9318.css} +1 -1
  4. package/core/built/assets/{ghost.min-9a259cab83f12017b28661fe40955399.js → ghost.min-501554f903f29164473a5dc620caaddb.js} +1233 -1176
  5. package/core/built/assets/{vendor.min-8556ef9dba3da78758b86c913b517c66.js → vendor.min-d43620e98444a46441495445f4c155f8.js} +679 -727
  6. package/core/frontend/helpers/date.js +3 -4
  7. package/core/frontend/services/theme-engine/middleware/update-global-template-options.js +3 -1
  8. package/core/server/api/canary/settings.js +2 -1
  9. package/core/server/api/canary/utils/serializers/output/products.js +4 -0
  10. package/core/server/data/db/info.js +4 -0
  11. package/core/server/data/migrations/versions/4.33/2022-01-14-11-50-add-type-column-to-products.js +12 -0
  12. package/core/server/data/migrations/versions/4.33/2022-01-14-11-51-add-default-free-tier.js +37 -0
  13. package/core/server/data/migrations/versions/4.33/2022-01-18-09-07-remove-duplicate-offer-redemptions.js +46 -0
  14. package/core/server/data/migrations/versions/4.33/2022-01-19-10-43-add-active-column-to-products-table.js +7 -0
  15. package/core/server/data/schema/default-settings.json +1 -1
  16. package/core/server/data/schema/fixtures/fixtures.json +9 -1
  17. package/core/server/data/schema/schema.js +2 -0
  18. package/core/server/models/base/plugins/data-manipulation.js +3 -2
  19. package/core/server/models/product.js +4 -0
  20. package/core/server/services/members/api.js +1 -15
  21. package/core/server/services/members/config.js +1 -9
  22. package/core/server/services/members/middleware.js +5 -3
  23. package/core/server/services/members/service.js +10 -28
  24. package/core/server/services/offers/service.js +1 -4
  25. package/core/server/services/public-config/config.js +3 -2
  26. package/core/server/services/stripe/config.js +24 -9
  27. package/core/server/services/stripe/index.js +36 -28
  28. package/core/server/update-check.js +2 -1
  29. package/core/server/web/admin/views/default-prod.html +4 -4
  30. package/core/server/web/admin/views/default.html +4 -4
  31. package/core/server/web/members/app.js +2 -1
  32. package/core/shared/config/defaults.json +2 -2
  33. package/core/shared/labs.js +2 -1
  34. package/package.json +37 -35
  35. package/yarn.lock +267 -410
@@ -8,7 +8,7 @@
8
8
  <title>Ghost Admin</title>
9
9
 
10
10
 
11
- <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.32%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%2C%22propagation%22%3Atrue%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" />
11
+ <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.33%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" />
12
12
 
13
13
  <meta name="HandheldFriendly" content="True" />
14
14
  <meta name="MobileOptimized" content="320" />
@@ -38,7 +38,7 @@
38
38
 
39
39
 
40
40
  <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
41
- <link rel="stylesheet" href="assets/ghost.min-5f48095976420b523ec7abc41180fbb8.css" title="light">
41
+ <link rel="stylesheet" href="assets/ghost.min-1f0218f33e08f8d69b2159977d0c9318.css" title="light">
42
42
 
43
43
 
44
44
 
@@ -56,8 +56,8 @@
56
56
  <div id="ember-basic-dropdown-wormhole"></div>
57
57
 
58
58
 
59
- <script src="assets/vendor.min-8556ef9dba3da78758b86c913b517c66.js"></script>
60
- <script src="assets/ghost.min-9a259cab83f12017b28661fe40955399.js"></script>
59
+ <script src="assets/vendor.min-d43620e98444a46441495445f4c155f8.js"></script>
60
+ <script src="assets/ghost.min-501554f903f29164473a5dc620caaddb.js"></script>
61
61
 
62
62
  </body>
63
63
  </html>
@@ -6,6 +6,7 @@ const express = require('../../../shared/express');
6
6
  const urlUtils = require('../../../shared/url-utils');
7
7
  const sentry = require('../../../shared/sentry');
8
8
  const membersService = require('../../services/members');
9
+ const stripeService = require('../../services/stripe');
9
10
  const middleware = membersService.middleware;
10
11
  const shared = require('../shared');
11
12
  const labs = require('../../../shared/labs');
@@ -28,7 +29,7 @@ module.exports = function setupMembersApp() {
28
29
  // Routing
29
30
 
30
31
  // Webhooks
31
- membersApp.post('/webhooks/stripe', middleware.stripeWebhooks);
32
+ membersApp.post('/webhooks/stripe', bodyParser.raw({type: 'application/json'}), stripeService.webhookController.handle.bind(stripeService.webhookController));
32
33
 
33
34
  // Initializes members specific routes as well as assigns members specific data to the req/res objects
34
35
  // We don't want to add global bodyParser middleware as that interfers with stripe webhook requests on - `/webhooks`.
@@ -127,8 +127,8 @@
127
127
  "emailAnalytics": true
128
128
  },
129
129
  "portal": {
130
- "url": "https://unpkg.com/@tryghost/portal@~1.13.0/umd/portal.min.js",
131
- "version": "1.13"
130
+ "url": "https://unpkg.com/@tryghost/portal@~1.14.0/umd/portal.min.js",
131
+ "version": "1.14"
132
132
  },
133
133
  "tenor": {
134
134
  "publicReadOnlyApiKey": null,
@@ -30,7 +30,8 @@ const ALPHA_FEATURES = [
30
30
  'cardSettingsPanel',
31
31
  'urlCache',
32
32
  'beforeAfterCard',
33
- 'tweetGridCard'
33
+ 'tweetGridCard',
34
+ 'membersActivityFeed'
34
35
  ];
35
36
 
36
37
  module.exports.GA_KEYS = [...GA_FEATURES];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ghost",
3
- "version": "4.32.3",
3
+ "version": "4.33.0",
4
4
  "description": "The professional publishing platform",
5
5
  "author": "Ghost Foundation",
6
6
  "homepage": "https://ghost.org",
@@ -55,56 +55,58 @@
55
55
  "dependencies": {
56
56
  "@nexes/nql": "0.6.0",
57
57
  "@sentry/node": "6.16.1",
58
- "@tryghost/adapter-manager": "0.2.26",
59
- "@tryghost/admin-api-schema": "2.6.1",
58
+ "@tryghost/adapter-manager": "0.2.27",
59
+ "@tryghost/admin-api-schema": "2.7.0",
60
60
  "@tryghost/bookshelf-plugins": "0.3.6",
61
- "@tryghost/bootstrap-socket": "0.2.15",
62
- "@tryghost/color-utils": "0.1.5",
63
- "@tryghost/config-url-helpers": "0.1.3",
64
- "@tryghost/constants": "1.0.0",
61
+ "@tryghost/bootstrap-socket": "0.2.16",
62
+ "@tryghost/color-utils": "0.1.6",
63
+ "@tryghost/config-url-helpers": "0.1.4",
64
+ "@tryghost/constants": "1.0.1",
65
65
  "@tryghost/custom-theme-settings-service": "0.3.1",
66
+ "@tryghost/database-info": "0.1.0",
66
67
  "@tryghost/debug": "0.1.10",
67
68
  "@tryghost/email-analytics-provider-mailgun": "1.0.7",
68
69
  "@tryghost/email-analytics-service": "1.0.5",
69
- "@tryghost/errors": "1.2.0",
70
- "@tryghost/express-dynamic-redirects": "0.2.3",
71
- "@tryghost/helpers": "1.1.54",
72
- "@tryghost/image-transform": "1.0.26",
73
- "@tryghost/job-manager": "0.8.17",
70
+ "@tryghost/errors": "1.2.1",
71
+ "@tryghost/express-dynamic-redirects": "0.2.4",
72
+ "@tryghost/helpers": "1.1.55",
73
+ "@tryghost/image-transform": "1.0.27",
74
+ "@tryghost/job-manager": "0.8.18",
74
75
  "@tryghost/kg-card-factory": "3.1.1",
75
76
  "@tryghost/kg-default-atoms": "3.1.1",
76
77
  "@tryghost/kg-default-cards": "5.15.12",
77
78
  "@tryghost/kg-markdown-html-renderer": "5.1.1",
78
79
  "@tryghost/kg-mobiledoc-html-renderer": "5.3.2",
79
- "@tryghost/limit-service": "1.0.8",
80
+ "@tryghost/limit-service": "1.0.9",
80
81
  "@tryghost/logging": "2.0.1",
81
82
  "@tryghost/magic-link": "1.0.15",
82
- "@tryghost/members-api": "3.0.1",
83
- "@tryghost/members-csv": "1.2.2",
84
- "@tryghost/members-importer": "0.3.7",
85
- "@tryghost/members-offers": "0.10.4",
86
- "@tryghost/members-ssr": "1.0.17",
83
+ "@tryghost/members-api": "4.4.1",
84
+ "@tryghost/members-csv": "1.2.3",
85
+ "@tryghost/members-importer": "0.4.1",
86
+ "@tryghost/members-offers": "0.10.5",
87
+ "@tryghost/members-ssr": "1.0.18",
88
+ "@tryghost/members-stripe-service": "0.6.3",
87
89
  "@tryghost/metrics": "1.0.2",
88
- "@tryghost/minifier": "0.1.9",
89
- "@tryghost/mw-error-handler": "0.1.1",
90
- "@tryghost/mw-session-from-token": "0.1.26",
90
+ "@tryghost/minifier": "0.1.10",
91
+ "@tryghost/mw-error-handler": "0.1.2",
92
+ "@tryghost/mw-session-from-token": "0.1.27",
91
93
  "@tryghost/nodemailer": "0.3.9",
92
- "@tryghost/package-json": "1.0.14",
93
- "@tryghost/promise": "0.1.13",
94
+ "@tryghost/package-json": "1.0.15",
95
+ "@tryghost/promise": "0.1.14",
94
96
  "@tryghost/request": "0.1.11",
95
97
  "@tryghost/root-utils": "0.3.8",
96
- "@tryghost/security": "0.2.13",
97
- "@tryghost/session-service": "0.1.36",
98
- "@tryghost/settings-path-manager": "0.1.2",
99
- "@tryghost/social-urls": "0.1.27",
100
- "@tryghost/string": "0.1.21",
98
+ "@tryghost/security": "0.2.14",
99
+ "@tryghost/session-service": "0.1.37",
100
+ "@tryghost/settings-path-manager": "0.1.3",
101
+ "@tryghost/social-urls": "0.1.28",
102
+ "@tryghost/string": "0.1.22",
101
103
  "@tryghost/tpl": "0.1.9",
102
104
  "@tryghost/update-check-service": "0.3.0",
103
- "@tryghost/url-utils": "2.0.4",
105
+ "@tryghost/url-utils": "2.0.5",
104
106
  "@tryghost/validator": "0.1.10",
105
107
  "@tryghost/version": "0.1.8",
106
- "@tryghost/vhost-middleware": "1.0.19",
107
- "@tryghost/zip": "1.1.18",
108
+ "@tryghost/vhost-middleware": "1.0.20",
109
+ "@tryghost/zip": "1.1.19",
108
110
  "amperize": "0.6.1",
109
111
  "analytics-node": "6.0.0",
110
112
  "bluebird": "3.7.2",
@@ -112,7 +114,7 @@
112
114
  "bookshelf": "1.2.0",
113
115
  "bookshelf-relations": "2.3.0",
114
116
  "brute-knex": "4.0.1",
115
- "bson-objectid": "2.0.1",
117
+ "bson-objectid": "2.0.2",
116
118
  "bthreads": "0.5.1",
117
119
  "cheerio": "0.22.0",
118
120
  "compression": "1.7.4",
@@ -186,7 +188,7 @@
186
188
  "coffeescript": "2.6.1",
187
189
  "cssnano": "5.0.15",
188
190
  "eslint": "7.32.0",
189
- "eslint-plugin-ghost": "2.11.0",
191
+ "eslint-plugin-ghost": "2.12.0",
190
192
  "expect": "27.4.6",
191
193
  "grunt": "1.4.1",
192
194
  "grunt-bg-shell": "2.3.3",
@@ -200,7 +202,7 @@
200
202
  "grunt-subgrunt": "1.3.0",
201
203
  "grunt-update-submodules": "0.4.1",
202
204
  "jwks-rsa": "2.0.5",
203
- "mocha": "9.1.3",
205
+ "mocha": "9.1.4",
204
206
  "mocha-slow-test-reporter": "0.1.2",
205
207
  "mock-knex": "0.4.10",
206
208
  "nock": "13.2.2",
@@ -209,7 +211,7 @@
209
211
  "rewire": "5.0.0",
210
212
  "should": "13.2.3",
211
213
  "sinon": "11.1.2",
212
- "supertest": "6.2.1",
214
+ "supertest": "6.2.2",
213
215
  "tmp": "0.2.1"
214
216
  },
215
217
  "resolutions": {