ghost 5.3.1 → 5.5.0

package/core/server/web/api/middleware/cors.js

@@ -2,9 +2,10 @@ const cors = require('cors');
 const url = require('url');
 const os = require('os');
 const urlUtils = require('../../../../shared/url-utils');
+const config = require('../../../../shared/config');
 
 let allowlist = [];
-const ENABLE_CORS = {origin: true, maxAge: 86400};
+const ENABLE_CORS = {origin: true, maxAge: config.get('caching:cors:maxAge')};
 const DISABLE_CORS = {origin: false};
 
 /**

package/core/server/web/api/testmode/jobs/graceful-job.js

@@ -37,7 +37,7 @@ const internalContext = {context: {internal: true}};
 
     if (shutdown) {
         postParentPortMessage(`Job shutting down gracefully`);
-        process.exit(0);
+        parentPort.postMessage('done');
     }
 
     postParentPortMessage(`Fetching posts`);
@@ -46,5 +46,5 @@ const internalContext = {context: {internal: true}};
     postParentPortMessage(`Found ${posts.data.length} posts. First one: ${posts.data[0].toJSON().slug}`);
     postParentPortMessage('Graceful job has completed!');
 
-    process.exit(0);
+    parentPort.postMessage('done');
 })();

package/core/server/web/api/testmode/routes.js

@@ -44,6 +44,20 @@ module.exports = function testRoutes() {
         res.sendStatus(202);
     });
 
+    router.get('/oneoff/:name', (req, res) => {
+        logging.info('Create Slow Job with timeout of', req.params.name);
+
+        const options = {};
+
+        options.solo = true;
+        options.name = req.params.name;
+        options.job = path.resolve(__dirname, 'jobs', `${options.name}.js`);
+
+        jobsService.addOneOffJob(options);
+
+        res.sendStatus(202);
+    });
+
     router.get('/schedule/:schedule/:name*?', (req, res) => {
         if (!req.params.schedule) {
             return res.sendStatus(400, 'schedule parameter cannot be mepty');

package/core/server/web/comments/routes.js

@@ -24,5 +24,7 @@ module.exports = function apiRoutes() {
     router.post('/:id/like', http(api.commentsComments.like));
     router.delete('/:id/like', http(api.commentsComments.unlike));
 
+    router.post('/:id/report', http(api.commentsComments.report));
+
     return router;
 };

package/core/server/web/members/app.js

@@ -1,9 +1,7 @@
 const debug = require('@tryghost/debug')('members');
-const {URL} = require('url');
 const cors = require('cors');
 const bodyParser = require('body-parser');
 const express = require('../../../shared/express');
-const urlUtils = require('../../../shared/url-utils');
 const sentry = require('../../../shared/sentry');
 const membersService = require('../../services/members');
 const stripeService = require('../../services/stripe');
@@ -11,6 +9,7 @@ const middleware = membersService.middleware;
 const shared = require('../shared');
 const labs = require('../../../shared/labs');
 const errorHandler = require('@tryghost/mw-error-handler');
+const config = require('../../../shared/config');
 
 const commentRouter = require('../comments');
 
@@ -22,8 +21,7 @@ module.exports = function setupMembersApp() {
     membersApp.use(shared.middleware.cacheControl('private'));
 
     // Support CORS for requests from the frontend
-    const siteUrl = new URL(urlUtils.getSiteUrl());
-    membersApp.use(cors(siteUrl.origin));
+    membersApp.use(cors({maxAge: config.get('caching:cors:maxAge')}));
 
     // Currently global handling for signing in with ?token= magiclinks
     membersApp.use(middleware.createSessionFromMagicLink);

package/core/shared/config/defaults.json

@@ -113,6 +113,9 @@
         },
         "robotstxt": {
             "maxAge": 3600000
+        },
+        "cors": {
+            "maxAge": 86400
         }
     },
     "imageOptimization": {
@@ -130,12 +133,21 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~2.3.0/umd/portal.min.js",
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/portal@~{version}/umd/portal.min.js",
         "version": "2.3"
     },
     "sodoSearch": {
-        "url": "https://unpkg.com/@tryghost/sodo-search@~1.0.0/umd/sodo-search.min.js",
-        "version": "1.0.0"
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/sodo-search.min.js",
+        "styles": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/main.css",
+        "version": "1.1"
+    },
+    "comments": {
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/comments-ui@~{version}/umd/comments-ui.min.js",
+        "styles": "https://cdn.jsdelivr.net/npm/@tryghost/comments-ui@~{version}/umd/main.css",
+        "version": "0.2"
+    },
+    "editor": {
+        "url": ""
     },
     "tenor": {
         "publicReadOnlyApiKey": null,
@@ -149,9 +161,5 @@
     },
     "gravatar": {
         "url": "https://www.gravatar.com/avatar/{hash}?s={size}&r={rating}&d={_default}"
-    },
-    "comments": {
-        "url": "https://unpkg.com/@tryghost/comments-ui@~0.1.0/umd/comments-ui.min.js",
-        "version": "0.1.0"
     }
 }

package/core/shared/config/env/config.testing.json

@@ -56,7 +56,8 @@
         "urlCache": "test/utils/fixtures/urls"
     },
     "sodoSearch": {
-        "url": "https://unpkg.com/@tryghost/sodo-search@~0.1.0/umd/sodo-search.min.js",
-        "version": "0.1.0"
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/sodo-search.min.js",
+        "styles": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/main.css",
+        "version": "1.0"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.3.1",
+  "version": "5.5.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -23,16 +23,16 @@
     "start": "node index",
     "dev": "grunt dev",
     "dev:debug": "DEBUG=ghost:* grunt dev",
-    "setup": "yarn install && knex-migrator init && grunt symlink && grunt init || (exit 0)",
-    "main": "grunt shell:main && grunt subgrunt:init",
+    "setup": "knex-migrator init && grunt symlink && grunt init || (exit 0)",
     "build": "grunt build",
-    "test": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js --timeout=60000",
+    "test": "yarn test:unit",
+    "test:single": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js --timeout=60000",
     "test:all": "yarn test:unit && yarn test:integration && yarn test:e2e && yarn lint",
     "test:debug": "DEBUG=ghost:test* yarn test",
     "test:unit": "c8 yarn test:unit:base",
     "test:unit:base": "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' './test/e2e-webhooks' --timeout=10000",
+    "test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' './test/e2e-server' './test/e2e-webhooks' --timeout=15000",
     "test:regression": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",
     "test:browser": "playwright test --browser=all test/e2e-browser",
     "test:ci": "yarn test:e2e -b && yarn test:integration -b && yarn test:regression -b",
@@ -46,36 +46,34 @@
     "lint:test": "eslint -c test/.eslintrc.js --ignore-path test/.eslintignore 'test/**/*.js'",
     "lint:code": "yarn lint:server && yarn lint:shared && yarn lint:frontend",
     "lint": "yarn lint:server && yarn lint:shared && yarn lint:frontend && yarn lint:test",
