ghost 6.47.0 → 6.48.0

package/core/server/services/recommendations/service/recommendation-metadata-service.ts

@@ -1,4 +1,3 @@
-/* eslint-disable ghost/filenames/match-exported-class */
 
 type OembedMetadata<Type extends string> = {
     version: '1.0',

package/core/server/services/recommendations/service/recommendation.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable ghost/filenames/match-exported-class */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/core/server/services/recommendations/service/recommendation.ts

@@ -1,4 +1,3 @@
-/* eslint-disable ghost/filenames/match-exported-class */
 
 import ObjectId from 'bson-objectid';
 import errors from '@tryghost/errors';

package/core/server/services/remote-flags/index.js

@@ -39,7 +39,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
 exports.stop = stop;
 exports.getInstance = getInstance;
-/* eslint-disable @typescript-eslint/no-require-imports */
 const logging_1 = __importDefault(require("@tryghost/logging"));
 const remote_flags_service_1 = require("./remote-flags-service");
 const flagOverrides = __importStar(require("../../../shared/labs-flag-overrides"));

package/core/server/services/remote-flags/index.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
 import logging from '@tryghost/logging';
 import {RemoteFlagsService} from './remote-flags-service';
 import * as flagOverrides from '../../../shared/labs-flag-overrides';

package/core/server/services/slack.js

@@ -179,7 +179,11 @@ function slackListener(model, options) {
 
     ping({
         ...model.toJSON(),
-        authors: model.related('authors').toJSON()
+        authors: model.related('authors').toJSON(),
+        // tags are needed so the lazy URL service can evaluate collection
+        // filters (e.g. `tag:foo`) when resolving the post URL; without them
+        // a tag-filtered post resolves to /404/
+        tags: model.related('tags').toJSON()
     });
 }
 

package/core/server/services/update-check/index.js

@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 
 const _ = require('lodash');
 

package/core/server/services/url/lazy-find-resource.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFindResource = createFindResource;
-/* eslint-disable @typescript-eslint/no-require-imports */
 const _ = require('lodash');
 const resourcesConfig = require('./config');
 const POST_SCOPE = { type: 'post', status: 'published' };

package/core/server/services/url/lazy-find-resource.ts

@@ -1,7 +1,5 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
 const _ = require('lodash');
 const resourcesConfig = require('./config');
-/* eslint-enable @typescript-eslint/no-require-imports */
 
 import type {ResourceLookupParams, FindResource} from './lazy-url-service';
 

package/core/server/services/url/lazy-url-service.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LazyUrlService = void 0;
-/* eslint-disable @typescript-eslint/no-require-imports */
 const debug = require('@tryghost/debug')('services:url:lazy');
 const errors = require('@tryghost/errors');
 const localUtils = require('../../../shared/url-utils');

package/core/server/services/url/lazy-url-service.ts

@@ -1,10 +1,8 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
 const debug = require('@tryghost/debug')('services:url:lazy');
 const errors = require('@tryghost/errors');
 const localUtils = require('../../../shared/url-utils');
 const {matchPermalink, toLookupParams} = require('./permalink-matcher');
 const {buildFilter, filterMatches, routerTypeOf} = require('./router-filter');
-/* eslint-enable @typescript-eslint/no-require-imports */
 
 import type {Resource, UrlOptions, LazyUrlServiceBackend} from './url-service-facade';
 import type {CompiledFilter} from './router-filter';

package/core/server/services/url/permalink-matcher.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchPermalink = matchPermalink;
 exports.toLookupParams = toLookupParams;
-/* eslint-disable @typescript-eslint/no-require-imports */
 const routeMatch = require('path-match')();
 const SUPPORTED_TOKENS = new Set([
     'id',

package/core/server/services/url/permalink-matcher.ts

@@ -1,6 +1,4 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
 const routeMatch = require('path-match')();
-/* eslint-enable @typescript-eslint/no-require-imports */
 
 import type {ResourceLookupParams} from './lazy-url-service';
 

package/core/server/services/url/router-filter.js

@@ -4,10 +4,8 @@ exports.EXPANSIONS = void 0;
 exports.routerTypeOf = routerTypeOf;
 exports.buildFilter = buildFilter;
 exports.filterMatches = filterMatches;
-/* eslint-disable @typescript-eslint/no-require-imports */
 const nql = require('@tryghost/nql');
 const logging = require('@tryghost/logging');
-/* eslint-enable @typescript-eslint/no-require-imports */
 // A deliberate copy of the eager UrlGenerator's NQL semantics: while both
 // services run side by side, eager is the parity oracle and must stay separate.
 exports.EXPANSIONS = [

package/core/server/services/url/router-filter.ts

@@ -1,7 +1,5 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
 const nql = require('@tryghost/nql');
 const logging = require('@tryghost/logging');
-/* eslint-enable @typescript-eslint/no-require-imports */
 
 // A deliberate copy of the eager UrlGenerator's NQL semantics: while both
 // services run side by side, eager is the parity oracle and must stay separate.

package/core/server/services/url/url-service-facade.js

@@ -17,7 +17,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UrlServiceFacade = void 0;
-/* eslint-disable @typescript-eslint/no-require-imports */
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');

package/core/server/services/url/url-service-facade.ts

@@ -15,11 +15,9 @@
  * swapped in behind a config flag without touching individual callers.
  */
 
-/* eslint-disable @typescript-eslint/no-require-imports */
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
-/* eslint-enable @typescript-eslint/no-require-imports */
 
 /**
  * Routing-level resource. `type` is one of the plural router keys

package/core/server/services/verification/verification-webhook-service.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verificationWebhookService = exports.VerificationWebhookService = void 0;
-/* eslint-disable @typescript-eslint/no-require-imports */
 const crypto_1 = __importDefault(require("crypto"));
 const logging = require('@tryghost/logging');
 const request = require('@tryghost/request');

package/core/server/services/verification/verification-webhook-service.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
 import crypto from 'crypto';
 const logging = require('@tryghost/logging');
 const request = require('@tryghost/request');

package/core/server/web/api/endpoints/admin/routes.js

@@ -64,13 +64,13 @@ module.exports = function apiRoutes() {
     router.post('/pages/:id/copy', mw.authAdminApi, http(api.pages.copy));
 
     // Gift links (behind the giftLinks flag)
-    router.get('/posts/:id/gift_link', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.read));
-    router.put('/posts/:id/gift_link', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.issue));
-    router.post('/posts/:id/gift_link', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.reissue));
-    router.get('/pages/:id/gift_link', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.read));
-    router.put('/pages/:id/gift_link', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.issue));
-    router.post('/pages/:id/gift_link', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.reissue));
-    router.put('/gift_links/revoke_all', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.revokeAll));
+    router.get('/posts/:id/gift_links', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.browse));
+    router.put('/posts/:id/gift_links', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.ensure));
+    router.post('/posts/:id/gift_links', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.create));
+    router.get('/pages/:id/gift_links', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.browse));
+    router.put('/pages/:id/gift_links', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.ensure));
+    router.post('/pages/:id/gift_links', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.create));
+    router.put('/gift_links/remove_all', mw.authAdminApi, labs.enabledMiddleware('giftLinks'), http(api.giftLinks.removeAll));
 
     // # Integrations
 

