Extracted frontend folder (#10780)

refs #10790

- Moved /core/apps into core/frontend
- Moved /core/server/helpers to /core/frontend/helpers along with /core/server/services/themes
- Changed helper location in overrides
- Moved /core/server/services/routing to /core/frontend/services
- Moved /core/server/services/url to /core/frontend/services
- Moved /core/server/data/meta to /core/frontend/meta
- Moved /core/server/services/rss to /core/frontend/services
- Moved /core/server/data/xml to /core/frontend/services

Gruntfile.js

@@ -9,7 +9,7 @@
 require('./core/server/overrides');
 
 const config = require('./core/server/config');
-const urlService = require('./core/server/services/url');
+const urlService = require('./core/frontend/services/url');
 const _ = require('lodash');
 const chalk = require('chalk');
 const fs = require('fs-extra');

core/server/apps/amp/index.js → core/frontend/apps/amp/index.js

@@ -1,9 +1,9 @@
 const router = require('./lib/router'),
     registerHelpers = require('./lib/helpers'),
-    urlUtils = require('../../lib/url-utils'),
+    urlUtils = require('../../../server/lib/url-utils'),
 
     // Dirty requires
-    settingsCache = require('../../services/settings/cache');
+    settingsCache = require('../../../server/services/settings/cache');
 
 function ampRouter(req, res) {
     if (settingsCache.get('amp') === true) {

core/server/apps/amp/lib/helpers/amp_content.js → core/frontend/apps/amp/lib/helpers/amp_content.js

@@ -13,7 +13,7 @@ const Promise = require('bluebird'),
     logging = proxy.logging,
     i18n = proxy.i18n,
     errors = proxy.errors,
-    urlUtils = require('../../../../lib/url-utils'),
+    urlUtils = require('../../../../../server/lib/url-utils'),
     amperizeCache = {};
 
 let allowedAMPTags = [],

core/server/apps/amp/lib/router.js → core/frontend/apps/amp/lib/router.js

@@ -3,7 +3,7 @@ const path = require('path'),
     ampRouter = express.Router(),
 
     // Dirty requires
-    common = require('../../../lib/common'),
+    common = require('../../../../server/lib/common'),
     urlService = require('../../../services/url'),
     helpers = require('../../../services/routing/helpers'),
     templateName = 'amp';

core/server/apps/private-blogging/index.js → core/frontend/apps/private-blogging/index.js

@@ -1,5 +1,5 @@
-const urlUtils = require('../../lib/url-utils'),
-    common = require('../../lib/common'),
+const urlUtils = require('../../../server/lib/url-utils'),
+    common = require('../../../server/lib/common'),
     middleware = require('./lib/middleware'),
     router = require('./lib/router'),
     registerHelpers = require('./lib/helpers'),

core/server/apps/private-blogging/lib/middleware.js → core/frontend/apps/private-blogging/lib/middleware.js

@@ -3,11 +3,11 @@ const url = require('url');
 const session = require('cookie-session');
 const crypto = require('crypto');
 const path = require('path');
-const config = require('../../../config');
-const urlUtils = require('../../../lib/url-utils');
-const constants = require('../../../lib/constants');
-const common = require('../../../lib/common');
-const settingsCache = require('../../../services/settings/cache');
+const config = require('../../../../server/config');
+const urlUtils = require('../../../../server/lib/url-utils');
+const constants = require('../../../../server/lib/constants');
+const common = require('../../../../server/lib/common');
+const settingsCache = require('../../../../server/services/settings/cache');
 // routeKeywords.private: 'private'
 const privateRoute = '/private/';
 

core/server/apps/private-blogging/lib/router.js → core/frontend/apps/private-blogging/lib/router.js

@@ -3,7 +3,7 @@ const path = require('path'),
     middleware = require('./middleware'),
     bodyParser = require('body-parser'),
     routing = require('../../../services/routing'),
-    web = require('../../../web'),
+    web = require('../../../../server/web'),
     templateName = 'private',
     privateRouter = express.Router();
 

core/server/apps/subscribers/index.js → core/frontend/apps/subscribers/index.js

@@ -1,7 +1,7 @@
 const router = require('./lib/router'),
     registerHelpers = require('./lib/helpers'),
     // Dirty requires
-    labs = require('../../services/labs');
+    labs = require('../../../server/services/labs');
 
 module.exports = {
     activate(ghost) {

core/server/apps/subscribers/lib/helpers/index.js → core/frontend/apps/subscribers/lib/helpers/index.js

@@ -1,5 +1,5 @@
 // Dirty requires!
-const labs = require('../../../../services/labs');
+const labs = require('../../../../../server/services/labs');
 
 module.exports = function registerHelpers(ghost) {
     ghost.helpers.register('input_email', require('./input_email'));

core/server/apps/subscribers/lib/router.js → core/frontend/apps/subscribers/lib/router.js

@@ -4,10 +4,10 @@ const path = require('path'),
     subscribeRouter = express.Router(),
     bodyParser = require('body-parser'),
     // Dirty requires
-    common = require('../../../lib/common'),
-    urlUtils = require('../../../lib/url-utils'),
+    common = require('../../../../server/lib/common'),
+    urlUtils = require('../../../../server/lib/url-utils'),
     urlService = require('../../../services/url'),
-    validator = require('../../../data/validation').validator,
+    validator = require('../../../../server/data/validation').validator,
     routing = require('../../../services/routing'),
     templateName = 'subscribe';
 
@@ -77,7 +77,7 @@ function handleSource(req, res, next) {
 function storeSubscriber(req, res, next) {
     req.body.status = 'subscribed';
 
-    const api = require('../../../api')[res.locals.apiVersion];
+    const api = require('../../../../server/api')[res.locals.apiVersion];
 
     if (_.isEmpty(req.body.email)) {
         return next(new common.errors.ValidationError({message: 'Email cannot be blank.'}));

core/server/helpers/navigation.js → core/frontend/helpers/navigation.js

@@ -3,7 +3,7 @@
 // Outputs navigation menu of static urls
 
 var proxy = require('./proxy'),
-    string = require('../lib/security/string'),
+    string = require('../../server/lib/security/string'),
     _ = require('lodash'),
     SafeString = proxy.SafeString,
     createFrame = proxy.hbs.handlebars.createFrame,

core/server/helpers/proxy.js → core/frontend/helpers/proxy.js

@@ -2,8 +2,8 @@
 // With the exception of modules like lodash, Bluebird
 // We can later refactor to enforce this something like we do in apps
 var hbs = require('../services/themes/engine'),
-    settingsCache = require('../services/settings/cache'),
-    config = require('../config');
+    settingsCache = require('../../server/services/settings/cache'),
+    config = require('../../server/config');
 
 // Direct requires:
 // - lodash
@@ -18,18 +18,18 @@ module.exports = {
     escapeExpression: hbs.escapeExpression,
 
     // TODO: Expose less of the API to make this safe
-    api: require('../api'),
+    api: require('../../server/api'),
 
     // TODO: Only expose "get"
     settingsCache: settingsCache,
 
     // These 3 are kind of core and required all the time
-    errors: require('../lib/common/errors'),
-    i18n: require('../lib/common/i18n'),
-    logging: require('../lib/common/logging'),
+    errors: require('../../server/lib/common/errors'),
+    i18n: require('../../server/lib/common/i18n'),
+    logging: require('../../server/lib/common/logging'),
 
     // This is used to detect if "isPost" is true in prevNext.
-    checks: require('../data/schema').checks,
+    checks: require('../../server/data/schema').checks,
 
     // Config!
     // Keys used:
@@ -40,26 +40,26 @@ module.exports = {
     },
 
     // Labs utils for enabling/disabling helpers
-    labs: require('../services/labs'),
+    labs: require('../../server/services/labs'),
 
     // Things required from data/meta
     metaData: {
-        get: require('../data/meta'), // ghost_head
-        getAssetUrl: require('../data/meta/asset_url'), // asset
-        getMetaDataExcerpt: require('../data/meta/excerpt'), // excerpt
-        getMetaDataDescription: require('../data/meta/description'), // meta_desc
-        getMetaDataTitle: require('../data/meta/title'), // meta_title
-        getPaginatedUrl: require('../data/meta/paginated_url'), // page_url
-        getMetaDataUrl: require('../data/meta/url') // url
+        get: require('../meta'), // ghost_head
+        getAssetUrl: require('../meta/asset_url'), // asset
+        getMetaDataExcerpt: require('../meta/excerpt'), // excerpt
+        getMetaDataDescription: require('../meta/description'), // meta_desc
+        getMetaDataTitle: require('../meta/title'), // meta_title
+        getPaginatedUrl: require('../meta/paginated_url'), // page_url
+        getMetaDataUrl: require('../meta/url') // url
     },
 
     // The local template thing, should this be merged with the channels one?
     templates: require('./template'),
 
     // Various utils, needs cleaning up / simplifying
     socialUrls: require('@tryghost/social-urls'),
-    blogIcon: require('../lib/image/blog-icon'),
+    blogIcon: require('../../server/lib/image/blog-icon'),
     urlService: require('../services/url'),
-    urlUtils: require('../lib/url-utils'),
+    urlUtils: require('../../server/lib/url-utils'),
     localUtils: require('./utils')
 };

core/server/helpers/reading_time.js → core/frontend/helpers/reading_time.js

@@ -11,7 +11,7 @@
 // Returns estimated reading time for post
 
 const proxy = require('./proxy');
-const schema = require('../data/schema').checks;
+const schema = require('../../server/data/schema').checks;
 const SafeString = proxy.SafeString;
 const calculateReadingTime = require('@tryghost/helpers').readingTime;
 

core/server/helpers/register.js → core/frontend/helpers/register.js

@@ -1,6 +1,6 @@
 var hbs = require('../services/themes/engine'),
     Promise = require('bluebird'),
-    config = require('../config'),
+    config = require('../../server/config'),
     proxy = require('./proxy');
 
 // Register an async handlebars helper for a given handlebars instance

core/server/data/meta/amp_url.js → core/frontend/meta/amp_url.js

@@ -1,4 +1,4 @@
-var urlUtils = require('../../lib/url-utils'),
+var urlUtils = require('../../server/lib/url-utils'),
     getUrl = require('./url'),
     _ = require('lodash');
 

core/server/data/meta/asset_url.js → core/frontend/meta/asset_url.js

@@ -1,7 +1,7 @@
 const crypto = require('crypto'),
-    config = require('../../config'),
-    imageLib = require('../../lib/image'),
-    urlUtils = require('../../lib/url-utils');
+    config = require('../../server/config'),
+    imageLib = require('../../server/lib/image'),
+    urlUtils = require('../../server/lib/url-utils');
 
 /**
  * Serve either uploaded favicon or default

core/server/data/meta/author_image.js → core/frontend/meta/author_image.js

@@ -1,4 +1,4 @@
-var urlUtils = require('../../lib/url-utils'),
+var urlUtils = require('../../server/lib/url-utils'),
     getContextObject = require('./context_object.js'),
     _ = require('lodash');
 

core/server/data/meta/author_url.js → core/frontend/meta/author_url.js

@@ -1,4 +1,4 @@
-var urlService = require('../../services/url');
+var urlService = require('../services/url');
 
 function getAuthorUrl(data, absolute) {
     var context = data.context ? data.context[0] : null;

core/server/data/meta/blog_logo.js → core/frontend/meta/blog_logo.js

@@ -1,6 +1,6 @@
-var urlUtils = require('../../lib/url-utils'),
-    settingsCache = require('../../services/settings/cache'),
-    imageLib = require('../../lib/image');
+var urlUtils = require('../../server/lib/url-utils'),
+    settingsCache = require('../../server/services/settings/cache'),
+    imageLib = require('../../server/lib/image');
 
 function getBlogLogo() {
     var logo = {};

core/server/data/meta/canonical_url.js → core/frontend/meta/canonical_url.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const urlUtils = require('../../lib/url-utils');
+const urlUtils = require('../../server/lib/url-utils');
 const getUrl = require('./url');
 
 function getCanonicalUrl(data) {

core/server/data/meta/context_object.js → core/frontend/meta/context_object.js

@@ -1,4 +1,4 @@
-var settingsCache = require('../../services/settings/cache'),
+var settingsCache = require('../../server/services/settings/cache'),
     _ = require('lodash');
 
 function getContextObject(data, context) {

core/server/data/meta/cover_image.js → core/frontend/meta/cover_image.js

@@ -1,4 +1,4 @@
-var urlUtils = require('../../lib/url-utils'),
+var urlUtils = require('../../server/lib/url-utils'),
     getContextObject = require('./context_object.js'),
     _ = require('lodash');
 

core/server/data/meta/description.js → core/frontend/meta/description.js

@@ -1,5 +1,5 @@
 var _ = require('lodash'),
-    settingsCache = require('../../services/settings/cache');
+    settingsCache = require('../../server/services/settings/cache');
 
 function getDescription(data, root, options) {
     var description = '',

core/server/data/meta/image-dimensions.js → core/frontend/meta/image-dimensions.js

@@ -1,6 +1,6 @@
 var Promise = require('bluebird'),
     _ = require('lodash'),
-    imageLib = require('../../lib/image');
+    imageLib = require('../../server/lib/image');
 
 /**
  * Get Image dimensions

core/server/data/meta/index.js → core/frontend/meta/index.js

@@ -1,7 +1,7 @@
 var Promise = require('bluebird'),
-    settingsCache = require('../../services/settings/cache'),
-    urlUtils = require('../../lib/url-utils'),
-    common = require('../../lib/common'),
+    settingsCache = require('../../server/services/settings/cache'),
+    urlUtils = require('../../server/lib/url-utils'),
+    common = require('../../server/lib/common'),
     getUrl = require('./url'),
     getImageDimensions = require('./image-dimensions'),
     getCanonicalUrl = require('./canonical_url'),

core/server/data/meta/og_image.js → core/frontend/meta/og_image.js

@@ -1,4 +1,4 @@
-var urlUtils = require('../../lib/url-utils'),
+var urlUtils = require('../../server/lib/url-utils'),
     getContextObject = require('./context_object.js'),
     _ = require('lodash');
 

core/server/data/meta/paginated_url.js → core/frontend/meta/paginated_url.js

@@ -1,5 +1,5 @@
 var _ = require('lodash'),
-    urlUtils = require('../../lib/url-utils');
+    urlUtils = require('../../server/lib/url-utils');
 
 function getPaginatedUrl(page, data, absolute) {
     // If we don't have enough information, return null right away

core/server/data/meta/rss_url.js → core/frontend/meta/rss_url.js

@@ -1,4 +1,4 @@
-const routingService = require('../../services/routing');
+const routingService = require('../services/routing');
 
 function getRssUrl(data, absolute) {
     return routingService.registry.getRssUrl({

core/server/data/meta/schema.js → core/frontend/meta/schema.js

@@ -1,5 +1,5 @@
-var config = require('../../config'),
-    escapeExpression = require('../../services/themes/engine').escapeExpression,
+var config = require('../../server/config'),
+    escapeExpression = require('../services/themes/engine').escapeExpression,
     socialUrls = require('@tryghost/social-urls'),
     _ = require('lodash');
 

core/server/data/meta/title.js → core/frontend/meta/title.js

@@ -1,5 +1,5 @@
 var _ = require('lodash'),
-    settingsCache = require('../../services/settings/cache');
+    settingsCache = require('../../server/services/settings/cache');
 
 function getTitle(data, root, options) {
     var title = '',

core/server/data/meta/twitter_image.js → core/frontend/meta/twitter_image.js

@@ -1,4 +1,4 @@
-var urlUtils = require('../../lib/url-utils'),
+var urlUtils = require('../../server/lib/url-utils'),
     getContextObject = require('./context_object.js'),
     _ = require('lodash');
 

core/server/data/meta/url.js → core/frontend/meta/url.js

@@ -1,6 +1,6 @@
-var schema = require('../schema').checks,
-    urlUtils = require('../../lib/url-utils'),
-    urlService = require('../../services/url');
+var schema = require('../../server/data/schema').checks,
+    urlUtils = require('../../server/lib/url-utils'),
+    urlService = require('../services/url');
 
 // This cleans the url from any `/amp` postfixes, so we'll never
 // output a url with `/amp` in the end, except for the needed `amphtml`

core/server/services/routing/CollectionRouter.js → core/frontend/services/routing/CollectionRouter.js

@@ -1,6 +1,6 @@
 const debug = require('ghost-ignition').debug('services:routing:collection-router');
-const common = require('../../lib/common');
-const urlUtils = require('../../lib/url-utils');
+const common = require('../../../server/lib/common');
+const urlUtils = require('../../../server/lib/url-utils');
 const ParentRouter = require('./ParentRouter');
 
 const controllers = require('./controllers');

core/server/services/routing/ParentRouter.js → core/frontend/services/routing/ParentRouter.js

@@ -12,8 +12,8 @@ const debug = require('ghost-ignition').debug('services:routing:ParentRouter'),
     express = require('express'),
     _ = require('lodash'),
     url = require('url'),
-    security = require('../../lib/security'),
-    urlUtils = require('../../lib/url-utils'),
+    security = require('../../../server/lib/security'),
+    urlUtils = require('../../../server/lib/url-utils'),
     registry = require('./registry');
 
 /**

core/server/services/routing/PreviewRouter.js → core/frontend/services/routing/PreviewRouter.js

@@ -1,5 +1,5 @@
 const ParentRouter = require('./ParentRouter');
-const urlUtils = require('../../lib/url-utils');
+const urlUtils = require('../../../server/lib/url-utils');
 const controllers = require('./controllers');
 
 /**

core/server/services/routing/RSSRouter.js → core/frontend/services/routing/RSSRouter.js

@@ -1,5 +1,5 @@
 const ParentRouter = require('./ParentRouter');
-const urlUtils = require('../../lib/url-utils');
+const urlUtils = require('../../../server/lib/url-utils');
 
 const controllers = require('./controllers');
 const middlewares = require('./middlewares');

core/server/services/routing/StaticPagesRouter.js → core/frontend/services/routing/StaticPagesRouter.js

@@ -1,8 +1,8 @@
 const debug = require('ghost-ignition').debug('services:routing:static-pages-router');
-const urlUtils = require('../../lib/url-utils');
+const urlUtils = require('../../../server/lib/url-utils');
 const ParentRouter = require('./ParentRouter');
 const controllers = require('./controllers');
-const common = require('../../lib/common');
+const common = require('../../../server/lib/common');
 
 /**
  * @description Resource: pages

core/server/services/routing/StaticRoutesRouter.js → core/frontend/services/routing/StaticRoutesRouter.js

@@ -1,6 +1,6 @@
 const debug = require('ghost-ignition').debug('services:routing:static-routes-router');
-const common = require('../../lib/common');
-const urlUtils = require('../../lib/url-utils');
+const common = require('../../../server/lib/common');
+const urlUtils = require('../../../server/lib/url-utils');
 const RSSRouter = require('./RSSRouter');
 const controllers = require('./controllers');
 const middlewares = require('./middlewares');