Add v3.40.4

Author: YannickRe

core/server/models/email-recipient.js

@@ -4,12 +4,6 @@ const EmailRecipient = ghostBookshelf.Model.extend({
     tableName: 'email_recipients',
     hasTimestamps: false,
 
-    relationships: ['email'],
-
-    relationshipBelongsTo: {
-        email: 'emails'
-    },
-
     email() {
         return this.belongsTo('Email', 'email_id');
     },

core/server/models/member.js

@@ -19,6 +19,14 @@ const Member = ghostBookshelf.Model.extend({
 
     relationships: ['labels', 'stripeCustomers', 'email_recipients'],
 
+    // do not delete email_recipients records when a member is destroyed. Recipient
+    // records are used for analytics and historical records
+    relationshipConfig: {
+        email_recipients: {
+            destroyRelated: false
+        }
+    },
+
     relationshipBelongsTo: {
         labels: 'labels',
         stripeCustomers: 'members_stripe_customers',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "3.40.3",
+  "version": "3.40.4",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -74,7 +74,7 @@
     "bluebird": "3.7.2",
     "body-parser": "1.19.0",
     "bookshelf": "0.15.2",
-    "bookshelf-relations": "1.3.2",
+    "bookshelf-relations": "1.4.1",
     "brute-knex": "4.0.1",
     "bson-objectid": "1.3.1",
     "bthreads": "0.5.1",

yarn.lock

@@ -1366,10 +1366,10 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
-bookshelf-relations@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-1.3.2.tgz#bceb0ab3b172b01a48a81eed16cd68446975515a"
-  integrity sha512-LrsWiO3kKfYCTGWxCVzFuEi/hIfukRz6n3KIcQqCFaAO/PmYxFtxarMGeVKDpL/hm1BudksrK7S9vXmkfgv8eQ==
+bookshelf-relations@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-1.4.1.tgz#10e651136193ec3edac8b30f380b66ec635634c7"
+  integrity sha512-CUmE7TiNh4BBYvJM05BJCT8e1XdPcClBHc6d3gIEvRlgciTx0hPAVj2zoOe4WdmzB7qU4ur/kcv/T4N4FSs3Jw==
   dependencies:
     bluebird "3.7.2"
     ghost-ignition "4.1.0"