package/core/shared/events-ts/post-deleted-event.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostDeletedEvent = void 0;
 class PostDeletedEvent {
     id;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     data;
     timestamp;
     constructor(data, timestamp) {
@@ -11,7 +10,6 @@ class PostDeletedEvent {
         this.data = data.data;
         this.timestamp = timestamp;
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     static create(data, timestamp = new Date()) {
         return new PostDeletedEvent(data, timestamp);
     }

package/core/shared/events-ts/post-deleted-event.ts

@@ -1,6 +1,5 @@
 export class PostDeletedEvent {
     id: string;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     data: any;
     timestamp: Date;
 
@@ -10,7 +9,6 @@ export class PostDeletedEvent {
         this.timestamp = timestamp;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     static create(data: any, timestamp = new Date()) {
         return new PostDeletedEvent(data, timestamp);
     }

package/core/shared/labs.js

@@ -132,7 +132,6 @@ module.exports.enabledHelper = function enabledHelper(options, callback) {
     });
     errDetails.help = tpl(options.errorHelp || messages.errorHelp, {url: options.helpUrl});
 
-    // eslint-disable-next-line no-restricted-syntax
     logging.error(new errors.DisabledFeatureError({
         message: errDetails.message,
         context: errDetails.context,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.47.0",
+  "version": "6.48.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -53,24 +53,16 @@
     "build:tsc": "tsc",
     "pretest": "pnpm build:assets",
     "test": "pnpm test:unit",
-    "test:vitest": "vitest run",
     "test:watch": "vitest --reporter=default",
     "test:single": "f() { case \"$1\" in test/unit/*) vitest run \"$1\" ;; test/*) vitest run -c vitest.config.db.ts \"$1\" ;; *) vitest run \"$1\" || vitest run -c vitest.config.db.ts \"$1\" ;; esac; }; f",
     "test:all": "pnpm test:unit && pnpm test:integration && pnpm test:e2e && pnpm lint",
     "test:debug": "DEBUG=ghost:test* pnpm test",
-    "test:unit": "pnpm test:vitest",
-    "test:integration": "pnpm test:integration:vitest",
-    "test:integration:vitest": "vitest run -c vitest.config.db.ts --project integration",
-    "test:integration:ci": "pnpm test:integration:vitest",
-    "test:e2e": "pnpm test:e2e:vitest",
-    "test:e2e:vitest": "vitest run -c vitest.config.db.ts --project e2e --project e2e-api",
-    "test:e2e:ci": "pnpm test:e2e:vitest",
+    "test:unit": "vitest run",
+    "test:integration": "vitest run -c vitest.config.db.ts --project integration",
+    "test:e2e": "vitest run -c vitest.config.db.ts --project e2e --project e2e-api --project e2e-isolated",
     "test:legacy": "vitest run -c vitest.config.db.ts --project legacy",
-    "test:ci:e2e": "c8 -c ./.c8rc.e2e.json -o coverage-e2e pnpm test:e2e:ci",
-    "test:ci:e2e:no-coverage": "pnpm test:e2e:ci",
-    "test:ci:legacy": "pnpm test:legacy",
-    "test:ci:integration": "c8 -c ./.c8rc.e2e.json -o coverage-integration --lines 52 --functions 47 --branches 73 --statements 52 pnpm test:integration:ci",
-    "test:ci:integration:no-coverage": "pnpm test:integration:ci",
+    "test:ci:e2e": "c8 -c ./.c8rc.e2e.json -o coverage-e2e pnpm test:e2e",
+    "test:ci:integration": "c8 -c ./.c8rc.e2e.json -o coverage-integration --lines 52 --functions 47 --branches 73 --statements 52 pnpm test:integration",
     "test:int:slow": "pnpm test:integration",
     "test:e2e:slow": "vitest run -c vitest.config.db.ts --project e2e --project e2e-api --reporter=verbose",
     "test:leg:slow": "vitest run -c vitest.config.db.ts --project legacy --reporter=verbose",
@@ -181,10 +173,10 @@
     "file-type": "21.3.4",
     "form-data": "4.0.6",
     "fs-extra": "11.3.5",
-    "ghost-storage-base": "2.1.0",
+    "ghost-storage-base": "2.1.2",
     "glob": "13.0.6",
     "got": "13.0.0",
-    "gscan": "6.4.0",
+    "gscan": "6.4.1",
     "handlebars": "4.7.9",
     "heic-convert": "2.1.0",
     "html-to-text": "5.1.1",