Add v3.26.1

YannickRe · Jul 22, 2020 · 90d993d · 90d993d
1 parent 6f41e07
commit 90d993d
Show file tree

Hide file tree

Showing 7 changed files with 490 additions and 505 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -214,8 +214,10 @@ stages:
               ResourceGroupName: '$(ResourceGroup)'
               SlotName: '$(SlotNameStaging)'
               packageForLinux: '$(Pipeline.Workspace)\**\*.zip'
+              WebConfigParameters: '-Handler iisnode -NodeStartFile server.js -appType node'
               enableCustomDeployment: true
               DeploymentType: 'webDeploy'
+              ExcludeFilesFromAppDataFlag: false
           - task: AzureAppServiceManage@0
             displayName: 'Start Azure App Service'
             inputs:
@@ -299,6 +301,7 @@ stages:
               ResourceGroupName: '$(ResourceGroup)'
               SlotName: '$(SlotNameStaging)'
               packageForLinux: '$(Pipeline.Workspace)\**\*.zip'
+              WebConfigParameters: '-Handler iisnode -NodeStartFile server.js -appType node'
               enableCustomDeployment: true
               DeploymentType: 'webDeploy'
               ExcludeFilesFromAppDataFlag: false

diff --git a/...t.min-a8c719b7cb6f84f601f7f8de5b63ce10.js → ...t.min-0dc4cd8c69609a43c4bf910036dd7f14.js b/...t.min-a8c719b7cb6f84f601f7f8de5b63ce10.js → ...t.min-0dc4cd8c69609a43c4bf910036dd7f14.js
diff --git a/core/server/services/members/index.js b/core/server/services/members/index.js
@@ -9,6 +9,7 @@ const urlUtils = require('../../../shared/url-utils');
 const settingsCache = require('../settings/cache');
 const config = require('../../../shared/config');
 const ghostVersion = require('../../lib/ghost-version');
+const _ = require('lodash');
 
 const membersConfig = new MembersConfigProvider({
     config,
@@ -21,6 +22,18 @@ const membersConfig = new MembersConfigProvider({
 let membersApi;
 let membersSettings;
 
+function reconfigureMembersAPI() {
+    const reconfiguredMembersAPI = createMembersApiInstance(membersConfig);
+    reconfiguredMembersAPI.bus.on('ready', function () {
+        membersApi = reconfiguredMembersAPI;
+    });
+    reconfiguredMembersAPI.bus.on('error', function (err) {
+        logging.error(err);
+    });
+}
+
+const debouncedReconfigureMembersAPI = _.debounce(reconfigureMembersAPI, 600);
+
 // Bind to events to automatically keep subscription info up-to-date from settings
 events.on('settings.edited', function updateSettingFromModel(settingModel) {
     if (![
@@ -39,13 +52,7 @@ events.on('settings.edited', function updateSettingFromModel(settingModel) {
         return;
     }
 
-    const reconfiguredMembersAPI = createMembersApiInstance(membersConfig);
-    reconfiguredMembersAPI.bus.on('ready', function () {
-        membersApi = reconfiguredMembersAPI;
-    });
-    reconfiguredMembersAPI.bus.on('error', function (err) {
-        logging.error(err);
-    });
+    debouncedReconfigureMembersAPI();
 });
 
 const membersService = {

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-9ec0ec4b5d6e604986a7d579c6dd3fbf.js"></script>
-                <script src="assets/ghost.min-a8c719b7cb6f84f601f7f8de5b63ce10.js"></script>
+                <script src="assets/ghost.min-0dc4cd8c69609a43c4bf910036dd7f14.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-9ec0ec4b5d6e604986a7d579c6dd3fbf.js"></script>
-                <script src="assets/ghost.min-a8c719b7cb6f84f601f7f8de5b63ce10.js"></script>
+                <script src="assets/ghost.min-0dc4cd8c69609a43c4bf910036dd7f14.js"></script>
 
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "3.26.0",
+  "version": "3.26.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@nexes/nql": "0.4.0",
-    "@sentry/node": "5.19.2",
+    "@sentry/node": "5.20.0",
     "@tryghost/adapter-manager": "0.1.7",
     "@tryghost/errors": "0.2.0",
     "@tryghost/helpers": "1.1.27",
@@ -52,7 +52,7 @@
     "@tryghost/kg-markdown-html-renderer": "2.0.1",
     "@tryghost/kg-mobiledoc-html-renderer": "3.0.1",
     "@tryghost/magic-link": "0.4.11",
-    "@tryghost/members-api": "0.24.3",
+    "@tryghost/members-api": "0.24.5",
     "@tryghost/members-csv": "0.2.1",
     "@tryghost/members-ssr": "0.8.3",
     "@tryghost/mw-session-from-token": "0.1.5",
@@ -97,7 +97,7 @@
     "js-yaml": "3.14.0",
     "jsonpath": "1.0.2",
     "jsonwebtoken": "8.5.1",
-    "juice": "6.0.0",
+    "juice": "7.0.0",
     "keypair": "1.0.1",
     "knex": "0.21.2",
     "knex-migrator": "3.4.6",
@@ -117,17 +117,17 @@
     "multer": "1.4.2",
     "mysql": "2.18.1",
     "nconf": "0.10.0",
-    "netjet": "1.3.0",
+    "netjet": "1.4.0",
     "node-jose": "1.1.4",
     "nodemailer": "0.7.1",
     "oembed-parser": "1.3.7",
     "path-match": "1.2.4",
     "probe-image-size": "5.0.0",
     "rss": "1.2.2",
-    "sanitize-html": "1.26.0",
+    "sanitize-html": "1.27.1",
     "semver": "7.3.2",
     "tough-cookie": "4.0.0",
-    "uuid": "8.1.0",
+    "uuid": "8.2.0",
     "validator": "6.3.0",
     "xml": "1.0.1",
     "applicationinsights": "^1.0.0"
@@ -138,26 +138,27 @@
   },
   "devDependencies": {
     "@lodder/grunt-postcss": "2.0.4",
+    "coffeescript": "2.5.1",
     "cssnano": "4.1.10",
     "eslint": "7.5.0",
     "eslint-plugin-ghost": "1.5.0",
-    "grunt": "1.1.0",
+    "grunt": "1.2.1",
     "grunt-bg-shell": "2.3.3",
     "grunt-contrib-clean": "2.0.0",
     "grunt-contrib-compress": "1.6.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-symlink": "1.0.0",
-    "grunt-contrib-uglify": "4.0.1",
+    "grunt-contrib-uglify": "5.0.0",
     "grunt-contrib-watch": "1.1.0",
     "grunt-express-server": "0.5.4",
     "grunt-mocha-cli": "6.0.0",
     "grunt-shell": "3.0.1",
     "grunt-subgrunt": "1.3.0",
     "grunt-update-submodules": "0.4.1",
     "jwks-rsa": "1.8.1",
-    "mocha": "7.2.0",
+    "mocha": "8.0.1",
     "mock-knex": "0.4.9",
-    "nock": "12.0.3",
+    "nock": "13.0.2",
     "proxyquire": "2.1.3",
     "rewire": "5.0.0",
     "should": "13.2.3",