-    "fix:admin": "yarn cache clean && cd core/admin && rm -rf node_modules tmp dist && yarn && cd ../../",
-    "fix:server": "yarn cache clean && rm -rf node_modules && yarn",
-    "fix": "yarn fix:admin && yarn fix:server"
+    "prepack": "grunt release"
   },
   "engines": {
     "node": "^14.17.0 || ^16.13.0",
     "cli": "^1.17.0"
   },
   "dependencies": {
-    "@sentry/node": "7.6.0",
-    "@tryghost/adapter-manager": "0.2.32",
+    "@sentry/node": "7.7.0",
+    "@tryghost/adapter-manager": "0.2.33",
     "@tryghost/admin-api-schema": "4.0.0",
-    "@tryghost/api-version-compatibility-service": "0.4.3",
+    "@tryghost/api-version-compatibility-service": "0.4.4",
     "@tryghost/bookshelf-plugins": "0.4.3",
-    "@tryghost/bootstrap-socket": "0.2.21",
+    "@tryghost/bootstrap-socket": "0.2.22",
     "@tryghost/color-utils": "0.1.19",
-    "@tryghost/config-url-helpers": "1.0.1",
-    "@tryghost/constants": "1.0.6",
-    "@tryghost/custom-theme-settings-service": "0.3.3",
-    "@tryghost/database-info": "0.3.7",
+    "@tryghost/config-url-helpers": "1.0.2",
+    "@tryghost/constants": "1.0.7",
+    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-0.0.0.tgz",
+    "@tryghost/database-info": "0.3.8",
     "@tryghost/debug": "0.1.17",
-    "@tryghost/domain-events": "0.1.14",
-    "@tryghost/email-analytics-provider-mailgun": "1.0.9",
-    "@tryghost/email-analytics-service": "1.0.7",
-    "@tryghost/email-content-generator": "0.1.3",
+    "@tryghost/domain-events": "file:components/tryghost-domain-events-0.0.0.tgz",
+    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-0.0.0.tgz",
+    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-0.0.0.tgz",
+    "@tryghost/email-content-generator": "0.1.4",
     "@tryghost/errors": "1.2.14",
-    "@tryghost/express-dynamic-redirects": "0.2.13",
+    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-0.0.0.tgz",
     "@tryghost/helpers": "1.1.71",
     "@tryghost/image-transform": "1.1.0",
-    "@tryghost/job-manager": "0.8.25",
+    "@tryghost/job-manager": "0.9.0",
     "@tryghost/kg-card-factory": "3.1.3",
     "@tryghost/kg-default-atoms": "3.1.2",
     "@tryghost/kg-default-cards": "5.16.2",
@@ -83,42 +81,42 @@
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.5",
     "@tryghost/limit-service": "1.2.1",
     "@tryghost/logging": "2.2.3",
-    "@tryghost/magic-link": "1.0.26",
-    "@tryghost/member-events": "0.4.6",
-    "@tryghost/members-api": "8.2.0",
-    "@tryghost/members-events-service": "0.4.3",
-    "@tryghost/members-importer": "0.5.16",
-    "@tryghost/members-offers": "0.11.6",
-    "@tryghost/members-ssr": "1.0.28",
-    "@tryghost/members-stripe-service": "0.10.5",
+    "@tryghost/magic-link": "file:components/tryghost-magic-link-0.0.0.tgz",
+    "@tryghost/member-events": "file:components/tryghost-member-events-0.0.0.tgz",
+    "@tryghost/members-api": "file:components/tryghost-members-api-0.0.0.tgz",
+    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-0.0.0.tgz",
+    "@tryghost/members-importer": "file:components/tryghost-members-importer-0.0.0.tgz",
+    "@tryghost/members-offers": "file:components/tryghost-members-offers-0.0.0.tgz",
+    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-0.0.0.tgz",
+    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-0.0.0.tgz",
     "@tryghost/metrics": "1.0.14",
-    "@tryghost/minifier": "0.1.16",
-    "@tryghost/mw-api-version-mismatch": "0.2.2",
-    "@tryghost/mw-error-handler": "1.0.3",
-    "@tryghost/mw-session-from-token": "0.1.33",
+    "@tryghost/minifier": "0.1.17",
+    "@tryghost/mw-api-version-mismatch": "0.2.3",
+    "@tryghost/mw-error-handler": "1.0.5",
+    "@tryghost/mw-session-from-token": "0.1.34",
     "@tryghost/nodemailer": "0.3.24",
     "@tryghost/nql": "0.9.2",
-    "@tryghost/package-json": "1.0.22",
-    "@tryghost/pretty-cli": "1.2.28",
-    "@tryghost/promise": "0.1.19",
+    "@tryghost/package-json": "1.0.23",
+    "@tryghost/pretty-cli": "1.2.29",
+    "@tryghost/promise": "0.1.20",
     "@tryghost/request": "0.1.28",
     "@tryghost/root-utils": "0.3.15",
-    "@tryghost/security": "0.3.2",
-    "@tryghost/session-service": "0.1.43",
-    "@tryghost/settings-path-manager": "0.1.8",
+    "@tryghost/security": "0.3.3",
+    "@tryghost/session-service": "0.1.44",
+    "@tryghost/settings-path-manager": "0.1.9",
     "@tryghost/social-urls": "0.1.32",
-    "@tryghost/stats-service": "0.2.2",
+    "@tryghost/stats-service": "0.3.0",
     "@tryghost/string": "0.1.26",
     "@tryghost/tpl": "0.1.17",
     "@tryghost/update-check-service": "0.3.4",
     "@tryghost/url-utils": "4.0.2",
     "@tryghost/validator": "0.1.26",
-    "@tryghost/verification-trigger": "0.2.5",
+    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-0.0.0.tgz",
     "@tryghost/version": "0.1.15",
-    "@tryghost/vhost-middleware": "1.0.26",
-    "@tryghost/zip": "1.1.26",
+    "@tryghost/vhost-middleware": "1.0.28",
+    "@tryghost/zip": "1.1.27",
     "amperize": "0.6.1",
-    "analytics-node": "6.0.0",
+    "analytics-node": "6.1.0",
     "bluebird": "3.7.2",
     "body-parser": "1.20.0",
     "bookshelf": "1.2.0",
@@ -144,9 +142,10 @@
     "ghost-storage-base": "1.0.0",
     "glob": "8.0.3",
     "got": "9.6.0",
-    "gscan": "4.31.2",
+    "gscan": "4.32.0",
     "html-to-text": "8.2.0",
-    "image-size": "1.0.1",
+    "human-number": "2.0.0",
+    "image-size": "1.0.2",
     "intl": "1.2.5",
     "intl-messageformat": "5.4.3",
     "js-yaml": "4.1.0",
@@ -154,17 +153,17 @@
     "jsonwebtoken": "8.5.1",
     "juice": "8.0.0",
     "keypair": "1.0.4",
-    "knex": "2.1.0",
-    "knex-migrator": "5.0.0",
+    "knex": "2.2.0",
+    "knex-migrator": "5.0.2",
     "lodash": "4.17.21",
     "luxon": "2.5.0",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.29.15",
+    "metascraper": "5.29.18",
     "metascraper-author": "5.29.15",
     "metascraper-description": "5.29.15",
     "metascraper-image": "5.29.15",
     "metascraper-logo": "5.29.15",
-    "metascraper-logo-favicon": "5.29.15",
+    "metascraper-logo-favicon": "5.30.0",
     "metascraper-publisher": "5.29.15",
     "metascraper-title": "5.29.15",
     "metascraper-url": "5.29.15",
@@ -178,7 +177,7 @@
     "path-match": "1.2.4",
     "probe-image-size": "7.2.3",
     "rss": "1.2.2",
-    "sanitize-html": "2.7.0",
+    "sanitize-html": "2.7.1",
     "semver": "7.3.7",
     "stoppable": "1.1.0",
     "tough-cookie": "4.0.0",
@@ -187,28 +186,26 @@
   },
   "optionalDependencies": {
     "@tryghost/html-to-mobiledoc": "1.8.6",
-    "sqlite3": "5.0.8"
+    "sqlite3": "5.0.10"
   },
   "devDependencies": {
     "@lodder/grunt-postcss": "3.1.1",
-    "@playwright/test": "1.23.2",
+    "@playwright/test": "1.24.0",
     "@tryghost/express-test": "0.11.1",
     "@tryghost/webhook-mock-receiver": "0.1.1",
-    "c8": "7.11.3",
+    "c8": "7.12.0",
     "cli-progress": "3.11.2",
     "coffeescript": "2.7.0",
     "cssnano": "5.1.12",
-    "eslint": "8.19.0",
+    "eslint": "8.20.0",
     "eslint-plugin-ghost": "2.14.0",
     "grunt": "1.5.3",
     "grunt-bg-shell": "2.3.3",
     "grunt-contrib-clean": "2.0.1",
-    "grunt-contrib-compress": "2.0.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-symlink": "1.0.0",
     "grunt-contrib-watch": "1.1.0",
     "grunt-express-server": "0.5.4",
-    "grunt-shell": "4.0.0",
     "grunt-subgrunt": "1.3.0",
     "grunt-update-submodules": "0.4.1",
     "inquirer": "8.2.4",
@@ -216,7 +213,7 @@
     "mocha": "10.0.0",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "TryGhost/mock-knex#8ecb8c227bf463c991c3d820d33f59efc3ab9682",
-    "nock": "13.2.8",
+    "nock": "13.2.9",
     "papaparse": "5.3.2",
     "postcss": "8.4.14",
     "rewire": "6.0.0",
@@ -228,6 +225,24 @@
   "resolutions": {
     "@tryghost/logging": "2.2.3",
     "moment": "2.24.0",
-    "moment-timezone": "0.5.23"
+    "moment-timezone": "0.5.23",
+    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-0.0.0.tgz",
+    "@tryghost/domain-events": "file:components/tryghost-domain-events-0.0.0.tgz",
+    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-0.0.0.tgz",
+    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-0.0.0.tgz",
+    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-0.0.0.tgz",
+    "@tryghost/magic-link": "file:components/tryghost-magic-link-0.0.0.tgz",
+    "@tryghost/member-analytics-service": "file:components/tryghost-member-analytics-service-0.0.0.tgz",
+    "@tryghost/member-events": "file:components/tryghost-member-events-0.0.0.tgz",
+    "@tryghost/members-analytics-ingress": "file:components/tryghost-members-analytics-ingress-0.0.0.tgz",
+    "@tryghost/members-api": "file:components/tryghost-members-api-0.0.0.tgz",
+    "@tryghost/members-csv": "file:components/tryghost-members-csv-0.0.0.tgz",
+    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-0.0.0.tgz",
+    "@tryghost/members-importer": "file:components/tryghost-members-importer-0.0.0.tgz",
+    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-0.0.0.tgz",
+    "@tryghost/members-offers": "file:components/tryghost-members-offers-0.0.0.tgz",
+    "@tryghost/members-payments": "file:components/tryghost-members-payments-0.0.0.tgz",
+    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-0.0.0.tgz",
+    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-0.0.0.tgz"
   }
 }