From 35e51e364b0f4458a54f77d2c5ca9c7f237b66bd Mon Sep 17 00:00:00 2001 From: Sam Lord Date: Tue, 15 Jun 2021 17:01:22 +0100 Subject: [PATCH] Switch to @tryghost/debug, remove ghost-ignition no issue The only pieces of Ghost-Ignition used in Ghost were debug and logging. Both of these modules have been superceded by the Framework monorepo, and all usages of Ignition have now been removed, replaced with @tryghost/debug and @tryghost/logging. --- core/boot.js | 2 +- core/frontend/helpers/ghost_head.js | 2 +- core/frontend/services/apps/index.js | 2 +- .../services/routing/CollectionRouter.js | 2 +- .../frontend/services/routing/ParentRouter.js | 2 +- .../services/routing/StaticPagesRouter.js | 2 +- .../services/routing/StaticRoutesRouter.js | 2 +- .../services/routing/TaxonomyRouter.js | 2 +- core/frontend/services/routing/bootstrap.js | 2 +- .../services/routing/controllers/channel.js | 2 +- .../routing/controllers/collection.js | 2 +- .../services/routing/controllers/entry.js | 2 +- .../services/routing/controllers/preview.js | 2 +- .../services/routing/controllers/rss.js | 2 +- .../services/routing/controllers/static.js | 2 +- .../routing/controllers/unsubscribe.js | 2 +- .../services/routing/helpers/entry-lookup.js | 2 +- .../routing/helpers/render-entries.js | 2 +- .../services/routing/helpers/render-entry.js | 2 +- .../services/routing/helpers/renderer.js | 2 +- .../services/settings/ensure-settings.js | 2 +- core/frontend/services/settings/index.js | 2 +- core/frontend/services/settings/loader.js | 2 +- core/frontend/services/settings/validate.js | 2 +- .../frontend/services/settings/yaml-parser.js | 2 +- core/frontend/services/url/Queue.js | 2 +- core/frontend/services/url/Resources.js | 2 +- core/frontend/services/url/UrlGenerator.js | 2 +- core/frontend/services/url/UrlService.js | 2 +- core/frontend/services/url/Urls.js | 2 +- .../adapters/scheduling/SchedulingDefault.js | 2 +- core/server/api/canary/utils/permissions.js | 2 +- .../canary/utils/serializers/input/authors.js | 2 +- .../api/canary/utils/serializers/input/db.js | 2 +- .../utils/serializers/input/integrations.js | 2 +- .../canary/utils/serializers/input/members.js | 2 +- .../canary/utils/serializers/input/pages.js | 2 +- .../canary/utils/serializers/input/posts.js | 2 +- .../canary/utils/serializers/input/tags.js | 2 +- .../canary/utils/serializers/input/users.js | 2 +- .../utils/serializers/input/webhooks.js | 2 +- .../utils/serializers/output/actions.js | 2 +- .../canary/utils/serializers/output/all.js | 2 +- .../serializers/output/authentication.js | 2 +- .../utils/serializers/output/authors.js | 2 +- .../canary/utils/serializers/output/config.js | 2 +- .../api/canary/utils/serializers/output/db.js | 2 +- .../canary/utils/serializers/output/images.js | 2 +- .../utils/serializers/output/integrations.js | 2 +- .../utils/serializers/output/invites.js | 2 +- .../canary/utils/serializers/output/labels.js | 2 +- .../canary/utils/serializers/output/mail.js | 2 +- .../utils/serializers/output/members.js | 2 +- .../utils/serializers/output/notifications.js | 2 +- .../canary/utils/serializers/output/oembed.js | 2 +- .../canary/utils/serializers/output/pages.js | 2 +- .../canary/utils/serializers/output/posts.js | 2 +- .../utils/serializers/output/products.js | 2 +- .../canary/utils/serializers/output/roles.js | 2 +- .../canary/utils/serializers/output/site.js | 2 +- .../canary/utils/serializers/output/slugs.js | 2 +- .../utils/serializers/output/snippets.js | 2 +- .../canary/utils/serializers/output/tags.js | 2 +- .../canary/utils/serializers/output/themes.js | 2 +- .../canary/utils/serializers/output/users.js | 2 +- .../utils/serializers/output/webhooks.js | 2 +- .../utils/validators/input/invitations.js | 2 +- .../utils/validators/input/passwordreset.js | 2 +- .../canary/utils/validators/input/setup.js | 2 +- .../canary/utils/validators/input/users.js | 2 +- core/server/api/shared/frame.js | 2 +- core/server/api/shared/headers.js | 2 +- core/server/api/shared/http.js | 2 +- core/server/api/shared/pipeline.js | 2 +- core/server/api/shared/serializers/handle.js | 2 +- .../api/shared/serializers/input/all.js | 2 +- core/server/api/shared/validators/handle.js | 2 +- .../server/api/shared/validators/input/all.js | 2 +- core/server/api/v2/utils/permissions.js | 2 +- .../api/v2/utils/serializers/input/db.js | 2 +- .../utils/serializers/input/integrations.js | 2 +- .../api/v2/utils/serializers/input/pages.js | 2 +- .../api/v2/utils/serializers/input/posts.js | 2 +- .../api/v2/utils/serializers/input/tags.js | 2 +- .../api/v2/utils/serializers/input/users.js | 2 +- .../v2/utils/serializers/input/webhooks.js | 2 +- .../v2/utils/serializers/output/actions.js | 2 +- .../api/v2/utils/serializers/output/all.js | 2 +- .../serializers/output/authentication.js | 2 +- .../v2/utils/serializers/output/authors.js | 2 +- .../api/v2/utils/serializers/output/config.js | 2 +- .../api/v2/utils/serializers/output/db.js | 2 +- .../api/v2/utils/serializers/output/images.js | 2 +- .../utils/serializers/output/integrations.js | 2 +- .../v2/utils/serializers/output/invites.js | 2 +- .../api/v2/utils/serializers/output/mail.js | 2 +- .../utils/serializers/output/notifications.js | 2 +- .../api/v2/utils/serializers/output/oembed.js | 2 +- .../api/v2/utils/serializers/output/pages.js | 2 +- .../api/v2/utils/serializers/output/posts.js | 2 +- .../api/v2/utils/serializers/output/roles.js | 2 +- .../api/v2/utils/serializers/output/site.js | 2 +- .../api/v2/utils/serializers/output/slugs.js | 2 +- .../api/v2/utils/serializers/output/tags.js | 2 +- .../api/v2/utils/serializers/output/themes.js | 2 +- .../api/v2/utils/serializers/output/users.js | 2 +- .../v2/utils/serializers/output/webhooks.js | 2 +- .../v2/utils/validators/input/invitations.js | 2 +- .../utils/validators/input/passwordreset.js | 2 +- .../api/v2/utils/validators/input/setup.js | 2 +- .../api/v2/utils/validators/input/users.js | 2 +- core/server/api/v3/utils/permissions.js | 2 +- .../api/v3/utils/serializers/input/authors.js | 2 +- .../api/v3/utils/serializers/input/db.js | 2 +- .../utils/serializers/input/integrations.js | 2 +- .../api/v3/utils/serializers/input/members.js | 2 +- .../api/v3/utils/serializers/input/pages.js | 2 +- .../api/v3/utils/serializers/input/posts.js | 2 +- .../api/v3/utils/serializers/input/tags.js | 2 +- .../api/v3/utils/serializers/input/users.js | 2 +- .../v3/utils/serializers/input/webhooks.js | 2 +- .../v3/utils/serializers/output/actions.js | 2 +- .../api/v3/utils/serializers/output/all.js | 2 +- .../serializers/output/authentication.js | 2 +- .../v3/utils/serializers/output/authors.js | 2 +- .../api/v3/utils/serializers/output/config.js | 2 +- .../api/v3/utils/serializers/output/db.js | 2 +- .../api/v3/utils/serializers/output/images.js | 2 +- .../utils/serializers/output/integrations.js | 2 +- .../v3/utils/serializers/output/invites.js | 2 +- .../api/v3/utils/serializers/output/labels.js | 2 +- .../api/v3/utils/serializers/output/mail.js | 2 +- .../v3/utils/serializers/output/members.js | 2 +- .../utils/serializers/output/notifications.js | 2 +- .../api/v3/utils/serializers/output/oembed.js | 2 +- .../api/v3/utils/serializers/output/pages.js | 2 +- .../api/v3/utils/serializers/output/posts.js | 2 +- .../api/v3/utils/serializers/output/roles.js | 2 +- .../api/v3/utils/serializers/output/site.js | 2 +- .../api/v3/utils/serializers/output/slugs.js | 2 +- .../v3/utils/serializers/output/snippets.js | 2 +- .../api/v3/utils/serializers/output/tags.js | 2 +- .../api/v3/utils/serializers/output/themes.js | 2 +- .../api/v3/utils/serializers/output/users.js | 2 +- .../v3/utils/serializers/output/webhooks.js | 2 +- .../v3/utils/validators/input/invitations.js | 2 +- .../utils/validators/input/passwordreset.js | 2 +- .../api/v3/utils/validators/input/setup.js | 2 +- .../api/v3/utils/validators/input/users.js | 2 +- .../data/importer/importers/data/base.js | 2 +- .../data/importer/importers/data/index.js | 2 +- .../data/importer/importers/data/posts.js | 2 +- .../data/importer/importers/data/roles.js | 2 +- .../data/importer/importers/data/settings.js | 2 +- .../data/importer/importers/data/tags.js | 2 +- .../data/importer/importers/data/users.js | 2 +- ...omplimentary-plan-from-members-settings.js | 2 +- ...emove-legacy-is-paid-flag-from-settings.js | 2 +- .../01-update-member-from-email-address.js | 2 +- core/server/ghost-server.js | 2 +- .../lib/image/cached-image-size-from-url.js | 2 +- core/server/lib/image/image-size.js | 2 +- core/server/models/base/index.js | 2 +- core/server/services/bulk-email/index.js | 2 +- .../email-analytics/jobs/fetch-all.js | 2 +- .../email-analytics/jobs/fetch-latest.js | 2 +- .../services/email-analytics/lib/queries.js | 2 +- core/server/services/mega/mega.js | 2 +- .../services/members/importer/batch-import.js | 2 +- core/server/services/settings/cache.js | 2 +- core/server/services/themes/index.js | 2 +- core/server/services/themes/loader.js | 2 +- core/server/services/themes/storage.js | 2 +- core/server/services/themes/validate.js | 2 +- core/server/services/webhooks/trigger.js | 2 +- core/server/web/admin/app.js | 2 +- core/server/web/admin/controller.js | 2 +- core/server/web/api/app.js | 2 +- core/server/web/api/canary/admin/app.js | 2 +- core/server/web/api/canary/content/app.js | 2 +- core/server/web/api/v2/admin/app.js | 2 +- core/server/web/api/v2/content/app.js | 2 +- core/server/web/api/v3/admin/app.js | 2 +- core/server/web/api/v3/content/app.js | 2 +- core/server/web/members/app.js | 2 +- core/server/web/oauth/app.js | 2 +- core/server/web/parent/app.js | 2 +- .../web/parent/middleware/log-request.js | 2 +- .../web/parent/middleware/request-id.js | 2 +- .../shared/middlewares/custom-redirects.js | 2 +- .../web/shared/middlewares/error-handler.js | 2 +- .../web/shared/middlewares/url-redirects.js | 2 +- core/server/web/site/app.js | 2 +- core/shared/config/index.js | 2 +- core/shared/express.js | 2 +- package.json | 2 +- test/utils/db-utils.js | 2 +- yarn.lock | 38 ++++--------------- 198 files changed, 205 insertions(+), 227 deletions(-) diff --git a/core/boot.js b/core/boot.js index 2f6430d3cf..ea591693a9 100644 --- a/core/boot.js +++ b/core/boot.js @@ -7,7 +7,7 @@ // IMPORTANT: The only global requires here should be overrides + debug so we can monitor timings with DEBUG=ghost:boot* node ghost require('./server/overrides'); -const debug = require('ghost-ignition').debug('boot'); +const debug = require('@tryghost/debug')('boot'); // END OF GLOBAL REQUIRES /** diff --git a/core/frontend/helpers/ghost_head.js b/core/frontend/helpers/ghost_head.js index b946d7d78c..3f76efab72 100644 --- a/core/frontend/helpers/ghost_head.js +++ b/core/frontend/helpers/ghost_head.js @@ -4,7 +4,7 @@ // Outputs scripts and other assets at the top of a Ghost theme const {metaData, escapeExpression, SafeString, logging, settingsCache, config, blogIcon, urlUtils} = require('../services/proxy'); const _ = require('lodash'); -const debug = require('ghost-ignition').debug('ghost_head'); +const debug = require('@tryghost/debug')('ghost_head'); const templateStyles = require('./tpl/styles'); const getMetaData = metaData.get; diff --git a/core/frontend/services/apps/index.js b/core/frontend/services/apps/index.js index 11564d366b..5c97fc9777 100644 --- a/core/frontend/services/apps/index.js +++ b/core/frontend/services/apps/index.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:apps'); +const debug = require('@tryghost/debug')('services:apps'); const Promise = require('bluebird'); const i18n = require('../../../shared/i18n'); const logging = require('@tryghost/logging'); diff --git a/core/frontend/services/routing/CollectionRouter.js b/core/frontend/services/routing/CollectionRouter.js index 51315f1c1e..aecc03f7ee 100644 --- a/core/frontend/services/routing/CollectionRouter.js +++ b/core/frontend/services/routing/CollectionRouter.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:collection-router'); +const debug = require('@tryghost/debug')('services:routing:collection-router'); const events = require('../../../server/lib/common/events'); const urlUtils = require('../../../shared/url-utils'); const ParentRouter = require('./ParentRouter'); diff --git a/core/frontend/services/routing/ParentRouter.js b/core/frontend/services/routing/ParentRouter.js index 9e0941507f..006273ba90 100644 --- a/core/frontend/services/routing/ParentRouter.js +++ b/core/frontend/services/routing/ParentRouter.js @@ -7,7 +7,7 @@ * Only allows for .use and .get at the moment - we don't have clear use-cases for anything else yet. */ -const debug = require('ghost-ignition').debug('services:routing:ParentRouter'); +const debug = require('@tryghost/debug')('services:routing:ParentRouter'); const EventEmitter = require('events').EventEmitter; const express = require('../../../shared/express'); diff --git a/core/frontend/services/routing/StaticPagesRouter.js b/core/frontend/services/routing/StaticPagesRouter.js index 1e8e9521fb..463117c6aa 100644 --- a/core/frontend/services/routing/StaticPagesRouter.js +++ b/core/frontend/services/routing/StaticPagesRouter.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:static-pages-router'); +const debug = require('@tryghost/debug')('services:routing:static-pages-router'); const urlUtils = require('../../../shared/url-utils'); const ParentRouter = require('./ParentRouter'); const controllers = require('./controllers'); diff --git a/core/frontend/services/routing/StaticRoutesRouter.js b/core/frontend/services/routing/StaticRoutesRouter.js index 307ebf50db..0e5bb58a92 100644 --- a/core/frontend/services/routing/StaticRoutesRouter.js +++ b/core/frontend/services/routing/StaticRoutesRouter.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:static-routes-router'); +const debug = require('@tryghost/debug')('services:routing:static-routes-router'); const events = require('../../../server/lib/common/events'); const errors = require('@tryghost/errors'); const urlUtils = require('../../../shared/url-utils'); diff --git a/core/frontend/services/routing/TaxonomyRouter.js b/core/frontend/services/routing/TaxonomyRouter.js index c8ce2d6e05..322e8dc133 100644 --- a/core/frontend/services/routing/TaxonomyRouter.js +++ b/core/frontend/services/routing/TaxonomyRouter.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:taxonomy-router'); +const debug = require('@tryghost/debug')('services:routing:taxonomy-router'); const config = require('../../../shared/config'); const events = require('../../../server/lib/common/events'); const ParentRouter = require('./ParentRouter'); diff --git a/core/frontend/services/routing/bootstrap.js b/core/frontend/services/routing/bootstrap.js index 7716d3cf9e..8a0ab3279c 100644 --- a/core/frontend/services/routing/bootstrap.js +++ b/core/frontend/services/routing/bootstrap.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:bootstrap'); +const debug = require('@tryghost/debug')('services:routing:bootstrap'); const _ = require('lodash'); const events = require('../../../server/lib/common/events'); const settingsService = require('../settings'); diff --git a/core/frontend/services/routing/controllers/channel.js b/core/frontend/services/routing/controllers/channel.js index f2a4c53293..15672f4839 100644 --- a/core/frontend/services/routing/controllers/channel.js +++ b/core/frontend/services/routing/controllers/channel.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('services:routing:controllers:channel'); +const debug = require('@tryghost/debug')('services:routing:controllers:channel'); const i18n = require('../../../../shared/i18n'); const errors = require('@tryghost/errors'); const security = require('@tryghost/security'); diff --git a/core/frontend/services/routing/controllers/collection.js b/core/frontend/services/routing/controllers/collection.js index ba78f17d89..f392e52e6f 100644 --- a/core/frontend/services/routing/controllers/collection.js +++ b/core/frontend/services/routing/controllers/collection.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('services:routing:controllers:collection'); +const debug = require('@tryghost/debug')('services:routing:controllers:collection'); const {i18n} = require('../../proxy'); const errors = require('@tryghost/errors'); const security = require('@tryghost/security'); diff --git a/core/frontend/services/routing/controllers/entry.js b/core/frontend/services/routing/controllers/entry.js index 5eb7a5ec3e..28f6157804 100644 --- a/core/frontend/services/routing/controllers/entry.js +++ b/core/frontend/services/routing/controllers/entry.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:controllers:entry'); +const debug = require('@tryghost/debug')('services:routing:controllers:entry'); const url = require('url'); const config = require('../../../../shared/config'); const urlService = require('../../../services/url'); diff --git a/core/frontend/services/routing/controllers/preview.js b/core/frontend/services/routing/controllers/preview.js index e6e1cf7932..4b6bd664b3 100644 --- a/core/frontend/services/routing/controllers/preview.js +++ b/core/frontend/services/routing/controllers/preview.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:controllers:preview'); +const debug = require('@tryghost/debug')('services:routing:controllers:preview'); const config = require('../../../../shared/config'); const urlService = require('../../url'); const urlUtils = require('../../../../shared/url-utils'); diff --git a/core/frontend/services/routing/controllers/rss.js b/core/frontend/services/routing/controllers/rss.js index 5d329c9ca1..4b11a60a04 100644 --- a/core/frontend/services/routing/controllers/rss.js +++ b/core/frontend/services/routing/controllers/rss.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('services:routing:controllers:rss'); +const debug = require('@tryghost/debug')('services:routing:controllers:rss'); const url = require('url'); const security = require('@tryghost/security'); const settingsCache = require('../../../../server/services/settings/cache'); diff --git a/core/frontend/services/routing/controllers/static.js b/core/frontend/services/routing/controllers/static.js index e1f0ea3819..c012e597c7 100644 --- a/core/frontend/services/routing/controllers/static.js +++ b/core/frontend/services/routing/controllers/static.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('services:routing:controllers:static'); +const debug = require('@tryghost/debug')('services:routing:controllers:static'); const helpers = require('../helpers'); function processQuery(query, locals) { diff --git a/core/frontend/services/routing/controllers/unsubscribe.js b/core/frontend/services/routing/controllers/unsubscribe.js index f788850f75..35a16c55c8 100644 --- a/core/frontend/services/routing/controllers/unsubscribe.js +++ b/core/frontend/services/routing/controllers/unsubscribe.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:controllers:unsubscribe'); +const debug = require('@tryghost/debug')('services:routing:controllers:unsubscribe'); const path = require('path'); const megaService = require('../../../../server/services/mega'); const helpers = require('../../../services/routing/helpers'); diff --git a/core/frontend/services/routing/helpers/entry-lookup.js b/core/frontend/services/routing/helpers/entry-lookup.js index 5208e38aa8..b7c3937cc8 100644 --- a/core/frontend/services/routing/helpers/entry-lookup.js +++ b/core/frontend/services/routing/helpers/entry-lookup.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const url = require('url'); -const debug = require('ghost-ignition').debug('services:routing:helpers:entry-lookup'); +const debug = require('@tryghost/debug')('services:routing:helpers:entry-lookup'); const routeMatch = require('path-match')(); /** diff --git a/core/frontend/services/routing/helpers/render-entries.js b/core/frontend/services/routing/helpers/render-entries.js index be6295a685..64ce061232 100644 --- a/core/frontend/services/routing/helpers/render-entries.js +++ b/core/frontend/services/routing/helpers/render-entries.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:helpers:render-entries'); +const debug = require('@tryghost/debug')('services:routing:helpers:render-entries'); const formatResponse = require('./format-response'); const renderer = require('./renderer'); diff --git a/core/frontend/services/routing/helpers/render-entry.js b/core/frontend/services/routing/helpers/render-entry.js index 40c21eeb3d..e6609a70d3 100644 --- a/core/frontend/services/routing/helpers/render-entry.js +++ b/core/frontend/services/routing/helpers/render-entry.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:helpers:render-post'); +const debug = require('@tryghost/debug')('services:routing:helpers:render-post'); const formatResponse = require('./format-response'); const renderer = require('./renderer'); /** diff --git a/core/frontend/services/routing/helpers/renderer.js b/core/frontend/services/routing/helpers/renderer.js index 3b057a07a7..dc138f08d7 100644 --- a/core/frontend/services/routing/helpers/renderer.js +++ b/core/frontend/services/routing/helpers/renderer.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:routing:helpers:renderer'); +const debug = require('@tryghost/debug')('services:routing:helpers:renderer'); const setContext = require('./context'); const templates = require('./templates'); diff --git a/core/frontend/services/settings/ensure-settings.js b/core/frontend/services/settings/ensure-settings.js index c05ba5f05d..199278e432 100644 --- a/core/frontend/services/settings/ensure-settings.js +++ b/core/frontend/services/settings/ensure-settings.js @@ -1,7 +1,7 @@ const fs = require('fs-extra'); const Promise = require('bluebird'); const path = require('path'); -const debug = require('ghost-ignition').debug('frontend:services:settings:ensure-settings'); +const debug = require('@tryghost/debug')('frontend:services:settings:ensure-settings'); const {i18n} = require('../proxy'); const errors = require('@tryghost/errors'); const config = require('../../../shared/config'); diff --git a/core/frontend/services/settings/index.js b/core/frontend/services/settings/index.js index 01c1b6fc54..fb04b6a927 100644 --- a/core/frontend/services/settings/index.js +++ b/core/frontend/services/settings/index.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const crypto = require('crypto'); -const debug = require('ghost-ignition').debug('frontend:services:settings:index'); +const debug = require('@tryghost/debug')('frontend:services:settings:index'); const SettingsLoader = require('./loader'); const ensureSettingsFiles = require('./ensure-settings'); diff --git a/core/frontend/services/settings/loader.js b/core/frontend/services/settings/loader.js index 59d6f95501..779eacfff0 100644 --- a/core/frontend/services/settings/loader.js +++ b/core/frontend/services/settings/loader.js @@ -1,6 +1,6 @@ const fs = require('fs-extra'); const path = require('path'); -const debug = require('ghost-ignition').debug('frontend:services:settings:settings-loader'); +const debug = require('@tryghost/debug')('frontend:services:settings:settings-loader'); const {i18n} = require('../proxy'); const errors = require('@tryghost/errors'); const config = require('../../../shared/config'); diff --git a/core/frontend/services/settings/validate.js b/core/frontend/services/settings/validate.js index 49b09e1c45..8f54483b9c 100644 --- a/core/frontend/services/settings/validate.js +++ b/core/frontend/services/settings/validate.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('frontend:services:settings:validate'); +const debug = require('@tryghost/debug')('frontend:services:settings:validate'); const {i18n} = require('../proxy'); const errors = require('@tryghost/errors'); const bridge = require('../../../bridge'); diff --git a/core/frontend/services/settings/yaml-parser.js b/core/frontend/services/settings/yaml-parser.js index c222f4e77f..1ecf89f8c3 100644 --- a/core/frontend/services/settings/yaml-parser.js +++ b/core/frontend/services/settings/yaml-parser.js @@ -1,5 +1,5 @@ const yaml = require('js-yaml'); -const debug = require('ghost-ignition').debug('frontend:services:settings:yaml-parser'); +const debug = require('@tryghost/debug')('frontend:services:settings:yaml-parser'); const {i18n} = require('../proxy'); const errors = require('@tryghost/errors'); diff --git a/core/frontend/services/url/Queue.js b/core/frontend/services/url/Queue.js index ca6acf8923..5909abe847 100644 --- a/core/frontend/services/url/Queue.js +++ b/core/frontend/services/url/Queue.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('services:url:queue'); +const debug = require('@tryghost/debug')('services:url:queue'); const EventEmitter = require('events').EventEmitter; const _ = require('lodash'); const logging = require('@tryghost/logging'); diff --git a/core/frontend/services/url/Resources.js b/core/frontend/services/url/Resources.js index 5889438005..c64ee900d1 100644 --- a/core/frontend/services/url/Resources.js +++ b/core/frontend/services/url/Resources.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('services:url:resources'); +const debug = require('@tryghost/debug')('services:url:resources'); const Resource = require('./Resource'); const config = require('../../../shared/config'); const models = require('../../../server/models'); diff --git a/core/frontend/services/url/UrlGenerator.js b/core/frontend/services/url/UrlGenerator.js index 886aa28c4b..bb9ea39b6b 100644 --- a/core/frontend/services/url/UrlGenerator.js +++ b/core/frontend/services/url/UrlGenerator.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const nql = require('@nexes/nql'); -const debug = require('ghost-ignition').debug('services:url:generator'); +const debug = require('@tryghost/debug')('services:url:generator'); const localUtils = require('../../../shared/url-utils'); // @TODO: merge with filter plugin diff --git a/core/frontend/services/url/UrlService.js b/core/frontend/services/url/UrlService.js index ec50c6222b..23f83823d9 100644 --- a/core/frontend/services/url/UrlService.js +++ b/core/frontend/services/url/UrlService.js @@ -1,4 +1,4 @@ -const _debug = require('ghost-ignition').debug._base; +const _debug = require('@tryghost/debug')._base; const debug = _debug('ghost:services:url:service'); const _ = require('lodash'); const events = require('../../../server/lib/common/events'); diff --git a/core/frontend/services/url/Urls.js b/core/frontend/services/url/Urls.js index 7a05658afe..99b5816d88 100644 --- a/core/frontend/services/url/Urls.js +++ b/core/frontend/services/url/Urls.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('services:url:urls'); +const debug = require('@tryghost/debug')('services:url:urls'); const events = require('../../../server/lib/common/events'); const urlUtils = require('../../../shared/url-utils'); const logging = require('@tryghost/logging'); diff --git a/core/server/adapters/scheduling/SchedulingDefault.js b/core/server/adapters/scheduling/SchedulingDefault.js index bb925e9ff2..8892dd7743 100644 --- a/core/server/adapters/scheduling/SchedulingDefault.js +++ b/core/server/adapters/scheduling/SchedulingDefault.js @@ -1,6 +1,6 @@ const util = require('util'); const moment = require('moment'); -const debug = require('ghost-ignition').debug('scheduling-default'); +const debug = require('@tryghost/debug')('scheduling-default'); const SchedulingBase = require('./SchedulingBase'); const logging = require('@tryghost/logging'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/canary/utils/permissions.js b/core/server/api/canary/utils/permissions.js index d1fcb0c680..13ebdda9ff 100644 --- a/core/server/api/canary/utils/permissions.js +++ b/core/server/api/canary/utils/permissions.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:permissions'); +const debug = require('@tryghost/debug')('api:canary:utils:permissions'); const Promise = require('bluebird'); const _ = require('lodash'); const permissions = require('../../../services/permissions'); diff --git a/core/server/api/canary/utils/serializers/input/authors.js b/core/server/api/canary/utils/serializers/input/authors.js index 52c9409046..4ac35c588f 100644 --- a/core/server/api/canary/utils/serializers/input/authors.js +++ b/core/server/api/canary/utils/serializers/input/authors.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:authors'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:authors'); const slugFilterOrder = require('./utils/slug-filter-order'); const utils = require('../../index'); diff --git a/core/server/api/canary/utils/serializers/input/db.js b/core/server/api/canary/utils/serializers/input/db.js index bd1738593f..ff492af2d8 100644 --- a/core/server/api/canary/utils/serializers/input/db.js +++ b/core/server/api/canary/utils/serializers/input/db.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:db'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:db'); const optionsUtil = require('../../../../shared/utils/options'); const INTERNAL_OPTIONS = ['transacting', 'forUpdate']; diff --git a/core/server/api/canary/utils/serializers/input/integrations.js b/core/server/api/canary/utils/serializers/input/integrations.js index 6c7edc0cd1..3e3590ff2c 100644 --- a/core/server/api/canary/utils/serializers/input/integrations.js +++ b/core/server/api/canary/utils/serializers/input/integrations.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:integrations'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:integrations'); function setDefaultFilter(frame) { if (frame.options.filter) { diff --git a/core/server/api/canary/utils/serializers/input/members.js b/core/server/api/canary/utils/serializers/input/members.js index 2623ea4d9d..e886c4f171 100644 --- a/core/server/api/canary/utils/serializers/input/members.js +++ b/core/server/api/canary/utils/serializers/input/members.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:members'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:members'); function defaultRelations(frame) { if (frame.options.withRelated) { diff --git a/core/server/api/canary/utils/serializers/input/pages.js b/core/server/api/canary/utils/serializers/input/pages.js index 6790a31f78..9b6251009c 100644 --- a/core/server/api/canary/utils/serializers/input/pages.js +++ b/core/server/api/canary/utils/serializers/input/pages.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:pages'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:pages'); const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues; const mobiledoc = require('../../../../../lib/mobiledoc'); const url = require('./utils/url'); diff --git a/core/server/api/canary/utils/serializers/input/posts.js b/core/server/api/canary/utils/serializers/input/posts.js index e4fae85bfd..39eedd260b 100644 --- a/core/server/api/canary/utils/serializers/input/posts.js +++ b/core/server/api/canary/utils/serializers/input/posts.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:posts'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:posts'); const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues; const url = require('./utils/url'); const slugFilterOrder = require('./utils/slug-filter-order'); diff --git a/core/server/api/canary/utils/serializers/input/tags.js b/core/server/api/canary/utils/serializers/input/tags.js index cc87e77650..e45b627e05 100644 --- a/core/server/api/canary/utils/serializers/input/tags.js +++ b/core/server/api/canary/utils/serializers/input/tags.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:tags'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:tags'); const url = require('./utils/url'); const slugFilterOrder = require('./utils/slug-filter-order'); const utils = require('../../index'); diff --git a/core/server/api/canary/utils/serializers/input/users.js b/core/server/api/canary/utils/serializers/input/users.js index c48449ee29..352159401f 100644 --- a/core/server/api/canary/utils/serializers/input/users.js +++ b/core/server/api/canary/utils/serializers/input/users.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:users'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:users'); const url = require('./utils/url'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/input/webhooks.js b/core/server/api/canary/utils/serializers/input/webhooks.js index 365de3b85f..c3188165d8 100644 --- a/core/server/api/canary/utils/serializers/input/webhooks.js +++ b/core/server/api/canary/utils/serializers/input/webhooks.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:webhooks'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:webhooks'); module.exports = { add(apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/actions.js b/core/server/api/canary/utils/serializers/output/actions.js index c88de98fa5..8c528ebb05 100644 --- a/core/server/api/canary/utils/serializers/output/actions.js +++ b/core/server/api/canary/utils/serializers/output/actions.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:actions'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:actions'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/all.js b/core/server/api/canary/utils/serializers/output/all.js index 24d2adb4b4..03d4dd5b53 100644 --- a/core/server/api/canary/utils/serializers/output/all.js +++ b/core/server/api/canary/utils/serializers/output/all.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:all'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:all'); const _ = require('lodash'); const removeXBY = (object) => { diff --git a/core/server/api/canary/utils/serializers/output/authentication.js b/core/server/api/canary/utils/serializers/output/authentication.js index 700f5b9a9f..cf8d30241f 100644 --- a/core/server/api/canary/utils/serializers/output/authentication.js +++ b/core/server/api/canary/utils/serializers/output/authentication.js @@ -1,6 +1,6 @@ const i18n = require('../../../../../../shared/i18n'); const mapper = require('./utils/mapper'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:authentication'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:authentication'); module.exports = { setup(user, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/authors.js b/core/server/api/canary/utils/serializers/output/authors.js index a1e09cceab..3d78e168a7 100644 --- a/core/server/api/canary/utils/serializers/output/authors.js +++ b/core/server/api/canary/utils/serializers/output/authors.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:authors'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:authors'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/config.js b/core/server/api/canary/utils/serializers/output/config.js index 6e1c03cb8d..9c47cfff26 100644 --- a/core/server/api/canary/utils/serializers/output/config.js +++ b/core/server/api/canary/utils/serializers/output/config.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:config'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:config'); module.exports = { all(data, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/db.js b/core/server/api/canary/utils/serializers/output/db.js index 7b2157c215..e2721b67f5 100644 --- a/core/server/api/canary/utils/serializers/output/db.js +++ b/core/server/api/canary/utils/serializers/output/db.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:db'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:db'); module.exports = { backupContent(filename, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/images.js b/core/server/api/canary/utils/serializers/output/images.js index f232570eb3..d09729a1f6 100644 --- a/core/server/api/canary/utils/serializers/output/images.js +++ b/core/server/api/canary/utils/serializers/output/images.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:images'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:images'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/integrations.js b/core/server/api/canary/utils/serializers/output/integrations.js index 794e3adba0..9a2a1c0613 100644 --- a/core/server/api/canary/utils/serializers/output/integrations.js +++ b/core/server/api/canary/utils/serializers/output/integrations.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:integrations'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:integrations'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/invites.js b/core/server/api/canary/utils/serializers/output/invites.js index 53b7a63ff5..6eba16d383 100644 --- a/core/server/api/canary/utils/serializers/output/invites.js +++ b/core/server/api/canary/utils/serializers/output/invites.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:invites'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:invites'); module.exports = { all(models, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/labels.js b/core/server/api/canary/utils/serializers/output/labels.js index 9839750d37..44ab9a8288 100644 --- a/core/server/api/canary/utils/serializers/output/labels.js +++ b/core/server/api/canary/utils/serializers/output/labels.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:labels'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:labels'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/mail.js b/core/server/api/canary/utils/serializers/output/mail.js index f8edb40007..f78040365a 100644 --- a/core/server/api/canary/utils/serializers/output/mail.js +++ b/core/server/api/canary/utils/serializers/output/mail.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:mail'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:mail'); module.exports = { all(response, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/members.js b/core/server/api/canary/utils/serializers/output/members.js index eaf8382c37..44f1157315 100644 --- a/core/server/api/canary/utils/serializers/output/members.js +++ b/core/server/api/canary/utils/serializers/output/members.js @@ -1,5 +1,5 @@ //@ts-check -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:members'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:members'); const {unparse} = require('@tryghost/members-csv'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/notifications.js b/core/server/api/canary/utils/serializers/output/notifications.js index a226116c7c..2cc7272f98 100644 --- a/core/server/api/canary/utils/serializers/output/notifications.js +++ b/core/server/api/canary/utils/serializers/output/notifications.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:notifications'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:notifications'); module.exports = { all(response, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/oembed.js b/core/server/api/canary/utils/serializers/output/oembed.js index 55f682df04..8fb603cd8f 100644 --- a/core/server/api/canary/utils/serializers/output/oembed.js +++ b/core/server/api/canary/utils/serializers/output/oembed.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:oembed'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:oembed'); module.exports = { all(res, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/pages.js b/core/server/api/canary/utils/serializers/output/pages.js index 6acd49be2a..8588eb7ec3 100644 --- a/core/server/api/canary/utils/serializers/output/pages.js +++ b/core/server/api/canary/utils/serializers/output/pages.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:pages'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:pages'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/posts.js b/core/server/api/canary/utils/serializers/output/posts.js index 72d3cd3355..7fac964f45 100644 --- a/core/server/api/canary/utils/serializers/output/posts.js +++ b/core/server/api/canary/utils/serializers/output/posts.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:posts'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:posts'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/products.js b/core/server/api/canary/utils/serializers/output/products.js index 97663ea686..cc8f4b518f 100644 --- a/core/server/api/canary/utils/serializers/output/products.js +++ b/core/server/api/canary/utils/serializers/output/products.js @@ -1,5 +1,5 @@ //@ts-check -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:products'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:products'); const _ = require('lodash'); const allowedIncludes = ['stripe_prices', 'monthly_price', 'yearly_price']; diff --git a/core/server/api/canary/utils/serializers/output/roles.js b/core/server/api/canary/utils/serializers/output/roles.js index 302b3472f4..aa64d0d282 100644 --- a/core/server/api/canary/utils/serializers/output/roles.js +++ b/core/server/api/canary/utils/serializers/output/roles.js @@ -1,5 +1,5 @@ const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:roles'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:roles'); const canThis = require('../../../../../services/permissions').canThis; module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/site.js b/core/server/api/canary/utils/serializers/output/site.js index 9517b6e95b..e6733eb62b 100644 --- a/core/server/api/canary/utils/serializers/output/site.js +++ b/core/server/api/canary/utils/serializers/output/site.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:site'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:site'); module.exports = { read(data, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/slugs.js b/core/server/api/canary/utils/serializers/output/slugs.js index 0a3c0c3178..0d18ff590c 100644 --- a/core/server/api/canary/utils/serializers/output/slugs.js +++ b/core/server/api/canary/utils/serializers/output/slugs.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:slugs'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:slugs'); module.exports = { all(slug, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/snippets.js b/core/server/api/canary/utils/serializers/output/snippets.js index ce7a25cb4a..d70ed4a070 100644 --- a/core/server/api/canary/utils/serializers/output/snippets.js +++ b/core/server/api/canary/utils/serializers/output/snippets.js @@ -1,5 +1,5 @@ //@ts-check -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:snippets'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:snippets'); module.exports = { browse: createSerializer('browse', paginatedSnippets), diff --git a/core/server/api/canary/utils/serializers/output/tags.js b/core/server/api/canary/utils/serializers/output/tags.js index f71a9fe93a..f8df3772f0 100644 --- a/core/server/api/canary/utils/serializers/output/tags.js +++ b/core/server/api/canary/utils/serializers/output/tags.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:tags'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:tags'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/canary/utils/serializers/output/themes.js b/core/server/api/canary/utils/serializers/output/themes.js index 0cfa74e7e4..b196672d25 100644 --- a/core/server/api/canary/utils/serializers/output/themes.js +++ b/core/server/api/canary/utils/serializers/output/themes.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:themes'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:themes'); module.exports = { browse(themes, apiConfig, frame) { diff --git a/core/server/api/canary/utils/serializers/output/users.js b/core/server/api/canary/utils/serializers/output/users.js index f6f4634eab..2eec370e23 100644 --- a/core/server/api/canary/utils/serializers/output/users.js +++ b/core/server/api/canary/utils/serializers/output/users.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:users'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:users'); const i18n = require('../../../../../../shared/i18n'); const mapper = require('./utils/mapper'); diff --git a/core/server/api/canary/utils/serializers/output/webhooks.js b/core/server/api/canary/utils/serializers/output/webhooks.js index 3d6922e1eb..6f97ef7683 100644 --- a/core/server/api/canary/utils/serializers/output/webhooks.js +++ b/core/server/api/canary/utils/serializers/output/webhooks.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:output:webhooks'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:webhooks'); module.exports = { all(models, apiConfig, frame) { diff --git a/core/server/api/canary/utils/validators/input/invitations.js b/core/server/api/canary/utils/validators/input/invitations.js index f71fc56f07..483fb8e8e0 100644 --- a/core/server/api/canary/utils/validators/input/invitations.js +++ b/core/server/api/canary/utils/validators/input/invitations.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const validator = require('validator'); -const debug = require('ghost-ignition').debug('api:canary:utils:validators:input:invitation'); +const debug = require('@tryghost/debug')('api:canary:utils:validators:input:invitation'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/canary/utils/validators/input/passwordreset.js b/core/server/api/canary/utils/validators/input/passwordreset.js index ec1071533b..60560ec350 100644 --- a/core/server/api/canary/utils/validators/input/passwordreset.js +++ b/core/server/api/canary/utils/validators/input/passwordreset.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const validator = require('validator'); -const debug = require('ghost-ignition').debug('api:canary:utils:validators:input:passwordreset'); +const debug = require('@tryghost/debug')('api:canary:utils:validators:input:passwordreset'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/canary/utils/validators/input/setup.js b/core/server/api/canary/utils/validators/input/setup.js index 79ab4d9ec1..adcf997df2 100644 --- a/core/server/api/canary/utils/validators/input/setup.js +++ b/core/server/api/canary/utils/validators/input/setup.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:canary:utils:validators:input:updateSetup'); +const debug = require('@tryghost/debug')('api:canary:utils:validators:input:updateSetup'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/canary/utils/validators/input/users.js b/core/server/api/canary/utils/validators/input/users.js index 2207a14f13..3f8717d94f 100644 --- a/core/server/api/canary/utils/validators/input/users.js +++ b/core/server/api/canary/utils/validators/input/users.js @@ -1,5 +1,5 @@ const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('api:canary:utils:validators:input:users'); +const debug = require('@tryghost/debug')('api:canary:utils:validators:input:users'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/shared/frame.js b/core/server/api/shared/frame.js index f690a1616c..46dde5d6da 100644 --- a/core/server/api/shared/frame.js +++ b/core/server/api/shared/frame.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:shared:frame'); +const debug = require('@tryghost/debug')('api:shared:frame'); const _ = require('lodash'); /** diff --git a/core/server/api/shared/headers.js b/core/server/api/shared/headers.js index af0623197b..7147b2a1fe 100644 --- a/core/server/api/shared/headers.js +++ b/core/server/api/shared/headers.js @@ -1,5 +1,5 @@ const url = require('url'); -const debug = require('ghost-ignition').debug('api:shared:headers'); +const debug = require('@tryghost/debug')('api:shared:headers'); const Promise = require('bluebird'); const INVALIDATE_ALL = '/*'; diff --git a/core/server/api/shared/http.js b/core/server/api/shared/http.js index 333b8038d6..0c9153f507 100644 --- a/core/server/api/shared/http.js +++ b/core/server/api/shared/http.js @@ -1,5 +1,5 @@ const url = require('url'); -const debug = require('ghost-ignition').debug('api:shared:http'); +const debug = require('@tryghost/debug')('api:shared:http'); const shared = require('../shared'); const models = require('../../models'); diff --git a/core/server/api/shared/pipeline.js b/core/server/api/shared/pipeline.js index e5acbff748..9200eea12b 100644 --- a/core/server/api/shared/pipeline.js +++ b/core/server/api/shared/pipeline.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:shared:pipeline'); +const debug = require('@tryghost/debug')('api:shared:pipeline'); const Promise = require('bluebird'); const _ = require('lodash'); const shared = require('../shared'); diff --git a/core/server/api/shared/serializers/handle.js b/core/server/api/shared/serializers/handle.js index 357ecb9cd0..21418709a5 100644 --- a/core/server/api/shared/serializers/handle.js +++ b/core/server/api/shared/serializers/handle.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:shared:serializers:handle'); +const debug = require('@tryghost/debug')('api:shared:serializers:handle'); const Promise = require('bluebird'); const {sequence} = require('@tryghost/promise'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/shared/serializers/input/all.js b/core/server/api/shared/serializers/input/all.js index a80580e071..a372dae279 100644 --- a/core/server/api/shared/serializers/input/all.js +++ b/core/server/api/shared/serializers/input/all.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:shared:serializers:input:all'); +const debug = require('@tryghost/debug')('api:shared:serializers:input:all'); const _ = require('lodash'); const utils = require('../../utils'); diff --git a/core/server/api/shared/validators/handle.js b/core/server/api/shared/validators/handle.js index 3c3872fbf4..27eb0da88b 100644 --- a/core/server/api/shared/validators/handle.js +++ b/core/server/api/shared/validators/handle.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:shared:validators:handle'); +const debug = require('@tryghost/debug')('api:shared:validators:handle'); const Promise = require('bluebird'); const errors = require('@tryghost/errors'); const {sequence} = require('@tryghost/promise'); diff --git a/core/server/api/shared/validators/input/all.js b/core/server/api/shared/validators/input/all.js index a03bdb8d11..372c4049e4 100644 --- a/core/server/api/shared/validators/input/all.js +++ b/core/server/api/shared/validators/input/all.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:shared:validators:input:all'); +const debug = require('@tryghost/debug')('api:shared:validators:input:all'); const _ = require('lodash'); const Promise = require('bluebird'); const i18n = require('../../../../../shared/i18n'); diff --git a/core/server/api/v2/utils/permissions.js b/core/server/api/v2/utils/permissions.js index 500664ee7f..572d34c111 100644 --- a/core/server/api/v2/utils/permissions.js +++ b/core/server/api/v2/utils/permissions.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:permissions'); +const debug = require('@tryghost/debug')('api:v2:utils:permissions'); const Promise = require('bluebird'); const _ = require('lodash'); const permissions = require('../../../services/permissions'); diff --git a/core/server/api/v2/utils/serializers/input/db.js b/core/server/api/v2/utils/serializers/input/db.js index 79e52d24ff..80d1c0e21b 100644 --- a/core/server/api/v2/utils/serializers/input/db.js +++ b/core/server/api/v2/utils/serializers/input/db.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:input:db'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:db'); const optionsUtil = require('../../../../shared/utils/options'); const INTERNAL_OPTIONS = ['transacting', 'forUpdate']; diff --git a/core/server/api/v2/utils/serializers/input/integrations.js b/core/server/api/v2/utils/serializers/input/integrations.js index 60435ff0ae..a4964c349a 100644 --- a/core/server/api/v2/utils/serializers/input/integrations.js +++ b/core/server/api/v2/utils/serializers/input/integrations.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:input:integrations'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:integrations'); function setDefaultFilter(frame) { if (frame.options.filter) { diff --git a/core/server/api/v2/utils/serializers/input/pages.js b/core/server/api/v2/utils/serializers/input/pages.js index df128fd8d2..20807d85b1 100644 --- a/core/server/api/v2/utils/serializers/input/pages.js +++ b/core/server/api/v2/utils/serializers/input/pages.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues; -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:input:pages'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:pages'); const mobiledoc = require('../../../../../lib/mobiledoc'); const url = require('./utils/url'); const localUtils = require('../../index'); diff --git a/core/server/api/v2/utils/serializers/input/posts.js b/core/server/api/v2/utils/serializers/input/posts.js index 661eae8714..e65c3db4e7 100644 --- a/core/server/api/v2/utils/serializers/input/posts.js +++ b/core/server/api/v2/utils/serializers/input/posts.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues; -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:input:posts'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:posts'); const url = require('./utils/url'); const localUtils = require('../../index'); const mobiledoc = require('../../../../../lib/mobiledoc'); diff --git a/core/server/api/v2/utils/serializers/input/tags.js b/core/server/api/v2/utils/serializers/input/tags.js index 21ce4f0e80..cb67166edc 100644 --- a/core/server/api/v2/utils/serializers/input/tags.js +++ b/core/server/api/v2/utils/serializers/input/tags.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:input:tags'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:tags'); const url = require('./utils/url'); const utils = require('../../index'); diff --git a/core/server/api/v2/utils/serializers/input/users.js b/core/server/api/v2/utils/serializers/input/users.js index bd6d2262ba..9322811de4 100644 --- a/core/server/api/v2/utils/serializers/input/users.js +++ b/core/server/api/v2/utils/serializers/input/users.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:input:users'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:users'); const url = require('./utils/url'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/input/webhooks.js b/core/server/api/v2/utils/serializers/input/webhooks.js index 365de3b85f..c3188165d8 100644 --- a/core/server/api/v2/utils/serializers/input/webhooks.js +++ b/core/server/api/v2/utils/serializers/input/webhooks.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:canary:utils:serializers:input:webhooks'); +const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:webhooks'); module.exports = { add(apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/actions.js b/core/server/api/v2/utils/serializers/output/actions.js index 99d5be3385..fbd940bc51 100644 --- a/core/server/api/v2/utils/serializers/output/actions.js +++ b/core/server/api/v2/utils/serializers/output/actions.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:actions'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:actions'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/all.js b/core/server/api/v2/utils/serializers/output/all.js index 14ca974d63..5adf3d2e81 100644 --- a/core/server/api/v2/utils/serializers/output/all.js +++ b/core/server/api/v2/utils/serializers/output/all.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:all'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:all'); const _ = require('lodash'); const removeXBY = (object) => { diff --git a/core/server/api/v2/utils/serializers/output/authentication.js b/core/server/api/v2/utils/serializers/output/authentication.js index 11b619b1fa..8a157d55de 100644 --- a/core/server/api/v2/utils/serializers/output/authentication.js +++ b/core/server/api/v2/utils/serializers/output/authentication.js @@ -1,6 +1,6 @@ const i18n = require('../../../../../../shared/i18n'); const mapper = require('./utils/mapper'); -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:authentication'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:authentication'); module.exports = { setup(user, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/authors.js b/core/server/api/v2/utils/serializers/output/authors.js index 9873485620..c4f795b7ad 100644 --- a/core/server/api/v2/utils/serializers/output/authors.js +++ b/core/server/api/v2/utils/serializers/output/authors.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:authors'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:authors'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/config.js b/core/server/api/v2/utils/serializers/output/config.js index 9f99eae15d..f69af4079d 100644 --- a/core/server/api/v2/utils/serializers/output/config.js +++ b/core/server/api/v2/utils/serializers/output/config.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:config'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:config'); module.exports = { all(data, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/db.js b/core/server/api/v2/utils/serializers/output/db.js index 7010e88032..fdcccb22d1 100644 --- a/core/server/api/v2/utils/serializers/output/db.js +++ b/core/server/api/v2/utils/serializers/output/db.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:db'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:db'); module.exports = { backupContent(filename, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/images.js b/core/server/api/v2/utils/serializers/output/images.js index d5f9d7c246..1595e2910c 100644 --- a/core/server/api/v2/utils/serializers/output/images.js +++ b/core/server/api/v2/utils/serializers/output/images.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:images'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:images'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/integrations.js b/core/server/api/v2/utils/serializers/output/integrations.js index e22d613e28..5e96ec8857 100644 --- a/core/server/api/v2/utils/serializers/output/integrations.js +++ b/core/server/api/v2/utils/serializers/output/integrations.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:integrations'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:integrations'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/invites.js b/core/server/api/v2/utils/serializers/output/invites.js index 772c25bbce..5f84b0aced 100644 --- a/core/server/api/v2/utils/serializers/output/invites.js +++ b/core/server/api/v2/utils/serializers/output/invites.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:invites'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:invites'); module.exports = { all(models, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/mail.js b/core/server/api/v2/utils/serializers/output/mail.js index 67db1b62ca..8565c26ab4 100644 --- a/core/server/api/v2/utils/serializers/output/mail.js +++ b/core/server/api/v2/utils/serializers/output/mail.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:mail'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:mail'); module.exports = { all(response, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/notifications.js b/core/server/api/v2/utils/serializers/output/notifications.js index f101f58081..572fe81e87 100644 --- a/core/server/api/v2/utils/serializers/output/notifications.js +++ b/core/server/api/v2/utils/serializers/output/notifications.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:notifications'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:notifications'); module.exports = { all(response, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/oembed.js b/core/server/api/v2/utils/serializers/output/oembed.js index 28191b4dbf..649dab4a5b 100644 --- a/core/server/api/v2/utils/serializers/output/oembed.js +++ b/core/server/api/v2/utils/serializers/output/oembed.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:oembed'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:oembed'); module.exports = { all(res, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/pages.js b/core/server/api/v2/utils/serializers/output/pages.js index 8e1e1efb69..c7b15f041f 100644 --- a/core/server/api/v2/utils/serializers/output/pages.js +++ b/core/server/api/v2/utils/serializers/output/pages.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:pages'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:pages'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/posts.js b/core/server/api/v2/utils/serializers/output/posts.js index ef52ec4fd3..e21efe628f 100644 --- a/core/server/api/v2/utils/serializers/output/posts.js +++ b/core/server/api/v2/utils/serializers/output/posts.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:posts'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:posts'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/roles.js b/core/server/api/v2/utils/serializers/output/roles.js index 677ff630d1..b71c3f5f77 100644 --- a/core/server/api/v2/utils/serializers/output/roles.js +++ b/core/server/api/v2/utils/serializers/output/roles.js @@ -1,5 +1,5 @@ const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:roles'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:roles'); const canThis = require('../../../../../services/permissions').canThis; module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/site.js b/core/server/api/v2/utils/serializers/output/site.js index 48125c1dbd..d955ee7931 100644 --- a/core/server/api/v2/utils/serializers/output/site.js +++ b/core/server/api/v2/utils/serializers/output/site.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:site'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:site'); module.exports = { read(data, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/slugs.js b/core/server/api/v2/utils/serializers/output/slugs.js index cb77a4f901..b2843f4178 100644 --- a/core/server/api/v2/utils/serializers/output/slugs.js +++ b/core/server/api/v2/utils/serializers/output/slugs.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:slugs'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:slugs'); module.exports = { all(slug, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/tags.js b/core/server/api/v2/utils/serializers/output/tags.js index 8b8dc3d0a4..0b388e7b3d 100644 --- a/core/server/api/v2/utils/serializers/output/tags.js +++ b/core/server/api/v2/utils/serializers/output/tags.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:tags'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:tags'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v2/utils/serializers/output/themes.js b/core/server/api/v2/utils/serializers/output/themes.js index 5b23ca2c24..9c8ba6664f 100644 --- a/core/server/api/v2/utils/serializers/output/themes.js +++ b/core/server/api/v2/utils/serializers/output/themes.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:themes'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:themes'); module.exports = { browse(themes, apiConfig, frame) { diff --git a/core/server/api/v2/utils/serializers/output/users.js b/core/server/api/v2/utils/serializers/output/users.js index de6a2ba498..32b8fb02bb 100644 --- a/core/server/api/v2/utils/serializers/output/users.js +++ b/core/server/api/v2/utils/serializers/output/users.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:users'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:users'); const i18n = require('../../../../../../shared/i18n'); const mapper = require('./utils/mapper'); diff --git a/core/server/api/v2/utils/serializers/output/webhooks.js b/core/server/api/v2/utils/serializers/output/webhooks.js index f7baca76e1..d54726b148 100644 --- a/core/server/api/v2/utils/serializers/output/webhooks.js +++ b/core/server/api/v2/utils/serializers/output/webhooks.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:webhooks'); +const debug = require('@tryghost/debug')('api:v2:utils:serializers:output:webhooks'); module.exports = { all(models, apiConfig, frame) { diff --git a/core/server/api/v2/utils/validators/input/invitations.js b/core/server/api/v2/utils/validators/input/invitations.js index 92553e6f86..e17fe88911 100644 --- a/core/server/api/v2/utils/validators/input/invitations.js +++ b/core/server/api/v2/utils/validators/input/invitations.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const validator = require('validator'); -const debug = require('ghost-ignition').debug('api:v2:utils:validators:input:invitation'); +const debug = require('@tryghost/debug')('api:v2:utils:validators:input:invitation'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/v2/utils/validators/input/passwordreset.js b/core/server/api/v2/utils/validators/input/passwordreset.js index 79a7a81f37..17d31c9b46 100644 --- a/core/server/api/v2/utils/validators/input/passwordreset.js +++ b/core/server/api/v2/utils/validators/input/passwordreset.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const validator = require('validator'); -const debug = require('ghost-ignition').debug('api:v2:utils:validators:input:passwordreset'); +const debug = require('@tryghost/debug')('api:v2:utils:validators:input:passwordreset'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/v2/utils/validators/input/setup.js b/core/server/api/v2/utils/validators/input/setup.js index c4d94d4b3a..77ae738ea0 100644 --- a/core/server/api/v2/utils/validators/input/setup.js +++ b/core/server/api/v2/utils/validators/input/setup.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v2:utils:validators:input:updateSetup'); +const debug = require('@tryghost/debug')('api:v2:utils:validators:input:updateSetup'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/v2/utils/validators/input/users.js b/core/server/api/v2/utils/validators/input/users.js index 74e7eafc3f..a0bf22f98f 100644 --- a/core/server/api/v2/utils/validators/input/users.js +++ b/core/server/api/v2/utils/validators/input/users.js @@ -1,5 +1,5 @@ const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('api:v2:utils:validators:input:users'); +const debug = require('@tryghost/debug')('api:v2:utils:validators:input:users'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/v3/utils/permissions.js b/core/server/api/v3/utils/permissions.js index 810a6e5a95..59734bec45 100644 --- a/core/server/api/v3/utils/permissions.js +++ b/core/server/api/v3/utils/permissions.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:permissions'); +const debug = require('@tryghost/debug')('api:v3:utils:permissions'); const Promise = require('bluebird'); const _ = require('lodash'); const permissions = require('../../../services/permissions'); diff --git a/core/server/api/v3/utils/serializers/input/authors.js b/core/server/api/v3/utils/serializers/input/authors.js index 7e5a86719a..5a071ed5cc 100644 --- a/core/server/api/v3/utils/serializers/input/authors.js +++ b/core/server/api/v3/utils/serializers/input/authors.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:authors'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:authors'); const slugFilterOrder = require('./utils/slug-filter-order'); const utils = require('../../index'); diff --git a/core/server/api/v3/utils/serializers/input/db.js b/core/server/api/v3/utils/serializers/input/db.js index e607c11ef0..cea6313a24 100644 --- a/core/server/api/v3/utils/serializers/input/db.js +++ b/core/server/api/v3/utils/serializers/input/db.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:db'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:db'); const optionsUtil = require('../../../../shared/utils/options'); const INTERNAL_OPTIONS = ['transacting', 'forUpdate']; diff --git a/core/server/api/v3/utils/serializers/input/integrations.js b/core/server/api/v3/utils/serializers/input/integrations.js index 9aeb289460..d0a509ad4c 100644 --- a/core/server/api/v3/utils/serializers/input/integrations.js +++ b/core/server/api/v3/utils/serializers/input/integrations.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:integrations'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:integrations'); function setDefaultFilter(frame) { if (frame.options.filter) { diff --git a/core/server/api/v3/utils/serializers/input/members.js b/core/server/api/v3/utils/serializers/input/members.js index 0952dad60c..76f4f05620 100644 --- a/core/server/api/v3/utils/serializers/input/members.js +++ b/core/server/api/v3/utils/serializers/input/members.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:members'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:members'); function defaultRelations(frame) { if (frame.options.withRelated) { diff --git a/core/server/api/v3/utils/serializers/input/pages.js b/core/server/api/v3/utils/serializers/input/pages.js index 98ddb3aebd..108db553cf 100644 --- a/core/server/api/v3/utils/serializers/input/pages.js +++ b/core/server/api/v3/utils/serializers/input/pages.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:pages'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:pages'); const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues; const mobiledoc = require('../../../../../lib/mobiledoc'); const url = require('./utils/url'); diff --git a/core/server/api/v3/utils/serializers/input/posts.js b/core/server/api/v3/utils/serializers/input/posts.js index d1637a92a8..a4e9c07160 100644 --- a/core/server/api/v3/utils/serializers/input/posts.js +++ b/core/server/api/v3/utils/serializers/input/posts.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:posts'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:posts'); const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues; const url = require('./utils/url'); const slugFilterOrder = require('./utils/slug-filter-order'); diff --git a/core/server/api/v3/utils/serializers/input/tags.js b/core/server/api/v3/utils/serializers/input/tags.js index de61e940e8..15da80b76f 100644 --- a/core/server/api/v3/utils/serializers/input/tags.js +++ b/core/server/api/v3/utils/serializers/input/tags.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:tags'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:tags'); const url = require('./utils/url'); const slugFilterOrder = require('./utils/slug-filter-order'); const utils = require('../../index'); diff --git a/core/server/api/v3/utils/serializers/input/users.js b/core/server/api/v3/utils/serializers/input/users.js index e81b7947a9..3738c51c33 100644 --- a/core/server/api/v3/utils/serializers/input/users.js +++ b/core/server/api/v3/utils/serializers/input/users.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:users'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:users'); const url = require('./utils/url'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/input/webhooks.js b/core/server/api/v3/utils/serializers/input/webhooks.js index 0c5a52620b..984afa1b83 100644 --- a/core/server/api/v3/utils/serializers/input/webhooks.js +++ b/core/server/api/v3/utils/serializers/input/webhooks.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:input:webhooks'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:webhooks'); module.exports = { add(apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/actions.js b/core/server/api/v3/utils/serializers/output/actions.js index 270846d4c3..c2b4680667 100644 --- a/core/server/api/v3/utils/serializers/output/actions.js +++ b/core/server/api/v3/utils/serializers/output/actions.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:actions'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:actions'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/all.js b/core/server/api/v3/utils/serializers/output/all.js index 95bbd922cc..e7a80a1f5a 100644 --- a/core/server/api/v3/utils/serializers/output/all.js +++ b/core/server/api/v3/utils/serializers/output/all.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:all'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:all'); const _ = require('lodash'); const removeXBY = (object) => { diff --git a/core/server/api/v3/utils/serializers/output/authentication.js b/core/server/api/v3/utils/serializers/output/authentication.js index 553b6ab486..3d25b1d819 100644 --- a/core/server/api/v3/utils/serializers/output/authentication.js +++ b/core/server/api/v3/utils/serializers/output/authentication.js @@ -1,6 +1,6 @@ const i18n = require('../../../../../../shared/i18n'); const mapper = require('./utils/mapper'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:authentication'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:authentication'); module.exports = { setup(user, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/authors.js b/core/server/api/v3/utils/serializers/output/authors.js index 62d4e188cc..3350b7b101 100644 --- a/core/server/api/v3/utils/serializers/output/authors.js +++ b/core/server/api/v3/utils/serializers/output/authors.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:authors'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:authors'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/config.js b/core/server/api/v3/utils/serializers/output/config.js index 81cf160746..7cdd664a60 100644 --- a/core/server/api/v3/utils/serializers/output/config.js +++ b/core/server/api/v3/utils/serializers/output/config.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:config'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:config'); module.exports = { all(data, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/db.js b/core/server/api/v3/utils/serializers/output/db.js index e5dd48802f..689e40ace6 100644 --- a/core/server/api/v3/utils/serializers/output/db.js +++ b/core/server/api/v3/utils/serializers/output/db.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:db'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:db'); module.exports = { backupContent(filename, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/images.js b/core/server/api/v3/utils/serializers/output/images.js index ad008f1ecf..997c87f2ea 100644 --- a/core/server/api/v3/utils/serializers/output/images.js +++ b/core/server/api/v3/utils/serializers/output/images.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:images'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:images'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/integrations.js b/core/server/api/v3/utils/serializers/output/integrations.js index 201fd08139..6bfedc6370 100644 --- a/core/server/api/v3/utils/serializers/output/integrations.js +++ b/core/server/api/v3/utils/serializers/output/integrations.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:integrations'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:integrations'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/invites.js b/core/server/api/v3/utils/serializers/output/invites.js index eee45d0bbe..ba51242d95 100644 --- a/core/server/api/v3/utils/serializers/output/invites.js +++ b/core/server/api/v3/utils/serializers/output/invites.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:invites'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:invites'); module.exports = { all(models, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/labels.js b/core/server/api/v3/utils/serializers/output/labels.js index 39cc9e7103..d9a51093a5 100644 --- a/core/server/api/v3/utils/serializers/output/labels.js +++ b/core/server/api/v3/utils/serializers/output/labels.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:labels'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:labels'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/mail.js b/core/server/api/v3/utils/serializers/output/mail.js index 994193a194..cb00ed908b 100644 --- a/core/server/api/v3/utils/serializers/output/mail.js +++ b/core/server/api/v3/utils/serializers/output/mail.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:mail'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:mail'); module.exports = { all(response, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/members.js b/core/server/api/v3/utils/serializers/output/members.js index e9cbb44996..e0bdb07ffd 100644 --- a/core/server/api/v3/utils/serializers/output/members.js +++ b/core/server/api/v3/utils/serializers/output/members.js @@ -1,5 +1,5 @@ //@ts-check -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:members'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:members'); const {unparse} = require('@tryghost/members-csv'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/notifications.js b/core/server/api/v3/utils/serializers/output/notifications.js index 8410eba952..d81fe5925d 100644 --- a/core/server/api/v3/utils/serializers/output/notifications.js +++ b/core/server/api/v3/utils/serializers/output/notifications.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:notifications'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:notifications'); module.exports = { all(response, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/oembed.js b/core/server/api/v3/utils/serializers/output/oembed.js index 9189cffcd8..5ebd6d2e1a 100644 --- a/core/server/api/v3/utils/serializers/output/oembed.js +++ b/core/server/api/v3/utils/serializers/output/oembed.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:oembed'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:oembed'); module.exports = { all(res, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/pages.js b/core/server/api/v3/utils/serializers/output/pages.js index 309a9426cf..af46bf9252 100644 --- a/core/server/api/v3/utils/serializers/output/pages.js +++ b/core/server/api/v3/utils/serializers/output/pages.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:pages'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:pages'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/posts.js b/core/server/api/v3/utils/serializers/output/posts.js index 2c9c4bfa29..452752b77a 100644 --- a/core/server/api/v3/utils/serializers/output/posts.js +++ b/core/server/api/v3/utils/serializers/output/posts.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:posts'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:posts'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/roles.js b/core/server/api/v3/utils/serializers/output/roles.js index 499cb5bcc8..631deac6a2 100644 --- a/core/server/api/v3/utils/serializers/output/roles.js +++ b/core/server/api/v3/utils/serializers/output/roles.js @@ -1,5 +1,5 @@ const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:roles'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:roles'); const canThis = require('../../../../../services/permissions').canThis; module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/site.js b/core/server/api/v3/utils/serializers/output/site.js index 72b2960911..159e15d958 100644 --- a/core/server/api/v3/utils/serializers/output/site.js +++ b/core/server/api/v3/utils/serializers/output/site.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:site'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:site'); module.exports = { read(data, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/slugs.js b/core/server/api/v3/utils/serializers/output/slugs.js index f5c743f983..846dd64f24 100644 --- a/core/server/api/v3/utils/serializers/output/slugs.js +++ b/core/server/api/v3/utils/serializers/output/slugs.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:slugs'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:slugs'); module.exports = { all(slug, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/snippets.js b/core/server/api/v3/utils/serializers/output/snippets.js index 4a0628e233..6aca663482 100644 --- a/core/server/api/v3/utils/serializers/output/snippets.js +++ b/core/server/api/v3/utils/serializers/output/snippets.js @@ -1,5 +1,5 @@ //@ts-check -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:snippets'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:snippets'); module.exports = { browse: createSerializer('browse', paginatedSnippets), diff --git a/core/server/api/v3/utils/serializers/output/tags.js b/core/server/api/v3/utils/serializers/output/tags.js index d0092afcd6..88f354b480 100644 --- a/core/server/api/v3/utils/serializers/output/tags.js +++ b/core/server/api/v3/utils/serializers/output/tags.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:tags'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:tags'); const mapper = require('./utils/mapper'); module.exports = { diff --git a/core/server/api/v3/utils/serializers/output/themes.js b/core/server/api/v3/utils/serializers/output/themes.js index b3dc548e1c..187fca87d7 100644 --- a/core/server/api/v3/utils/serializers/output/themes.js +++ b/core/server/api/v3/utils/serializers/output/themes.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:themes'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:themes'); module.exports = { browse(themes, apiConfig, frame) { diff --git a/core/server/api/v3/utils/serializers/output/users.js b/core/server/api/v3/utils/serializers/output/users.js index 25a2bec6dd..7a6604da93 100644 --- a/core/server/api/v3/utils/serializers/output/users.js +++ b/core/server/api/v3/utils/serializers/output/users.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:users'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:users'); const i18n = require('../../../../../../shared/i18n'); const mapper = require('./utils/mapper'); diff --git a/core/server/api/v3/utils/serializers/output/webhooks.js b/core/server/api/v3/utils/serializers/output/webhooks.js index 6f3874fb21..05e1b3de77 100644 --- a/core/server/api/v3/utils/serializers/output/webhooks.js +++ b/core/server/api/v3/utils/serializers/output/webhooks.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:serializers:output:webhooks'); +const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:webhooks'); module.exports = { all(models, apiConfig, frame) { diff --git a/core/server/api/v3/utils/validators/input/invitations.js b/core/server/api/v3/utils/validators/input/invitations.js index 37e29f11b0..bb4e7fe1c6 100644 --- a/core/server/api/v3/utils/validators/input/invitations.js +++ b/core/server/api/v3/utils/validators/input/invitations.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const validator = require('validator'); -const debug = require('ghost-ignition').debug('api:v3:utils:validators:input:invitation'); +const debug = require('@tryghost/debug')('api:v3:utils:validators:input:invitation'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/v3/utils/validators/input/passwordreset.js b/core/server/api/v3/utils/validators/input/passwordreset.js index fa66b00014..fe842d4f76 100644 --- a/core/server/api/v3/utils/validators/input/passwordreset.js +++ b/core/server/api/v3/utils/validators/input/passwordreset.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const validator = require('validator'); -const debug = require('ghost-ignition').debug('api:v3:utils:validators:input:passwordreset'); +const debug = require('@tryghost/debug')('api:v3:utils:validators:input:passwordreset'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/v3/utils/validators/input/setup.js b/core/server/api/v3/utils/validators/input/setup.js index 005cc15658..b16561ab6f 100644 --- a/core/server/api/v3/utils/validators/input/setup.js +++ b/core/server/api/v3/utils/validators/input/setup.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('api:v3:utils:validators:input:updateSetup'); +const debug = require('@tryghost/debug')('api:v3:utils:validators:input:updateSetup'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/api/v3/utils/validators/input/users.js b/core/server/api/v3/utils/validators/input/users.js index 2310bc0bbb..bafec55235 100644 --- a/core/server/api/v3/utils/validators/input/users.js +++ b/core/server/api/v3/utils/validators/input/users.js @@ -1,5 +1,5 @@ const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('api:v3:utils:validators:input:users'); +const debug = require('@tryghost/debug')('api:v3:utils:validators:input:users'); const i18n = require('../../../../../../shared/i18n'); const errors = require('@tryghost/errors'); diff --git a/core/server/data/importer/importers/data/base.js b/core/server/data/importer/importers/data/base.js index aa4f00ae2d..8c96da89e3 100644 --- a/core/server/data/importer/importers/data/base.js +++ b/core/server/data/importer/importers/data/base.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('importer:base'); +const debug = require('@tryghost/debug')('importer:base'); const _ = require('lodash'); const Promise = require('bluebird'); const ObjectId = require('bson-objectid'); diff --git a/core/server/data/importer/importers/data/index.js b/core/server/data/importer/importers/data/index.js index 869223dcc1..13bd9e1d36 100644 --- a/core/server/data/importer/importers/data/index.js +++ b/core/server/data/importer/importers/data/index.js @@ -2,7 +2,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const semver = require('semver'); const {IncorrectUsageError} = require('@tryghost/errors'); -const debug = require('ghost-ignition').debug('importer:data'); +const debug = require('@tryghost/debug')('importer:data'); const {sequence} = require('@tryghost/promise'); const models = require('../../../../models'); const PostsImporter = require('./posts'); diff --git a/core/server/data/importer/importers/data/posts.js b/core/server/data/importer/importers/data/posts.js index a565cd32cb..dcb861a7ff 100644 --- a/core/server/data/importer/importers/data/posts.js +++ b/core/server/data/importer/importers/data/posts.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('importer:posts'); +const debug = require('@tryghost/debug')('importer:posts'); const _ = require('lodash'); const uuid = require('uuid'); const BaseImporter = require('./base'); diff --git a/core/server/data/importer/importers/data/roles.js b/core/server/data/importer/importers/data/roles.js index 43103fa9a6..20e1b0d375 100644 --- a/core/server/data/importer/importers/data/roles.js +++ b/core/server/data/importer/importers/data/roles.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('importer:roles'); +const debug = require('@tryghost/debug')('importer:roles'); const BaseImporter = require('./base'); class RolesImporter extends BaseImporter { diff --git a/core/server/data/importer/importers/data/settings.js b/core/server/data/importer/importers/data/settings.js index bac1c5feb3..460822b00e 100644 --- a/core/server/data/importer/importers/data/settings.js +++ b/core/server/data/importer/importers/data/settings.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('importer:settings'); +const debug = require('@tryghost/debug')('importer:settings'); const Promise = require('bluebird'); const ObjectId = require('bson-objectid').default; const _ = require('lodash'); diff --git a/core/server/data/importer/importers/data/tags.js b/core/server/data/importer/importers/data/tags.js index b14e27025f..aa95a95858 100644 --- a/core/server/data/importer/importers/data/tags.js +++ b/core/server/data/importer/importers/data/tags.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('importer:tags'); +const debug = require('@tryghost/debug')('importer:tags'); const Promise = require('bluebird'); const _ = require('lodash'); const BaseImporter = require('./base'); diff --git a/core/server/data/importer/importers/data/users.js b/core/server/data/importer/importers/data/users.js index 269bd45770..9087fb4c9e 100644 --- a/core/server/data/importer/importers/data/users.js +++ b/core/server/data/importer/importers/data/users.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('importer:users'); +const debug = require('@tryghost/debug')('importer:users'); const _ = require('lodash'); const BaseImporter = require('./base'); const models = require('../../../../models'); diff --git a/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js b/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js index cea461c961..c5364cba2f 100644 --- a/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js +++ b/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const logging = require('@tryghost/logging'); -const debug = require('ghost-ignition').debug('migrations'); +const debug = require('@tryghost/debug')('migrations'); module.exports.config = { transaction: true diff --git a/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js b/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js index da0d515212..41fa6fbd8f 100644 --- a/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js +++ b/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js @@ -1,5 +1,5 @@ const logging = require('@tryghost/logging'); -const debug = require('ghost-ignition').debug('migrations'); +const debug = require('@tryghost/debug')('migrations'); module.exports.config = { transaction: true diff --git a/core/server/data/migrations/versions/3.19/01-update-member-from-email-address.js b/core/server/data/migrations/versions/3.19/01-update-member-from-email-address.js index 53d502d78e..1746416e8a 100644 --- a/core/server/data/migrations/versions/3.19/01-update-member-from-email-address.js +++ b/core/server/data/migrations/versions/3.19/01-update-member-from-email-address.js @@ -1,6 +1,6 @@ const logging = require('@tryghost/logging'); const urlUtils = require('../../../../../shared/url-utils'); -const debug = require('ghost-ignition').debug('migrations'); +const debug = require('@tryghost/debug')('migrations'); module.exports.config = { transaction: true diff --git a/core/server/ghost-server.js b/core/server/ghost-server.js index cfd6e97afe..6627f0ca2a 100644 --- a/core/server/ghost-server.js +++ b/core/server/ghost-server.js @@ -1,6 +1,6 @@ // # Ghost Server // Handles the creation of an HTTP Server for Ghost -const debug = require('ghost-ignition').debug('server'); +const debug = require('@tryghost/debug')('server'); const Promise = require('bluebird'); const fs = require('fs-extra'); diff --git a/core/server/lib/image/cached-image-size-from-url.js b/core/server/lib/image/cached-image-size-from-url.js index 2adf02fcf8..8fd550e76b 100644 --- a/core/server/lib/image/cached-image-size-from-url.js +++ b/core/server/lib/image/cached-image-size-from-url.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('utils:image-size-cache'); +const debug = require('@tryghost/debug')('utils:image-size-cache'); const errors = require('@tryghost/errors'); class CachedImageSizeFromUrl { diff --git a/core/server/lib/image/image-size.js b/core/server/lib/image/image-size.js index 660a5d0787..0611b94821 100644 --- a/core/server/lib/image/image-size.js +++ b/core/server/lib/image/image-size.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('utils:image-size'); +const debug = require('@tryghost/debug')('utils:image-size'); const sizeOf = require('image-size'); const probeSizeOf = require('probe-image-size'); const url = require('url'); diff --git a/core/server/models/base/index.js b/core/server/models/base/index.js index 59ac9f760a..518ce90664 100644 --- a/core/server/models/base/index.js +++ b/core/server/models/base/index.js @@ -12,7 +12,7 @@ const bookshelf = require('bookshelf'); const moment = require('moment'); const Promise = require('bluebird'); const ObjectId = require('bson-objectid'); -const debug = require('ghost-ignition').debug('models:base'); +const debug = require('@tryghost/debug')('models:base'); const config = require('../../../shared/config'); const db = require('../../data/db'); const events = require('../../lib/common/events'); diff --git a/core/server/services/bulk-email/index.js b/core/server/services/bulk-email/index.js index b4fe82c08b..b1bd1a4faa 100644 --- a/core/server/services/bulk-email/index.js +++ b/core/server/services/bulk-email/index.js @@ -7,7 +7,7 @@ const logging = require('@tryghost/logging'); const models = require('../../models'); const mailgunProvider = require('./mailgun'); const sentry = require('../../../shared/sentry'); -const debug = require('ghost-ignition').debug('mega'); +const debug = require('@tryghost/debug')('mega'); const postEmailSerializer = require('../mega/post-email-serializer'); const BATCH_SIZE = mailgunProvider.BATCH_SIZE; diff --git a/core/server/services/email-analytics/jobs/fetch-all.js b/core/server/services/email-analytics/jobs/fetch-all.js index 4280a93616..f26f9aa185 100644 --- a/core/server/services/email-analytics/jobs/fetch-all.js +++ b/core/server/services/email-analytics/jobs/fetch-all.js @@ -1,5 +1,5 @@ const {parentPort} = require('bthreads'); -const debug = require('ghost-ignition').debug('jobs:email-analytics:fetch-all'); +const debug = require('@tryghost/debug')('jobs:email-analytics:fetch-all'); // one-off job to fetch all available events and re-process them idempotently // NB. can be a _very_ long job for sites with many members and frequent emails diff --git a/core/server/services/email-analytics/jobs/fetch-latest.js b/core/server/services/email-analytics/jobs/fetch-latest.js index af3f25c896..05f79c8352 100644 --- a/core/server/services/email-analytics/jobs/fetch-latest.js +++ b/core/server/services/email-analytics/jobs/fetch-latest.js @@ -1,5 +1,5 @@ const {parentPort} = require('bthreads'); -const debug = require('ghost-ignition').debug('jobs:email-analytics:fetch-latest'); +const debug = require('@tryghost/debug')('jobs:email-analytics:fetch-latest'); // recurring job to fetch analytics since the most recently seen event timestamp diff --git a/core/server/services/email-analytics/lib/queries.js b/core/server/services/email-analytics/lib/queries.js index a32645d526..79a9805a4e 100644 --- a/core/server/services/email-analytics/lib/queries.js +++ b/core/server/services/email-analytics/lib/queries.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('services:email-analytics'); +const debug = require('@tryghost/debug')('services:email-analytics'); const db = require('../../../data/db'); const MIN_EMAIL_COUNT_FOR_OPEN_RATE = 5; diff --git a/core/server/services/mega/mega.js b/core/server/services/mega/mega.js index caaa4625bb..70d4033915 100644 --- a/core/server/services/mega/mega.js +++ b/core/server/services/mega/mega.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const Promise = require('bluebird'); -const debug = require('ghost-ignition').debug('mega'); +const debug = require('@tryghost/debug')('mega'); const url = require('url'); const moment = require('moment'); const ObjectID = require('bson-objectid'); diff --git a/core/server/services/members/importer/batch-import.js b/core/server/services/members/importer/batch-import.js index 530e03cf64..47657da272 100644 --- a/core/server/services/members/importer/batch-import.js +++ b/core/server/services/members/importer/batch-import.js @@ -3,7 +3,7 @@ const uuid = require('uuid'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const errors = require('@tryghost/errors'); -const debug = require('ghost-ignition').debug('importer:members'); +const debug = require('@tryghost/debug')('importer:members'); const membersService = require('../index'); const models = require('../../../models'); const i18n = require('../../../../shared/i18n'); diff --git a/core/server/services/settings/cache.js b/core/server/services/settings/cache.js index 54dfa18e7b..7ac00112d0 100644 --- a/core/server/services/settings/cache.js +++ b/core/server/services/settings/cache.js @@ -1,7 +1,7 @@ // It's important to keep the requires absolutely minimal here, // As this cache is used in SO many other areas, we may open ourselves to // circular dependency bugs. -const debug = require('ghost-ignition').debug('settings:cache'); +const debug = require('@tryghost/debug')('settings:cache'); const _ = require('lodash'); const events = require('../../lib/common/events'); const publicSettings = require('./public'); diff --git a/core/server/services/themes/index.js b/core/server/services/themes/index.js index 4874047163..f8468e367e 100644 --- a/core/server/services/themes/index.js +++ b/core/server/services/themes/index.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('themes'); +const debug = require('@tryghost/debug')('themes'); const i18n = require('../../../shared/i18n'); const logging = require('@tryghost/logging'); const errors = require('@tryghost/errors'); diff --git a/core/server/services/themes/loader.js b/core/server/services/themes/loader.js index 4607e562ef..caeaef3be6 100644 --- a/core/server/services/themes/loader.js +++ b/core/server/services/themes/loader.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('themes:loader'); +const debug = require('@tryghost/debug')('themes:loader'); const config = require('../../../shared/config'); const packageJSON = require('@tryghost/package-json'); const themeList = require('./list'); diff --git a/core/server/services/themes/storage.js b/core/server/services/themes/storage.js index 568658fc00..326a8c3eb7 100644 --- a/core/server/services/themes/storage.js +++ b/core/server/services/themes/storage.js @@ -11,7 +11,7 @@ const settingsCache = require('../settings/cache'); const i18n = require('../../../shared/i18n'); const logging = require('@tryghost/logging'); const errors = require('@tryghost/errors'); -const debug = require('ghost-ignition').debug('api:themes'); +const debug = require('@tryghost/debug')('api:themes'); const ObjectID = require('bson-objectid'); let themeStorage; diff --git a/core/server/services/themes/validate.js b/core/server/services/themes/validate.js index df8d78369b..c995dea899 100644 --- a/core/server/services/themes/validate.js +++ b/core/server/services/themes/validate.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('theme:validate'); +const debug = require('@tryghost/debug')('theme:validate'); const _ = require('lodash'); const Promise = require('bluebird'); const fs = require('fs-extra'); diff --git a/core/server/services/webhooks/trigger.js b/core/server/services/webhooks/trigger.js index 94fcf8d794..111dbc7c2d 100644 --- a/core/server/services/webhooks/trigger.js +++ b/core/server/services/webhooks/trigger.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const debug = require('ghost-ignition').debug('services:webhooks:trigger'); +const debug = require('@tryghost/debug')('services:webhooks:trigger'); const logging = require('@tryghost/logging'); const request = require('../../lib/request'); const models = require('../../models'); diff --git a/core/server/web/admin/app.js b/core/server/web/admin/app.js index 3b6388a038..38ffb495fe 100644 --- a/core/server/web/admin/app.js +++ b/core/server/web/admin/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:admin:app'); +const debug = require('@tryghost/debug')('web:admin:app'); const express = require('../../../shared/express'); const serveStatic = express.static; const config = require('../../../shared/config'); diff --git a/core/server/web/admin/controller.js b/core/server/web/admin/controller.js index ad48506a47..4e4685abc4 100644 --- a/core/server/web/admin/controller.js +++ b/core/server/web/admin/controller.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:admin:controller'); +const debug = require('@tryghost/debug')('web:admin:controller'); const path = require('path'); const config = require('../../../shared/config'); const updateCheck = require('../../update-check'); diff --git a/core/server/web/api/app.js b/core/server/web/api/app.js index 2307f43d49..9d5073a438 100644 --- a/core/server/web/api/app.js +++ b/core/server/web/api/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:api:default:app'); +const debug = require('@tryghost/debug')('web:api:default:app'); const config = require('../../../shared/config'); const express = require('../../../shared/express'); const urlUtils = require('../../../shared/url-utils'); diff --git a/core/server/web/api/canary/admin/app.js b/core/server/web/api/canary/admin/app.js index 7151c00623..802afd8e00 100644 --- a/core/server/web/api/canary/admin/app.js +++ b/core/server/web/api/canary/admin/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:canary:admin:app'); +const debug = require('@tryghost/debug')('web:canary:admin:app'); const boolParser = require('express-query-boolean'); const express = require('../../../../../shared/express'); const bodyParser = require('body-parser'); diff --git a/core/server/web/api/canary/content/app.js b/core/server/web/api/canary/content/app.js index bb13851187..fd9daf0065 100644 --- a/core/server/web/api/canary/content/app.js +++ b/core/server/web/api/canary/content/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:api:canary:content:app'); +const debug = require('@tryghost/debug')('web:api:canary:content:app'); const boolParser = require('express-query-boolean'); const bodyParser = require('body-parser'); const express = require('../../../../../shared/express'); diff --git a/core/server/web/api/v2/admin/app.js b/core/server/web/api/v2/admin/app.js index fae4cd3235..e0beb9e34e 100644 --- a/core/server/web/api/v2/admin/app.js +++ b/core/server/web/api/v2/admin/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:v2:admin:app'); +const debug = require('@tryghost/debug')('web:v2:admin:app'); const boolParser = require('express-query-boolean'); const express = require('../../../../../shared/express'); const bodyParser = require('body-parser'); diff --git a/core/server/web/api/v2/content/app.js b/core/server/web/api/v2/content/app.js index 61954d061f..2931526aab 100644 --- a/core/server/web/api/v2/content/app.js +++ b/core/server/web/api/v2/content/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:api:v2:content:app'); +const debug = require('@tryghost/debug')('web:api:v2:content:app'); const boolParser = require('express-query-boolean'); const bodyParser = require('body-parser'); const express = require('../../../../../shared/express'); diff --git a/core/server/web/api/v3/admin/app.js b/core/server/web/api/v3/admin/app.js index 545375c99f..c5b6ec3e3e 100644 --- a/core/server/web/api/v3/admin/app.js +++ b/core/server/web/api/v3/admin/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:v3:admin:app'); +const debug = require('@tryghost/debug')('web:v3:admin:app'); const boolParser = require('express-query-boolean'); const express = require('../../../../../shared/express'); const bodyParser = require('body-parser'); diff --git a/core/server/web/api/v3/content/app.js b/core/server/web/api/v3/content/app.js index a0fbb9beff..b142d4797b 100644 --- a/core/server/web/api/v3/content/app.js +++ b/core/server/web/api/v3/content/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:api:v3:content:app'); +const debug = require('@tryghost/debug')('web:api:v3:content:app'); const boolParser = require('express-query-boolean'); const bodyParser = require('body-parser'); const express = require('../../../../../shared/express'); diff --git a/core/server/web/members/app.js b/core/server/web/members/app.js index 0a2e299156..64da7cc035 100644 --- a/core/server/web/members/app.js +++ b/core/server/web/members/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:members:app'); +const debug = require('@tryghost/debug')('web:members:app'); const {URL} = require('url'); const cors = require('cors'); const bodyParser = require('body-parser'); diff --git a/core/server/web/oauth/app.js b/core/server/web/oauth/app.js index f18dda2370..491d8f964b 100644 --- a/core/server/web/oauth/app.js +++ b/core/server/web/oauth/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:oauth:app'); +const debug = require('@tryghost/debug')('web:oauth:app'); const {URL} = require('url'); const passport = require('passport'); const GoogleStrategy = require('passport-google-oauth20').Strategy; diff --git a/core/server/web/parent/app.js b/core/server/web/parent/app.js index e794c91927..9bb8614d41 100644 --- a/core/server/web/parent/app.js +++ b/core/server/web/parent/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:parent'); +const debug = require('@tryghost/debug')('web:parent'); const express = require('../../../shared/express'); const vhost = require('@tryghost/vhost-middleware'); const config = require('../../../shared/config'); diff --git a/core/server/web/parent/middleware/log-request.js b/core/server/web/parent/middleware/log-request.js index 6fbb5a4128..121b63d385 100644 --- a/core/server/web/parent/middleware/log-request.js +++ b/core/server/web/parent/middleware/log-request.js @@ -1,7 +1,7 @@ const logging = require('@tryghost/logging'); /** - * @TODO: move this middleware to ignition? + * @TODO: move this middleware to Framework monorepo? */ module.exports = function logRequest(req, res, next) { const startTime = Date.now(); diff --git a/core/server/web/parent/middleware/request-id.js b/core/server/web/parent/middleware/request-id.js index be465fc3a2..275e8ba6f6 100644 --- a/core/server/web/parent/middleware/request-id.js +++ b/core/server/web/parent/middleware/request-id.js @@ -1,7 +1,7 @@ const uuid = require('uuid'); /** - * @TODO: move this middleware to ignition? + * @TODO: move this middleware to Framework monorepo? */ module.exports = (req, res, next) => { const requestId = req.get('X-Request-ID') || uuid.v4(); diff --git a/core/server/web/shared/middlewares/custom-redirects.js b/core/server/web/shared/middlewares/custom-redirects.js index 4406c73dae..69458f19c2 100644 --- a/core/server/web/shared/middlewares/custom-redirects.js +++ b/core/server/web/shared/middlewares/custom-redirects.js @@ -1,7 +1,7 @@ const express = require('../../../../shared/express'); const url = require('url'); const querystring = require('querystring'); -const debug = require('ghost-ignition').debug('web:shared:mw:custom-redirects'); +const debug = require('@tryghost/debug')('web:shared:mw:custom-redirects'); const config = require('../../../../shared/config'); const urlUtils = require('../../../../shared/url-utils'); const errors = require('@tryghost/errors'); diff --git a/core/server/web/shared/middlewares/error-handler.js b/core/server/web/shared/middlewares/error-handler.js index a4c61a2fbb..436ef8d50b 100644 --- a/core/server/web/shared/middlewares/error-handler.js +++ b/core/server/web/shared/middlewares/error-handler.js @@ -1,6 +1,6 @@ const hbs = require('express-hbs'); const _ = require('lodash'); -const debug = require('ghost-ignition').debug('error-handler'); +const debug = require('@tryghost/debug')('error-handler'); const errors = require('@tryghost/errors'); const config = require('../../../../shared/config'); const i18n = require('../../../../shared/i18n'); diff --git a/core/server/web/shared/middlewares/url-redirects.js b/core/server/web/shared/middlewares/url-redirects.js index 8ee5edb228..e8b38c927c 100644 --- a/core/server/web/shared/middlewares/url-redirects.js +++ b/core/server/web/shared/middlewares/url-redirects.js @@ -1,6 +1,6 @@ const url = require('url'); const path = require('path'); -const debug = require('ghost-ignition').debug('web:shared:mw:url-redirects'); +const debug = require('@tryghost/debug')('web:shared:mw:url-redirects'); const urlUtils = require('../../../../shared/url-utils'); const _private = {}; diff --git a/core/server/web/site/app.js b/core/server/web/site/app.js index 1a7dc5a6ae..814c831dbe 100644 --- a/core/server/web/site/app.js +++ b/core/server/web/site/app.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('web:site:app'); +const debug = require('@tryghost/debug')('web:site:app'); const path = require('path'); const express = require('../../../shared/express'); const cors = require('cors'); diff --git a/core/shared/config/index.js b/core/shared/config/index.js index 7e4b1cbad9..37e35efaab 100644 --- a/core/shared/config/index.js +++ b/core/shared/config/index.js @@ -2,7 +2,7 @@ const Nconf = require('nconf'); const _ = require('lodash'); const os = require('os'); const path = require('path'); -const _debug = require('ghost-ignition').debug._base; +const _debug = require('@tryghost/debug')._base; const debug = _debug('ghost:config'); const localUtils = require('./utils'); const env = process.env.NODE_ENV || 'development'; diff --git a/core/shared/express.js b/core/shared/express.js index b1b004420f..a9169e486b 100644 --- a/core/shared/express.js +++ b/core/shared/express.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('shared:express'); +const debug = require('@tryghost/debug')('shared:express'); const express = require('express'); const sentry = require('./sentry'); diff --git a/package.json b/package.json index 3546c25e54..4ce221003a 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "@tryghost/bookshelf-plugins": "0.1.1", "@tryghost/bootstrap-socket": "0.2.9", "@tryghost/constants": "0.1.8", + "@tryghost/debug": "0.1.1", "@tryghost/email-analytics-provider-mailgun": "1.0.0", "@tryghost/email-analytics-service": "1.0.0", "@tryghost/errors": "0.2.12", @@ -99,7 +100,6 @@ "express-query-boolean": "2.0.0", "express-session": "1.17.2", "fs-extra": "10.0.0", - "ghost-ignition": "4.6.3", "ghost-storage-base": "0.0.4", "glob": "7.1.7", "got": "9.6.0", diff --git a/test/utils/db-utils.js b/test/utils/db-utils.js index 0f7dafdd0d..5788e4f94d 100644 --- a/test/utils/db-utils.js +++ b/test/utils/db-utils.js @@ -1,4 +1,4 @@ -const debug = require('ghost-ignition').debug('test:dbUtils'); +const debug = require('@tryghost/debug')('test:dbUtils'); // Utility Packages const Promise = require('bluebird'); diff --git a/yarn.lock b/yarn.lock index fe44825f8b..25cc111b2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -699,6 +699,14 @@ resolved "https://registry.yarnpkg.com/@tryghost/constants/-/constants-0.1.8.tgz#b08074cdc6f8a379209750e60c2ab62c8ba895cf" integrity sha512-3/w0k2JlpYjG/3tU3zjvVlrNH+kK9bjZvp7xaCkvmbsLGxQFMtlKU4fFY+rcpDVWOkywIHmKbLGmAqADgZeakA== +"@tryghost/debug@0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.1.tgz#65d267b2d8cd4f9f863efdeb151912ad99587843" + integrity sha512-To3TPu4Aqyj1PbzNdWdG5rGEJBjEYWD8Ju2RjSgZSK+5PaUtaGbEOGirTf4OelIHMaSeKPzTG2KkVEJVGhBDNQ== + dependencies: + "@tryghost/root-utils" "^0.3.0" + debug "^4.3.1" + "@tryghost/debug@^0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.0.tgz#f55dc680b07fe49556c436d43e93e726e6ecbfc3" @@ -958,14 +966,6 @@ caller "^1.0.1" find-root "^1.1.0" -"@tryghost/root-utils@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.1.0.tgz#7578cb5e57953316fef58edd43a152a86b719a8f" - integrity sha512-zy3PSviwytjvjdMso86RYZLE2I4e2yL/s83fIEf/g17C8V8hsCcgE83cFOpCw3ISWDFX3Qi0IX9kI3or2pfGLg== - dependencies: - caller "^1.0.1" - find-root "^1.1.0" - "@tryghost/root-utils@^0.2.2": version "0.2.2" resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.2.2.tgz#bdd22faf5bd6628494748363e69de4afc8563a0e" @@ -4497,28 +4497,6 @@ ghost-ignition@4.6.2, ghost-ignition@^4.2.4, ghost-ignition@^4.6.1, ghost-igniti prettyjson "1.2.1" uuid "8.3.2" -ghost-ignition@4.6.3: - version "4.6.3" - resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-4.6.3.tgz#eea33bbd84e4e26096f9b7c8838f972acdab7533" - integrity sha512-F9Kms91NG7miRH8FdmvHvWGt9crVHaKYap3gFrGekCi0TTpssN6duGi0NERSqAcf+7gC7QXT3BP/yCWwBr3fqw== - dependencies: - "@tryghost/bunyan-rotating-filestream" "0.0.7" - "@tryghost/elasticsearch-bunyan" "0.1.1" - "@tryghost/root-utils" "^0.1.0" - bunyan "1.8.15" - bunyan-loggly "1.4.2" - caller "1.0.1" - debug "4.3.1" - find-root "1.1.0" - fs-extra "9.1.0" - gelf-stream "1.1.1" - json-stringify-safe "5.0.1" - lodash "4.17.21" - moment "2.27.0" - nconf "0.11.2" - prettyjson "1.2.1" - uuid "8.3.2" - ghost-storage-base@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/ghost-storage-base/-/ghost-storage-base-0.0.4.tgz#c5badcab13d1763febc8eb3b293e1eb3a5e511e1"