diff --git a/Gruntfile.js b/Gruntfile.js index 91dd35a78e..d70be6f733 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,7 +8,7 @@ require('./core/server/overrides'); -const config = require('./core/server/config'); +const config = require('./core/shared/config'); const urlService = require('./core/frontend/services/url'); const _ = require('lodash'); const fs = require('fs-extra'); diff --git a/MigratorConfig.js b/MigratorConfig.js index 1a5de8487e..1370dd806a 100644 --- a/MigratorConfig.js +++ b/MigratorConfig.js @@ -1,4 +1,4 @@ -const config = require('./core/server/config'); +const config = require('./core/shared/config'); const ghostVersion = require('./core/server/lib/ghost-version'); /** diff --git a/core/frontend/apps/private-blogging/lib/middleware.js b/core/frontend/apps/private-blogging/lib/middleware.js index e6219fbb15..48bbec1e16 100644 --- a/core/frontend/apps/private-blogging/lib/middleware.js +++ b/core/frontend/apps/private-blogging/lib/middleware.js @@ -3,7 +3,7 @@ const url = require('url'); const session = require('cookie-session'); const crypto = require('crypto'); const path = require('path'); -const config = require('../../../../server/config'); +const config = require('../../../../shared/config'); const urlUtils = require('../../../../server/lib/url-utils'); const constants = require('../../../../server/lib/constants'); const {i18n} = require('../../../../server/lib/common'); diff --git a/core/frontend/meta/asset_url.js b/core/frontend/meta/asset_url.js index 219569df9b..f0a22442da 100644 --- a/core/frontend/meta/asset_url.js +++ b/core/frontend/meta/asset_url.js @@ -1,5 +1,5 @@ const crypto = require('crypto'); -const config = require('../../server/config'); +const config = require('../../shared/config'); const {blogIcon} = require('../../server/lib/image'); const urlUtils = require('../../server/lib/url-utils'); diff --git a/core/frontend/meta/schema.js b/core/frontend/meta/schema.js index b38d490965..52206b7f0c 100644 --- a/core/frontend/meta/schema.js +++ b/core/frontend/meta/schema.js @@ -1,4 +1,4 @@ -const config = require('../../server/config'); +const config = require('../../shared/config'); const escapeExpression = require('../services/themes/engine').escapeExpression; const socialUrls = require('@tryghost/social-urls'); const _ = require('lodash'); diff --git a/core/frontend/services/apps/index.js b/core/frontend/services/apps/index.js index d413ffd379..657598e99b 100644 --- a/core/frontend/services/apps/index.js +++ b/core/frontend/services/apps/index.js @@ -2,7 +2,7 @@ const debug = require('ghost-ignition').debug('services:apps'); const Promise = require('bluebird'); const {logging, i18n} = require('../../../server/lib/common'); const errors = require('@tryghost/errors'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const loader = require('./loader'); module.exports = { diff --git a/core/frontend/services/apps/loader.js b/core/frontend/services/apps/loader.js index b1a7bac2c2..ebec2a3755 100644 --- a/core/frontend/services/apps/loader.js +++ b/core/frontend/services/apps/loader.js @@ -2,7 +2,7 @@ const path = require('path'); const _ = require('lodash'); const Promise = require('bluebird'); const {i18n} = require('../../../server/lib/common'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const Proxy = require('./proxy'); // Get the full path to an app by name diff --git a/core/frontend/services/proxy.js b/core/frontend/services/proxy.js index 5460a52f5b..ace44b2659 100644 --- a/core/frontend/services/proxy.js +++ b/core/frontend/services/proxy.js @@ -6,7 +6,7 @@ const errors = require('@tryghost/errors'); const {i18n, logging} = require('../../server/lib/common'); const settingsCache = require('../../server/services/settings/cache'); -const config = require('../../server/config'); +const config = require('../../shared/config'); // Direct requires: // - lodash diff --git a/core/frontend/services/redirects/settings.js b/core/frontend/services/redirects/settings.js index e6a0400e3f..074d7af0ed 100644 --- a/core/frontend/services/redirects/settings.js +++ b/core/frontend/services/redirects/settings.js @@ -5,7 +5,7 @@ const moment = require('moment-timezone'); const validation = require('./validation'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const {i18n} = require('../../../server/lib/common'); const errors = require('@tryghost/errors'); diff --git a/core/frontend/services/routing/TaxonomyRouter.js b/core/frontend/services/routing/TaxonomyRouter.js index 9e1a36d8a9..3c0b894173 100644 --- a/core/frontend/services/routing/TaxonomyRouter.js +++ b/core/frontend/services/routing/TaxonomyRouter.js @@ -1,5 +1,5 @@ const debug = require('ghost-ignition').debug('services:routing:taxonomy-router'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const {events} = require('../../../server/lib/common'); const ParentRouter = require('./ParentRouter'); const RSSRouter = require('./RSSRouter'); diff --git a/core/frontend/services/routing/controllers/entry.js b/core/frontend/services/routing/controllers/entry.js index 9e85e69a87..dcda2ca39d 100644 --- a/core/frontend/services/routing/controllers/entry.js +++ b/core/frontend/services/routing/controllers/entry.js @@ -1,6 +1,6 @@ const debug = require('ghost-ignition').debug('services:routing:controllers:entry'); const url = require('url'); -const config = require('../../../../server/config'); +const config = require('../../../../shared/config'); const urlService = require('../../../services/url'); const urlUtils = require('../../../../server/lib/url-utils'); const helpers = require('../helpers'); diff --git a/core/frontend/services/routing/controllers/preview.js b/core/frontend/services/routing/controllers/preview.js index c7144d9657..3343170e34 100644 --- a/core/frontend/services/routing/controllers/preview.js +++ b/core/frontend/services/routing/controllers/preview.js @@ -1,5 +1,5 @@ const debug = require('ghost-ignition').debug('services:routing:controllers:preview'); -const config = require('../../../../server/config'); +const config = require('../../../../shared/config'); const urlService = require('../../url'); const urlUtils = require('../../../../server/lib/url-utils'); const helpers = require('../helpers'); diff --git a/core/frontend/services/routing/helpers/templates.js b/core/frontend/services/routing/helpers/templates.js index 709370a755..4d0cb33555 100644 --- a/core/frontend/services/routing/helpers/templates.js +++ b/core/frontend/services/routing/helpers/templates.js @@ -6,7 +6,7 @@ const _ = require('lodash'); const path = require('path'); const url = require('url'); -const config = require('../../../../server/config'); +const config = require('../../../../shared/config'); const themes = require('../../themes'); const _private = {}; diff --git a/core/frontend/services/routing/settings.js b/core/frontend/services/routing/settings.js index ad33f1f096..71f79abc55 100644 --- a/core/frontend/services/routing/settings.js +++ b/core/frontend/services/routing/settings.js @@ -4,7 +4,7 @@ const path = require('path'); const urlService = require('../url'); const errors = require('@tryghost/errors'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); /** * The `routes.yaml` file offers a way to configure your Ghost blog. It's currently a setting feature diff --git a/core/frontend/services/settings/ensure-settings.js b/core/frontend/services/settings/ensure-settings.js index f85129e867..4d2f93b337 100644 --- a/core/frontend/services/settings/ensure-settings.js +++ b/core/frontend/services/settings/ensure-settings.js @@ -4,7 +4,7 @@ const path = require('path'); const debug = require('ghost-ignition').debug('frontend:services:settings:ensure-settings'); const {i18n} = require('../../../server/lib/common'); const errors = require('@tryghost/errors'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); /** * Makes sure that all supported settings files are in the diff --git a/core/frontend/services/settings/loader.js b/core/frontend/services/settings/loader.js index 918506c8e1..2b1fdacf21 100644 --- a/core/frontend/services/settings/loader.js +++ b/core/frontend/services/settings/loader.js @@ -3,7 +3,7 @@ const path = require('path'); const debug = require('ghost-ignition').debug('frontend:services:settings:settings-loader'); const {i18n} = require('../../../server/lib/common'); const errors = require('@tryghost/errors'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const yamlParser = require('./yaml-parser'); const validate = require('./validate'); diff --git a/core/frontend/services/sitemap/handler.js b/core/frontend/services/sitemap/handler.js index da131f1f57..c4a01ff497 100644 --- a/core/frontend/services/sitemap/handler.js +++ b/core/frontend/services/sitemap/handler.js @@ -1,4 +1,4 @@ -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const Manager = require('./manager'); const manager = new Manager(); diff --git a/core/frontend/services/themes/ThemeStorage.js b/core/frontend/services/themes/ThemeStorage.js index 0cfc3eb33b..a4a5e4fc3f 100644 --- a/core/frontend/services/themes/ThemeStorage.js +++ b/core/frontend/services/themes/ThemeStorage.js @@ -1,7 +1,7 @@ const fs = require('fs-extra'); const os = require('os'); const path = require('path'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const security = require('../../../server/lib/security'); const {compress} = require('@tryghost/zip'); const LocalFileStorage = require('../../../server/adapters/storage/LocalFileStorage'); diff --git a/core/frontend/services/themes/active.js b/core/frontend/services/themes/active.js index f15d2cd3d1..a9b00ab4f3 100644 --- a/core/frontend/services/themes/active.js +++ b/core/frontend/services/themes/active.js @@ -16,7 +16,7 @@ const join = require('path').join; const _ = require('lodash'); const themeConfig = require('./config'); const themeEngines = require('./engines'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const engine = require('./engine'); // Current instance of ActiveTheme diff --git a/core/frontend/services/themes/engine.js b/core/frontend/services/themes/engine.js index 5addd79c79..c0c3e3b08a 100644 --- a/core/frontend/services/themes/engine.js +++ b/core/frontend/services/themes/engine.js @@ -1,5 +1,5 @@ const hbs = require('express-hbs'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const instance = hbs.create(); // @TODO think about a config option for this e.g. theme.devmode? diff --git a/core/frontend/services/themes/engines/create.js b/core/frontend/services/themes/engines/create.js index c4716389fc..46d5f22082 100644 --- a/core/frontend/services/themes/engines/create.js +++ b/core/frontend/services/themes/engines/create.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const semver = require('semver'); -const config = require('../../../../server/config'); +const config = require('../../../../shared/config'); const DEFAULTS = require('./defaults'); const allowedKeys = ['ghost-api']; diff --git a/core/frontend/services/themes/handlebars/register.js b/core/frontend/services/themes/handlebars/register.js index 4e1c4d9efc..9eb0957fd9 100644 --- a/core/frontend/services/themes/handlebars/register.js +++ b/core/frontend/services/themes/handlebars/register.js @@ -1,7 +1,7 @@ const Promise = require('bluebird'); const errors = require('@tryghost/errors'); const hbs = require('../engine'); -const config = require('../../../../server/config'); +const config = require('../../../../shared/config'); const {logging} = require('../../../../server/lib/common'); // Register an async handlebars helper for a given handlebars instance diff --git a/core/frontend/services/themes/i18n.js b/core/frontend/services/themes/i18n.js index eb5b105ea6..a98ed3b856 100644 --- a/core/frontend/services/themes/i18n.js +++ b/core/frontend/services/themes/i18n.js @@ -1,7 +1,7 @@ const errors = require('@tryghost/errors'); const {i18n, events, logging} = require('../../../server/lib/common'); const settingsCache = require('../../../server/services/settings/cache'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const jp = require('jsonpath'); diff --git a/core/frontend/services/themes/loader.js b/core/frontend/services/themes/loader.js index 99c15ddd14..cfaad5b36e 100644 --- a/core/frontend/services/themes/loader.js +++ b/core/frontend/services/themes/loader.js @@ -1,5 +1,5 @@ const debug = require('ghost-ignition').debug('themes:loader'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const packageJSON = require('../../../server/lib/fs/package-json'); const themeList = require('./list'); let loadAllThemes; diff --git a/core/frontend/services/themes/middleware.js b/core/frontend/services/themes/middleware.js index 7139351622..0eea790a65 100644 --- a/core/frontend/services/themes/middleware.js +++ b/core/frontend/services/themes/middleware.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const hbs = require('./engine'); const urlUtils = require('../../../server/lib/url-utils'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const {i18n} = require('../../../server/lib/common'); const errors = require('@tryghost/errors'); const settingsCache = require('../../../server/services/settings/cache'); diff --git a/core/frontend/services/themes/validate.js b/core/frontend/services/themes/validate.js index e1c5cff6a2..5c51299e0d 100644 --- a/core/frontend/services/themes/validate.js +++ b/core/frontend/services/themes/validate.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const fs = require('fs-extra'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const {i18n} = require('../../../server/lib/common'); const errors = require('@tryghost/errors'); diff --git a/core/frontend/services/url/Resources.js b/core/frontend/services/url/Resources.js index 2cdde5ef9e..0d9aa5bc4f 100644 --- a/core/frontend/services/url/Resources.js +++ b/core/frontend/services/url/Resources.js @@ -2,7 +2,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const debug = require('ghost-ignition').debug('services:url:resources'); const Resource = require('./Resource'); -const config = require('../../../server/config'); +const config = require('../../../shared/config'); const models = require('../../../server/models'); const {events} = require('../../../server/lib/common'); diff --git a/core/server/adapters/storage/LocalFileStorage.js b/core/server/adapters/storage/LocalFileStorage.js index 6226531b4d..ad2fc7e37b 100644 --- a/core/server/adapters/storage/LocalFileStorage.js +++ b/core/server/adapters/storage/LocalFileStorage.js @@ -6,7 +6,7 @@ const fs = require('fs-extra'); const path = require('path'); const Promise = require('bluebird'); const moment = require('moment'); -const config = require('../../config'); +const config = require('../../../shared/config'); const {logging, i18n} = require('../../lib/common'); const errors = require('@tryghost/errors'); const constants = require('../../lib/constants'); diff --git a/core/server/analytics-events.js b/core/server/analytics-events.js index abafcefdcc..1e02ebaf40 100644 --- a/core/server/analytics-events.js +++ b/core/server/analytics-events.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const Analytics = require('analytics-node'); -const config = require('./config'); +const config = require('../shared/config'); const {events} = require('./lib/common'); module.exports.init = function () { diff --git a/core/server/api/canary/authentication.js b/core/server/api/canary/authentication.js index 407e8d0ad8..ca69152478 100644 --- a/core/server/api/canary/authentication.js +++ b/core/server/api/canary/authentication.js @@ -1,5 +1,5 @@ const api = require('./index'); -const config = require('../../config'); +const config = require('../../../shared/config'); const {i18n} = require('../../lib/common'); const errors = require('@tryghost/errors'); const web = require('../../web'); diff --git a/core/server/api/canary/config.js b/core/server/api/canary/config.js index 64c0005467..dd0ba37835 100644 --- a/core/server/api/canary/config.js +++ b/core/server/api/canary/config.js @@ -1,5 +1,5 @@ const {isPlainObject} = require('lodash'); -const config = require('../../config'); +const config = require('../../../shared/config'); const labs = require('../../services/labs'); const ghostVersion = require('../../lib/ghost-version'); diff --git a/core/server/api/canary/members.js b/core/server/api/canary/members.js index 03dab90b5e..8a1aee964b 100644 --- a/core/server/api/canary/members.js +++ b/core/server/api/canary/members.js @@ -3,7 +3,7 @@ const Promise = require('bluebird'); const moment = require('moment-timezone'); const errors = require('@tryghost/errors'); -const config = require('../../config'); +const config = require('../../../shared/config'); const models = require('../../models'); const membersService = require('../../services/members'); const settingsCache = require('../../services/settings/cache'); diff --git a/core/server/api/canary/posts.js b/core/server/api/canary/posts.js index 1db09d9dc7..3ffa4707f4 100644 --- a/core/server/api/canary/posts.js +++ b/core/server/api/canary/posts.js @@ -7,7 +7,7 @@ const membersService = require('../../services/members'); const allowedIncludes = ['tags', 'authors', 'authors.roles', 'email']; const unsafeAttrs = ['status', 'authors', 'visibility']; const _ = require('lodash'); -const config = require('../../config'); +const config = require('../../../shared/config'); module.exports = { docName: 'posts', diff --git a/core/server/api/canary/schedules.js b/core/server/api/canary/schedules.js index d989350526..0e4ed6ec3f 100644 --- a/core/server/api/canary/schedules.js +++ b/core/server/api/canary/schedules.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const moment = require('moment'); -const config = require('../../config'); +const config = require('../../../shared/config'); const models = require('../../models'); const urlUtils = require('../../lib/url-utils'); const {i18n} = require('../../lib/common'); diff --git a/core/server/api/canary/site.js b/core/server/api/canary/site.js index db7d7086db..28f5947ef4 100644 --- a/core/server/api/canary/site.js +++ b/core/server/api/canary/site.js @@ -1,7 +1,7 @@ const ghostVersion = require('../../lib/ghost-version'); const settingsCache = require('../../services/settings/cache'); const urlUtils = require('../../lib/url-utils'); -const config = require('../../config'); +const config = require('../../../shared/config'); const site = { docName: 'site', diff --git a/core/server/api/canary/utils/serializers/output/utils/clean.js b/core/server/api/canary/utils/serializers/output/utils/clean.js index 3c55ffbc89..646b5edd6a 100644 --- a/core/server/api/canary/utils/serializers/output/utils/clean.js +++ b/core/server/api/canary/utils/serializers/output/utils/clean.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const localUtils = require('../../../index'); -const config = require('../../../../../../config'); +const config = require('../../../../../../../shared/config'); const tag = (attrs, frame) => { if (localUtils.isContentAPI(frame)) { diff --git a/core/server/api/canary/utils/serializers/output/utils/mapper.js b/core/server/api/canary/utils/serializers/output/utils/mapper.js index 16ea5dccde..543b867624 100644 --- a/core/server/api/canary/utils/serializers/output/utils/mapper.js +++ b/core/server/api/canary/utils/serializers/output/utils/mapper.js @@ -6,7 +6,7 @@ const gating = require('./post-gating'); const clean = require('./clean'); const extraAttrs = require('./extra-attrs'); const postsMetaSchema = require('../../../../../../data/schema').tables.posts_meta; -const config = require('../../../../../../config'); +const config = require('../../../../../../../shared/config'); const mapUser = (model, frame) => { const jsonModel = model.toJSON ? model.toJSON(frame.options) : model; diff --git a/core/server/api/canary/utils/validators/input/images.js b/core/server/api/canary/utils/validators/input/images.js index 06ca7ce070..42ed757fd2 100644 --- a/core/server/api/canary/utils/validators/input/images.js +++ b/core/server/api/canary/utils/validators/input/images.js @@ -1,5 +1,5 @@ const jsonSchema = require('../utils/json-schema'); -const config = require('../../../../../config'); +const config = require('../../../../../../shared/config'); const {i18n} = require('../../../../../lib/common'); const errors = require('@tryghost/errors'); const {imageSize, blogIcon} = require('../../../../../lib/image'); diff --git a/core/server/api/v2/authentication.js b/core/server/api/v2/authentication.js index 407e8d0ad8..ca69152478 100644 --- a/core/server/api/v2/authentication.js +++ b/core/server/api/v2/authentication.js @@ -1,5 +1,5 @@ const api = require('./index'); -const config = require('../../config'); +const config = require('../../../shared/config'); const {i18n} = require('../../lib/common'); const errors = require('@tryghost/errors'); const web = require('../../web'); diff --git a/core/server/api/v2/config.js b/core/server/api/v2/config.js index f0f2011ab7..ba9e06feec 100644 --- a/core/server/api/v2/config.js +++ b/core/server/api/v2/config.js @@ -1,5 +1,5 @@ const {isPlainObject} = require('lodash'); -const config = require('../../config'); +const config = require('../../../shared/config'); const labs = require('../../services/labs'); const ghostVersion = require('../../lib/ghost-version'); diff --git a/core/server/api/v2/schedules.js b/core/server/api/v2/schedules.js index d989350526..0e4ed6ec3f 100644 --- a/core/server/api/v2/schedules.js +++ b/core/server/api/v2/schedules.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const moment = require('moment'); -const config = require('../../config'); +const config = require('../../../shared/config'); const models = require('../../models'); const urlUtils = require('../../lib/url-utils'); const {i18n} = require('../../lib/common'); diff --git a/core/server/api/v2/utils/validators/input/images.js b/core/server/api/v2/utils/validators/input/images.js index 06ca7ce070..42ed757fd2 100644 --- a/core/server/api/v2/utils/validators/input/images.js +++ b/core/server/api/v2/utils/validators/input/images.js @@ -1,5 +1,5 @@ const jsonSchema = require('../utils/json-schema'); -const config = require('../../../../../config'); +const config = require('../../../../../../shared/config'); const {i18n} = require('../../../../../lib/common'); const errors = require('@tryghost/errors'); const {imageSize, blogIcon} = require('../../../../../lib/image'); diff --git a/core/server/data/db/backup.js b/core/server/data/db/backup.js index a2cbc62a94..084f4507d9 100644 --- a/core/server/data/db/backup.js +++ b/core/server/data/db/backup.js @@ -4,7 +4,7 @@ const fs = require('fs-extra'); const path = require('path'); const Promise = require('bluebird'); -const config = require('../../config'); +const config = require('../../../shared/config'); const {logging} = require('../../lib/common'); const urlUtils = require('../../lib/url-utils'); const exporter = require('../exporter'); diff --git a/core/server/data/db/connection.js b/core/server/data/db/connection.js index 8245b645de..7c217f5445 100644 --- a/core/server/data/db/connection.js +++ b/core/server/data/db/connection.js @@ -1,5 +1,5 @@ const knex = require('knex'); -const config = require('../../config'); +const config = require('../../../shared/config'); const {logging} = require('../../lib/common'); const errors = require('@tryghost/errors'); let knexInstance; diff --git a/core/server/data/db/migrator.js b/core/server/data/db/migrator.js index f372795713..e8f034e715 100644 --- a/core/server/data/db/migrator.js +++ b/core/server/data/db/migrator.js @@ -1,5 +1,5 @@ const KnexMigrator = require('knex-migrator'); -const config = require('../../config'); +const config = require('../../../shared/config'); const errors = require('@tryghost/errors'); const knexMigrator = new KnexMigrator({ diff --git a/core/server/data/importer/handlers/image.js b/core/server/data/importer/handlers/image.js index 3e9ce8ecd8..b127a37324 100644 --- a/core/server/data/importer/handlers/image.js +++ b/core/server/data/importer/handlers/image.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const path = require('path'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const urlUtils = require('../../../lib/url-utils'); const storage = require('../../../adapters/storage'); let ImageHandler; diff --git a/core/server/data/migrations/versions/2.0/4-permalink-setting.js b/core/server/data/migrations/versions/2.0/4-permalink-setting.js index 1201a97ee9..cc94641a3a 100644 --- a/core/server/data/migrations/versions/2.0/4-permalink-setting.js +++ b/core/server/data/migrations/versions/2.0/4-permalink-setting.js @@ -1,6 +1,6 @@ const path = require('path'); const fs = require('fs-extra'); -const config = require('../../../../config'); +const config = require('../../../../../shared/config'); const {logging} = require('../../../../lib/common'); const models = require('../../../../models'); const message1 = 'Removing `globals.permalinks` from routes.yaml.'; diff --git a/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js b/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js index 0df0e809c0..4f7dbafcd6 100644 --- a/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js +++ b/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js @@ -2,7 +2,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const {logging} = require('../../../../lib/common'); const settingsCache = require('../../../../services/settings/cache'); -const config = require('../../../../config'); +const config = require('../../../../../shared/config'); const moment = require('moment'); const fs = require('fs-extra'); const path = require('path'); diff --git a/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js b/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js index f900b1e013..df3ff33b02 100644 --- a/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js +++ b/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js @@ -1,5 +1,5 @@ const {logging} = require('../../../../lib/common'); -const config = require('../../../../config'); +const config = require('../../../../../shared/config'); const {URL} = require('url'); module.exports.config = { diff --git a/core/server/ghost-server.js b/core/server/ghost-server.js index e8e9e98cc8..c8365b98db 100644 --- a/core/server/ghost-server.js +++ b/core/server/ghost-server.js @@ -6,7 +6,7 @@ const Promise = require('bluebird'); const fs = require('fs-extra'); const path = require('path'); const _ = require('lodash'); -const config = require('./config'); +const config = require('../shared/config'); const urlUtils = require('./lib/url-utils'); const errors = require('@tryghost/errors'); const {events, i18n, logging} = require('./lib/common'); diff --git a/core/server/index.js b/core/server/index.js index e2553a1191..94210c0b44 100644 --- a/core/server/index.js +++ b/core/server/index.js @@ -11,7 +11,7 @@ require('./overrides'); const debug = require('ghost-ignition').debug('boot:init'); const Promise = require('bluebird'); -const config = require('./config'); +const config = require('../shared/config'); const {events, i18n, logging} = require('./lib/common'); const migrator = require('./data/db/migrator'); const urlUtils = require('./lib/url-utils'); diff --git a/core/server/lib/common/logging.js b/core/server/lib/common/logging.js index c948cbf416..afc32eacf0 100644 --- a/core/server/lib/common/logging.js +++ b/core/server/lib/common/logging.js @@ -1,4 +1,4 @@ -const config = require('../../config'); +const config = require('../../../shared/config'); const {logging} = require('ghost-ignition'); module.exports = logging({ diff --git a/core/server/lib/image/blog-icon.js b/core/server/lib/image/blog-icon.js index 002d5d9921..a24847b2a1 100644 --- a/core/server/lib/image/blog-icon.js +++ b/core/server/lib/image/blog-icon.js @@ -2,7 +2,7 @@ const sizeOf = require('image-size'); const Promise = require('bluebird'); const _ = require('lodash'); const path = require('path'); -const config = require('../../config'); +const config = require('../../../shared/config'); const {i18n} = require('../common'); const errors = require('@tryghost/errors'); const urlUtils = require('../../lib/url-utils'); diff --git a/core/server/lib/image/gravatar.js b/core/server/lib/image/gravatar.js index cd949f05c3..deadb5be8b 100644 --- a/core/server/lib/image/gravatar.js +++ b/core/server/lib/image/gravatar.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const crypto = require('crypto'); -const config = require('../../config'); +const config = require('../../../shared/config'); const request = require('../request'); module.exports.lookup = function lookup(userData, timeout) { diff --git a/core/server/lib/image/image-size.js b/core/server/lib/image/image-size.js index c9448355f2..bf5b1ffbb9 100644 --- a/core/server/lib/image/image-size.js +++ b/core/server/lib/image/image-size.js @@ -8,7 +8,7 @@ const request = require('../request'); const urlUtils = require('../../lib/url-utils'); const {i18n} = require('../common'); const errors = require('@tryghost/errors'); -const config = require('../../config'); +const config = require('../../../shared/config'); const storage = require('../../adapters/storage'); const storageUtils = require('../../adapters/storage/utils'); const validator = require('../../data/validation').validator; diff --git a/core/server/lib/mobiledoc.js b/core/server/lib/mobiledoc.js index 387447fe80..878a4b217a 100644 --- a/core/server/lib/mobiledoc.js +++ b/core/server/lib/mobiledoc.js @@ -1,6 +1,6 @@ const errors = require('@tryghost/errors'); const {logging} = require('./common'); -const config = require('../config'); +const config = require('../../shared/config'); let cardFactory; let cards; diff --git a/core/server/lib/url-utils.js b/core/server/lib/url-utils.js index 2788937e0e..72c3e821cb 100644 --- a/core/server/lib/url-utils.js +++ b/core/server/lib/url-utils.js @@ -1,5 +1,5 @@ const UrlUtils = require('@tryghost/url-utils'); -const config = require('../config'); +const config = require('../../shared/config'); const mobiledoc = require('./mobiledoc'); const urlUtils = new UrlUtils({ diff --git a/core/server/models/base/index.js b/core/server/models/base/index.js index c76a340fd7..fa19f3154b 100644 --- a/core/server/models/base/index.js +++ b/core/server/models/base/index.js @@ -13,7 +13,7 @@ const moment = require('moment'); const Promise = require('bluebird'); const ObjectId = require('bson-objectid'); const debug = require('ghost-ignition').debug('models:base'); -const config = require('../../config'); +const config = require('../../../shared/config'); const db = require('../../data/db'); const {logging, events, i18n} = require('../../lib/common'); const errors = require('@tryghost/errors'); diff --git a/core/server/models/member.js b/core/server/models/member.js index 6d0ae4da5f..66ac35cc99 100644 --- a/core/server/models/member.js +++ b/core/server/models/member.js @@ -2,7 +2,7 @@ const ghostBookshelf = require('./base'); const uuid = require('uuid'); const _ = require('lodash'); const sequence = require('../lib/promise/sequence'); -const config = require('../config'); +const config = require('../../shared/config'); const crypto = require('crypto'); const Member = ghostBookshelf.Model.extend({ diff --git a/core/server/models/post.js b/core/server/models/post.js index 340eb42e8e..7eac7d7d5a 100644 --- a/core/server/models/post.js +++ b/core/server/models/post.js @@ -8,7 +8,7 @@ const {i18n} = require('../lib/common'); const errors = require('@tryghost/errors'); const htmlToText = require('html-to-text'); const ghostBookshelf = require('./base'); -const config = require('../config'); +const config = require('../../shared/config'); const settingsCache = require('../services/settings/cache'); const mobiledocLib = require('../lib/mobiledoc'); const relations = require('./relations'); diff --git a/core/server/services/adapter-manager/index.js b/core/server/services/adapter-manager/index.js index 6041d64f37..e07debc73e 100644 --- a/core/server/services/adapter-manager/index.js +++ b/core/server/services/adapter-manager/index.js @@ -1,6 +1,6 @@ const AdapterManager = require('@tryghost/adapter-manager'); const getAdapterServiceConfig = require('./config'); -const config = require('../../config'); +const config = require('../../../shared/config'); const adapterManager = new AdapterManager({ loadAdapterFromPath: require, diff --git a/core/server/services/auth/members/index.js b/core/server/services/auth/members/index.js index 3f2356ae79..3cc06cb0e5 100644 --- a/core/server/services/auth/members/index.js +++ b/core/server/services/auth/members/index.js @@ -1,7 +1,7 @@ const jwt = require('express-jwt'); const membersService = require('../../members'); const labs = require('../../labs'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); let UNO_MEMBERINO; diff --git a/core/server/services/auth/session/express-session.js b/core/server/services/auth/session/express-session.js index 52de15d5d7..880427a9f9 100644 --- a/core/server/services/auth/session/express-session.js +++ b/core/server/services/auth/session/express-session.js @@ -1,6 +1,6 @@ const session = require('express-session'); const constants = require('../../../lib/constants'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const settingsCache = require('../../settings/cache'); const models = require('../../../models'); const urlUtils = require('../../../lib/url-utils'); diff --git a/core/server/services/auth/setup.js b/core/server/services/auth/setup.js index 029a5e5d6d..2fc3df9d0d 100644 --- a/core/server/services/auth/setup.js +++ b/core/server/services/auth/setup.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const config = require('../../config'); +const config = require('../../../shared/config'); const errors = require('@tryghost/errors'); const {i18n, logging} = require('../../lib/common'); const models = require('../../models'); diff --git a/core/server/services/bulk-email/index.js b/core/server/services/bulk-email/index.js index 4f6f562683..4a7ec509fb 100644 --- a/core/server/services/bulk-email/index.js +++ b/core/server/services/bulk-email/index.js @@ -2,7 +2,7 @@ const _ = require('lodash'); const errors = require('@tryghost/errors'); const {i18n, logging} = require('../../lib/common'); const mailgunProvider = require('./mailgun'); -const configService = require('../../config'); +const configService = require('../../../shared/config'); const settingsCache = require('../settings/cache'); const sentry = require('../../../shared/sentry'); diff --git a/core/server/services/bulk-email/mailgun.js b/core/server/services/bulk-email/mailgun.js index 825da705fa..9a6e1f0e15 100644 --- a/core/server/services/bulk-email/mailgun.js +++ b/core/server/services/bulk-email/mailgun.js @@ -1,7 +1,7 @@ const {URL} = require('url'); const mailgun = require('mailgun-js'); const {logging} = require('../../lib/common'); -const configService = require('../../config'); +const configService = require('../../../shared/config'); const settingsCache = require('../settings/cache'); function createMailgun(config) { diff --git a/core/server/services/mail/GhostMailer.js b/core/server/services/mail/GhostMailer.js index 975a8ff687..6e1f82761b 100644 --- a/core/server/services/mail/GhostMailer.js +++ b/core/server/services/mail/GhostMailer.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const validator = require('validator'); -const config = require('../../config'); +const config = require('../../../shared/config'); const errors = require('@tryghost/errors'); const {i18n} = require('../../lib/common'); const settingsCache = require('../settings/cache'); diff --git a/core/server/services/mega/mega.js b/core/server/services/mega/mega.js index ab8a51829c..1c41be7a38 100644 --- a/core/server/services/mega/mega.js +++ b/core/server/services/mega/mega.js @@ -7,7 +7,7 @@ const membersService = require('../members'); const bulkEmailService = require('../bulk-email'); const models = require('../../models'); const postEmailSerializer = require('./post-email-serializer'); -const config = require('../../config'); +const config = require('../../../shared/config'); const getEmailData = async (postModel, members = []) => { const {emailTmpl, replacements} = await postEmailSerializer.serialize(postModel); diff --git a/core/server/services/members/middleware.js b/core/server/services/members/middleware.js index d8f2425b83..ed423366b2 100644 --- a/core/server/services/members/middleware.js +++ b/core/server/services/members/middleware.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const {logging} = require('../../lib/common'); -const config = require('../../config'); +const config = require('../../../shared/config'); const labsService = require('../labs'); const membersService = require('./index'); const urlUtils = require('../../lib/url-utils'); diff --git a/core/server/services/xmlrpc.js b/core/server/services/xmlrpc.js index 1e98609c6f..faad7ccc67 100644 --- a/core/server/services/xmlrpc.js +++ b/core/server/services/xmlrpc.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const xml = require('xml'); -const config = require('../config'); +const config = require('../../shared/config'); const urlService = require('../../frontend/services/url'); const errors = require('@tryghost/errors'); const {events, i18n, logging} = require('../lib/common'); diff --git a/core/server/update-check.js b/core/server/update-check.js index 34bc358ad8..ca2bf3b9ff 100644 --- a/core/server/update-check.js +++ b/core/server/update-check.js @@ -16,7 +16,7 @@ const _ = require('lodash'); const url = require('url'); const debug = require('ghost-ignition').debug('update-check'); const api = require('./api').v2; -const config = require('./config'); +const config = require('../shared/config'); const urlUtils = require('./lib/url-utils'); const errors = require('@tryghost/errors'); const {i18n, logging} = require('./lib/common'); diff --git a/core/server/web/admin/app.js b/core/server/web/admin/app.js index 3420d25b3a..0d096bcd96 100644 --- a/core/server/web/admin/app.js +++ b/core/server/web/admin/app.js @@ -1,7 +1,7 @@ const debug = require('ghost-ignition').debug('web:admin:app'); const express = require('../../../shared/express'); const serveStatic = express.static; -const config = require('../../config'); +const config = require('../../../shared/config'); const constants = require('../../lib/constants'); const urlUtils = require('../../lib/url-utils'); const shared = require('../shared'); diff --git a/core/server/web/admin/controller.js b/core/server/web/admin/controller.js index b894752940..bc9e9fe6a5 100644 --- a/core/server/web/admin/controller.js +++ b/core/server/web/admin/controller.js @@ -1,6 +1,6 @@ const debug = require('ghost-ignition').debug('web:admin:controller'); const path = require('path'); -const config = require('../../config'); +const config = require('../../../shared/config'); const updateCheck = require('../../update-check'); const {logging} = require('../../lib/common'); diff --git a/core/server/web/api/middleware/normalize-image.js b/core/server/web/api/middleware/normalize-image.js index 7b756d61ca..24e49fd75a 100644 --- a/core/server/web/api/middleware/normalize-image.js +++ b/core/server/web/api/middleware/normalize-image.js @@ -1,5 +1,5 @@ const cloneDeep = require('lodash/cloneDeep'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const {logging} = require('../../../lib/common'); const imageTransform = require('@tryghost/image-transform'); diff --git a/core/server/web/api/middleware/upload.js b/core/server/web/api/middleware/upload.js index c628c9bc9d..c102bf3b04 100644 --- a/core/server/web/api/middleware/upload.js +++ b/core/server/web/api/middleware/upload.js @@ -3,7 +3,7 @@ const os = require('os'); const multer = require('multer'); const fs = require('fs-extra'); const errors = require('@tryghost/errors'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const {i18n,logging} = require('../../../lib/common'); const upload = { diff --git a/core/server/web/parent/app.js b/core/server/web/parent/app.js index d4e92fc01d..d5f435e8b9 100644 --- a/core/server/web/parent/app.js +++ b/core/server/web/parent/app.js @@ -1,7 +1,7 @@ const debug = require('ghost-ignition').debug('web:parent'); const express = require('../../../shared/express'); const vhost = require('@tryghost/vhost-middleware'); -const config = require('../../config'); +const config = require('../../../shared/config'); const compress = require('compression'); const netjet = require('netjet'); const mw = require('./middleware'); diff --git a/core/server/web/shared/middlewares/api/spam-prevention.js b/core/server/web/shared/middlewares/api/spam-prevention.js index 8061bf3bf9..2cb5747f25 100644 --- a/core/server/web/shared/middlewares/api/spam-prevention.js +++ b/core/server/web/shared/middlewares/api/spam-prevention.js @@ -2,7 +2,7 @@ const moment = require('moment'); const extend = require('lodash/extend'); const pick = require('lodash/pick'); const errors = require('@tryghost/errors'); -const config = require('../../../../config'); +const config = require('../../../../../shared/config'); const {logging,i18n} = require('../../../../lib/common'); const spam = config.get('spam') || {}; diff --git a/core/server/web/shared/middlewares/custom-redirects.js b/core/server/web/shared/middlewares/custom-redirects.js index e0614ce23c..7c9a90d71f 100644 --- a/core/server/web/shared/middlewares/custom-redirects.js +++ b/core/server/web/shared/middlewares/custom-redirects.js @@ -3,7 +3,7 @@ const express = require('../../../../shared/express'); const url = require('url'); const path = require('path'); const debug = require('ghost-ignition').debug('web:shared:mw:custom-redirects'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const urlUtils = require('../../../lib/url-utils'); const errors = require('@tryghost/errors'); const {logging, i18n} = require('../../../lib/common'); diff --git a/core/server/web/shared/middlewares/error-handler.js b/core/server/web/shared/middlewares/error-handler.js index b1afab7322..d236a7d047 100644 --- a/core/server/web/shared/middlewares/error-handler.js +++ b/core/server/web/shared/middlewares/error-handler.js @@ -2,7 +2,7 @@ const hbs = require('express-hbs'); const _ = require('lodash'); const debug = require('ghost-ignition').debug('error-handler'); const errors = require('@tryghost/errors'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const {i18n} = require('../../../lib/common'); const helpers = require('../../../../frontend/services/routing/helpers'); const sentry = require('../../../../shared/sentry'); diff --git a/core/server/web/shared/middlewares/maintenance.js b/core/server/web/shared/middlewares/maintenance.js index 7695f03535..b71165cead 100644 --- a/core/server/web/shared/middlewares/maintenance.js +++ b/core/server/web/shared/middlewares/maintenance.js @@ -1,5 +1,5 @@ const errors = require('@tryghost/errors'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const {i18n} = require('../../../lib/common'); const urlService = require('../../../../frontend/services/url'); diff --git a/core/server/web/shared/middlewares/pretty-urls.js b/core/server/web/shared/middlewares/pretty-urls.js index 602e8c4275..ac9c445eb7 100644 --- a/core/server/web/shared/middlewares/pretty-urls.js +++ b/core/server/web/shared/middlewares/pretty-urls.js @@ -7,7 +7,7 @@ // @TODO optimise this to reduce the number of redirects required to get to a pretty URL // @TODO move this to being used by routers? const slashes = require('connect-slashes'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); module.exports = [ slashes(true, { diff --git a/core/server/web/site/app.js b/core/server/web/site/app.js index cf14cecec0..991779170b 100644 --- a/core/server/web/site/app.js +++ b/core/server/web/site/app.js @@ -6,7 +6,7 @@ const {URL} = require('url'); const errors = require('@tryghost/errors'); // App requires -const config = require('../../config'); +const config = require('../../../shared/config'); const constants = require('../../lib/constants'); const storage = require('../../adapters/storage'); const urlService = require('../../../frontend/services/url'); diff --git a/core/server/web/site/middleware/redirect-ghost-to-admin.js b/core/server/web/site/middleware/redirect-ghost-to-admin.js index 8538456eb6..1cb73dde5e 100644 --- a/core/server/web/site/middleware/redirect-ghost-to-admin.js +++ b/core/server/web/site/middleware/redirect-ghost-to-admin.js @@ -1,5 +1,5 @@ const express = require('../../../../shared/express'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const urlUtils = require('../../../lib/url-utils'); const adminRedirect = (path) => { diff --git a/core/server/web/site/middleware/serve-favicon.js b/core/server/web/site/middleware/serve-favicon.js index 4c1eb6d2e4..d7a9a57101 100644 --- a/core/server/web/site/middleware/serve-favicon.js +++ b/core/server/web/site/middleware/serve-favicon.js @@ -1,7 +1,7 @@ const fs = require('fs-extra'); const path = require('path'); const crypto = require('crypto'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const {blogIcon} = require('../../../lib/image'); const storage = require('../../../adapters/storage'); const urlUtils = require('../../../lib/url-utils'); diff --git a/core/server/web/site/middleware/serve-public-file.js b/core/server/web/site/middleware/serve-public-file.js index 216b559022..6ed9ac78eb 100644 --- a/core/server/web/site/middleware/serve-public-file.js +++ b/core/server/web/site/middleware/serve-public-file.js @@ -2,7 +2,7 @@ const crypto = require('crypto'); const fs = require('fs-extra'); const path = require('path'); const errors = require('@tryghost/errors'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const urlUtils = require('../../../lib/url-utils'); const {i18n} = require('../../../lib/common'); diff --git a/core/server/web/site/middleware/static-theme.js b/core/server/web/site/middleware/static-theme.js index cb914d4d29..e9ea41e1f2 100644 --- a/core/server/web/site/middleware/static-theme.js +++ b/core/server/web/site/middleware/static-theme.js @@ -1,5 +1,5 @@ const path = require('path'); -const config = require('../../../config'); +const config = require('../../../../shared/config'); const constants = require('../../../lib/constants'); const themeUtils = require('../../../../frontend/services/themes'); const express = require('../../../../shared/express'); diff --git a/core/server/config/defaults.json b/core/shared/config/defaults.json similarity index 100% rename from core/server/config/defaults.json rename to core/shared/config/defaults.json diff --git a/core/server/config/env/config.development.json b/core/shared/config/env/config.development.json similarity index 100% rename from core/server/config/env/config.development.json rename to core/shared/config/env/config.development.json diff --git a/core/server/config/env/config.production.json b/core/shared/config/env/config.production.json similarity index 100% rename from core/server/config/env/config.production.json rename to core/shared/config/env/config.production.json diff --git a/core/server/config/env/config.testing-mysql.json b/core/shared/config/env/config.testing-mysql.json similarity index 100% rename from core/server/config/env/config.testing-mysql.json rename to core/shared/config/env/config.testing-mysql.json diff --git a/core/server/config/env/config.testing.json b/core/shared/config/env/config.testing.json similarity index 100% rename from core/server/config/env/config.testing.json rename to core/shared/config/env/config.testing.json diff --git a/core/server/config/index.js b/core/shared/config/index.js similarity index 100% rename from core/server/config/index.js rename to core/shared/config/index.js diff --git a/core/server/config/overrides.json b/core/shared/config/overrides.json similarity index 100% rename from core/server/config/overrides.json rename to core/shared/config/overrides.json diff --git a/core/server/config/utils.js b/core/shared/config/utils.js similarity index 100% rename from core/server/config/utils.js rename to core/shared/config/utils.js diff --git a/core/shared/sentry.js b/core/shared/sentry.js index 777e58bbaf..fe89ed63cf 100644 --- a/core/shared/sentry.js +++ b/core/shared/sentry.js @@ -1,4 +1,4 @@ -const config = require('../server/config'); +const config = require('./config'); const sentryConfig = config.get('sentry'); const expressNoop = function (req, res, next) { diff --git a/test/api-acceptance/admin/actions_spec.js b/test/api-acceptance/admin/actions_spec.js index bea4ef73db..214f10af69 100644 --- a/test/api-acceptance/admin/actions_spec.js +++ b/test/api-acceptance/admin/actions_spec.js @@ -3,7 +3,7 @@ const Promise = require('bluebird'); const supertest = require('supertest'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/api-acceptance/admin/config_spec.js b/test/api-acceptance/admin/config_spec.js index 3972d20520..6ed27354d1 100644 --- a/test/api-acceptance/admin/config_spec.js +++ b/test/api-acceptance/admin/config_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/api-acceptance/admin/db_spec.js b/test/api-acceptance/admin/db_spec.js index 58f3d51d23..3f740464b0 100644 --- a/test/api-acceptance/admin/db_spec.js +++ b/test/api-acceptance/admin/db_spec.js @@ -2,7 +2,7 @@ const path = require('path'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const common = require('../../../core/server/lib/common'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/admin/email_preview_spec.js b/test/api-acceptance/admin/email_preview_spec.js index a96ad7f2f8..778c1a2bb2 100644 --- a/test/api-acceptance/admin/email_preview_spec.js +++ b/test/api-acceptance/admin/email_preview_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const models = require('../../../core/server/models/index'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/emails_spec.js b/test/api-acceptance/admin/emails_spec.js index e3773dfcb0..e09ad7329c 100644 --- a/test/api-acceptance/admin/emails_spec.js +++ b/test/api-acceptance/admin/emails_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/images_spec.js b/test/api-acceptance/admin/images_spec.js index 790b59cfe2..9af262b2a7 100644 --- a/test/api-acceptance/admin/images_spec.js +++ b/test/api-acceptance/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/integrations_spec.js b/test/api-acceptance/admin/integrations_spec.js index 350344b331..53b691cf03 100644 --- a/test/api-acceptance/admin/integrations_spec.js +++ b/test/api-acceptance/admin/integrations_spec.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const should = require('should'); const supertest = require('supertest'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/admin/invites_spec.js b/test/api-acceptance/admin/invites_spec.js index 571eb531bb..4b7c3f5796 100644 --- a/test/api-acceptance/admin/invites_spec.js +++ b/test/api-acceptance/admin/invites_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const mailService = require('../../../core/server/services/mail'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/key_authentication_spec.js b/test/api-acceptance/admin/key_authentication_spec.js index 7f48ce7b7b..d984fd1d70 100644 --- a/test/api-acceptance/admin/key_authentication_spec.js +++ b/test/api-acceptance/admin/key_authentication_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/mail_spec.js b/test/api-acceptance/admin/mail_spec.js index f6ae982361..e81783a2a5 100644 --- a/test/api-acceptance/admin/mail_spec.js +++ b/test/api-acceptance/admin/mail_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const mailService = require('../../../core/server/services/mail'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/admin/members_spec.js b/test/api-acceptance/admin/members_spec.js index f72f14ebb6..21b88f8f16 100644 --- a/test/api-acceptance/admin/members_spec.js +++ b/test/api-acceptance/admin/members_spec.js @@ -4,7 +4,7 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const labs = require('../../../core/server/services/labs'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/notifications_spec.js b/test/api-acceptance/admin/notifications_spec.js index 94e66fc85a..0dd4621f52 100644 --- a/test/api-acceptance/admin/notifications_spec.js +++ b/test/api-acceptance/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/oembed_spec.js b/test/api-acceptance/admin/oembed_spec.js index 5b39604793..4eedd91160 100644 --- a/test/api-acceptance/admin/oembed_spec.js +++ b/test/api-acceptance/admin/oembed_spec.js @@ -2,7 +2,7 @@ const nock = require('nock'); const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils/index'); -const config = require('../../../core/server/config/index'); +const config = require('../../../core/shared/config/index'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/pages_spec.js b/test/api-acceptance/admin/pages_spec.js index 87906c639c..5f787cecc3 100644 --- a/test/api-acceptance/admin/pages_spec.js +++ b/test/api-acceptance/admin/pages_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const models = require('../../../core/server/models'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/admin/posts_spec.js b/test/api-acceptance/admin/posts_spec.js index 4d93997a92..d62c87cc05 100644 --- a/test/api-acceptance/admin/posts_spec.js +++ b/test/api-acceptance/admin/posts_spec.js @@ -4,7 +4,7 @@ const _ = require('lodash'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const models = require('../../../core/server/models'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/admin/roles_spec.js b/test/api-acceptance/admin/roles_spec.js index eb9fe9b3ab..05f307785c 100644 --- a/test/api-acceptance/admin/roles_spec.js +++ b/test/api-acceptance/admin/roles_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/admin/settings_spec.js b/test/api-acceptance/admin/settings_spec.js index b0dc74f409..0d6b85aacb 100644 --- a/test/api-acceptance/admin/settings_spec.js +++ b/test/api-acceptance/admin/settings_spec.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const supertest = require('supertest'); const os = require('os'); const fs = require('fs-extra'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/slugs_spec.js b/test/api-acceptance/admin/slugs_spec.js index 7d058e784d..606a1d0f7e 100644 --- a/test/api-acceptance/admin/slugs_spec.js +++ b/test/api-acceptance/admin/slugs_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/test/api-acceptance/admin/tags_spec.js b/test/api-acceptance/admin/tags_spec.js index 7db86bf858..42865fbea8 100644 --- a/test/api-acceptance/admin/tags_spec.js +++ b/test/api-acceptance/admin/tags_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/themes_spec.js b/test/api-acceptance/admin/themes_spec.js index 848b953174..584a114bb3 100644 --- a/test/api-acceptance/admin/themes_spec.js +++ b/test/api-acceptance/admin/themes_spec.js @@ -4,7 +4,7 @@ const fs = require('fs'); const _ = require('lodash'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/admin/users_spec.js b/test/api-acceptance/admin/users_spec.js index 838a157961..03177a447b 100644 --- a/test/api-acceptance/admin/users_spec.js +++ b/test/api-acceptance/admin/users_spec.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const supertest = require('supertest'); const Promise = require('bluebird'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const db = require('../../../core/server/data/db'); const models = require('../../../core/server/models'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/admin/webhooks_spec.js b/test/api-acceptance/admin/webhooks_spec.js index e49cf2bb2d..b7b0a0726e 100644 --- a/test/api-acceptance/admin/webhooks_spec.js +++ b/test/api-acceptance/admin/webhooks_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/content/authors_spec.js b/test/api-acceptance/content/authors_spec.js index 10a48d9118..8563244a1c 100644 --- a/test/api-acceptance/content/authors_spec.js +++ b/test/api-acceptance/content/authors_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const _ = require('lodash'); const url = require('url'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const models = require('../../../core/server/models'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/test/api-acceptance/content/key_authentication_spec.js b/test/api-acceptance/content/key_authentication_spec.js index 2ba7adb310..267f5af5fa 100644 --- a/test/api-acceptance/content/key_authentication_spec.js +++ b/test/api-acceptance/content/key_authentication_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/content/pages_spec.js b/test/api-acceptance/content/pages_spec.js index a4fefdb923..8f133598d5 100644 --- a/test/api-acceptance/content/pages_spec.js +++ b/test/api-acceptance/content/pages_spec.js @@ -3,7 +3,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/content/posts_spec.js b/test/api-acceptance/content/posts_spec.js index d7899b0926..adbaa160e1 100644 --- a/test/api-acceptance/content/posts_spec.js +++ b/test/api-acceptance/content/posts_spec.js @@ -6,7 +6,7 @@ const cheerio = require('cheerio'); const moment = require('moment'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/api-acceptance/content/settings_spec.js b/test/api-acceptance/content/settings_spec.js index af6ff78130..9927a6f2a7 100644 --- a/test/api-acceptance/content/settings_spec.js +++ b/test/api-acceptance/content/settings_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const localUtils = require('./utils'); // Values to test against diff --git a/test/api-acceptance/content/tags_spec.js b/test/api-acceptance/content/tags_spec.js index 013e474dca..d3ce4b6e15 100644 --- a/test/api-acceptance/content/tags_spec.js +++ b/test/api-acceptance/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const _ = require('lodash'); const url = require('url'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/frontend-acceptance/default_routes_spec.js b/test/frontend-acceptance/default_routes_spec.js index cf1fa42280..7a298db61d 100644 --- a/test/frontend-acceptance/default_routes_spec.js +++ b/test/frontend-acceptance/default_routes_spec.js @@ -13,7 +13,7 @@ const cheerio = require('cheerio'); const _ = require('lodash'); const testUtils = require('../utils'); const configUtils = require('../utils/configUtils'); -const config = require('../../core/server/config'); +const config = require('../../core/shared/config'); const settingsCache = require('../../core/server/services/settings/cache'); const origCache = _.cloneDeep(settingsCache); const ghost = testUtils.startGhost; diff --git a/test/regression/api/admin_spec.js b/test/regression/api/admin_spec.js index 2ce4bc0455..7e46b506e9 100644 --- a/test/regression/api/admin_spec.js +++ b/test/regression/api/admin_spec.js @@ -11,7 +11,7 @@ const configUtils = require('../../utils/configUtils'); const urlUtils = require('../../utils/urlUtils'); const ghost = testUtils.startGhost; const {i18n} = require('../../../core/server/lib/common'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); let request; i18n.init(); diff --git a/test/regression/api/canary/admin/authentication_spec.js b/test/regression/api/canary/admin/authentication_spec.js index 2fc87301f5..4073465336 100644 --- a/test/regression/api/canary/admin/authentication_spec.js +++ b/test/regression/api/canary/admin/authentication_spec.js @@ -6,7 +6,7 @@ const testUtils = require('../../../../utils/index'); const models = require('../../../../../core/server/models/index'); const security = require('../../../../../core/server/lib/security/index'); const settingsCache = require('../../../../../core/server/services/settings/cache'); -const config = require('../../../../../core/server/config/index'); +const config = require('../../../../../core/shared/config/index'); const mailService = require('../../../../../core/server/services/mail/index'); let ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/db_spec.js b/test/regression/api/canary/admin/db_spec.js index f4c84963dc..5d25eb3300 100644 --- a/test/regression/api/canary/admin/db_spec.js +++ b/test/regression/api/canary/admin/db_spec.js @@ -6,7 +6,7 @@ const uuid = require('uuid'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const models = require('../../../../../core/server/models'); const common = require('../../../../../core/server/lib/common'); const testUtils = require('../../../../utils'); diff --git a/test/regression/api/canary/admin/identities_spec.js b/test/regression/api/canary/admin/identities_spec.js index 10becb5e55..913d9d5854 100644 --- a/test/regression/api/canary/admin/identities_spec.js +++ b/test/regression/api/canary/admin/identities_spec.js @@ -4,7 +4,7 @@ const jwt = require('jsonwebtoken'); const jwksClient = require('jwks-rsa'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/images_spec.js b/test/regression/api/canary/admin/images_spec.js index d52cb66ec0..7c63149e8f 100644 --- a/test/regression/api/canary/admin/images_spec.js +++ b/test/regression/api/canary/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/members_signin_url_spec.js b/test/regression/api/canary/admin/members_signin_url_spec.js index c6533f5249..9e3dba2fc9 100644 --- a/test/regression/api/canary/admin/members_signin_url_spec.js +++ b/test/regression/api/canary/admin/members_signin_url_spec.js @@ -4,7 +4,7 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const labs = require('../../../../../core/server/services/labs'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/members_spec.js b/test/regression/api/canary/admin/members_spec.js index f4b12d624a..10b7806030 100644 --- a/test/regression/api/canary/admin/members_spec.js +++ b/test/regression/api/canary/admin/members_spec.js @@ -4,7 +4,7 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const labs = require('../../../../../core/server/services/labs'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/notifications_spec.js b/test/regression/api/canary/admin/notifications_spec.js index e77020dc13..2e469908e7 100644 --- a/test/regression/api/canary/admin/notifications_spec.js +++ b/test/regression/api/canary/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/pages_spec.js b/test/regression/api/canary/admin/pages_spec.js index 6c0cc48e50..f269746cb6 100644 --- a/test/regression/api/canary/admin/pages_spec.js +++ b/test/regression/api/canary/admin/pages_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/canary/admin/posts_spec.js b/test/regression/api/canary/admin/posts_spec.js index 8c494446be..a6c7694eef 100644 --- a/test/regression/api/canary/admin/posts_spec.js +++ b/test/regression/api/canary/admin/posts_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const models = require('../../../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/redirects_spec.js b/test/regression/api/canary/admin/redirects_spec.js index 6b4fd1cf6a..b43b285afe 100644 --- a/test/regression/api/canary/admin/redirects_spec.js +++ b/test/regression/api/canary/admin/redirects_spec.js @@ -6,7 +6,7 @@ const path = require('path'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/canary/admin/schedules_spec.js b/test/regression/api/canary/admin/schedules_spec.js index 77fac94c52..0b4b6af78b 100644 --- a/test/regression/api/canary/admin/schedules_spec.js +++ b/test/regression/api/canary/admin/schedules_spec.js @@ -6,7 +6,7 @@ const sinon = require('sinon'); const moment = require('moment-timezone'); const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); const models = require('../../../../../core/server/models/index'); -const config = require('../../../../../core/server/config/index'); +const config = require('../../../../../core/shared/config/index'); const testUtils = require('../../../../utils/index'); const localUtils = require('./utils'); diff --git a/test/regression/api/canary/admin/settings_spec.js b/test/regression/api/canary/admin/settings_spec.js index f5aee62a0c..9a2e9dfb93 100644 --- a/test/regression/api/canary/admin/settings_spec.js +++ b/test/regression/api/canary/admin/settings_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/slack_spec.js b/test/regression/api/canary/admin/slack_spec.js index 6d832085e3..89a03baed5 100644 --- a/test/regression/api/canary/admin/slack_spec.js +++ b/test/regression/api/canary/admin/slack_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const common = require('../../../../../core/server/lib/common'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/admin/users_spec.js b/test/regression/api/canary/admin/users_spec.js index f49ce7d690..d4aef10335 100644 --- a/test/regression/api/canary/admin/users_spec.js +++ b/test/regression/api/canary/admin/users_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/canary/content/authors_spec.js b/test/regression/api/canary/content/authors_spec.js index 43a19db267..3bbab28051 100644 --- a/test/regression/api/canary/content/authors_spec.js +++ b/test/regression/api/canary/content/authors_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/canary/content/pages_spec.js b/test/regression/api/canary/content/pages_spec.js index 1a036c2932..bb689494c9 100644 --- a/test/regression/api/canary/content/pages_spec.js +++ b/test/regression/api/canary/content/pages_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/canary/content/posts_spec.js b/test/regression/api/canary/content/posts_spec.js index 0127706b10..4364ffd06a 100644 --- a/test/regression/api/canary/content/posts_spec.js +++ b/test/regression/api/canary/content/posts_spec.js @@ -8,7 +8,7 @@ const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); const urlUtils = require('../../../../utils/urlUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/canary/content/tags_spec.js b/test/regression/api/canary/content/tags_spec.js index 8815c9ac18..2fba0f703f 100644 --- a/test/regression/api/canary/content/tags_spec.js +++ b/test/regression/api/canary/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v2/admin/authentication_spec.js b/test/regression/api/v2/admin/authentication_spec.js index b78923b055..f617c0a6df 100644 --- a/test/regression/api/v2/admin/authentication_spec.js +++ b/test/regression/api/v2/admin/authentication_spec.js @@ -6,7 +6,7 @@ const testUtils = require('../../../../utils/index'); const models = require('../../../../../core/server/models/index'); const security = require('../../../../../core/server/lib/security/index'); const settingsCache = require('../../../../../core/server/services/settings/cache'); -const config = require('../../../../../core/server/config/index'); +const config = require('../../../../../core/shared/config/index'); const mailService = require('../../../../../core/server/services/mail/index'); const configUtils = require('../../../../utils/configUtils'); diff --git a/test/regression/api/v2/admin/db_spec.js b/test/regression/api/v2/admin/db_spec.js index d494b2bbb8..77fd75ca19 100644 --- a/test/regression/api/v2/admin/db_spec.js +++ b/test/regression/api/v2/admin/db_spec.js @@ -6,7 +6,7 @@ const uuid = require('uuid'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const models = require('../../../../../core/server/models'); const common = require('../../../../../core/server/lib/common'); const testUtils = require('../../../../utils'); diff --git a/test/regression/api/v2/admin/images_spec.js b/test/regression/api/v2/admin/images_spec.js index d52cb66ec0..7c63149e8f 100644 --- a/test/regression/api/v2/admin/images_spec.js +++ b/test/regression/api/v2/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v2/admin/notifications_spec.js b/test/regression/api/v2/admin/notifications_spec.js index e77020dc13..2e469908e7 100644 --- a/test/regression/api/v2/admin/notifications_spec.js +++ b/test/regression/api/v2/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v2/admin/oembed_spec.js b/test/regression/api/v2/admin/oembed_spec.js index 1c338c7756..b5dcc9099f 100644 --- a/test/regression/api/v2/admin/oembed_spec.js +++ b/test/regression/api/v2/admin/oembed_spec.js @@ -2,7 +2,7 @@ const nock = require('nock'); const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils/index'); -const config = require('../../../../../core/server/config/index'); +const config = require('../../../../../core/shared/config/index'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v2/admin/pages_spec.js b/test/regression/api/v2/admin/pages_spec.js index 6c0cc48e50..f269746cb6 100644 --- a/test/regression/api/v2/admin/pages_spec.js +++ b/test/regression/api/v2/admin/pages_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v2/admin/posts_spec.js b/test/regression/api/v2/admin/posts_spec.js index 992271b355..59e789f973 100644 --- a/test/regression/api/v2/admin/posts_spec.js +++ b/test/regression/api/v2/admin/posts_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const models = require('../../../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v2/admin/redirects_spec.js b/test/regression/api/v2/admin/redirects_spec.js index 6b4fd1cf6a..b43b285afe 100644 --- a/test/regression/api/v2/admin/redirects_spec.js +++ b/test/regression/api/v2/admin/redirects_spec.js @@ -6,7 +6,7 @@ const path = require('path'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v2/admin/schedules_spec.js b/test/regression/api/v2/admin/schedules_spec.js index fc1c33d4f0..ea43633e5c 100644 --- a/test/regression/api/v2/admin/schedules_spec.js +++ b/test/regression/api/v2/admin/schedules_spec.js @@ -6,7 +6,7 @@ const sinon = require('sinon'); const moment = require('moment-timezone'); const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); const models = require('../../../../../core/server/models/index'); -const config = require('../../../../../core/server/config/index'); +const config = require('../../../../../core/shared/config/index'); const testUtils = require('../../../../utils/index'); const localUtils = require('./utils'); diff --git a/test/regression/api/v2/admin/settings_spec.js b/test/regression/api/v2/admin/settings_spec.js index 43d2df1883..5a31f36df5 100644 --- a/test/regression/api/v2/admin/settings_spec.js +++ b/test/regression/api/v2/admin/settings_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v2/admin/slack_spec.js b/test/regression/api/v2/admin/slack_spec.js index 6d832085e3..89a03baed5 100644 --- a/test/regression/api/v2/admin/slack_spec.js +++ b/test/regression/api/v2/admin/slack_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const common = require('../../../../../core/server/lib/common'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v2/admin/users_spec.js b/test/regression/api/v2/admin/users_spec.js index f49ce7d690..d4aef10335 100644 --- a/test/regression/api/v2/admin/users_spec.js +++ b/test/regression/api/v2/admin/users_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v2/content/authors_spec.js b/test/regression/api/v2/content/authors_spec.js index 43a19db267..3bbab28051 100644 --- a/test/regression/api/v2/content/authors_spec.js +++ b/test/regression/api/v2/content/authors_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v2/content/pages_spec.js b/test/regression/api/v2/content/pages_spec.js index 0c2d88ae37..6b6da6ccfb 100644 --- a/test/regression/api/v2/content/pages_spec.js +++ b/test/regression/api/v2/content/pages_spec.js @@ -4,7 +4,7 @@ const supertest = require('supertest'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v2/content/posts_spec.js b/test/regression/api/v2/content/posts_spec.js index 9258bf1f1b..ddeec8730c 100644 --- a/test/regression/api/v2/content/posts_spec.js +++ b/test/regression/api/v2/content/posts_spec.js @@ -10,7 +10,7 @@ const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); const urlUtils = require('../../../../utils/urlUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v2/content/tags_spec.js b/test/regression/api/v2/content/tags_spec.js index f94b25b8de..a9674ef29a 100644 --- a/test/regression/api/v2/content/tags_spec.js +++ b/test/regression/api/v2/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v3/admin/authentication_spec.js b/test/regression/api/v3/admin/authentication_spec.js index 2fc87301f5..4073465336 100644 --- a/test/regression/api/v3/admin/authentication_spec.js +++ b/test/regression/api/v3/admin/authentication_spec.js @@ -6,7 +6,7 @@ const testUtils = require('../../../../utils/index'); const models = require('../../../../../core/server/models/index'); const security = require('../../../../../core/server/lib/security/index'); const settingsCache = require('../../../../../core/server/services/settings/cache'); -const config = require('../../../../../core/server/config/index'); +const config = require('../../../../../core/shared/config/index'); const mailService = require('../../../../../core/server/services/mail/index'); let ghost = testUtils.startGhost; diff --git a/test/regression/api/v3/admin/db_spec.js b/test/regression/api/v3/admin/db_spec.js index 4ed70bb6b8..88820bd4c5 100644 --- a/test/regression/api/v3/admin/db_spec.js +++ b/test/regression/api/v3/admin/db_spec.js @@ -6,7 +6,7 @@ const uuid = require('uuid'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const models = require('../../../../../core/server/models'); const common = require('../../../../../core/server/lib/common'); const testUtils = require('../../../../utils'); diff --git a/test/regression/api/v3/admin/images_spec.js b/test/regression/api/v3/admin/images_spec.js index d52cb66ec0..7c63149e8f 100644 --- a/test/regression/api/v3/admin/images_spec.js +++ b/test/regression/api/v3/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v3/admin/notifications_spec.js b/test/regression/api/v3/admin/notifications_spec.js index e77020dc13..2e469908e7 100644 --- a/test/regression/api/v3/admin/notifications_spec.js +++ b/test/regression/api/v3/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v3/admin/posts_spec.js b/test/regression/api/v3/admin/posts_spec.js index 9dd5d2afb0..38d97499ec 100644 --- a/test/regression/api/v3/admin/posts_spec.js +++ b/test/regression/api/v3/admin/posts_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const models = require('../../../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v3/admin/redirects_spec.js b/test/regression/api/v3/admin/redirects_spec.js index 6b4fd1cf6a..b43b285afe 100644 --- a/test/regression/api/v3/admin/redirects_spec.js +++ b/test/regression/api/v3/admin/redirects_spec.js @@ -6,7 +6,7 @@ const path = require('path'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v3/admin/schedules_spec.js b/test/regression/api/v3/admin/schedules_spec.js index 8ced262516..e08c4133bc 100644 --- a/test/regression/api/v3/admin/schedules_spec.js +++ b/test/regression/api/v3/admin/schedules_spec.js @@ -6,7 +6,7 @@ const sinon = require('sinon'); const moment = require('moment-timezone'); const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); const models = require('../../../../../core/server/models/index'); -const config = require('../../../../../core/server/config/index'); +const config = require('../../../../../core/shared/config/index'); const testUtils = require('../../../../utils/index'); const localUtils = require('./utils'); diff --git a/test/regression/api/v3/admin/settings_spec.js b/test/regression/api/v3/admin/settings_spec.js index 1c319141c4..ac5fba52a5 100644 --- a/test/regression/api/v3/admin/settings_spec.js +++ b/test/regression/api/v3/admin/settings_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v3/admin/slack_spec.js b/test/regression/api/v3/admin/slack_spec.js index 6d832085e3..89a03baed5 100644 --- a/test/regression/api/v3/admin/slack_spec.js +++ b/test/regression/api/v3/admin/slack_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const common = require('../../../../../core/server/lib/common'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v3/admin/users_spec.js b/test/regression/api/v3/admin/users_spec.js index f49ce7d690..d4aef10335 100644 --- a/test/regression/api/v3/admin/users_spec.js +++ b/test/regression/api/v3/admin/users_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../../../utils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v3/content/authors_spec.js b/test/regression/api/v3/content/authors_spec.js index 43a19db267..3bbab28051 100644 --- a/test/regression/api/v3/content/authors_spec.js +++ b/test/regression/api/v3/content/authors_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; diff --git a/test/regression/api/v3/content/pages_spec.js b/test/regression/api/v3/content/pages_spec.js index 6aea0e2f6b..4b3265e9a1 100644 --- a/test/regression/api/v3/content/pages_spec.js +++ b/test/regression/api/v3/content/pages_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v3/content/posts_spec.js b/test/regression/api/v3/content/posts_spec.js index 88bfe63bea..2e7fab73e9 100644 --- a/test/regression/api/v3/content/posts_spec.js +++ b/test/regression/api/v3/content/posts_spec.js @@ -8,7 +8,7 @@ const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); const urlUtils = require('../../../../utils/urlUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/api/v3/content/tags_spec.js b/test/regression/api/v3/content/tags_spec.js index fc0ca75e30..58e210d9b1 100644 --- a/test/regression/api/v3/content/tags_spec.js +++ b/test/regression/api/v3/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/server/config'); +const config = require('../../../../../core/shared/config'); const ghost = testUtils.startGhost; let request; diff --git a/test/regression/site/dynamic_routing_spec.js b/test/regression/site/dynamic_routing_spec.js index 0d66f8eae2..35fad6fda2 100644 --- a/test/regression/site/dynamic_routing_spec.js +++ b/test/regression/site/dynamic_routing_spec.js @@ -10,7 +10,7 @@ const path = require('path'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); const cheerio = require('cheerio'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const api = require('../../../core/server/api'); const settingsCache = require('../../../core/server/services/settings/cache'); const ghost = testUtils.startGhost; diff --git a/test/regression/site/frontend_spec.js b/test/regression/site/frontend_spec.js index b367522e46..66ccbb98dc 100644 --- a/test/regression/site/frontend_spec.js +++ b/test/regression/site/frontend_spec.js @@ -12,7 +12,7 @@ const _ = require('lodash'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); const urlUtils = require('../../utils/urlUtils'); -const config = require('../../../core/server/config'); +const config = require('../../../core/shared/config'); const settingsCache = require('../../../core/server/services/settings/cache'); const origCache = _.cloneDeep(settingsCache); const ghost = testUtils.startGhost; diff --git a/test/unit/adapters/scheduling/utils_spec.js b/test/unit/adapters/scheduling/utils_spec.js index fa3cc04c54..c7794c7a02 100644 --- a/test/unit/adapters/scheduling/utils_spec.js +++ b/test/unit/adapters/scheduling/utils_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const fs = require('fs-extra'); const configUtils = require('../../../utils/configUtils'); -const config = require('../../../../core/server/config'); +const config = require('../../../../core/shared/config'); const schedulingUtils = require('../../../../core/server/adapters/scheduling/utils'); const schedulingPath = configUtils.config.getContentPath('adapters') + 'scheduling/'; diff --git a/test/unit/config/index_spec.js b/test/unit/config/index_spec.js index 4dbe782812..e1902695d1 100644 --- a/test/unit/config/index_spec.js +++ b/test/unit/config/index_spec.js @@ -22,7 +22,7 @@ describe('Config', function () { beforeEach(function () { originalEnv = _.clone(process.env); originalArgv = _.clone(process.argv); - config = rewire('../../../core/server/config'); + config = rewire('../../../core/shared/config'); // we manually call `loadConf` in the tests and we need to ensure that the minimum // required config properties are available diff --git a/test/unit/config/utils_spec.js b/test/unit/config/utils_spec.js index bd3e712cd2..760dcb0c1e 100644 --- a/test/unit/config/utils_spec.js +++ b/test/unit/config/utils_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const configUtils = require('../../../core/server/config/utils'); +const configUtils = require('../../../core/shared/config/utils'); describe('UNIT: Config utils', function () { describe('makePathsAbsolute', function () { diff --git a/test/unit/services/themes/active_spec.js b/test/unit/services/themes/active_spec.js index 1258578da0..8b119c5a96 100644 --- a/test/unit/services/themes/active_spec.js +++ b/test/unit/services/themes/active_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const config = require('../../../../core/server/config'); +const config = require('../../../../core/shared/config'); // is only exposed via themes.getActive() const activeTheme = require('../../../../core/frontend/services/themes/active'); diff --git a/test/unit/services/themes/loader_spec.js b/test/unit/services/themes/loader_spec.js index d81976c32d..0e341b8b90 100644 --- a/test/unit/services/themes/loader_spec.js +++ b/test/unit/services/themes/loader_spec.js @@ -3,7 +3,7 @@ const sinon = require('sinon'); const fs = require('fs-extra'); const tmp = require('tmp'); const join = require('path').join; -const config = require('../../../../core/server/config'); +const config = require('../../../../core/shared/config'); const loader = require('../../../../core/frontend/services/themes/loader'); const themeList = require('../../../../core/frontend/services/themes/list'); diff --git a/test/utils/api.js b/test/utils/api.js index b97e5a1778..4076ce92fb 100644 --- a/test/utils/api.js +++ b/test/utils/api.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const url = require('url'); const moment = require('moment'); const DataGenerator = require('./fixtures/data-generator'); -const config = require('../../core/server/config'); +const config = require('../../core/shared/config'); const sequence = require('../../core/server/lib/promise/sequence'); const host = config.get('server').host; const port = config.get('server').port; diff --git a/test/utils/configUtils.js b/test/utils/configUtils.js index ac8514febf..bfa0093e38 100644 --- a/test/utils/configUtils.js +++ b/test/utils/configUtils.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const config = require('../../core/server/config'); +const config = require('../../core/shared/config'); const configUtils = {}; configUtils.config = config; diff --git a/test/utils/index.js b/test/utils/index.js index 78418e4c3a..e72280ae28 100644 --- a/test/utils/index.js +++ b/test/utils/index.js @@ -31,7 +31,7 @@ const DataGenerator = require('./fixtures/data-generator'); const configUtils = require('./configUtils'); const filterData = require('./fixtures/filter-param'); const APIUtils = require('./api'); -const config = require('../../core/server/config'); +const config = require('../../core/shared/config'); const knexMigrator = new KnexMigrator(); let fixtures; let getFixtureOps; diff --git a/test/utils/urlUtils.js b/test/utils/urlUtils.js index 16880ab7dd..0c2767c049 100644 --- a/test/utils/urlUtils.js +++ b/test/utils/urlUtils.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const sinon = require('sinon'); const UrlUtils = require('@tryghost/url-utils'); -const config = require('../../core/server/config'); +const config = require('../../core/shared/config'); const urlUtils = require('../../core/server/lib/url-utils'); const defaultSandbox = sinon.createSandbox();