- .*?<\/ol><\/div>/, '');
// Make sure to have space between paragraphs and new lines
diff --git a/core/frontend/meta/image-dimensions.js b/core/frontend/meta/image-dimensions.js
index d453c07eb8..b77fa3c2d9 100644
--- a/core/frontend/meta/image-dimensions.js
+++ b/core/frontend/meta/image-dimensions.js
@@ -1,6 +1,6 @@
-var Promise = require('bluebird'),
- _ = require('lodash'),
- imageLib = require('../../server/lib/image');
+const Promise = require('bluebird');
+const _ = require('lodash');
+const imageLib = require('../../server/lib/image');
/**
* Get Image dimensions
@@ -10,7 +10,7 @@ var Promise = require('bluebird'),
* called to receive image width and height
*/
function getImageDimensions(metaData) {
- var fetch = {
+ const fetch = {
coverImage: imageLib.imageSizeCache(metaData.coverImage.url),
authorImage: imageLib.imageSizeCache(metaData.authorImage.url),
ogImage: imageLib.imageSizeCache(metaData.ogImage.url),
diff --git a/core/frontend/meta/index.js b/core/frontend/meta/index.js
index 31d84360aa..92ad2be665 100644
--- a/core/frontend/meta/index.js
+++ b/core/frontend/meta/index.js
@@ -1,80 +1,81 @@
-var Promise = require('bluebird'),
- 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'),
- getAmpUrl = require('./amp_url'),
- getPaginatedUrl = require('./paginated_url'),
- getAuthorUrl = require('./author_url'),
- getBlogLogo = require('./blog_logo'),
- getRssUrl = require('./rss_url'),
- getTitle = require('./title'),
- getDescription = require('./description'),
- getCoverImage = require('./cover_image'),
- getAuthorImage = require('./author_image'),
- getAuthorFacebook = require('./author_fb_url'),
- getCreatorTwitter = require('./creator_url'),
- getKeywords = require('./keywords'),
- getPublishedDate = require('./published_date'),
- getModifiedDate = require('./modified_date'),
- getOgType = require('./og_type'),
- getOgImage = require('./og_image'),
- getTwitterImage = require('./twitter_image'),
- getStructuredData = require('./structured_data'),
- getSchema = require('./schema'),
- getExcerpt = require('./excerpt');
+const Promise = require('bluebird');
+const settingsCache = require('../../server/services/settings/cache');
+const urlUtils = require('../../server/lib/url-utils');
+const common = require('../../server/lib/common');
+const getUrl = require('./url');
+const getImageDimensions = require('./image-dimensions');
+const getCanonicalUrl = require('./canonical_url');
+const getAmpUrl = require('./amp_url');
+const getPaginatedUrl = require('./paginated_url');
+const getAuthorUrl = require('./author_url');
+const getBlogLogo = require('./blog_logo');
+const getRssUrl = require('./rss_url');
+const getTitle = require('./title');
+const getDescription = require('./description');
+const getCoverImage = require('./cover_image');
+const getAuthorImage = require('./author_image');
+const getAuthorFacebook = require('./author_fb_url');
+const getCreatorTwitter = require('./creator_url');
+const getKeywords = require('./keywords');
+const getPublishedDate = require('./published_date');
+const getModifiedDate = require('./modified_date');
+const getOgType = require('./og_type');
+const getOgImage = require('./og_image');
+const getTwitterImage = require('./twitter_image');
+const getStructuredData = require('./structured_data');
+const getSchema = require('./schema');
+const getExcerpt = require('./excerpt');
function getMetaData(data, root) {
- var metaData = {
- url: getUrl(data, true),
- canonicalUrl: getCanonicalUrl(data),
- ampUrl: getAmpUrl(data),
- previousUrl: getPaginatedUrl('prev', data, true),
- nextUrl: getPaginatedUrl('next', data, true),
- authorUrl: getAuthorUrl(data, true),
- rssUrl: getRssUrl(data, true),
- metaTitle: getTitle(data, root),
- metaDescription: getDescription(data, root) || null,
- coverImage: {
- url: getCoverImage(data, true)
- },
- authorImage: {
- url: getAuthorImage(data, true)
- },
- ogImage: {
- url: getOgImage(data)
- },
- ogTitle: getTitle(data, root, {property: 'og'}),
- ogDescription: getDescription(data, root, {property: 'og'}),
- twitterImage: getTwitterImage(data, true),
- twitterTitle: getTitle(data, root, {property: 'twitter'}),
- twitterDescription: getDescription(data, root, {property: 'twitter'}),
- authorFacebook: getAuthorFacebook(data),
- creatorTwitter: getCreatorTwitter(data),
- keywords: getKeywords(data),
- publishedDate: getPublishedDate(data),
- modifiedDate: getModifiedDate(data),
- ogType: getOgType(data),
- // @TODO: pass into each meta helper - wrap each helper
- site: {
- title: settingsCache.get('title'),
- description: settingsCache.get('description'),
- url: urlUtils.urlFor('home', true),
- facebook: settingsCache.get('facebook'),
- twitter: settingsCache.get('twitter'),
- timezone: settingsCache.get('active_timezone'),
- navigation: settingsCache.get('navigation'),
- icon: settingsCache.get('icon'),
- cover_image: settingsCache.get('cover_image'),
- logo: getBlogLogo(),
- amp: settingsCache.get('amp')
- }
+ const metaData = {
+ url: getUrl(data, true),
+ canonicalUrl: getCanonicalUrl(data),
+ ampUrl: getAmpUrl(data),
+ previousUrl: getPaginatedUrl('prev', data, true),
+ nextUrl: getPaginatedUrl('next', data, true),
+ authorUrl: getAuthorUrl(data, true),
+ rssUrl: getRssUrl(data, true),
+ metaTitle: getTitle(data, root),
+ metaDescription: getDescription(data, root) || null,
+ coverImage: {
+ url: getCoverImage(data, true)
},
- customExcerpt,
- metaDescription,
- fallbackExcerpt;
+ authorImage: {
+ url: getAuthorImage(data, true)
+ },
+ ogImage: {
+ url: getOgImage(data)
+ },
+ ogTitle: getTitle(data, root, {property: 'og'}),
+ ogDescription: getDescription(data, root, {property: 'og'}),
+ twitterImage: getTwitterImage(data, true),
+ twitterTitle: getTitle(data, root, {property: 'twitter'}),
+ twitterDescription: getDescription(data, root, {property: 'twitter'}),
+ authorFacebook: getAuthorFacebook(data),
+ creatorTwitter: getCreatorTwitter(data),
+ keywords: getKeywords(data),
+ publishedDate: getPublishedDate(data),
+ modifiedDate: getModifiedDate(data),
+ ogType: getOgType(data),
+ // @TODO: pass into each meta helper - wrap each helper
+ site: {
+ title: settingsCache.get('title'),
+ description: settingsCache.get('description'),
+ url: urlUtils.urlFor('home', true),
+ facebook: settingsCache.get('facebook'),
+ twitter: settingsCache.get('twitter'),
+ timezone: settingsCache.get('active_timezone'),
+ navigation: settingsCache.get('navigation'),
+ icon: settingsCache.get('icon'),
+ cover_image: settingsCache.get('cover_image'),
+ logo: getBlogLogo(),
+ amp: settingsCache.get('amp')
+ }
+ };
+
+ let customExcerpt;
+ let metaDescription;
+ let fallbackExcerpt;
// TODO: cleanup these if statements
// NOTE: should use 'post' OR 'page' once https://github.com/TryGhost/Ghost/issues/10042 is resolved
diff --git a/core/frontend/meta/modified_date.js b/core/frontend/meta/modified_date.js
index b4efcef7f7..93432b1b4b 100644
--- a/core/frontend/meta/modified_date.js
+++ b/core/frontend/meta/modified_date.js
@@ -1,8 +1,8 @@
-var _ = require('lodash');
+const _ = require('lodash');
function getModifiedDate(data) {
- var context = data.context ? data.context : null,
- modDate;
+ let context = data.context ? data.context : null;
+ let modDate;
context = _.includes(context, 'amp') ? 'post' : context;
diff --git a/core/frontend/meta/og_type.js b/core/frontend/meta/og_type.js
index 2ccb056efd..673c187022 100644
--- a/core/frontend/meta/og_type.js
+++ b/core/frontend/meta/og_type.js
@@ -1,5 +1,5 @@
function getOgType(data) {
- var context = data.context ? data.context[0] : null;
+ let context = data.context ? data.context[0] : null;
context = context === 'amp' ? 'post' : context;
diff --git a/core/frontend/meta/paginated_url.js b/core/frontend/meta/paginated_url.js
index ac9bf5a3ba..437173021e 100644
--- a/core/frontend/meta/paginated_url.js
+++ b/core/frontend/meta/paginated_url.js
@@ -1,20 +1,25 @@
-var _ = require('lodash'),
- urlUtils = require('../../server/lib/url-utils');
+const _ = require('lodash');
+const urlUtils = require('../../server/lib/url-utils');
function getPaginatedUrl(page, data, absolute) {
// If we don't have enough information, return null right away
if (!data || !data.relativeUrl || !data.pagination) {
return null;
}
+
// routeKeywords.page: 'page'
- var pagePath = urlUtils.urlJoin('/page/'),
- // Try to match the base url, as whatever precedes the pagePath
- // routeKeywords.page: 'page'
- baseUrlPattern = new RegExp('(.+)?(/page/\\d+/)'),
- baseUrlMatch = data.relativeUrl.match(baseUrlPattern),
- // If there is no match for pagePath, use the original url, without the trailing slash
- baseUrl = baseUrlMatch ? baseUrlMatch[1] : data.relativeUrl.slice(0, -1),
- newRelativeUrl;
+ const pagePath = urlUtils.urlJoin('/page/');
+
+ // Try to match the base url, as whatever precedes the pagePath
+ // routeKeywords.page: 'page'
+ const baseUrlPattern = new RegExp('(.+)?(/page/\\d+/)');
+
+ const baseUrlMatch = data.relativeUrl.match(baseUrlPattern);
+
+ // If there is no match for pagePath, use the original url, without the trailing slash
+ const baseUrl = baseUrlMatch ? baseUrlMatch[1] : data.relativeUrl.slice(0, -1);
+
+ let newRelativeUrl;
if (page === 'next' && data.pagination.next) {
newRelativeUrl = urlUtils.urlJoin(pagePath, data.pagination.next, '/');
diff --git a/core/frontend/meta/published_date.js b/core/frontend/meta/published_date.js
index f1cc1c1b15..044e2ef418 100644
--- a/core/frontend/meta/published_date.js
+++ b/core/frontend/meta/published_date.js
@@ -1,5 +1,5 @@
function getPublishedDate(data) {
- var context = data.context ? data.context[0] : null;
+ let context = data.context ? data.context[0] : null;
context = context === 'amp' ? 'post' : context;
diff --git a/core/frontend/meta/schema.js b/core/frontend/meta/schema.js
index 6c9cbfc555..f67741f06d 100644
--- a/core/frontend/meta/schema.js
+++ b/core/frontend/meta/schema.js
@@ -1,10 +1,10 @@
-var config = require('../../server/config'),
- escapeExpression = require('../services/themes/engine').escapeExpression,
- socialUrls = require('@tryghost/social-urls'),
- _ = require('lodash');
+const config = require('../../server/config');
+const escapeExpression = require('../services/themes/engine').escapeExpression;
+const socialUrls = require('@tryghost/social-urls');
+const _ = require('lodash');
function schemaImageObject(metaDataVal) {
- var imageObject;
+ let imageObject;
if (!metaDataVal) {
return null;
}
@@ -23,7 +23,7 @@ function schemaImageObject(metaDataVal) {
}
function schemaPublisherObject(metaDataVal) {
- var publisherObject;
+ let publisherObject;
publisherObject = {
'@type': 'Organization',
@@ -37,7 +37,7 @@ function schemaPublisherObject(metaDataVal) {
// Creates the final schema object with values that are not null
function trimSchema(schema) {
- var schemaObject = {};
+ const schemaObject = {};
_.each(schema, function (value, key) {
if (value !== null && typeof value !== 'undefined') {
@@ -49,7 +49,7 @@ function trimSchema(schema) {
}
function trimSameAs(data, context) {
- var sameAs = [];
+ const sameAs = [];
if (context === 'post' || context === 'page') {
if (data[context].primary_author.website) {
@@ -79,8 +79,9 @@ function trimSameAs(data, context) {
function getPostSchema(metaData, data) {
// CASE: metaData.excerpt for post context is populated by either the custom excerpt, the meta description,
// or the automated excerpt of 50 words. It is empty for any other context.
- var description = metaData.excerpt ? escapeExpression(metaData.excerpt) : null,
- schema;
+ const description = metaData.excerpt ? escapeExpression(metaData.excerpt) : null;
+
+ let schema;
const context = data.page ? 'page' : 'post';
@@ -116,7 +117,7 @@ function getPostSchema(metaData, data) {
}
function getHomeSchema(metaData) {
- var schema = {
+ const schema = {
'@context': 'https://schema.org',
'@type': 'WebSite',
publisher: schemaPublisherObject(metaData),
@@ -134,7 +135,7 @@ function getHomeSchema(metaData) {
}
function getTagSchema(metaData, data) {
- var schema = {
+ const schema = {
'@context': 'https://schema.org',
'@type': 'Series',
publisher: schemaPublisherObject(metaData),
@@ -154,7 +155,7 @@ function getTagSchema(metaData, data) {
}
function getAuthorSchema(metaData, data) {
- var schema = {
+ const schema = {
'@context': 'https://schema.org',
'@type': 'Person',
sameAs: trimSameAs(data, 'author'),
@@ -175,7 +176,7 @@ function getAuthorSchema(metaData, data) {
function getSchema(metaData, data) {
if (!config.isPrivacyDisabled('useStructuredData')) {
- var context = data.context ? data.context : null;
+ const context = data.context ? data.context : null;
if (_.includes(context, 'post') || _.includes(context, 'page') || _.includes(context, 'amp')) {
return getPostSchema(metaData, data);
} else if (_.includes(context, 'home')) {
diff --git a/core/frontend/meta/structured_data.js b/core/frontend/meta/structured_data.js
index e2a24df897..d6ac7f369a 100644
--- a/core/frontend/meta/structured_data.js
+++ b/core/frontend/meta/structured_data.js
@@ -1,8 +1,8 @@
-var socialUrls = require('@tryghost/social-urls');
+const socialUrls = require('@tryghost/social-urls');
function getStructuredData(metaData) {
- var structuredData,
- card = 'summary';
+ let structuredData;
+ let card = 'summary';
if (metaData.twitterImage || metaData.coverImage.url) {
card = 'summary_large_image';
@@ -46,7 +46,7 @@ function getStructuredData(metaData) {
// return structured data removing null or undefined keys
return Object.keys(structuredData).reduce(function (data, key) {
- var content = structuredData[key];
+ const content = structuredData[key];
if (content !== null && typeof content !== 'undefined') {
data[key] = content;
}
diff --git a/core/frontend/meta/url.js b/core/frontend/meta/url.js
index 2fccd86502..deb54ffe4e 100644
--- a/core/frontend/meta/url.js
+++ b/core/frontend/meta/url.js
@@ -1,6 +1,6 @@
-var schema = require('../../server/data/schema').checks,
- urlUtils = require('../../server/lib/url-utils'),
- urlService = require('../services/url');
+const schema = require('../../server/data/schema').checks;
+const urlUtils = require('../../server/lib/url-utils');
+const 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`
diff --git a/core/frontend/services/proxy.js b/core/frontend/services/proxy.js
index d4d46ea29c..014d15fdb8 100644
--- a/core/frontend/services/proxy.js
+++ b/core/frontend/services/proxy.js
@@ -1,9 +1,10 @@
// This file defines everything that helpers "require"
// With the exception of modules like lodash, Bluebird
// We can later refactor to enforce this something like we did in apps
-var hbs = require('./themes/engine'),
- settingsCache = require('../../server/services/settings/cache'),
- config = require('../../server/config');
+const hbs = require('./themes/engine');
+
+const settingsCache = require('../../server/services/settings/cache');
+const config = require('../../server/config');
// Direct requires:
// - lodash
diff --git a/core/frontend/services/routing/CollectionRouter.js b/core/frontend/services/routing/CollectionRouter.js
index d1d12f580a..28da81e173 100644
--- a/core/frontend/services/routing/CollectionRouter.js
+++ b/core/frontend/services/routing/CollectionRouter.js
@@ -147,8 +147,8 @@ class CollectionRouter extends ParentRouter {
* @private
*/
_onTimezoneEdited(settingModel) {
- const newTimezone = settingModel.attributes.value,
- previousTimezone = settingModel._previousAttributes.value;
+ const newTimezone = settingModel.attributes.value;
+ const previousTimezone = settingModel._previousAttributes.value;
if (newTimezone === previousTimezone) {
return;
diff --git a/core/frontend/services/routing/ParentRouter.js b/core/frontend/services/routing/ParentRouter.js
index ded60743d8..1aef782132 100644
--- a/core/frontend/services/routing/ParentRouter.js
+++ b/core/frontend/services/routing/ParentRouter.js
@@ -7,14 +7,15 @@
* Only allows for .use and .get at the moment - we don't have clear use-cases for anything else yet.
*/
-const debug = require('ghost-ignition').debug('services:routing:ParentRouter'),
- EventEmitter = require('events').EventEmitter,
- express = require('express'),
- _ = require('lodash'),
- url = require('url'),
- security = require('../../../server/lib/security'),
- urlUtils = require('../../../server/lib/url-utils'),
- registry = require('./registry');
+const debug = require('ghost-ignition').debug('services:routing:ParentRouter');
+
+const EventEmitter = require('events').EventEmitter;
+const express = require('express');
+const _ = require('lodash');
+const url = require('url');
+const security = require('../../../server/lib/security');
+const urlUtils = require('../../../server/lib/url-utils');
+const registry = require('./registry');
/**
* @description Inherited express router, which gives control to us.
diff --git a/core/frontend/services/routing/controllers/channel.js b/core/frontend/services/routing/controllers/channel.js
index 1f9601e276..165d9c8853 100644
--- a/core/frontend/services/routing/controllers/channel.js
+++ b/core/frontend/services/routing/controllers/channel.js
@@ -1,9 +1,9 @@
-const _ = require('lodash'),
- debug = require('ghost-ignition').debug('services:routing:controllers:channel'),
- common = require('../../../../server/lib/common'),
- security = require('../../../../server/lib/security'),
- themes = require('../../themes'),
- helpers = require('../helpers');
+const _ = require('lodash');
+const debug = require('ghost-ignition').debug('services:routing:controllers:channel');
+const common = require('../../../../server/lib/common');
+const security = require('../../../../server/lib/security');
+const themes = require('../../themes');
+const helpers = require('../helpers');
/**
* @description Channel controller.
diff --git a/core/frontend/services/routing/controllers/collection.js b/core/frontend/services/routing/controllers/collection.js
index d0d67a2d41..892de33066 100644
--- a/core/frontend/services/routing/controllers/collection.js
+++ b/core/frontend/services/routing/controllers/collection.js
@@ -1,10 +1,10 @@
-const _ = require('lodash'),
- debug = require('ghost-ignition').debug('services:routing:controllers:collection'),
- common = require('../../../../server/lib/common'),
- security = require('../../../../server/lib/security'),
- urlService = require('../../url'),
- themes = require('../../themes'),
- helpers = require('../helpers');
+const _ = require('lodash');
+const debug = require('ghost-ignition').debug('services:routing:controllers:collection');
+const common = require('../../../../server/lib/common');
+const security = require('../../../../server/lib/security');
+const urlService = require('../../url');
+const themes = require('../../themes');
+const helpers = require('../helpers');
/**
* @description Collection controller.
diff --git a/core/frontend/services/routing/controllers/rss.js b/core/frontend/services/routing/controllers/rss.js
index b00249bf34..0bfec1f0dd 100644
--- a/core/frontend/services/routing/controllers/rss.js
+++ b/core/frontend/services/routing/controllers/rss.js
@@ -1,15 +1,15 @@
-const _ = require('lodash'),
- debug = require('ghost-ignition').debug('services:routing:controllers:rss'),
- url = require('url'),
- security = require('../../../../server/lib/security'),
- settingsCache = require('../../../../server/services/settings/cache'),
- rssService = require('../../rss'),
- helpers = require('../helpers');
+const _ = require('lodash');
+const debug = require('ghost-ignition').debug('services:routing:controllers:rss');
+const url = require('url');
+const security = require('../../../../server/lib/security');
+const settingsCache = require('../../../../server/services/settings/cache');
+const rssService = require('../../rss');
+const helpers = require('../helpers');
// @TODO: is this really correct? Should we be using meta data title?
function getTitle(relatedData) {
relatedData = relatedData || {};
- var titleStart = _.get(relatedData, 'author[0].name') || _.get(relatedData, 'tag[0].name') || '';
+ let titleStart = _.get(relatedData, 'author[0].name') || _.get(relatedData, 'tag[0].name') || '';
titleStart += titleStart ? ' - ' : '';
return titleStart + settingsCache.get('title');
diff --git a/core/frontend/services/routing/controllers/static.js b/core/frontend/services/routing/controllers/static.js
index 38430518d5..f113d3e5b7 100644
--- a/core/frontend/services/routing/controllers/static.js
+++ b/core/frontend/services/routing/controllers/static.js
@@ -1,7 +1,7 @@
-const _ = require('lodash'),
- Promise = require('bluebird'),
- debug = require('ghost-ignition').debug('services:routing:controllers:static'),
- helpers = require('../helpers');
+const _ = require('lodash');
+const Promise = require('bluebird');
+const debug = require('ghost-ignition').debug('services:routing:controllers:static');
+const helpers = require('../helpers');
function processQuery(query, locals) {
const api = require('../../../../server/api')[locals.apiVersion];
diff --git a/core/frontend/services/routing/helpers/context.js b/core/frontend/services/routing/helpers/context.js
index 0e387eaa9a..8894866615 100644
--- a/core/frontend/services/routing/helpers/context.js
+++ b/core/frontend/services/routing/helpers/context.js
@@ -10,15 +10,17 @@
* 2. req.params.page - always has the page parameter, regardless of if the URL contains a keyword
* 3. data - used for telling the difference between posts and pages
*/
-const // @TODO: fix this!! These regexes are app specific and should be dynamic. They should not belong here....
- // routeKeywords.private: 'private'
- privatePattern = new RegExp('^\\/private\\/'),
- // routeKeywords.amp: 'amp'
- ampPattern = new RegExp('\\/amp\\/$'),
- homePattern = new RegExp('^\\/$');
+// @TODO: fix this!! These regexes are app specific and should be dynamic. They should not belong here....
+// routeKeywords.private: 'private'
+const privatePattern = new RegExp('^\\/private\\/');
+
+// routeKeywords.amp: 'amp'
+const ampPattern = new RegExp('\\/amp\\/$');
+
+const homePattern = new RegExp('^\\/$');
function setResponseContext(req, res, data) {
- var pageParam = req.params && req.params.page !== undefined ? parseInt(req.params.page, 10) : 1;
+ const pageParam = req.params && req.params.page !== undefined ? parseInt(req.params.page, 10) : 1;
res.locals = res.locals || {};
res.locals.context = [];
diff --git a/core/frontend/services/routing/helpers/fetch-data.js b/core/frontend/services/routing/helpers/fetch-data.js
index df09c1f97c..f642542f83 100644
--- a/core/frontend/services/routing/helpers/fetch-data.js
+++ b/core/frontend/services/routing/helpers/fetch-data.js
@@ -72,8 +72,8 @@ function fetchData(pathOptions, routerOptions, locals) {
pathOptions = pathOptions || {};
routerOptions = routerOptions || {};
- let postQuery = _.cloneDeep(defaultPostQuery),
- props = {};
+ let postQuery = _.cloneDeep(defaultPostQuery);
+ let props = {};
if (routerOptions.filter) {
postQuery.options.filter = routerOptions.filter;
diff --git a/core/frontend/services/routing/helpers/format-response.js b/core/frontend/services/routing/helpers/format-response.js
index 77fbf5e1b9..349cb9eeed 100644
--- a/core/frontend/services/routing/helpers/format-response.js
+++ b/core/frontend/services/routing/helpers/format-response.js
@@ -6,7 +6,7 @@ const _ = require('lodash');
* @return {Object} containing page variables
*/
function formatPageResponse(result) {
- var response = {};
+ const response = {};
if (result.posts) {
response.posts = result.posts;
diff --git a/core/frontend/services/routing/helpers/render-entries.js b/core/frontend/services/routing/helpers/render-entries.js
index bd3d1e4750..ef96fb7e2c 100644
--- a/core/frontend/services/routing/helpers/render-entries.js
+++ b/core/frontend/services/routing/helpers/render-entries.js
@@ -1,6 +1,6 @@
-const debug = require('ghost-ignition').debug('services:routing:helpers:render-entries'),
- formatResponse = require('./format-response'),
- renderer = require('./renderer');
+const debug = require('ghost-ignition').debug('services:routing:helpers:render-entries');
+const formatResponse = require('./format-response');
+const renderer = require('./renderer');
/**
* @description Helper to handle rendering multiple resources.
diff --git a/core/frontend/services/routing/helpers/render-entry.js b/core/frontend/services/routing/helpers/render-entry.js
index 2c684bdd38..d25daa417e 100644
--- a/core/frontend/services/routing/helpers/render-entry.js
+++ b/core/frontend/services/routing/helpers/render-entry.js
@@ -1,6 +1,6 @@
-const debug = require('ghost-ignition').debug('services:routing:helpers:render-post'),
- formatResponse = require('./format-response'),
- renderer = require('./renderer');
+const debug = require('ghost-ignition').debug('services:routing:helpers:render-post');
+const formatResponse = require('./format-response');
+const renderer = require('./renderer');
/**
* @description Helper to handle rendering multiple resources.
*
diff --git a/core/frontend/services/routing/helpers/renderer.js b/core/frontend/services/routing/helpers/renderer.js
index 2515638c0d..3b057a07a7 100644
--- a/core/frontend/services/routing/helpers/renderer.js
+++ b/core/frontend/services/routing/helpers/renderer.js
@@ -1,6 +1,6 @@
-const debug = require('ghost-ignition').debug('services:routing:helpers:renderer'),
- setContext = require('./context'),
- templates = require('./templates');
+const debug = require('ghost-ignition').debug('services:routing:helpers:renderer');
+const setContext = require('./context');
+const templates = require('./templates');
/**
* @description Helper function to finally render the data.
diff --git a/core/frontend/services/routing/helpers/templates.js b/core/frontend/services/routing/helpers/templates.js
index 60f0410e80..709370a755 100644
--- a/core/frontend/services/routing/helpers/templates.js
+++ b/core/frontend/services/routing/helpers/templates.js
@@ -2,12 +2,13 @@
//
// Figure out which template should be used to render a request
// based on the templates which are allowed, and what is available in the theme
-const _ = require('lodash'),
- path = require('path'),
- url = require('url'),
- config = require('../../../../server/config'),
- themes = require('../../themes'),
- _private = {};
+const _ = require('lodash');
+
+const path = require('path');
+const url = require('url');
+const config = require('../../../../server/config');
+const themes = require('../../themes');
+const _private = {};
/**
* @description Get Error Template Hierarchy
@@ -20,8 +21,8 @@ const _ = require('lodash'),
* @returns {String[]}
*/
_private.getErrorTemplateHierarchy = function getErrorTemplateHierarchy(statusCode) {
- const errorCode = _.toString(statusCode),
- templateList = ['error'];
+ const errorCode = _.toString(statusCode);
+ const templateList = ['error'];
// Add error class template: E.g. error-4xx.hbs or error-5xx.hbs
templateList.unshift('error-' + errorCode[0] + 'xx');
@@ -141,20 +142,20 @@ _private.pickTemplate = function pickTemplate(templateList, fallback) {
};
_private.getTemplateForEntry = function getTemplateForEntry(postObject) {
- const templateList = _private.getEntryTemplateHierarchy(postObject),
- fallback = templateList[templateList.length - 1];
+ const templateList = _private.getEntryTemplateHierarchy(postObject);
+ const fallback = templateList[templateList.length - 1];
return _private.pickTemplate(templateList, fallback);
};
_private.getTemplateForEntries = function getTemplateForEntries(routerOptions, requestOptions) {
- const templateList = _private.getEntriesTemplateHierarchy(routerOptions, requestOptions),
- fallback = templateList[templateList.length - 1];
+ const templateList = _private.getEntriesTemplateHierarchy(routerOptions, requestOptions);
+ const fallback = templateList[templateList.length - 1];
return _private.pickTemplate(templateList, fallback);
};
_private.getTemplateForError = function getTemplateForError(statusCode) {
- const templateList = _private.getErrorTemplateHierarchy(statusCode),
- fallback = path.resolve(config.get('paths').defaultViews, 'error.hbs');
+ const templateList = _private.getErrorTemplateHierarchy(statusCode);
+ const fallback = path.resolve(config.get('paths').defaultViews, 'error.hbs');
return _private.pickTemplate(templateList, fallback);
};
diff --git a/core/frontend/services/routing/middlewares/page-param.js b/core/frontend/services/routing/middlewares/page-param.js
index 68d3c80e7c..74dd16bf9b 100644
--- a/core/frontend/services/routing/middlewares/page-param.js
+++ b/core/frontend/services/routing/middlewares/page-param.js
@@ -1,5 +1,5 @@
-const common = require('../../../../server/lib/common'),
- urlUtils = require('../../../../server/lib/url-utils');
+const common = require('../../../../server/lib/common');
+const urlUtils = require('../../../../server/lib/url-utils');
/**
* @description Middleware, which validates and interprets the page param e.g. /page/1
diff --git a/core/frontend/services/rss/cache.js b/core/frontend/services/rss/cache.js
index 5e1a7bf772..531881b978 100644
--- a/core/frontend/services/rss/cache.js
+++ b/core/frontend/services/rss/cache.js
@@ -1,9 +1,9 @@
-var crypto = require('crypto'),
- generateFeed = require('./generate-feed'),
- feedCache = {};
+const crypto = require('crypto');
+const generateFeed = require('./generate-feed');
+const feedCache = {};
module.exports.getXML = function getFeedXml(baseUrl, data) {
- var dataHash = crypto.createHash('md5').update(JSON.stringify(data)).digest('hex');
+ const dataHash = crypto.createHash('md5').update(JSON.stringify(data)).digest('hex');
if (!feedCache[baseUrl] || feedCache[baseUrl].hash !== dataHash) {
// We need to regenerate
feedCache[baseUrl] = {
diff --git a/core/frontend/services/rss/generate-feed.js b/core/frontend/services/rss/generate-feed.js
index 2d499a7fe8..d3cc407032 100644
--- a/core/frontend/services/rss/generate-feed.js
+++ b/core/frontend/services/rss/generate-feed.js
@@ -1,12 +1,12 @@
-var downsize = require('downsize'),
- Promise = require('bluebird'),
- cheerio = require('cheerio'),
- RSS = require('rss'),
- urlUtils = require('../../../server/lib/url-utils'),
- urlService = require('../url'),
- generateFeed,
- generateItem,
- generateTags;
+const downsize = require('downsize');
+const Promise = require('bluebird');
+const cheerio = require('cheerio');
+const RSS = require('rss');
+const urlUtils = require('../../../server/lib/url-utils');
+const urlService = require('../url');
+let generateFeed;
+let generateItem;
+let generateTags;
generateTags = function generateTags(data) {
if (data.tags) {
diff --git a/core/frontend/services/rss/renderer.js b/core/frontend/services/rss/renderer.js
index 4be8bd4efd..9a15afc918 100644
--- a/core/frontend/services/rss/renderer.js
+++ b/core/frontend/services/rss/renderer.js
@@ -1,9 +1,9 @@
-var _ = require('lodash'),
- rssCache = require('./cache');
+const _ = require('lodash');
+const rssCache = require('./cache');
module.exports.render = function render(res, baseUrl, data) {
// Format data - this is the same as what Express does
- var rssData = _.merge({}, res.locals, data);
+ const rssData = _.merge({}, res.locals, data);
// Fetch RSS from the cache
return rssCache
diff --git a/core/frontend/services/settings/ensure-settings.js b/core/frontend/services/settings/ensure-settings.js
index 2e87ff1a75..a8e83be1fe 100644
--- a/core/frontend/services/settings/ensure-settings.js
+++ b/core/frontend/services/settings/ensure-settings.js
@@ -1,9 +1,9 @@
-const fs = require('fs-extra'),
- Promise = require('bluebird'),
- path = require('path'),
- debug = require('ghost-ignition').debug('frontend:services:settings:ensure-settings'),
- common = require('../../../server/lib/common'),
- config = require('../../../server/config');
+const fs = require('fs-extra');
+const Promise = require('bluebird');
+const path = require('path');
+const debug = require('ghost-ignition').debug('frontend:services:settings:ensure-settings');
+const common = require('../../../server/lib/common');
+const config = require('../../../server/config');
/**
* Makes sure that all supported settings files are in the
@@ -16,13 +16,13 @@ const fs = require('fs-extra'),
* copy the default yaml file over.
*/
module.exports = function ensureSettingsFiles(knownSettings) {
- const contentPath = config.getContentPath('settings'),
- defaultSettingsPath = config.get('paths').defaultSettings;
+ const contentPath = config.getContentPath('settings');
+ const defaultSettingsPath = config.get('paths').defaultSettings;
return Promise.each(knownSettings, function (setting) {
- const fileName = `${setting}.yaml`,
- defaultFileName = `default-${fileName}`,
- filePath = path.join(contentPath, fileName);
+ const fileName = `${setting}.yaml`;
+ const defaultFileName = `default-${fileName}`;
+ const filePath = path.join(contentPath, fileName);
return fs.readFile(filePath, 'utf8')
.catch({code: 'ENOENT'}, () => {
diff --git a/core/frontend/services/settings/index.js b/core/frontend/services/settings/index.js
index 589c1cda08..f9b2032a2f 100644
--- a/core/frontend/services/settings/index.js
+++ b/core/frontend/services/settings/index.js
@@ -68,8 +68,8 @@ module.exports = {
* `/content/settings` directory.
*/
getAll: function getAll() {
- const knownSettings = this.knownSettings(),
- settingsToReturn = {};
+ const knownSettings = this.knownSettings();
+ const settingsToReturn = {};
_.each(knownSettings, function (setting) {
settingsToReturn[setting] = SettingsLoader(setting);
diff --git a/core/frontend/services/settings/loader.js b/core/frontend/services/settings/loader.js
index 9a9d8ccc11..3eda489c56 100644
--- a/core/frontend/services/settings/loader.js
+++ b/core/frontend/services/settings/loader.js
@@ -1,10 +1,10 @@
-const fs = require('fs-extra'),
- path = require('path'),
- debug = require('ghost-ignition').debug('frontend:services:settings:settings-loader'),
- common = require('../../../server/lib/common'),
- config = require('../../../server/config'),
- yamlParser = require('./yaml-parser'),
- validate = require('./validate');
+const fs = require('fs-extra');
+const path = require('path');
+const debug = require('ghost-ignition').debug('frontend:services:settings:settings-loader');
+const common = require('../../../server/lib/common');
+const config = require('../../../server/config');
+const yamlParser = require('./yaml-parser');
+const validate = require('./validate');
/**
* Reads the desired settings YAML file and passes the
diff --git a/core/frontend/services/settings/yaml-parser.js b/core/frontend/services/settings/yaml-parser.js
index c8bc335a0f..0c1c0cfbff 100644
--- a/core/frontend/services/settings/yaml-parser.js
+++ b/core/frontend/services/settings/yaml-parser.js
@@ -1,6 +1,6 @@
-const yaml = require('js-yaml'),
- debug = require('ghost-ignition').debug('frontend:services:settings:yaml-parser'),
- common = require('../../../server/lib/common');
+const yaml = require('js-yaml');
+const debug = require('ghost-ignition').debug('frontend:services:settings:yaml-parser');
+const common = require('../../../server/lib/common');
/**
* Takes a YAML file, parses it and returns a JSON Object
diff --git a/core/frontend/services/sitemap/base-generator.js b/core/frontend/services/sitemap/base-generator.js
index 4f023762c5..1cdcb659e3 100644
--- a/core/frontend/services/sitemap/base-generator.js
+++ b/core/frontend/services/sitemap/base-generator.js
@@ -1,9 +1,9 @@
-const _ = require('lodash'),
- xml = require('xml'),
- moment = require('moment'),
- path = require('path'),
- urlUtils = require('../../../server/lib/url-utils'),
- localUtils = require('./utils');
+const _ = require('lodash');
+const xml = require('xml');
+const moment = require('moment');
+const path = require('path');
+const urlUtils = require('../../../server/lib/url-utils');
+const localUtils = require('./utils');
// Sitemap specific xml namespace declarations that should not change
const XMLNS_DECLS = {
@@ -22,24 +22,28 @@ class BaseSiteMapGenerator {
}
generateXmlFromNodes() {
- var self = this,
- // Get a mapping of node to timestamp
- timedNodes = _.map(this.nodeLookup, function (node, id) {
- return {
- id: id,
- // Using negative here to sort newest to oldest
- ts: -(self.nodeTimeLookup[id] || 0),
- node: node
- };
- }, []),
- // Sort nodes by timestamp
- sortedNodes = _.sortBy(timedNodes, 'ts'),
- // Grab just the nodes
- urlElements = _.map(sortedNodes, 'node'),
- data = {
- // Concat the elements to the _attr declaration
- urlset: [XMLNS_DECLS].concat(urlElements)
+ const self = this;
+
+ // Get a mapping of node to timestamp
+ const timedNodes = _.map(this.nodeLookup, function (node, id) {
+ return {
+ id: id,
+ // Using negative here to sort newest to oldest
+ ts: -(self.nodeTimeLookup[id] || 0),
+ node: node
};
+ }, []);
+
+ // Sort nodes by timestamp
+ const sortedNodes = _.sortBy(timedNodes, 'ts');
+
+ // Grab just the nodes
+ const urlElements = _.map(sortedNodes, 'node');
+
+ const data = {
+ // Concat the elements to the _attr declaration
+ urlset: [XMLNS_DECLS].concat(urlElements)
+ };
// Return the xml
return localUtils.getDeclarations() + xml(data);
@@ -83,7 +87,8 @@ class BaseSiteMapGenerator {
}
createUrlNodeFromDatum(url, datum) {
- let node, imgNode;
+ let node;
+ let imgNode;
node = {
url: [
@@ -103,9 +108,10 @@ class BaseSiteMapGenerator {
createImageNodeFromDatum(datum) {
// Check for cover first because user has cover but the rest only have image
- var image = datum.cover_image || datum.profile_image || datum.feature_image,
- imageUrl,
- imageEl;
+ const image = datum.cover_image || datum.profile_image || datum.feature_image;
+
+ let imageUrl;
+ let imageEl;
if (!image) {
return;
diff --git a/core/frontend/services/sitemap/handler.js b/core/frontend/services/sitemap/handler.js
index e0434e1a4e..da131f1f57 100644
--- a/core/frontend/services/sitemap/handler.js
+++ b/core/frontend/services/sitemap/handler.js
@@ -1,6 +1,6 @@
-const config = require('../../../server/config'),
- Manager = require('./manager'),
- manager = new Manager();
+const config = require('../../../server/config');
+const Manager = require('./manager');
+const manager = new Manager();
// Responsible for handling requests for sitemap files
module.exports = function handler(siteApp) {
@@ -22,8 +22,8 @@ module.exports = function handler(siteApp) {
});
siteApp.get('/sitemap-:resource.xml', verifyResourceType, function sitemapResourceXML(req, res) {
- var type = req.params.resource,
- page = 1;
+ const type = req.params.resource;
+ const page = 1;
res.set({
'Cache-Control': 'public, max-age=' + config.get('caching:sitemap:maxAge'),
diff --git a/core/frontend/services/sitemap/index-generator.js b/core/frontend/services/sitemap/index-generator.js
index bce7a3f33d..a08a20e365 100644
--- a/core/frontend/services/sitemap/index-generator.js
+++ b/core/frontend/services/sitemap/index-generator.js
@@ -1,8 +1,8 @@
-const _ = require('lodash'),
- xml = require('xml'),
- moment = require('moment'),
- urlUtils = require('../../../server/lib/url-utils'),
- localUtils = require('./utils');
+const _ = require('lodash');
+const xml = require('xml');
+const moment = require('moment');
+const urlUtils = require('../../../server/lib/url-utils');
+const localUtils = require('./utils');
const XMLNS_DECLS = {
_attr: {
@@ -17,11 +17,12 @@ class SiteMapIndexGenerator {
}
getXml() {
- const urlElements = this.generateSiteMapUrlElements(),
- data = {
- // Concat the elements to the _attr declaration
- sitemapindex: [XMLNS_DECLS].concat(urlElements)
- };
+ const urlElements = this.generateSiteMapUrlElements();
+
+ const data = {
+ // Concat the elements to the _attr declaration
+ sitemapindex: [XMLNS_DECLS].concat(urlElements)
+ };
// Return the xml
return localUtils.getDeclarations() + xml(data);
@@ -29,8 +30,8 @@ class SiteMapIndexGenerator {
generateSiteMapUrlElements() {
return _.map(this.types, (resourceType) => {
- var url = urlUtils.urlFor({relativeUrl: '/sitemap-' + resourceType.name + '.xml'}, true),
- lastModified = resourceType.lastModified;
+ const url = urlUtils.urlFor({relativeUrl: '/sitemap-' + resourceType.name + '.xml'}, true);
+ const lastModified = resourceType.lastModified;
return {
sitemap: [
diff --git a/core/frontend/services/sitemap/manager.js b/core/frontend/services/sitemap/manager.js
index ec63b6f5f2..52c45eb96e 100644
--- a/core/frontend/services/sitemap/manager.js
+++ b/core/frontend/services/sitemap/manager.js
@@ -1,9 +1,9 @@
-const common = require('../../../server/lib/common'),
- IndexMapGenerator = require('./index-generator'),
- PagesMapGenerator = require('./page-generator'),
- PostsMapGenerator = require('./post-generator'),
- UsersMapGenerator = require('./user-generator'),
- TagsMapGenerator = require('./tag-generator');
+const common = require('../../../server/lib/common');
+const IndexMapGenerator = require('./index-generator');
+const PagesMapGenerator = require('./page-generator');
+const PostsMapGenerator = require('./post-generator');
+const UsersMapGenerator = require('./user-generator');
+const TagsMapGenerator = require('./tag-generator');
class SiteMapManager {
constructor(options) {
diff --git a/core/frontend/services/sitemap/page-generator.js b/core/frontend/services/sitemap/page-generator.js
index bf4dc98e73..3ac496591c 100644
--- a/core/frontend/services/sitemap/page-generator.js
+++ b/core/frontend/services/sitemap/page-generator.js
@@ -1,5 +1,5 @@
-const _ = require('lodash'),
- BaseMapGenerator = require('./base-generator');
+const _ = require('lodash');
+const BaseMapGenerator = require('./base-generator');
class PageMapGenerator extends BaseMapGenerator {
constructor(opts) {
diff --git a/core/frontend/services/sitemap/post-generator.js b/core/frontend/services/sitemap/post-generator.js
index 75b34fc837..20d7018495 100644
--- a/core/frontend/services/sitemap/post-generator.js
+++ b/core/frontend/services/sitemap/post-generator.js
@@ -1,5 +1,5 @@
-const _ = require('lodash'),
- BaseMapGenerator = require('./base-generator');
+const _ = require('lodash');
+const BaseMapGenerator = require('./base-generator');
class PostMapGenerator extends BaseMapGenerator {
constructor(opts) {
diff --git a/core/frontend/services/sitemap/tag-generator.js b/core/frontend/services/sitemap/tag-generator.js
index 618b3b3983..9707e77c3a 100644
--- a/core/frontend/services/sitemap/tag-generator.js
+++ b/core/frontend/services/sitemap/tag-generator.js
@@ -1,5 +1,5 @@
-const _ = require('lodash'),
- BaseMapGenerator = require('./base-generator');
+const _ = require('lodash');
+const BaseMapGenerator = require('./base-generator');
class TagsMapGenerator extends BaseMapGenerator {
constructor(opts) {
diff --git a/core/frontend/services/sitemap/user-generator.js b/core/frontend/services/sitemap/user-generator.js
index 840d1d82ff..20535ed388 100644
--- a/core/frontend/services/sitemap/user-generator.js
+++ b/core/frontend/services/sitemap/user-generator.js
@@ -1,6 +1,6 @@
-const _ = require('lodash'),
- validator = require('validator'),
- BaseMapGenerator = require('./base-generator');
+const _ = require('lodash');
+const validator = require('validator');
+const BaseMapGenerator = require('./base-generator');
class UserMapGenerator extends BaseMapGenerator {
constructor(opts) {
diff --git a/core/frontend/services/sitemap/utils.js b/core/frontend/services/sitemap/utils.js
index 86fff4b386..e0bd5fcaee 100644
--- a/core/frontend/services/sitemap/utils.js
+++ b/core/frontend/services/sitemap/utils.js
@@ -1,9 +1,9 @@
-var urlUtils = require('../../../server/lib/url-utils'),
- sitemapsUtils;
+const urlUtils = require('../../../server/lib/url-utils');
+let sitemapsUtils;
sitemapsUtils = {
getDeclarations: function () {
- var baseUrl = urlUtils.urlFor('sitemap_xsl', true);
+ let baseUrl = urlUtils.urlFor('sitemap_xsl', true);
baseUrl = baseUrl.replace(/^(http:|https:)/, '');
return '' +
'';
diff --git a/core/frontend/services/themes/ThemeStorage.js b/core/frontend/services/themes/ThemeStorage.js
index 9250d5f30d..0cfc3eb33b 100644
--- a/core/frontend/services/themes/ThemeStorage.js
+++ b/core/frontend/services/themes/ThemeStorage.js
@@ -1,10 +1,10 @@
-var fs = require('fs-extra'),
- os = require('os'),
- path = require('path'),
- config = require('../../../server/config'),
- security = require('../../../server/lib/security'),
- {compress} = require('@tryghost/zip'),
- LocalFileStorage = require('../../../server/adapters/storage/LocalFileStorage');
+const fs = require('fs-extra');
+const os = require('os');
+const path = require('path');
+const config = require('../../../server/config');
+const security = require('../../../server/lib/security');
+const {compress} = require('@tryghost/zip');
+const LocalFileStorage = require('../../../server/adapters/storage/LocalFileStorage');
/**
* @TODO: combine with loader.js?
@@ -21,16 +21,18 @@ class ThemeStorage extends LocalFileStorage {
}
serve(options) {
- var self = this;
+ const self = this;
return function downloadTheme(req, res, next) {
- var themeName = options.name,
- themePath = path.join(self.storagePath, themeName),
- zipName = themeName + '.zip',
- // store this in a unique temporary folder
- zipBasePath = path.join(os.tmpdir(), security.identifier.uid(10)),
- zipPath = path.join(zipBasePath, zipName),
- stream;
+ const themeName = options.name;
+ const themePath = path.join(self.storagePath, themeName);
+ const zipName = themeName + '.zip';
+
+ // store this in a unique temporary folder
+ const zipBasePath = path.join(os.tmpdir(), security.identifier.uid(10));
+
+ const zipPath = path.join(zipBasePath, zipName);
+ let stream;
fs.ensureDir(zipBasePath)
.then(function () {
diff --git a/core/frontend/services/themes/active.js b/core/frontend/services/themes/active.js
index 4a98a3a015..f15d2cd3d1 100644
--- a/core/frontend/services/themes/active.js
+++ b/core/frontend/services/themes/active.js
@@ -11,14 +11,16 @@
* No properties marked with an _ should be used directly.
*
*/
-var join = require('path').join,
- _ = require('lodash'),
- themeConfig = require('./config'),
- themeEngines = require('./engines'),
- config = require('../../../server/config'),
- engine = require('./engine'),
- // Current instance of ActiveTheme
- currentActiveTheme;
+const join = require('path').join;
+
+const _ = require('lodash');
+const themeConfig = require('./config');
+const themeEngines = require('./engines');
+const config = require('../../../server/config');
+const engine = require('./engine');
+
+// Current instance of ActiveTheme
+let currentActiveTheme;
class ActiveTheme {
/**
diff --git a/core/frontend/services/themes/config/index.js b/core/frontend/services/themes/config/index.js
index 946a5cb7b1..c55d0db9e4 100644
--- a/core/frontend/services/themes/config/index.js
+++ b/core/frontend/services/themes/config/index.js
@@ -1,9 +1,9 @@
-var _ = require('lodash'),
- defaultConfig = require('./defaults'),
- allowedKeys = ['posts_per_page', 'image_sizes'];
+const _ = require('lodash');
+const defaultConfig = require('./defaults');
+const allowedKeys = ['posts_per_page', 'image_sizes'];
module.exports.create = function configLoader(packageJson) {
- var config = _.cloneDeep(defaultConfig);
+ let config = _.cloneDeep(defaultConfig);
if (packageJson && Object.prototype.hasOwnProperty.call(packageJson, 'config')) {
config = _.assign(config, _.pick(packageJson.config, allowedKeys));
diff --git a/core/frontend/services/themes/engine.js b/core/frontend/services/themes/engine.js
index 0d8b58c5d9..5addd79c79 100644
--- a/core/frontend/services/themes/engine.js
+++ b/core/frontend/services/themes/engine.js
@@ -1,6 +1,6 @@
-var hbs = require('express-hbs'),
- config = require('../../../server/config'),
- instance = hbs.create();
+const hbs = require('express-hbs');
+const config = require('../../../server/config');
+const instance = hbs.create();
// @TODO think about a config option for this e.g. theme.devmode?
if (config.get('env') !== 'production') {
@@ -10,7 +10,7 @@ if (config.get('env') !== 'production') {
instance.escapeExpression = instance.handlebars.Utils.escapeExpression;
instance.configure = function configure(partialsPath) {
- var hbsOptions = {
+ const hbsOptions = {
partialsDir: [config.get('paths').helperTemplates],
onCompile: function onCompile(exhbs, source) {
return exhbs.handlebars.compile(source, {preventIndent: true});
diff --git a/core/frontend/services/themes/handlebars/register.js b/core/frontend/services/themes/handlebars/register.js
index 67e67fc4a7..2d5fab0ebf 100644
--- a/core/frontend/services/themes/handlebars/register.js
+++ b/core/frontend/services/themes/handlebars/register.js
@@ -16,14 +16,15 @@ function asyncHelperWrapper(hbs, name, fn) {
Promise.resolve(fn.call(this, context, options)).then(function asyncHelperSuccess(result) {
cb(result);
}).catch(function asyncHelperError(err) {
- var wrappedErr = err instanceof errors.GhostError ? err : new errors.IncorrectUsageError({
- err: err,
- context: 'registerAsyncThemeHelper: ' + name,
- errorDetails: {
- originalError: err
- }
- }),
- result = config.get('env') === 'development' ? wrappedErr : '';
+ const wrappedErr = err instanceof errors.GhostError ? err : new errors.IncorrectUsageError({
+ err: err,
+ context: 'registerAsyncThemeHelper: ' + name,
+ errorDetails: {
+ originalError: err
+ }
+ });
+
+ const result = config.get('env') === 'development' ? wrappedErr : '';
logging.error(wrappedErr);
diff --git a/core/frontend/services/themes/handlebars/template.js b/core/frontend/services/themes/handlebars/template.js
index 9dd922f882..99e1413032 100644
--- a/core/frontend/services/themes/handlebars/template.js
+++ b/core/frontend/services/themes/handlebars/template.js
@@ -8,7 +8,7 @@ const {i18n} = require('../../../../server/lib/common');
// Execute a template helper
// All template helpers are register as partial view.
templates.execute = function execute(name, context, data) {
- var partial = hbs.handlebars.partials[name];
+ const partial = hbs.handlebars.partials[name];
if (partial === undefined) {
throw new errors.IncorrectUsageError({
diff --git a/core/frontend/services/themes/index.js b/core/frontend/services/themes/index.js
index c21084a3fa..bc8d3eb8a7 100644
--- a/core/frontend/services/themes/index.js
+++ b/core/frontend/services/themes/index.js
@@ -14,7 +14,7 @@ module.exports = {
// Init themes module
// TODO: move this once we're clear what needs to happen here
init: function initThemes() {
- var activeThemeName = settingsCache.get('active_theme');
+ const activeThemeName = settingsCache.get('active_theme');
i18n.init();
diff --git a/core/frontend/services/themes/list.js b/core/frontend/services/themes/list.js
index 287cdea27c..a0a9841564 100644
--- a/core/frontend/services/themes/list.js
+++ b/core/frontend/services/themes/list.js
@@ -1,8 +1,9 @@
/**
* Store themes after loading them from the file system
*/
-var _ = require('lodash'),
- themeListCache = {};
+const _ = require('lodash');
+
+let themeListCache = {};
module.exports = {
get: function get(key) {
@@ -23,7 +24,7 @@ module.exports = {
},
init: function init(themes) {
- var self = this;
+ const self = this;
// First, reset the cache
themeListCache = {};
// For each theme, call set. Allows us to do processing on set later.
diff --git a/core/frontend/services/themes/loader.js b/core/frontend/services/themes/loader.js
index 7c2b530973..99c15ddd14 100644
--- a/core/frontend/services/themes/loader.js
+++ b/core/frontend/services/themes/loader.js
@@ -1,9 +1,9 @@
-var debug = require('ghost-ignition').debug('themes:loader'),
- config = require('../../../server/config'),
- packageJSON = require('../../../server/lib/fs/package-json'),
- themeList = require('./list'),
- loadAllThemes,
- loadOneTheme;
+const debug = require('ghost-ignition').debug('themes:loader');
+const config = require('../../../server/config');
+const packageJSON = require('../../../server/lib/fs/package-json');
+const themeList = require('./list');
+let loadAllThemes;
+let loadOneTheme;
loadAllThemes = function loadAllThemes() {
return packageJSON.read
diff --git a/core/frontend/services/themes/to-json.js b/core/frontend/services/themes/to-json.js
index 894b2c7385..71b072c372 100644
--- a/core/frontend/services/themes/to-json.js
+++ b/core/frontend/services/themes/to-json.js
@@ -1,8 +1,8 @@
-var _ = require('lodash'),
- themeList = require('./list'),
- active = require('./active'),
- packageJSON = require('../../../server/lib/fs/package-json'),
- settingsCache = require('../../../server/services/settings/cache');
+const _ = require('lodash');
+const themeList = require('./list');
+const active = require('./active');
+const packageJSON = require('../../../server/lib/fs/package-json');
+const settingsCache = require('../../../server/services/settings/cache');
/**
*
@@ -17,7 +17,8 @@ var _ = require('lodash'),
* @return {*}
*/
module.exports = function toJSON(name, checkedTheme) {
- var themeResult, toFilter;
+ let themeResult;
+ let toFilter;
if (!name) {
toFilter = themeList.getAll();
diff --git a/core/frontend/services/url/Queue.js b/core/frontend/services/url/Queue.js
index cd8d17cfb6..3568bce691 100644
--- a/core/frontend/services/url/Queue.js
+++ b/core/frontend/services/url/Queue.js
@@ -1,7 +1,7 @@
-const debug = require('ghost-ignition').debug('services:url:queue'),
- EventEmitter = require('events').EventEmitter,
- _ = require('lodash'),
- common = require('../../../server/lib/common');
+const debug = require('ghost-ignition').debug('services:url:queue');
+const EventEmitter = require('events').EventEmitter;
+const _ = require('lodash');
+const common = require('../../../server/lib/common');
/**
* ### Purpose of this queue
@@ -102,9 +102,9 @@ class Queue extends EventEmitter {
* @param {Object} options
*/
run(options) {
- const event = options.event,
- action = options.action,
- eventData = options.eventData;
+ const event = options.event;
+ const action = options.action;
+ const eventData = options.eventData;
clearTimeout(this.toNotify[action].timeout);
this.toNotify[action].timeout = null;
diff --git a/core/frontend/services/url/Resource.js b/core/frontend/services/url/Resource.js
index f7ac08fe17..039d2c114a 100644
--- a/core/frontend/services/url/Resource.js
+++ b/core/frontend/services/url/Resource.js
@@ -1,5 +1,5 @@
-const EventEmitter = require('events').EventEmitter,
- common = require('../../../server/lib/common');
+const EventEmitter = require('events').EventEmitter;
+const common = require('../../../server/lib/common');
/**
* Resource cache.
diff --git a/core/frontend/services/url/UrlGenerator.js b/core/frontend/services/url/UrlGenerator.js
index 3b44966bdf..246727c71e 100644
--- a/core/frontend/services/url/UrlGenerator.js
+++ b/core/frontend/services/url/UrlGenerator.js
@@ -1,27 +1,28 @@
-const _ = require('lodash'),
- nql = require('@nexes/nql'),
- debug = require('ghost-ignition').debug('services:url:generator'),
- localUtils = require('../../../server/lib/url-utils'),
- // @TODO: merge with filter plugin
- EXPANSIONS = [{
- key: 'author',
- replacement: 'authors.slug'
- }, {
- key: 'tags',
- replacement: 'tags.slug'
- }, {
- key: 'tag',
- replacement: 'tags.slug'
- }, {
- key: 'authors',
- replacement: 'authors.slug'
- }, {
- key: 'primary_tag',
- replacement: 'primary_tag.slug'
- }, {
- key: 'primary_author',
- replacement: 'primary_author.slug'
- }];
+const _ = require('lodash');
+const nql = require('@nexes/nql');
+const debug = require('ghost-ignition').debug('services:url:generator');
+const localUtils = require('../../../server/lib/url-utils');
+
+// @TODO: merge with filter plugin
+const EXPANSIONS = [{
+ key: 'author',
+ replacement: 'authors.slug'
+}, {
+ key: 'tags',
+ replacement: 'tags.slug'
+}, {
+ key: 'tag',
+ replacement: 'tags.slug'
+}, {
+ key: 'authors',
+ replacement: 'authors.slug'
+}, {
+ key: 'primary_tag',
+ replacement: 'primary_tag.slug'
+}, {
+ key: 'primary_author',
+ replacement: 'primary_author.slug'
+}];
const mapNQLKeyValues = require('../../../shared/nql-map-key-values');
diff --git a/core/frontend/services/url/UrlService.js b/core/frontend/services/url/UrlService.js
index 7b0773a5c4..6982542148 100644
--- a/core/frontend/services/url/UrlService.js
+++ b/core/frontend/services/url/UrlService.js
@@ -1,12 +1,12 @@
-const _debug = require('ghost-ignition').debug._base,
- debug = _debug('ghost:services:url:service'),
- _ = require('lodash'),
- common = require('../../../server/lib/common'),
- UrlGenerator = require('./UrlGenerator'),
- Queue = require('./Queue'),
- Urls = require('./Urls'),
- Resources = require('./Resources'),
- urlUtils = require('../../../server/lib/url-utils');
+const _debug = require('ghost-ignition').debug._base;
+const debug = _debug('ghost:services:url:service');
+const _ = require('lodash');
+const common = require('../../../server/lib/common');
+const UrlGenerator = require('./UrlGenerator');
+const Queue = require('./Queue');
+const Urls = require('./Urls');
+const Resources = require('./Resources');
+const urlUtils = require('../../../server/lib/url-utils');
/**
* The url service class holds all instances in a centralised place.
diff --git a/core/frontend/services/url/index.js b/core/frontend/services/url/index.js
index cd4b29fe23..7f55723216 100644
--- a/core/frontend/services/url/index.js
+++ b/core/frontend/services/url/index.js
@@ -1,5 +1,5 @@
-const UrlService = require('./UrlService'),
- urlService = new UrlService();
+const UrlService = require('./UrlService');
+const urlService = new UrlService();
// Singleton
module.exports = urlService;
diff --git a/core/server/adapters/scheduling/SchedulingDefault.js b/core/server/adapters/scheduling/SchedulingDefault.js
index cf66fea19d..cad990f06f 100644
--- a/core/server/adapters/scheduling/SchedulingDefault.js
+++ b/core/server/adapters/scheduling/SchedulingDefault.js
@@ -99,8 +99,8 @@ SchedulingDefault.prototype.unschedule = function (object, options = {bootstrap:
*/
SchedulingDefault.prototype.run = function () {
const self = this;
- let timeout = null,
- recursiveRun;
+ let timeout = null;
+ let recursiveRun;
// NOTE: Ensure the scheduler never runs twice.
if (this.isRunning) {
@@ -111,8 +111,8 @@ SchedulingDefault.prototype.run = function () {
recursiveRun = function recursiveRun() {
timeout = setTimeout(function () {
- const times = Object.keys(self.allJobs),
- nextJobs = {};
+ const times = Object.keys(self.allJobs);
+ const nextJobs = {};
// CASE: We stop till the offset is too big. We are only interested in jobs which need get executed soon.
times.every(function (time) {
@@ -142,11 +142,11 @@ SchedulingDefault.prototype.run = function () {
* @private
*/
SchedulingDefault.prototype._addJob = function (object) {
- let timestamp = moment(object.time).valueOf(),
- keys = [],
- sortedJobs = {},
- instantJob = {},
- i = 0;
+ let timestamp = moment(object.time).valueOf();
+ let keys = [];
+ let sortedJobs = {};
+ let instantJob = {};
+ let i = 0;
// CASE: should have been already pinged or should be pinged soon
if (moment(timestamp).diff(moment(), 'minutes') < this.offsetInMinutes) {
@@ -218,12 +218,12 @@ SchedulingDefault.prototype._deleteJob = function (object) {
* We can't use "process.nextTick" otherwise we will block I/O operations.
*/
SchedulingDefault.prototype._execute = function (jobs) {
- const keys = Object.keys(jobs),
- self = this;
+ const keys = Object.keys(jobs);
+ const self = this;
keys.forEach(function (timestamp) {
- let timeout = null,
- diff = moment(Number(timestamp)).diff(moment());
+ let timeout = null;
+ let diff = moment(Number(timestamp)).diff(moment());
// NOTE: awake a little before...
timeout = setTimeout(function () {
diff --git a/core/server/adapters/storage/LocalFileStorage.js b/core/server/adapters/storage/LocalFileStorage.js
index cccabbebd0..9b1602751c 100644
--- a/core/server/adapters/storage/LocalFileStorage.js
+++ b/core/server/adapters/storage/LocalFileStorage.js
@@ -1,16 +1,17 @@
// # Local File System Image Storage module
// The (default) module for storing images, using the local file system
-const serveStatic = require('express').static,
- fs = require('fs-extra'),
- path = require('path'),
- Promise = require('bluebird'),
- moment = require('moment'),
- config = require('../../config'),
- common = require('../../lib/common'),
- constants = require('../../lib/constants'),
- urlUtils = require('../../lib/url-utils'),
- StorageBase = require('ghost-storage-base');
+const serveStatic = require('express').static;
+
+const fs = require('fs-extra');
+const path = require('path');
+const Promise = require('bluebird');
+const moment = require('moment');
+const config = require('../../config');
+const common = require('../../lib/common');
+const constants = require('../../lib/constants');
+const urlUtils = require('../../lib/url-utils');
+const StorageBase = require('ghost-storage-base');
class LocalFileStore extends StorageBase {
constructor() {
diff --git a/core/server/adapters/storage/utils.js b/core/server/adapters/storage/utils.js
index 1aa729bee6..8db3b10cba 100644
--- a/core/server/adapters/storage/utils.js
+++ b/core/server/adapters/storage/utils.js
@@ -15,16 +15,17 @@ const urlUtils = require('../../lib/url-utils');
exports.getLocalFileStoragePath = function getLocalFileStoragePath(imagePath) {
// The '/' in urlJoin is necessary to add the '/' to `content/images`, if no subdirectory is setup
const urlRegExp = new RegExp(`^${urlUtils.urlJoin(
- urlUtils.urlFor('home', true),
- urlUtils.getSubdir(),
- '/',
- urlUtils.STATIC_IMAGE_URL_PREFIX)}`
- ),
- filePathRegExp = new RegExp(`^${urlUtils.urlJoin(
- urlUtils.getSubdir(),
- '/',
- urlUtils.STATIC_IMAGE_URL_PREFIX)}`
- );
+ urlUtils.urlFor('home', true),
+ urlUtils.getSubdir(),
+ '/',
+ urlUtils.STATIC_IMAGE_URL_PREFIX)}`
+ );
+
+ const filePathRegExp = new RegExp(`^${urlUtils.urlJoin(
+ urlUtils.getSubdir(),
+ '/',
+ urlUtils.STATIC_IMAGE_URL_PREFIX)}`
+ );
if (imagePath.match(urlRegExp)) {
return imagePath.replace(urlRegExp, '');
diff --git a/core/server/analytics-events.js b/core/server/analytics-events.js
index 7a8d1533d4..62e5d343a7 100644
--- a/core/server/analytics-events.js
+++ b/core/server/analytics-events.js
@@ -1,14 +1,14 @@
-var _ = require('lodash'),
- Analytics = require('analytics-node'),
- config = require('./config'),
- common = require('./lib/common'),
- analytics;
+const _ = require('lodash');
+const Analytics = require('analytics-node');
+const config = require('./config');
+const common = require('./lib/common');
+let analytics;
module.exports.init = function () {
analytics = new Analytics(config.get('segment:key'));
- var toTrack,
- trackDefaults = config.get('segment:trackDefaults') || {},
- prefix = config.get('segment:prefix') || '';
+ let toTrack;
+ const trackDefaults = config.get('segment:trackDefaults') || {};
+ const prefix = config.get('segment:prefix') || '';
toTrack = [
{
diff --git a/core/server/api/canary/notifications.js b/core/server/api/canary/notifications.js
index 5fef525113..38486a2b11 100644
--- a/core/server/api/canary/notifications.js
+++ b/core/server/api/canary/notifications.js
@@ -162,11 +162,12 @@ module.exports = {
const allNotifications = _private.fetchAllNotifications();
const notificationToMarkAsSeen = allNotifications.find((notification) => {
- return notification.id === frame.options.notification_id;
- }),
- notificationToMarkAsSeenIndex = allNotifications.findIndex((notification) => {
- return notification.id === frame.options.notification_id;
- });
+ return notification.id === frame.options.notification_id;
+ });
+
+ const notificationToMarkAsSeenIndex = allNotifications.findIndex((notification) => {
+ return notification.id === frame.options.notification_id;
+ });
if (notificationToMarkAsSeenIndex > -1 && !notificationToMarkAsSeen.dismissible) {
return Promise.reject(new common.errors.NoPermissionError({
diff --git a/core/server/api/shared/pipeline.js b/core/server/api/shared/pipeline.js
index 66409da1cc..e655968861 100644
--- a/core/server/api/shared/pipeline.js
+++ b/core/server/api/shared/pipeline.js
@@ -189,7 +189,9 @@ const pipeline = (apiController, apiUtils, apiType) => {
obj[key] = function wrapper() {
const apiConfig = {docName, method};
- let options, data, frame;
+ let options;
+ let data;
+ let frame;
if (arguments.length === 2) {
data = arguments[0];
diff --git a/core/server/api/v2/notifications.js b/core/server/api/v2/notifications.js
index 5fef525113..38486a2b11 100644
--- a/core/server/api/v2/notifications.js
+++ b/core/server/api/v2/notifications.js
@@ -162,11 +162,12 @@ module.exports = {
const allNotifications = _private.fetchAllNotifications();
const notificationToMarkAsSeen = allNotifications.find((notification) => {
- return notification.id === frame.options.notification_id;
- }),
- notificationToMarkAsSeenIndex = allNotifications.findIndex((notification) => {
- return notification.id === frame.options.notification_id;
- });
+ return notification.id === frame.options.notification_id;
+ });
+
+ const notificationToMarkAsSeenIndex = allNotifications.findIndex((notification) => {
+ return notification.id === frame.options.notification_id;
+ });
if (notificationToMarkAsSeenIndex > -1 && !notificationToMarkAsSeen.dismissible) {
return Promise.reject(new common.errors.NoPermissionError({
diff --git a/core/server/config/index.js b/core/server/config/index.js
index 1ed06aebc8..1e8b2e62a7 100644
--- a/core/server/config/index.js
+++ b/core/server/config/index.js
@@ -1,32 +1,32 @@
-var Nconf = require('nconf'),
- path = require('path'),
- _debug = require('ghost-ignition').debug._base,
- debug = _debug('ghost:config'),
- localUtils = require('./utils'),
- env = process.env.NODE_ENV || 'development',
- _private = {};
+const Nconf = require('nconf');
+const path = require('path');
+const _debug = require('ghost-ignition').debug._base;
+const debug = _debug('ghost:config');
+const localUtils = require('./utils');
+const env = process.env.NODE_ENV || 'development';
+const _private = {};
_private.loadNconf = function loadNconf(options) {
debug('config start');
options = options || {};
- var baseConfigPath = options.baseConfigPath || __dirname,
- customConfigPath = options.customConfigPath || process.cwd(),
- nconf = new Nconf.Provider();
+ const baseConfigPath = options.baseConfigPath || __dirname;
+ const customConfigPath = options.customConfigPath || process.cwd();
+ const nconf = new Nconf.Provider();
/**
- * no channel can override the overrides
- */
+ * no channel can override the overrides
+ */
nconf.file('overrides', path.join(baseConfigPath, 'overrides.json'));
/**
- * command line arguments
- */
+ * command line arguments
+ */
nconf.argv();
/**
- * env arguments
- */
+ * env arguments
+ */
nconf.env({
separator: '__',
parseValues: true
@@ -38,9 +38,9 @@ _private.loadNconf = function loadNconf(options) {
nconf.file('defaults', path.join(baseConfigPath, 'defaults.json'));
/**
- * transform all relative paths to absolute paths
- * transform sqlite filename path for Ghost-CLI
- */
+ * transform all relative paths to absolute paths
+ * transform sqlite filename path for Ghost-CLI
+ */
nconf.makePathsAbsolute = localUtils.makePathsAbsolute.bind(nconf);
nconf.isPrivacyDisabled = localUtils.isPrivacyDisabled.bind(nconf);
nconf.getContentPath = localUtils.getContentPath.bind(nconf);
@@ -53,19 +53,19 @@ _private.loadNconf = function loadNconf(options) {
nconf.makePathsAbsolute(nconf.get('database:connection'), 'database:connection');
}
/**
- * Check if the URL in config has a protocol
- */
+ * Check if the URL in config has a protocol
+ */
nconf.checkUrlProtocol = localUtils.checkUrlProtocol.bind(nconf);
nconf.checkUrlProtocol();
/**
- * Ensure that the content path exists
- */
+ * Ensure that the content path exists
+ */
nconf.doesContentPathExist();
/**
- * values we have to set manual
- */
+ * values we have to set manual
+ */
nconf.set('env', env);
// Wrap this in a check, because else nconf.get() is executed unnecessarily
diff --git a/core/server/config/utils.js b/core/server/config/utils.js
index 4d405508b6..834233e5ca 100644
--- a/core/server/config/utils.js
+++ b/core/server/config/utils.js
@@ -1,6 +1,6 @@
-var path = require('path'),
- fs = require('fs-extra'),
- _ = require('lodash');
+const path = require('path');
+const fs = require('fs-extra');
+const _ = require('lodash');
exports.isPrivacyDisabled = function isPrivacyDisabled(privacyFlag) {
if (!this.get('privacy')) {
@@ -29,7 +29,7 @@ exports.isPrivacyDisabled = function isPrivacyDisabled(privacyFlag) {
* Path can be a "." to re-present current folder
*/
exports.makePathsAbsolute = function makePathsAbsolute(obj, parent) {
- var self = this;
+ const self = this;
_.each(obj, function (configValue, pathsKey) {
if (_.isObject(configValue)) {
@@ -80,7 +80,7 @@ exports.doesContentPathExist = function doesContentPathExist() {
* Check if the URL in config has a protocol and sanitise it if not including a warning that it should be changed
*/
exports.checkUrlProtocol = function checkUrlProtocol() {
- var url = this.get('url');
+ const url = this.get('url');
if (!url.match(/^https?:\/\//i)) {
throw new Error('URL in config must be provided with protocol, eg. "http://my-ghost-blog.com"');
@@ -95,7 +95,7 @@ exports.checkUrlProtocol = function checkUrlProtocol() {
* https://github.com/indexzero/nconf/issues/235#issuecomment-257606507
*/
exports.sanitizeDatabaseProperties = function sanitizeDatabaseProperties() {
- var database = this.get('database');
+ const database = this.get('database');
if (this.get('database:client') === 'mysql') {
delete database.connection.filename;
diff --git a/core/server/data/db/backup.js b/core/server/data/db/backup.js
index 3075b94c53..5d2547685b 100644
--- a/core/server/data/db/backup.js
+++ b/core/server/data/db/backup.js
@@ -1,18 +1,18 @@
// # Backup Database
// Provides for backing up the database before making potentially destructive changes
-var fs = require('fs-extra'),
- path = require('path'),
- Promise = require('bluebird'),
- config = require('../../config'),
- common = require('../../lib/common'),
- urlUtils = require('../../lib/url-utils'),
- exporter = require('../exporter'),
+const fs = require('fs-extra');
- writeExportFile,
- backup;
+const path = require('path');
+const Promise = require('bluebird');
+const config = require('../../config');
+const common = require('../../lib/common');
+const urlUtils = require('../../lib/url-utils');
+const exporter = require('../exporter');
+let writeExportFile;
+let backup;
writeExportFile = function writeExportFile(exportResult) {
- var filename = path.resolve(urlUtils.urlJoin(config.get('paths').contentPath, 'data', exportResult.filename));
+ const filename = path.resolve(urlUtils.urlJoin(config.get('paths').contentPath, 'data', exportResult.filename));
return fs.writeFile(filename, JSON.stringify(exportResult.data)).return(filename);
};
@@ -41,7 +41,7 @@ backup = function backup(options) {
common.logging.info('Creating database backup');
options = options || {};
- var props = {
+ const props = {
data: exporter.doExport(options),
filename: exporter.fileName(options)
};
diff --git a/core/server/data/db/connection.js b/core/server/data/db/connection.js
index 78f5135375..595e489ab1 100644
--- a/core/server/data/db/connection.js
+++ b/core/server/data/db/connection.js
@@ -1,14 +1,14 @@
-var knex = require('knex'),
- config = require('../../config'),
- common = require('../../lib/common'),
- knexInstance;
+const knex = require('knex');
+const config = require('../../config');
+const common = require('../../lib/common');
+let knexInstance;
// @TODO:
// - if you require this file before config file was loaded,
// - then this file is cached and you have no chance to connect to the db anymore
// - bring dynamic into this file (db.connect())
function configure(dbConfig) {
- var client = dbConfig.client;
+ const client = dbConfig.client;
if (client === 'sqlite3') {
dbConfig.useNullAsDefault = Object.prototype.hasOwnProperty.call(dbConfig, 'useNullAsDefault') ? dbConfig.useNullAsDefault : true;
diff --git a/core/server/data/db/index.js b/core/server/data/db/index.js
index b1d2d03667..49883ca90e 100644
--- a/core/server/data/db/index.js
+++ b/core/server/data/db/index.js
@@ -1,4 +1,4 @@
-var connection;
+let connection;
Object.defineProperty(exports, 'knex', {
enumerable: true,
diff --git a/core/server/data/db/migrator.js b/core/server/data/db/migrator.js
index 623c5d8e33..689768daab 100644
--- a/core/server/data/db/migrator.js
+++ b/core/server/data/db/migrator.js
@@ -1,12 +1,14 @@
-const KnexMigrator = require('knex-migrator'),
- config = require('../../config'),
- common = require('../../lib/common'),
- knexMigrator = new KnexMigrator({
- knexMigratorFilePath: config.get('paths:appRoot')
- });
+const KnexMigrator = require('knex-migrator');
+const config = require('../../config');
+const common = require('../../lib/common');
+
+const knexMigrator = new KnexMigrator({
+ knexMigratorFilePath: config.get('paths:appRoot')
+});
module.exports.getState = () => {
- let state, err;
+ let state;
+ let err;
return knexMigrator.isDatabaseOK()
.then(() => {
diff --git a/core/server/data/exporter/index.js b/core/server/data/exporter/index.js
index 05bcac2218..9aa88da099 100644
--- a/core/server/data/exporter/index.js
+++ b/core/server/data/exporter/index.js
@@ -1,32 +1,36 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- db = require('../../data/db'),
- commands = require('../schema').commands,
- ghostVersion = require('../../lib/ghost-version'),
- common = require('../../lib/common'),
- security = require('../../lib/security'),
- models = require('../../models'),
- EXCLUDED_TABLES = ['sessions', 'mobiledoc_revisions'],
- EXCLUDED_FIELDS_CONDITIONS = {
- settings: [{
- operator: 'whereNot',
- key: 'key',
- value: 'permalinks'
- }]
- },
- modelOptions = {context: {internal: true}},
+const _ = require('lodash');
+const Promise = require('bluebird');
+const db = require('../../data/db');
+const commands = require('../schema').commands;
+const ghostVersion = require('../../lib/ghost-version');
+const common = require('../../lib/common');
+const security = require('../../lib/security');
+const models = require('../../models');
+const EXCLUDED_TABLES = ['sessions', 'mobiledoc_revisions'];
- // private
- getVersionAndTables,
- exportTable,
+const EXCLUDED_FIELDS_CONDITIONS = {
+ settings: [{
+ operator: 'whereNot',
+ key: 'key',
+ value: 'permalinks'
+ }]
+};
- // public
- doExport,
- exportFileName;
+const modelOptions = {context: {internal: true}};
+
+// private
+let getVersionAndTables;
+
+let exportTable;
+
+// public
+let doExport;
+
+let exportFileName;
exportFileName = function exportFileName(options) {
- var datetime = require('moment')().format('YYYY-MM-DD-HH-mm-ss'),
- title = '';
+ const datetime = require('moment')().format('YYYY-MM-DD-HH-mm-ss');
+ let title = '';
options = options || {};
@@ -48,7 +52,7 @@ exportFileName = function exportFileName(options) {
};
getVersionAndTables = function getVersionAndTables(options) {
- var props = {
+ const props = {
version: ghostVersion.full,
tables: commands.getTables(options.transacting)
};
@@ -74,7 +78,8 @@ exportTable = function exportTable(tableName, options) {
doExport = function doExport(options) {
options = options || {include: []};
- var tables, version;
+ let tables;
+ let version;
return getVersionAndTables(options).then(function exportAllTables(result) {
tables = result.tables;
@@ -84,7 +89,7 @@ doExport = function doExport(options) {
return exportTable(tableName, options);
});
}).then(function formatData(tableData) {
- var exportData = {
+ const exportData = {
meta: {
exported_on: new Date().getTime(),
version: version
diff --git a/core/server/data/importer/handlers/image.js b/core/server/data/importer/handlers/image.js
index d9c1fa44d0..3e9ce8ecd8 100644
--- a/core/server/data/importer/handlers/image.js
+++ b/core/server/data/importer/handlers/image.js
@@ -1,11 +1,10 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- path = require('path'),
- config = require('../../../config'),
- urlUtils = require('../../../lib/url-utils'),
- storage = require('../../../adapters/storage'),
-
- ImageHandler;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const path = require('path');
+const config = require('../../../config');
+const urlUtils = require('../../../lib/url-utils');
+const storage = require('../../../adapters/storage');
+let ImageHandler;
ImageHandler = {
type: 'images',
@@ -14,16 +13,17 @@ ImageHandler = {
directories: ['images', 'content'],
loadFile: function (files, baseDir) {
- var store = storage.getStorage(),
- baseDirRegex = baseDir ? new RegExp('^' + baseDir + '/') : new RegExp(''),
- imageFolderRegexes = _.map(urlUtils.STATIC_IMAGE_URL_PREFIX.split('/'), function (dir) {
- return new RegExp('^' + dir + '/');
- });
+ const store = storage.getStorage();
+ const baseDirRegex = baseDir ? new RegExp('^' + baseDir + '/') : new RegExp('');
+
+ const imageFolderRegexes = _.map(urlUtils.STATIC_IMAGE_URL_PREFIX.split('/'), function (dir) {
+ return new RegExp('^' + dir + '/');
+ });
// normalize the directory structure
files = _.map(files, function (file) {
- var noBaseDir = file.name.replace(baseDirRegex, ''),
- noGhostDirs = noBaseDir;
+ const noBaseDir = file.name.replace(baseDirRegex, '');
+ let noGhostDirs = noBaseDir;
_.each(imageFolderRegexes, function (regex) {
noGhostDirs = noGhostDirs.replace(regex, '');
diff --git a/core/server/data/importer/handlers/json.js b/core/server/data/importer/handlers/json.js
index 321d12c7f1..66370ca7e4 100644
--- a/core/server/data/importer/handlers/json.js
+++ b/core/server/data/importer/handlers/json.js
@@ -1,8 +1,8 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- fs = require('fs-extra'),
- common = require('../../../lib/common'),
- JSONHandler;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const fs = require('fs-extra');
+const common = require('../../../lib/common');
+let JSONHandler;
JSONHandler = {
type: 'data',
@@ -12,10 +12,10 @@ JSONHandler = {
loadFile: function (files, startDir) { // eslint-disable-line no-unused-vars
// @TODO: Handle multiple JSON files
- var filePath = files[0].path;
+ const filePath = files[0].path;
return fs.readFile(filePath).then(function (fileData) {
- var importData;
+ let importData;
try {
importData = JSON.parse(fileData);
diff --git a/core/server/data/importer/handlers/markdown.js b/core/server/data/importer/handlers/markdown.js
index e694bfcb77..b39aed18ec 100644
--- a/core/server/data/importer/handlers/markdown.js
+++ b/core/server/data/importer/handlers/markdown.js
@@ -1,21 +1,19 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- fs = require('fs-extra'),
- moment = require('moment'),
-
- featuredImageRegex = /^(!\[]\(([^)]*?)\)\s+)(?=#)/,
- titleRegex = /^#\s?([\w\W]*?)(?=\n)/,
- statusRegex = /(published||draft)-/,
- dateRegex = /(\d{4}-\d{2}-\d{2})-/,
-
- processDateTime,
- processFileName,
- processMarkdownFile,
- MarkdownHandler;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const fs = require('fs-extra');
+const moment = require('moment');
+const featuredImageRegex = /^(!\[]\(([^)]*?)\)\s+)(?=#)/;
+const titleRegex = /^#\s?([\w\W]*?)(?=\n)/;
+const statusRegex = /(published||draft)-/;
+const dateRegex = /(\d{4}-\d{2}-\d{2})-/;
+let processDateTime;
+let processFileName;
+let processMarkdownFile;
+let MarkdownHandler;
// Takes a date from the filename in y-m-d-h-m form, and converts it into a Date ready to import
processDateTime = function (post, datetime) {
- var format = 'YYYY-MM-DD-HH-mm';
+ const format = 'YYYY-MM-DD-HH-mm';
datetime = moment.utc(datetime, format).valueOf();
if (post.status && post.status === 'published') {
@@ -28,9 +26,9 @@ processDateTime = function (post, datetime) {
};
processFileName = function (filename) {
- var post = {},
- name = filename.split('.')[0],
- match;
+ let post = {};
+ let name = filename.split('.')[0];
+ let match;
// Parse out the status
match = name.match(statusRegex);
@@ -54,8 +52,8 @@ processFileName = function (filename) {
};
processMarkdownFile = function (filename, content) {
- var post = processFileName(filename),
- match;
+ const post = processFileName(filename);
+ let match;
content = content.replace(/\r\n/gm, '\n');
@@ -87,9 +85,9 @@ MarkdownHandler = {
directories: [],
loadFile: function (files, startDir) {
- var startDirRegex = startDir ? new RegExp('^' + startDir + '/') : new RegExp(''),
- posts = [],
- ops = [];
+ const startDirRegex = startDir ? new RegExp('^' + startDir + '/') : new RegExp('');
+ const posts = [];
+ const ops = [];
_.each(files, function (file) {
ops.push(fs.readFile(file.path).then(function (content) {
diff --git a/core/server/data/importer/importers/data/base.js b/core/server/data/importer/importers/data/base.js
index 8057829dd7..b2c3cc0607 100644
--- a/core/server/data/importer/importers/data/base.js
+++ b/core/server/data/importer/importers/data/base.js
@@ -1,10 +1,10 @@
-const debug = require('ghost-ignition').debug('importer:base'),
- _ = require('lodash'),
- Promise = require('bluebird'),
- ObjectId = require('bson-objectid'),
- common = require('../../../../lib/common'),
- sequence = require('../../../../lib/promise/sequence'),
- models = require('../../../../models');
+const debug = require('ghost-ignition').debug('importer:base');
+const _ = require('lodash');
+const Promise = require('bluebird');
+const ObjectId = require('bson-objectid');
+const common = require('../../../../lib/common');
+const sequence = require('../../../../lib/promise/sequence');
+const models = require('../../../../models');
class Base {
constructor(allDataFromFile, options) {
@@ -108,7 +108,8 @@ class Base {
}
handleError(errs, obj) {
- let errorsToReject = [], problems = [];
+ let errorsToReject = [];
+ let problems = [];
// CASE: validation errors, see models/base/events.js onValidate
if (!_.isArray(errs)) {
diff --git a/core/server/data/importer/importers/data/index.js b/core/server/data/importer/importers/data/index.js
index 3c2af3e0b5..b023c24707 100644
--- a/core/server/data/importer/importers/data/index.js
+++ b/core/server/data/importer/importers/data/index.js
@@ -1,17 +1,17 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- semver = require('semver'),
- common = require('../../../../lib/common'),
- debug = require('ghost-ignition').debug('importer:data'),
- sequence = require('../../../../lib/promise/sequence'),
- models = require('../../../../models'),
- PostsImporter = require('./posts'),
- TagsImporter = require('./tags'),
- SettingsImporter = require('./settings'),
- UsersImporter = require('./users'),
- RolesImporter = require('./roles'),
- importers = {},
- DataImporter;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const semver = require('semver');
+const common = require('../../../../lib/common');
+const debug = require('ghost-ignition').debug('importer:data');
+const sequence = require('../../../../lib/promise/sequence');
+const models = require('../../../../models');
+const PostsImporter = require('./posts');
+const TagsImporter = require('./tags');
+const SettingsImporter = require('./settings');
+const UsersImporter = require('./users');
+const RolesImporter = require('./roles');
+let importers = {};
+let DataImporter;
DataImporter = {
type: 'data',
@@ -35,7 +35,11 @@ DataImporter = {
doImport: function doImport(importData, importOptions) {
importOptions = importOptions || {};
- var ops = [], errors = [], results = [], modelOptions = {
+ const ops = [];
+ let errors = [];
+ let results = [];
+
+ const modelOptions = {
importing: true,
context: {
internal: true
@@ -128,7 +132,7 @@ DataImporter = {
* originalData: data from the json file
* problems: warnings
*/
- var toReturn = {
+ const toReturn = {
data: {},
originalData: importData.data,
problems: []
diff --git a/core/server/data/importer/importers/data/roles.js b/core/server/data/importer/importers/data/roles.js
index becd42a166..43103fa9a6 100644
--- a/core/server/data/importer/importers/data/roles.js
+++ b/core/server/data/importer/importers/data/roles.js
@@ -1,5 +1,5 @@
-const debug = require('ghost-ignition').debug('importer:roles'),
- BaseImporter = require('./base');
+const debug = require('ghost-ignition').debug('importer:roles');
+const BaseImporter = require('./base');
class RolesImporter extends BaseImporter {
constructor(allDataFromFile) {
diff --git a/core/server/data/importer/importers/data/tags.js b/core/server/data/importer/importers/data/tags.js
index 98314beba3..b14e27025f 100644
--- a/core/server/data/importer/importers/data/tags.js
+++ b/core/server/data/importer/importers/data/tags.js
@@ -1,8 +1,8 @@
-const debug = require('ghost-ignition').debug('importer:tags'),
- Promise = require('bluebird'),
- _ = require('lodash'),
- BaseImporter = require('./base'),
- models = require('../../../../models');
+const debug = require('ghost-ignition').debug('importer:tags');
+const Promise = require('bluebird');
+const _ = require('lodash');
+const BaseImporter = require('./base');
+const models = require('../../../../models');
class TagsImporter extends BaseImporter {
constructor(allDataFromFile) {
diff --git a/core/server/data/importer/importers/data/users.js b/core/server/data/importer/importers/data/users.js
index 970d754756..0e7d2c223b 100644
--- a/core/server/data/importer/importers/data/users.js
+++ b/core/server/data/importer/importers/data/users.js
@@ -1,7 +1,7 @@
-const debug = require('ghost-ignition').debug('importer:users'),
- _ = require('lodash'),
- BaseImporter = require('./base'),
- models = require('../../../../models');
+const debug = require('ghost-ignition').debug('importer:users');
+const _ = require('lodash');
+const BaseImporter = require('./base');
+const models = require('../../../../models');
class UsersImporter extends BaseImporter {
constructor(allDataFromFile) {
@@ -30,7 +30,8 @@ class UsersImporter extends BaseImporter {
beforeImport() {
debug('beforeImport');
- let role, lookup = {};
+ let role;
+ let lookup = {};
// NOTE: sort out duplicated roles based on incremental id
_.each(this.requiredFromFile.roles_users, (attachedRole) => {
diff --git a/core/server/data/importer/importers/image.js b/core/server/data/importer/importers/image.js
index 4b6f69a1e8..015f9a2066 100644
--- a/core/server/data/importer/importers/image.js
+++ b/core/server/data/importer/importers/image.js
@@ -1,11 +1,11 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- storage = require('../../../adapters/storage'),
- replaceImage,
- ImageImporter,
- preProcessPosts,
- preProcessTags,
- preProcessUsers;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const storage = require('../../../adapters/storage');
+let replaceImage;
+let ImageImporter;
+let preProcessPosts;
+let preProcessTags;
+let preProcessUsers;
replaceImage = function (markdown, image) {
if (!markdown) {
@@ -13,7 +13,7 @@ replaceImage = function (markdown, image) {
}
// Normalizes to include a trailing slash if there was one
- var regex = new RegExp('(/)?' + image.originalPath, 'gm');
+ const regex = new RegExp('(/)?' + image.originalPath, 'gm');
return markdown.replace(regex, image.newPath);
};
@@ -64,7 +64,7 @@ ImageImporter = {
return importData;
},
doImport: function (imageData) {
- var store = storage.getStorage();
+ const store = storage.getStorage();
return Promise.map(imageData, function (image) {
return store.save(image, image.targetDir).then(function (result) {
diff --git a/core/server/data/importer/index.js b/core/server/data/importer/index.js
index 9413333150..957ecf786f 100644
--- a/core/server/data/importer/index.js
+++ b/core/server/data/importer/index.js
@@ -1,26 +1,26 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- fs = require('fs-extra'),
- path = require('path'),
- os = require('os'),
- glob = require('glob'),
- uuid = require('uuid'),
- {extract} = require('@tryghost/zip'),
- sequence = require('../../lib/promise/sequence'),
- pipeline = require('../../lib/promise/pipeline'),
- common = require('../../lib/common'),
- ImageHandler = require('./handlers/image'),
- JSONHandler = require('./handlers/json'),
- MarkdownHandler = require('./handlers/markdown'),
- ImageImporter = require('./importers/image'),
- DataImporter = require('./importers/data'),
+const _ = require('lodash');
+const Promise = require('bluebird');
+const fs = require('fs-extra');
+const path = require('path');
+const os = require('os');
+const glob = require('glob');
+const uuid = require('uuid');
+const {extract} = require('@tryghost/zip');
+const sequence = require('../../lib/promise/sequence');
+const pipeline = require('../../lib/promise/pipeline');
+const common = require('../../lib/common');
+const ImageHandler = require('./handlers/image');
+const JSONHandler = require('./handlers/json');
+const MarkdownHandler = require('./handlers/markdown');
+const ImageImporter = require('./importers/image');
+const DataImporter = require('./importers/data');
- // Glob levels
- ROOT_ONLY = 0,
- ROOT_OR_SINGLE_DIR = 1,
- ALL_DIRS = 2,
+// Glob levels
+const ROOT_ONLY = 0;
- defaults;
+const ROOT_OR_SINGLE_DIR = 1;
+const ALL_DIRS = 2;
+let defaults;
defaults = {
extensions: ['.zip'],
@@ -80,7 +80,7 @@ _.extend(ImportManager.prototype, {
* @returns {String}
*/
getExtensionGlob: function (extensions, level) {
- var prefix = level === ALL_DIRS ? '**/*' :
+ const prefix = level === ALL_DIRS ? '**/*' :
(level === ROOT_OR_SINGLE_DIR ? '{*/*,*}' : '*');
return prefix + this.getGlobPattern(extensions);
@@ -92,7 +92,7 @@ _.extend(ImportManager.prototype, {
* @returns {String}
*/
getDirectoryGlob: function (directories, level) {
- var prefix = level === ALL_DIRS ? '**/' :
+ const prefix = level === ALL_DIRS ? '**/' :
(level === ROOT_OR_SINGLE_DIR ? '{*/,}' : '');
return prefix + this.getGlobPattern(directories);
@@ -102,7 +102,7 @@ _.extend(ImportManager.prototype, {
* @returns {Function}
*/
cleanUp: function () {
- var self = this;
+ const self = this;
if (self.fileToDelete === null) {
return;
@@ -137,15 +137,18 @@ _.extend(ImportManager.prototype, {
*/
isValidZip: function (directory) {
// Globs match content in the root or inside a single directory
- var extMatchesBase = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_OR_SINGLE_DIR), {cwd: directory}),
- extMatchesAll = glob.sync(
- this.getExtensionGlob(this.getExtensions(), ALL_DIRS), {cwd: directory}
- ),
- dirMatches = glob.sync(
- this.getDirectoryGlob(this.getDirectories(), ROOT_OR_SINGLE_DIR), {cwd: directory}
- ),
- oldRoonMatches = glob.sync(this.getDirectoryGlob(['drafts', 'published', 'deleted'], ROOT_OR_SINGLE_DIR),
- {cwd: directory});
+ const extMatchesBase = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_OR_SINGLE_DIR), {cwd: directory});
+
+ const extMatchesAll = glob.sync(
+ this.getExtensionGlob(this.getExtensions(), ALL_DIRS), {cwd: directory}
+ );
+
+ const dirMatches = glob.sync(
+ this.getDirectoryGlob(this.getDirectories(), ROOT_OR_SINGLE_DIR), {cwd: directory}
+ );
+
+ const oldRoonMatches = glob.sync(this.getDirectoryGlob(['drafts', 'published', 'deleted'], ROOT_OR_SINGLE_DIR),
+ {cwd: directory});
// This is a temporary extra message for the old format roon export which doesn't work with Ghost
if (oldRoonMatches.length > 0) {
@@ -184,7 +187,7 @@ _.extend(ImportManager.prototype, {
* @returns [] Files
*/
getFilesFromZip: function (handler, directory) {
- var globPattern = this.getExtensionGlob(handler.extensions, ALL_DIRS);
+ const globPattern = this.getExtensionGlob(handler.extensions, ALL_DIRS);
return _.map(glob.sync(globPattern, {cwd: directory}), function (file) {
return {name: file, path: path.join(directory, file)};
});
@@ -196,9 +199,10 @@ _.extend(ImportManager.prototype, {
*/
getBaseDirectory: function (directory) {
// Globs match root level only
- var extMatches = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_ONLY), {cwd: directory}),
- dirMatches = glob.sync(this.getDirectoryGlob(this.getDirectories(), ROOT_ONLY), {cwd: directory}),
- extMatchesAll;
+ const extMatches = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_ONLY), {cwd: directory});
+
+ const dirMatches = glob.sync(this.getDirectoryGlob(this.getDirectories(), ROOT_ONLY), {cwd: directory});
+ let extMatchesAll;
// There is no base directory
if (extMatches.length > 0 || dirMatches.length > 0) {
@@ -224,12 +228,12 @@ _.extend(ImportManager.prototype, {
* @returns {Promise(ImportData)}
*/
processZip: function (file) {
- var self = this;
+ const self = this;
return this.extractZip(file.path).then(function (zipDirectory) {
- var ops = [],
- importData = {},
- baseDir;
+ const ops = [];
+ const importData = {};
+ let baseDir;
self.isValidZip(zipDirectory);
baseDir = self.getBaseDirectory(zipDirectory);
@@ -242,7 +246,7 @@ _.extend(ImportManager.prototype, {
}));
}
- var files = self.getFilesFromZip(handler, zipDirectory);
+ const files = self.getFilesFromZip(handler, zipDirectory);
if (files.length > 0) {
ops.push(function () {
@@ -274,13 +278,13 @@ _.extend(ImportManager.prototype, {
* @returns {Promise(ImportData)}
*/
processFile: function (file, ext) {
- var fileHandler = _.find(this.handlers, function (handler) {
+ const fileHandler = _.find(this.handlers, function (handler) {
return _.includes(handler.extensions, ext);
});
return fileHandler.loadFile([_.pick(file, 'name', 'path')]).then(function (loadedData) {
// normalize the returned data
- var importData = {};
+ const importData = {};
importData[fileHandler.type] = loadedData;
return importData;
});
@@ -293,8 +297,8 @@ _.extend(ImportManager.prototype, {
* @returns {Promise}
*/
loadFile: function (file) {
- var self = this,
- ext = path.extname(file.name).toLowerCase();
+ const self = this;
+ const ext = path.extname(file.name).toLowerCase();
return this.isZip(ext) ? self.processZip(file) : self.processFile(file, ext);
},
/**
@@ -305,7 +309,7 @@ _.extend(ImportManager.prototype, {
* @returns {Promise(ImportData)}
*/
preProcess: function (importData) {
- var ops = [];
+ const ops = [];
_.each(this.importers, function (importer) {
ops.push(function () {
return importer.preProcess(importData);
@@ -324,7 +328,7 @@ _.extend(ImportManager.prototype, {
*/
doImport: function (importData, importOptions) {
importOptions = importOptions || {};
- var ops = [];
+ const ops = [];
_.each(this.importers, function (importer) {
if (Object.prototype.hasOwnProperty.call(importData, importer.type)) {
ops.push(function () {
@@ -354,7 +358,7 @@ _.extend(ImportManager.prototype, {
* @returns {Promise}
*/
importFromFile: function (file, importOptions = {}) {
- var self = this;
+ const self = this;
// Step 1: Handle converting the file to usable data
return this.loadFile(file).then(function (importData) {
diff --git a/core/server/data/migrations/hooks/init/before.js b/core/server/data/migrations/hooks/init/before.js
index 006f4287f9..e47c925f93 100644
--- a/core/server/data/migrations/hooks/init/before.js
+++ b/core/server/data/migrations/hooks/init/before.js
@@ -1,5 +1,5 @@
-var Promise = require('bluebird'),
- models = require('../../../../models');
+const Promise = require('bluebird');
+const models = require('../../../../models');
module.exports = function before() {
models.init();
diff --git a/core/server/data/migrations/hooks/init/shutdown.js b/core/server/data/migrations/hooks/init/shutdown.js
index 2aaf87f07e..719ef4df31 100644
--- a/core/server/data/migrations/hooks/init/shutdown.js
+++ b/core/server/data/migrations/hooks/init/shutdown.js
@@ -1,5 +1,5 @@
-const _ = require('lodash'),
- database = require('../../../db');
+const _ = require('lodash');
+const database = require('../../../db');
module.exports = function shutdown(options = {}) {
if (options.executedFromShell === true) {
diff --git a/core/server/data/migrations/hooks/migrate/afterEach.js b/core/server/data/migrations/hooks/migrate/afterEach.js
index 385145cabc..25e03f4eaa 100644
--- a/core/server/data/migrations/hooks/migrate/afterEach.js
+++ b/core/server/data/migrations/hooks/migrate/afterEach.js
@@ -1,4 +1,4 @@
-var Promise = require('bluebird');
+const Promise = require('bluebird');
module.exports = function afterEach() {
return Promise.resolve();
diff --git a/core/server/data/migrations/hooks/migrate/before.js b/core/server/data/migrations/hooks/migrate/before.js
index 403df18dc6..18feffd03e 100644
--- a/core/server/data/migrations/hooks/migrate/before.js
+++ b/core/server/data/migrations/hooks/migrate/before.js
@@ -1,5 +1,5 @@
-var dbBackup = require('../../../db/backup'),
- models = require('../../../../models');
+const dbBackup = require('../../../db/backup');
+const models = require('../../../../models');
module.exports = function before() {
models.init();
diff --git a/core/server/data/migrations/hooks/migrate/beforeEach.js b/core/server/data/migrations/hooks/migrate/beforeEach.js
index 050b1103fb..19ac899053 100644
--- a/core/server/data/migrations/hooks/migrate/beforeEach.js
+++ b/core/server/data/migrations/hooks/migrate/beforeEach.js
@@ -1,4 +1,4 @@
-var Promise = require('bluebird');
+const Promise = require('bluebird');
module.exports = function beforeEach() {
return Promise.resolve();
diff --git a/core/server/data/migrations/init/1-create-tables.js b/core/server/data/migrations/init/1-create-tables.js
index 5d67926c5e..2aa83e2474 100644
--- a/core/server/data/migrations/init/1-create-tables.js
+++ b/core/server/data/migrations/init/1-create-tables.js
@@ -1,11 +1,11 @@
-var Promise = require('bluebird'),
- commands = require('../../schema').commands,
- schema = require('../../schema').tables,
- common = require('../../../lib/common'),
- schemaTables = Object.keys(schema);
+const Promise = require('bluebird');
+const commands = require('../../schema').commands;
+const schema = require('../../schema').tables;
+const common = require('../../../lib/common');
+const schemaTables = Object.keys(schema);
module.exports.up = function createTables(options) {
- var connection = options.connection;
+ const connection = options.connection;
return Promise.mapSeries(schemaTables, function createTable(table) {
common.logging.info('Creating table: ' + table);
diff --git a/core/server/data/migrations/init/2-create-fixtures.js b/core/server/data/migrations/init/2-create-fixtures.js
index 13f124823f..18f0b3c019 100644
--- a/core/server/data/migrations/init/2-create-fixtures.js
+++ b/core/server/data/migrations/init/2-create-fixtures.js
@@ -1,14 +1,14 @@
-var Promise = require('bluebird'),
- _ = require('lodash'),
- fixtures = require('../../schema/fixtures'),
- common = require('../../../lib/common');
+const Promise = require('bluebird');
+const _ = require('lodash');
+const fixtures = require('../../schema/fixtures');
+const common = require('../../../lib/common');
module.exports.config = {
transaction: true
};
module.exports.up = function insertFixtures(options) {
- var localOptions = _.merge({
+ const localOptions = _.merge({
context: {internal: true},
migrating: true
}, options);
diff --git a/core/server/data/migrations/versions/1.13/1-custom-template-post.js b/core/server/data/migrations/versions/1.13/1-custom-template-post.js
index 5cf15e0863..754207fd7b 100644
--- a/core/server/data/migrations/versions/1.13/1-custom-template-post.js
+++ b/core/server/data/migrations/versions/1.13/1-custom-template-post.js
@@ -1,14 +1,14 @@
-const Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- commands = require('../../../schema').commands,
- table = 'posts',
- columns = ['custom_template'],
- _private = {};
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'posts';
+const columns = ['custom_template'];
+const _private = {};
_private.handle = function handle(options) {
- let type = options.type,
- isAdding = type === 'Adding',
- operation = isAdding ? commands.addColumn : commands.dropColumn;
+ let type = options.type;
+ let isAdding = type === 'Adding';
+ let operation = isAdding ? commands.addColumn : commands.dropColumn;
return function (options) {
let connection = options.connection;
diff --git a/core/server/data/migrations/versions/1.13/2-theme-permissions.js b/core/server/data/migrations/versions/1.13/2-theme-permissions.js
index 8407729eaa..2a3db50791 100644
--- a/core/server/data/migrations/versions/1.13/2-theme-permissions.js
+++ b/core/server/data/migrations/versions/1.13/2-theme-permissions.js
@@ -1,9 +1,9 @@
-var _ = require('lodash'),
- utils = require('../../../schema/fixtures/utils'),
- permissions = require('../../../../services/permissions'),
- common = require('../../../../lib/common'),
- resource = 'theme',
- _private = {};
+const _ = require('lodash');
+const utils = require('../../../schema/fixtures/utils');
+const permissions = require('../../../../services/permissions');
+const common = require('../../../../lib/common');
+const resource = 'theme';
+const _private = {};
_private.getPermissions = function getPermissions() {
return utils.findModelFixtures('Permission', {object_type: resource});
@@ -26,11 +26,12 @@ module.exports.config = {
};
module.exports.up = function addRedirectsPermissions(options) {
- var modelToAdd = _private.getPermissions(),
- relationToAdd = _private.getRelations(),
- localOptions = _.merge({
- context: {internal: true}
- }, options);
+ const modelToAdd = _private.getPermissions();
+ const relationToAdd = _private.getRelations();
+
+ const localOptions = _.merge({
+ context: {internal: true}
+ }, options);
return utils.addFixturesForModel(modelToAdd, localOptions)
.then(function (result) {
diff --git a/core/server/data/migrations/versions/1.18/1-add-webhooks-table.js b/core/server/data/migrations/versions/1.18/1-add-webhooks-table.js
index bc0fefa5e9..7c49891dbd 100644
--- a/core/server/data/migrations/versions/1.18/1-add-webhooks-table.js
+++ b/core/server/data/migrations/versions/1.18/1-add-webhooks-table.js
@@ -1,9 +1,9 @@
-var Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- commands = require('../../../schema').commands,
- table = 'webhooks',
- message1 = 'Adding table: ' + table,
- message2 = 'Dropping table: ' + table;
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'webhooks';
+const message1 = 'Adding table: ' + table;
+const message2 = 'Dropping table: ' + table;
module.exports.up = function addWebhooksTable(options) {
let connection = options.connection;
diff --git a/core/server/data/migrations/versions/1.19/1-webhook-permissions.js b/core/server/data/migrations/versions/1.19/1-webhook-permissions.js
index 10330f9954..6d785783da 100644
--- a/core/server/data/migrations/versions/1.19/1-webhook-permissions.js
+++ b/core/server/data/migrations/versions/1.19/1-webhook-permissions.js
@@ -1,9 +1,9 @@
-var _ = require('lodash'),
- utils = require('../../../schema/fixtures/utils'),
- permissions = require('../../../../services/permissions'),
- logging = require('../../../../lib/common/logging'),
- resource = 'webhook',
- _private = {};
+const _ = require('lodash');
+const utils = require('../../../schema/fixtures/utils');
+const permissions = require('../../../../services/permissions');
+const logging = require('../../../../lib/common/logging');
+const resource = 'webhook';
+const _private = {};
_private.getPermissions = function getPermissions() {
return utils.findModelFixtures('Permission', {object_type: resource});
@@ -26,11 +26,12 @@ module.exports.config = {
};
module.exports.up = function addRedirectsPermissions(options) {
- var modelToAdd = _private.getPermissions(),
- relationToAdd = _private.getRelations(),
- localOptions = _.merge({
- context: {internal: true}
- }, options);
+ const modelToAdd = _private.getPermissions();
+ const relationToAdd = _private.getRelations();
+
+ const localOptions = _.merge({
+ context: {internal: true}
+ }, options);
return utils.addFixturesForModel(modelToAdd, localOptions)
.then(function (result) {
diff --git a/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js b/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js
index 6926e5b3e1..dbd9249c4c 100644
--- a/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js
+++ b/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js
@@ -1,6 +1,6 @@
-const _ = require('lodash'),
- models = require('../../../../models'),
- common = require('../../../../lib/common');
+const _ = require('lodash');
+const models = require('../../../../models');
+const common = require('../../../../lib/common');
module.exports.config = {
transaction: true
diff --git a/core/server/data/migrations/versions/1.21/1-add-contributor-role.js b/core/server/data/migrations/versions/1.21/1-add-contributor-role.js
index 5dcf2bf67c..4795f8d9a0 100644
--- a/core/server/data/migrations/versions/1.21/1-add-contributor-role.js
+++ b/core/server/data/migrations/versions/1.21/1-add-contributor-role.js
@@ -1,13 +1,13 @@
-const merge = require('lodash/merge'),
- utils = require('../../../schema/fixtures/utils'),
- models = require('../../../../models'),
- permissions = require('../../../../services/permissions'),
- logging = require('../../../../lib/common/logging'),
- _private = {};
+const merge = require('lodash/merge');
+const utils = require('../../../schema/fixtures/utils');
+const models = require('../../../../models');
+const permissions = require('../../../../services/permissions');
+const logging = require('../../../../lib/common/logging');
+const _private = {};
_private.addRole = function addRole(options) {
- const contributorRole = utils.findModelFixtureEntry('Role', {name: 'Contributor'}),
- message = 'Adding "Contributor" role to roles table';
+ const contributorRole = utils.findModelFixtureEntry('Role', {name: 'Contributor'});
+ const message = 'Adding "Contributor" role to roles table';
return models.Role.findOne({name: contributorRole.name}, options)
.then((role) => {
@@ -22,8 +22,8 @@ _private.addRole = function addRole(options) {
};
_private.addContributorPermissions = function getPermissions(options) {
- const relations = utils.findRelationFixture('Role', 'Permission'),
- message = 'Adding permissions_roles fixtures for the contributor role';
+ const relations = utils.findRelationFixture('Role', 'Permission');
+ const message = 'Adding permissions_roles fixtures for the contributor role';
return utils.addFixturesForRelation({
from: relations.from,
@@ -46,7 +46,7 @@ module.exports.config = {
};
module.exports.up = function addContributorRole(options) {
- var localOptions = merge({
+ const localOptions = merge({
context: {internal: true}
}, options);
diff --git a/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.js b/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.js
index abdcab25ec..5a68f28e5c 100644
--- a/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.js
+++ b/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.js
@@ -1,9 +1,9 @@
-const Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- commands = require('../../../schema').commands,
- table = 'posts_authors',
- message1 = 'Adding table: ' + table,
- message2 = 'Dropping table: ' + table;
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'posts_authors';
+const message1 = 'Adding table: ' + table;
+const message2 = 'Dropping table: ' + table;
module.exports.up = function addMultipleAuthorsTable(options) {
let connection = options.connection;
diff --git a/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js b/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js
index f68292baef..db65fb09e7 100644
--- a/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js
+++ b/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js
@@ -1,16 +1,16 @@
-const _ = require('lodash'),
- Promise = require('bluebird'),
- ObjectId = require('bson-objectid'),
- common = require('../../../../lib/common'),
- models = require('../../../../models');
+const _ = require('lodash');
+const Promise = require('bluebird');
+const ObjectId = require('bson-objectid');
+const common = require('../../../../lib/common');
+const models = require('../../../../models');
module.exports.config = {
transaction: true
};
module.exports.up = function handleMultipleAuthors(options) {
- const postAllColumns = ['id', 'author_id'],
- userColumns = ['id'];
+ const postAllColumns = ['id', 'author_id'];
+ const userColumns = ['id'];
let localOptions = _.merge({
context: {internal: true}
diff --git a/core/server/data/migrations/versions/1.3/1-post-excerpt.js b/core/server/data/migrations/versions/1.3/1-post-excerpt.js
index d6e5510a64..29ba66407d 100644
--- a/core/server/data/migrations/versions/1.3/1-post-excerpt.js
+++ b/core/server/data/migrations/versions/1.3/1-post-excerpt.js
@@ -1,14 +1,14 @@
-const Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- commands = require('../../../schema').commands,
- table = 'posts',
- columns = ['custom_excerpt'],
- _private = {};
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'posts';
+const columns = ['custom_excerpt'];
+const _private = {};
_private.handle = function handle(options) {
- let type = options.type,
- isAdding = type === 'Adding',
- operation = isAdding ? commands.addColumn : commands.dropColumn;
+ let type = options.type;
+ let isAdding = type === 'Adding';
+ let operation = isAdding ? commands.addColumn : commands.dropColumn;
return function (options) {
let connection = options.connection;
diff --git a/core/server/data/migrations/versions/1.4/1-codeinjection-post.js b/core/server/data/migrations/versions/1.4/1-codeinjection-post.js
index d0b3512632..eb64ac3c73 100644
--- a/core/server/data/migrations/versions/1.4/1-codeinjection-post.js
+++ b/core/server/data/migrations/versions/1.4/1-codeinjection-post.js
@@ -1,14 +1,14 @@
-const Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- commands = require('../../../schema').commands,
- table = 'posts',
- columns = ['codeinjection_head', 'codeinjection_foot'],
- _private = {};
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'posts';
+const columns = ['codeinjection_head', 'codeinjection_foot'];
+const _private = {};
_private.handle = function handle(options) {
- let type = options.type,
- isAdding = type === 'Adding',
- operation = isAdding ? commands.addColumn : commands.dropColumn;
+ let type = options.type;
+ let isAdding = type === 'Adding';
+ let operation = isAdding ? commands.addColumn : commands.dropColumn;
return function (options) {
let connection = options.connection;
diff --git a/core/server/data/migrations/versions/1.5/1-og-twitter-post.js b/core/server/data/migrations/versions/1.5/1-og-twitter-post.js
index 0a868a5b3c..bb6b18d27c 100644
--- a/core/server/data/migrations/versions/1.5/1-og-twitter-post.js
+++ b/core/server/data/migrations/versions/1.5/1-og-twitter-post.js
@@ -1,14 +1,14 @@
-const Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- commands = require('../../../schema').commands,
- table = 'posts',
- columns = ['og_image', 'og_title', 'og_description', 'twitter_image', 'twitter_title', 'twitter_description'],
- _private = {};
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'posts';
+const columns = ['og_image', 'og_title', 'og_description', 'twitter_image', 'twitter_title', 'twitter_description'];
+const _private = {};
_private.handle = function handle(options) {
- let type = options.type,
- isAdding = type === 'Adding',
- operation = isAdding ? commands.addColumn : commands.dropColumn;
+ let type = options.type;
+ let isAdding = type === 'Adding';
+ let operation = isAdding ? commands.addColumn : commands.dropColumn;
return function (options) {
let connection = options.connection;
diff --git a/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js b/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js
index 0af5fe66c8..7539956b8f 100644
--- a/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js
+++ b/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js
@@ -1,9 +1,9 @@
-var _ = require('lodash'),
- utils = require('../../../schema/fixtures/utils'),
- permissions = require('../../../../services/permissions'),
- common = require('../../../../lib/common'),
- resource = 'redirect',
- _private = {};
+const _ = require('lodash');
+const utils = require('../../../schema/fixtures/utils');
+const permissions = require('../../../../services/permissions');
+const common = require('../../../../lib/common');
+const resource = 'redirect';
+const _private = {};
_private.getPermissions = function getPermissions() {
return utils.findModelFixtures('Permission', {object_type: resource});
@@ -26,11 +26,12 @@ module.exports.config = {
};
module.exports.up = function addRedirectsPermissions(options) {
- var modelToAdd = _private.getPermissions(),
- relationToAdd = _private.getRelations(),
- localOptions = _.merge({
- context: {internal: true}
- }, options);
+ const modelToAdd = _private.getPermissions();
+ const relationToAdd = _private.getRelations();
+
+ const localOptions = _.merge({
+ context: {internal: true}
+ }, options);
return utils.addFixturesForModel(modelToAdd, localOptions).then(function (result) {
_private.printResult(result, 'Adding permissions fixtures for ' + resource + 's');
diff --git a/core/server/data/migrations/versions/2.0/1-rename-amp-column.js b/core/server/data/migrations/versions/2.0/1-rename-amp-column.js
index 46679cfc08..1a70ba809d 100644
--- a/core/server/data/migrations/versions/2.0/1-rename-amp-column.js
+++ b/core/server/data/migrations/versions/2.0/1-rename-amp-column.js
@@ -1,11 +1,11 @@
-const common = require('../../../../lib/common'),
- table = 'posts',
- columnNameOld = 'amp',
- columnNameNew = 'comment_id',
- message1 = `Renaming column ${columnNameOld} to ${columnNameNew}`,
- message2 = `Rollback: Renaming column ${columnNameNew} to ${columnNameOld}`,
- message3 = `Renamed column ${columnNameOld} to ${columnNameNew}`,
- message4 = `Rollback: Renamed column ${columnNameNew} to ${columnNameOld}`;
+const common = require('../../../../lib/common');
+const table = 'posts';
+const columnNameOld = 'amp';
+const columnNameNew = 'comment_id';
+const message1 = `Renaming column ${columnNameOld} to ${columnNameNew}`;
+const message2 = `Rollback: Renaming column ${columnNameNew} to ${columnNameOld}`;
+const message3 = `Renamed column ${columnNameOld} to ${columnNameNew}`;
+const message4 = `Rollback: Renamed column ${columnNameNew} to ${columnNameOld}`;
module.exports.up = (options) => {
const connection = options.connection;
diff --git a/core/server/data/migrations/versions/2.0/2-update-posts.js b/core/server/data/migrations/versions/2.0/2-update-posts.js
index 24bd4ae83e..2d648f6577 100644
--- a/core/server/data/migrations/versions/2.0/2-update-posts.js
+++ b/core/server/data/migrations/versions/2.0/2-update-posts.js
@@ -1,11 +1,11 @@
-const _ = require('lodash'),
- Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- mobiledocLib = require('../../../../lib/mobiledoc'),
- message1 = 'Updating posts: apply new editor format and set comment_id field.',
- message2 = 'Updated posts: apply new editor format and set comment_id field.',
- message3 = 'Rollback: Updating posts: use old editor format',
- message4 = 'Rollback: Updated posts: use old editor format';
+const _ = require('lodash');
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const mobiledocLib = require('../../../../lib/mobiledoc');
+const message1 = 'Updating posts: apply new editor format and set comment_id field.';
+const message2 = 'Updated posts: apply new editor format and set comment_id field.';
+const message3 = 'Rollback: Updating posts: use old editor format';
+const message4 = 'Rollback: Updated posts: use old editor format';
module.exports.config = {
transaction: true
diff --git a/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js b/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js
index 0e64239d7c..8075247e86 100644
--- a/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js
+++ b/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js
@@ -1,10 +1,10 @@
-const _ = require('lodash'),
- Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- models = require('../../../../models'),
- message1 = 'Removing `koenigEditor` from labs.',
- message2 = 'Removed `koenigEditor` from labs.',
- message3 = 'Rollback: Please re-enable König Beta if required. We can\'t rollback this change.';
+const _ = require('lodash');
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const models = require('../../../../models');
+const message1 = 'Removing `koenigEditor` from labs.';
+const message2 = 'Removed `koenigEditor` from labs.';
+const message3 = 'Rollback: Please re-enable König Beta if required. We can\'t rollback this change.';
module.exports.config = {
transaction: true
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 4ad1528109..14c5d95c08 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,13 +1,13 @@
-const path = require('path'),
- fs = require('fs-extra'),
- config = require('../../../../config'),
- common = require('../../../../lib/common'),
- models = require('../../../../models'),
- message1 = 'Removing `globals.permalinks` from routes.yaml.',
- message2 = 'Removed `globals.permalinks` from routes.yaml.',
- message3 = 'Skip: Removing `globals.permalinks` from routes.yaml.',
- message4 = 'Rollback: Removing `globals.permalink` from routes.yaml. Nothing todo.',
- message5 = 'Skip Rollback: Removing `globals.permalinks` from routes.yaml. Nothing todo.';
+const path = require('path');
+const fs = require('fs-extra');
+const config = require('../../../../config');
+const common = require('../../../../lib/common');
+const models = require('../../../../models');
+const message1 = 'Removing `globals.permalinks` from routes.yaml.';
+const message2 = 'Removed `globals.permalinks` from routes.yaml.';
+const message3 = 'Skip: Removing `globals.permalinks` from routes.yaml.';
+const message4 = 'Rollback: Removing `globals.permalink` from routes.yaml. Nothing todo.';
+const message5 = 'Skip Rollback: Removing `globals.permalinks` from routes.yaml. Nothing todo.';
module.exports.up = () => {
let localOptions = {
diff --git a/core/server/data/migrations/versions/2.0/5-remove-demo-post.js b/core/server/data/migrations/versions/2.0/5-remove-demo-post.js
index fb61fac442..20b06f8125 100644
--- a/core/server/data/migrations/versions/2.0/5-remove-demo-post.js
+++ b/core/server/data/migrations/versions/2.0/5-remove-demo-post.js
@@ -1,10 +1,10 @@
-const _ = require('lodash'),
- common = require('../../../../lib/common'),
- message1 = 'Removing demo post.',
- message2 = 'Removed demo post.',
- message3 = 'Rollback: Bring back demo post.',
- message4 = 'Skip: Demo post was already removed.',
- message5 = 'Skip: Demo post exists.';
+const _ = require('lodash');
+const common = require('../../../../lib/common');
+const message1 = 'Removing demo post.';
+const message2 = 'Removed demo post.';
+const message3 = 'Rollback: Bring back demo post.';
+const message4 = 'Skip: Demo post was already removed.';
+const message5 = 'Skip: Demo post exists.';
const demoPost = {
title: 'Koenig Demo Post',
diff --git a/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.js b/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.js
index 26d68f8adb..daefe3254d 100644
--- a/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.js
+++ b/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.js
@@ -1,14 +1,14 @@
-const Promise = require('bluebird'),
- common = require('../../../../lib/common'),
- commands = require('../../../schema').commands,
- table = 'posts',
- columns = ['canonical_url'],
- _private = {};
+const Promise = require('bluebird');
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'posts';
+const columns = ['canonical_url'];
+const _private = {};
_private.handle = function handle(options) {
- let type = options.type,
- isAdding = type === 'Adding',
- operation = isAdding ? commands.addColumn : commands.dropColumn;
+ let type = options.type;
+ let isAdding = type === 'Adding';
+ let operation = isAdding ? commands.addColumn : commands.dropColumn;
return function (options) {
let connection = options.connection;
diff --git a/core/server/data/schema/clients/index.js b/core/server/data/schema/clients/index.js
index d19923a4dc..ae255b0d32 100644
--- a/core/server/data/schema/clients/index.js
+++ b/core/server/data/schema/clients/index.js
@@ -1,5 +1,5 @@
-var sqlite3 = require('./sqlite3'),
- mysql = require('./mysql');
+const sqlite3 = require('./sqlite3');
+const mysql = require('./mysql');
module.exports = {
sqlite3: sqlite3,
diff --git a/core/server/data/schema/clients/mysql.js b/core/server/data/schema/clients/mysql.js
index 9424c4882f..25ef9cfd0f 100644
--- a/core/server/data/schema/clients/mysql.js
+++ b/core/server/data/schema/clients/mysql.js
@@ -1,14 +1,15 @@
-var _ = require('lodash'),
- db = require('../../../data/db'),
+const _ = require('lodash');
+const db = require('../../../data/db');
- // private
- doRawAndFlatten,
+// private
+let doRawAndFlatten;
- // public
- getTables,
- getIndexes,
- getColumns,
- checkPostTable;
+// public
+let getTables;
+
+let getIndexes;
+let getColumns;
+let checkPostTable;
doRawAndFlatten = function doRaw(query, transaction, flattenFn) {
return (transaction || db.knex).raw(query).then(function (response) {
diff --git a/core/server/data/schema/clients/sqlite3.js b/core/server/data/schema/clients/sqlite3.js
index f869ee2e4b..6c2ad530d4 100644
--- a/core/server/data/schema/clients/sqlite3.js
+++ b/core/server/data/schema/clients/sqlite3.js
@@ -1,13 +1,14 @@
-var _ = require('lodash'),
- db = require('../../../data/db'),
+const _ = require('lodash');
+const db = require('../../../data/db');
- // private
- doRaw,
+// private
+let doRaw;
- // public
- getTables,
- getIndexes,
- getColumns;
+// public
+let getTables;
+
+let getIndexes;
+let getColumns;
doRaw = function doRaw(query, transaction, fn) {
if (!fn) {
diff --git a/core/server/data/schema/commands.js b/core/server/data/schema/commands.js
index ddeab13cba..b57950d6d2 100644
--- a/core/server/data/schema/commands.js
+++ b/core/server/data/schema/commands.js
@@ -1,12 +1,12 @@
-var _ = require('lodash'),
- Promise = require('bluebird'),
- common = require('../../lib/common'),
- db = require('../db'),
- schema = require('./schema'),
- clients = require('./clients');
+const _ = require('lodash');
+const Promise = require('bluebird');
+const common = require('../../lib/common');
+const db = require('../db');
+const schema = require('./schema');
+const clients = require('./clients');
function addTableColumn(tableName, table, columnName, columnSpec = schema[tableName][columnName]) {
- var column;
+ let column;
// creation distinguishes between text with fieldtype, string with maxlength and all others
if (columnSpec.type === 'text' && Object.prototype.hasOwnProperty.call(columnSpec, 'fieldtype')) {
@@ -83,7 +83,7 @@ function createTable(table, transaction) {
}
return (transaction || db.knex).schema.createTable(table, function (t) {
- var columnKeys = _.keys(schema[table]);
+ const columnKeys = _.keys(schema[table]);
_.each(columnKeys, function (column) {
return addTableColumn(table, t, column);
});
@@ -96,7 +96,7 @@ function deleteTable(table, transaction) {
}
function getTables(transaction) {
- var client = (transaction || db.knex).client.config.client;
+ const client = (transaction || db.knex).client.config.client;
if (_.includes(_.keys(clients), client)) {
return clients[client].getTables(transaction);
@@ -106,7 +106,7 @@ function getTables(transaction) {
}
function getIndexes(table, transaction) {
- var client = (transaction || db.knex).client.config.client;
+ const client = (transaction || db.knex).client.config.client;
if (_.includes(_.keys(clients), client)) {
return clients[client].getIndexes(table, transaction);
@@ -116,7 +116,7 @@ function getIndexes(table, transaction) {
}
function getColumns(table, transaction) {
- var client = (transaction || db.knex).client.config.client;
+ const client = (transaction || db.knex).client.config.client;
if (_.includes(_.keys(clients), client)) {
return clients[client].getColumns(table);
@@ -126,7 +126,7 @@ function getColumns(table, transaction) {
}
function checkTables(transaction) {
- var client = (transaction || db.knex).client.config.client;
+ const client = (transaction || db.knex).client.config.client;
if (client === 'mysql') {
return clients[client].checkPostTable();
diff --git a/core/server/data/schema/fixtures/utils.js b/core/server/data/schema/fixtures/utils.js
index 0c7951a4f5..e96ccc5ec9 100644
--- a/core/server/data/schema/fixtures/utils.js
+++ b/core/server/data/schema/fixtures/utils.js
@@ -1,30 +1,29 @@
// # Fixture Utils
// Standalone file which can be required to help with advanced operations on the fixtures.json file
-var _ = require('lodash'),
- Promise = require('bluebird'),
- common = require('../../../lib/common'),
- models = require('../../../models'),
- baseUtils = require('../../../models/base/utils'),
- sequence = require('../../../lib/promise/sequence'),
- moment = require('moment'),
+const _ = require('lodash');
- fixtures = require('./fixtures'),
+const Promise = require('bluebird');
+const common = require('../../../lib/common');
+const models = require('../../../models');
+const baseUtils = require('../../../models/base/utils');
+const sequence = require('../../../lib/promise/sequence');
+const moment = require('moment');
+const fixtures = require('./fixtures');
- // Private
- matchFunc,
- matchObj,
- fetchRelationData,
- findRelationFixture,
- findModelFixture,
+// Private
+let matchFunc;
- addFixturesForModel,
- addFixturesForRelation,
- removeFixturesForModel,
- removeFixturesForRelation,
-
- findModelFixtureEntry,
- findModelFixtures,
- findPermissionRelationsForObject;
+let matchObj;
+let fetchRelationData;
+let findRelationFixture;
+let findModelFixture;
+let addFixturesForModel;
+let addFixturesForRelation;
+let removeFixturesForModel;
+let removeFixturesForRelation;
+let findModelFixtureEntry;
+let findModelFixtures;
+let findPermissionRelationsForObject;
/**
* ### Match Func
@@ -41,7 +40,7 @@ var _ = require('lodash'),
matchFunc = function matchFunc(match, key, value) {
if (_.isArray(match)) {
return function (item) {
- var valueTest = true;
+ let valueTest = true;
if (_.isArray(value)) {
valueTest = value.indexOf(item.get(match[1])) > -1;
@@ -60,7 +59,7 @@ matchFunc = function matchFunc(match, key, value) {
};
matchObj = function matchObj(match, item) {
- var matchObj = {};
+ const matchObj = {};
if (_.isArray(match)) {
_.each(match, function (matchProp) {
@@ -82,11 +81,12 @@ matchObj = function matchObj(match, item) {
* @returns {Promise<*>}
*/
fetchRelationData = function fetchRelationData(relation, options) {
- var fromOptions = _.extend({}, options, {withRelated: [relation.from.relation]}),
- props = {
- from: models[relation.from.model].findAll(fromOptions),
- to: models[relation.to.model].findAll(options)
- };
+ const fromOptions = _.extend({}, options, {withRelated: [relation.from.relation]});
+
+ const props = {
+ from: models[relation.from.model].findAll(fromOptions),
+ to: models[relation.to.model].findAll(options)
+ };
return Promise.props(props);
};
@@ -150,11 +150,12 @@ addFixturesForModel = function addFixturesForModel(modelFixture, options = {}) {
* @returns {Promise.<*>}
*/
addFixturesForRelation = function addFixturesForRelation(relationFixture, options) {
- var ops = [], max = 0;
+ const ops = [];
+ let max = 0;
return fetchRelationData(relationFixture, options).then(function getRelationOps(data) {
_.each(relationFixture.entries, function processEntries(entry, key) {
- var fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
+ const fromItem = data.from.find(matchFunc(relationFixture.from.match, key));
// CASE: You add new fixtures e.g. a new role in a new release.
// As soon as an **older** migration script wants to add permissions for any resource, it iterates over the
@@ -165,7 +166,7 @@ addFixturesForRelation = function addFixturesForRelation(relationFixture, option
}
_.each(entry, function processEntryValues(value, key) {
- var toItems = data.to.filter(matchFunc(relationFixture.to.match, key, value));
+ let toItems = data.to.filter(matchFunc(relationFixture.to.match, key, value));
max += toItems.length;
// Remove any duplicates that already exist in the collection
@@ -227,7 +228,7 @@ findModelFixtureEntry = function findModelFixtureEntry(modelName, matchExpr) {
* @returns {Object} model fixture
*/
findModelFixtures = function findModelFixtures(modelName, matchExpr) {
- var foundModel = _.cloneDeep(findModelFixture(modelName));
+ const foundModel = _.cloneDeep(findModelFixture(modelName));
foundModel.entries = _.filter(foundModel.entries, matchExpr);
return foundModel;
};
@@ -254,7 +255,7 @@ findRelationFixture = function findRelationFixture(from, to) {
*/
findPermissionRelationsForObject = function findPermissionRelationsForObject(objName, role) {
// Make a copy and delete any entries we don't want
- var foundRelation = _.cloneDeep(findRelationFixture('Role', 'Permission'));
+ const foundRelation = _.cloneDeep(findRelationFixture('Role', 'Permission'));
_.each(foundRelation.entries, function (entry, key) {
_.each(entry, function (perm, obj) {
diff --git a/core/server/data/validation/index.js b/core/server/data/validation/index.js
index dd93ff061e..313e5d3652 100644
--- a/core/server/data/validation/index.js
+++ b/core/server/data/validation/index.js
@@ -1,17 +1,16 @@
-var schema = require('../schema').tables,
- _ = require('lodash'),
- validator = require('validator'),
- moment = require('moment-timezone'),
- assert = require('assert'),
- Promise = require('bluebird'),
- common = require('../../lib/common'),
- settingsCache = require('../../services/settings/cache'),
- urlUtils = require('../../lib/url-utils'),
-
- validatePassword,
- validateSchema,
- validateSettings,
- validate;
+const schema = require('../schema').tables;
+const _ = require('lodash');
+const validator = require('validator');
+const moment = require('moment-timezone');
+const assert = require('assert');
+const Promise = require('bluebird');
+const common = require('../../lib/common');
+const settingsCache = require('../../services/settings/cache');
+const urlUtils = require('../../lib/url-utils');
+let validatePassword;
+let validateSchema;
+let validateSettings;
+let validate;
function assertString(input) {
assert(typeof input === 'string', 'Validator js validates strings only');
@@ -24,9 +23,9 @@ function assertString(input) {
* @return {Boolean}
*/
function characterOccurance(stringToTest) {
- var chars = {},
- allowedOccurancy,
- valid = true;
+ const chars = {};
+ let allowedOccurancy;
+ let valid = true;
stringToTest = _.toString(stringToTest);
allowedOccurancy = stringToTest.length / 2;
@@ -55,7 +54,7 @@ function characterOccurance(stringToTest) {
// @TODO: We modify the global validator dependency here! https://github.com/chriso/validator.js/issues/525#issuecomment-213149570
validator.extend = function (name, fn) {
validator[name] = function () {
- var args = Array.prototype.slice.call(arguments);
+ const args = Array.prototype.slice.call(arguments);
assertString(args[0]);
return fn.apply(validator, args);
};
@@ -93,19 +92,20 @@ validator.extend('isSlug', function isSlug(str) {
* valid password: `validationResult: {isValid: true}`
*/
validatePassword = function validatePassword(password, email, blogTitle) {
- var validationResult = {isValid: true},
- disallowedPasswords = ['password', 'ghost', 'passw0rd'],
- blogUrl = urlUtils.urlFor('home', true),
- badPasswords = [
- '1234567890',
- 'qwertyuiop',
- 'qwertzuiop',
- 'asdfghjkl;',
- 'abcdefghij',
- '0987654321',
- '1q2w3e4r5t',
- '12345asdfg'
- ];
+ const validationResult = {isValid: true};
+ const disallowedPasswords = ['password', 'ghost', 'passw0rd'];
+ let blogUrl = urlUtils.urlFor('home', true);
+
+ const badPasswords = [
+ '1234567890',
+ 'qwertyuiop',
+ 'qwertzuiop',
+ 'asdfghjkl;',
+ 'abcdefghij',
+ '0987654321',
+ '1q2w3e4r5t',
+ '12345asdfg'
+ ];
blogTitle = blogTitle ? blogTitle : settingsCache.get('title');
blogUrl = blogUrl.replace(/^http(s?):\/\//, '');
@@ -178,12 +178,12 @@ validatePassword = function validatePassword(password, email, blogTitle) {
validateSchema = function validateSchema(tableName, model, options) {
options = options || {};
- var columns = _.keys(schema[tableName]),
- validationErrors = [];
+ const columns = _.keys(schema[tableName]);
+ let validationErrors = [];
_.each(columns, function each(columnKey) {
- var message = '',
- strVal = _.toString(model.get(columnKey)); // KEEP: Validator.js only validates strings.
+ let message = ''; // KEEP: Validator.js only validates strings.
+ const strVal = _.toString(model.get(columnKey));
if (options.method !== 'insert' && !_.has(model.changed, columnKey)) {
return;
@@ -276,9 +276,9 @@ validateSchema = function validateSchema(tableName, model, options) {
// settings are checked against the validation objects
// form default-settings.json
validateSettings = function validateSettings(defaultSettings, model) {
- var values = model.toJSON(),
- validationErrors = [],
- matchingDefault = defaultSettings[values.key];
+ const values = model.toJSON();
+ let validationErrors = [];
+ const matchingDefault = defaultSettings[values.key];
if (matchingDefault && matchingDefault.validations) {
validationErrors = validationErrors.concat(validate(values.value, values.key, matchingDefault.validations, 'settings'));
@@ -313,11 +313,12 @@ validateSettings = function validateSettings(defaultSettings, model) {
* @return {Array} returns an Array including the found validation errors (empty if none found);
*/
validate = function validate(value, key, validations, tableName) {
- var validationErrors = [], translation;
+ const validationErrors = [];
+ let translation;
value = _.toString(value);
_.each(validations, function each(validationOptions, validationName) {
- var goodResult = true;
+ let goodResult = true;
if (_.isBoolean(validationOptions)) {
goodResult = validationOptions;
diff --git a/core/server/ghost-server.js b/core/server/ghost-server.js
index 36c221d47b..dbdb062bf3 100644
--- a/core/server/ghost-server.js
+++ b/core/server/ghost-server.js
@@ -1,14 +1,15 @@
// # Ghost Server
// Handles the creation of an HTTP Server for Ghost
-var debug = require('ghost-ignition').debug('server'),
- Promise = require('bluebird'),
- fs = require('fs-extra'),
- path = require('path'),
- _ = require('lodash'),
- config = require('./config'),
- urlUtils = require('./lib/url-utils'),
- common = require('./lib/common'),
- moment = require('moment');
+const debug = require('ghost-ignition').debug('server');
+
+const Promise = require('bluebird');
+const fs = require('fs-extra');
+const path = require('path');
+const _ = require('lodash');
+const config = require('./config');
+const urlUtils = require('./lib/url-utils');
+const common = require('./lib/common');
+const moment = require('moment');
/**
* ## GhostServer
@@ -44,12 +45,14 @@ const debugInfo = {
*/
GhostServer.prototype.start = function (externalApp) {
debug('Starting...');
- var self = this,
- rootApp = externalApp ? externalApp : self.rootApp,
- socketConfig, socketValues = {
- path: path.join(config.get('paths').contentPath, config.get('env') + '.socket'),
- permissions: '660'
- };
+ const self = this;
+ const rootApp = externalApp ? externalApp : self.rootApp;
+ let socketConfig;
+
+ const socketValues = {
+ path: path.join(config.get('paths').contentPath, config.get('env') + '.socket'),
+ permissions: '660'
+ };
return new Promise(function (resolve, reject) {
if (Object.prototype.hasOwnProperty.call(config.get('server'), 'socket')) {
@@ -80,7 +83,7 @@ GhostServer.prototype.start = function (externalApp) {
}
self.httpServer.on('error', function (error) {
- var ghostError;
+ let ghostError;
if (error.errno === 'EADDRINUSE') {
ghostError = new common.errors.GhostError({
@@ -118,7 +121,7 @@ GhostServer.prototype.start = function (externalApp) {
* @returns {Promise} Resolves once Ghost has stopped
*/
GhostServer.prototype.stop = function () {
- var self = this;
+ const self = this;
return new Promise(function (resolve) {
if (self.httpServer === null) {
@@ -164,7 +167,7 @@ GhostServer.prototype.hammertime = function () {
* @param {Object} socket
*/
GhostServer.prototype.connection = function (socket) {
- var self = this;
+ const self = this;
self.connectionId += 1;
socket._ghostId = self.connectionId;
@@ -182,10 +185,10 @@ GhostServer.prototype.connection = function (socket) {
* httpServer from returning. We need to destroy all connections manually.
*/
GhostServer.prototype.closeConnections = function () {
- var self = this;
+ const self = this;
Object.keys(self.connections).forEach(function (socketId) {
- var socket = self.connections[socketId];
+ const socket = self.connections[socketId];
if (socket) {
socket.destroy();
diff --git a/core/server/index.js b/core/server/index.js
index a134bf4290..c5c5f8a582 100644
--- a/core/server/index.js
+++ b/core/server/index.js
@@ -30,12 +30,12 @@ function initialiseServices() {
// We pass the themeService API version here, so that the frontend services are less tightly-coupled
routing.bootstrap.start(themeService.getApiVersion());
- const permissions = require('./services/permissions'),
- xmlrpc = require('./services/xmlrpc'),
- slack = require('./services/slack'),
- {mega} = require('./services/mega'),
- webhooks = require('./services/webhooks'),
- scheduling = require('./adapters/scheduling');
+ const permissions = require('./services/permissions');
+ const xmlrpc = require('./services/xmlrpc');
+ const slack = require('./services/slack');
+ const {mega} = require('./services/mega');
+ const webhooks = require('./services/webhooks');
+ const scheduling = require('./adapters/scheduling');
debug('`initialiseServices` Start...');
diff --git a/core/server/lib/common/errors.js b/core/server/lib/common/errors.js
index 3886a852bd..08086fc71c 100644
--- a/core/server/lib/common/errors.js
+++ b/core/server/lib/common/errors.js
@@ -1,7 +1,7 @@
-const merge = require('lodash/merge'),
- each = require('lodash/each'),
- util = require('util'),
- errors = require('ghost-ignition').errors;
+const merge = require('lodash/merge');
+const each = require('lodash/each');
+const util = require('util');
+const errors = require('ghost-ignition').errors;
function GhostError(options) {
options = options || {};
diff --git a/core/server/lib/common/events.js b/core/server/lib/common/events.js
index 4ca28b24f7..5a39b9ad98 100644
--- a/core/server/lib/common/events.js
+++ b/core/server/lib/common/events.js
@@ -1,7 +1,7 @@
-const events = require('events'),
- util = require('util');
-let EventRegistry,
- EventRegistryInstance;
+const events = require('events');
+const util = require('util');
+let EventRegistry;
+let EventRegistryInstance;
EventRegistry = function () {
events.EventEmitter.call(this);
diff --git a/core/server/lib/common/i18n.js b/core/server/lib/common/i18n.js
index 197052eebb..19ef972a01 100644
--- a/core/server/lib/common/i18n.js
+++ b/core/server/lib/common/i18n.js
@@ -43,7 +43,8 @@ class I18n {
* @returns {string}
*/
t(path, bindings) {
- let string, msg;
+ let string;
+ let msg;
string = this._findString(path);
@@ -111,7 +112,8 @@ class I18n {
*/
_findString(msgPath, opts) {
const options = merge({log: true}, opts || {});
- let candidateString, matchingString;
+ let candidateString;
+ let matchingString;
// no path? no string
if (msgPath.length === 0 || !isString(msgPath)) {
@@ -179,7 +181,8 @@ class I18n {
* - Polyfill node.js if it does not have Intl support or support for a particular locale
*/
_initializeIntl() {
- let hasBuiltInLocaleData, IntlPolyfill;
+ let hasBuiltInLocaleData;
+ let IntlPolyfill;
if (global.Intl) {
// Determine if the built-in `Intl` has the locale data we need.
diff --git a/core/server/lib/common/logging.js b/core/server/lib/common/logging.js
index d3d332a42e..c948cbf416 100644
--- a/core/server/lib/common/logging.js
+++ b/core/server/lib/common/logging.js
@@ -1,5 +1,5 @@
-const config = require('../../config'),
- {logging} = require('ghost-ignition');
+const config = require('../../config');
+const {logging} = require('ghost-ignition');
module.exports = logging({
name: config.get('logging:name'),
diff --git a/core/server/lib/fs/package-json/filter.js b/core/server/lib/fs/package-json/filter.js
index c461599514..86843a2a9d 100644
--- a/core/server/lib/fs/package-json/filter.js
+++ b/core/server/lib/fs/package-json/filter.js
@@ -1,6 +1,6 @@
-var _ = require('lodash'),
- notAPackageRegex = /^\.|_messages|README.md/i,
- filterPackages;
+const _ = require('lodash');
+const notAPackageRegex = /^\.|_messages|README.md/i;
+let filterPackages;
/**
* ### Filter Packages
@@ -26,7 +26,7 @@ filterPackages = function filterPackages(packages, active) {
}
return _.reduce(packages, function (result, pkg, key) {
- var item = {};
+ let item = {};
if (!key.match(notAPackageRegex)) {
item = {
name: key,
diff --git a/core/server/lib/fs/package-json/parse.js b/core/server/lib/fs/package-json/parse.js
index 7b0454bf9e..a07d867869 100644
--- a/core/server/lib/fs/package-json/parse.js
+++ b/core/server/lib/fs/package-json/parse.js
@@ -2,9 +2,10 @@
* Dependencies
*/
-var Promise = require('bluebird'),
- fs = require('fs-extra'),
- common = require('../../common');
+const Promise = require('bluebird');
+
+const fs = require('fs-extra');
+const common = require('../../common');
/**
* Parse package.json and validate it has
@@ -14,13 +15,15 @@ var Promise = require('bluebird'),
function parsePackageJson(path) {
return fs.readFile(path)
.catch(function () {
- var err = new Error(common.i18n.t('errors.utils.parsepackagejson.couldNotReadPackage'));
+ const err = new Error(common.i18n.t('errors.utils.parsepackagejson.couldNotReadPackage'));
err.context = path;
return Promise.reject(err);
})
.then(function (source) {
- var hasRequiredKeys, json, err;
+ let hasRequiredKeys;
+ let json;
+ let err;
try {
json = JSON.parse(source);
diff --git a/core/server/lib/fs/package-json/read.js b/core/server/lib/fs/package-json/read.js
index 6a10fab547..e6c94d29c6 100644
--- a/core/server/lib/fs/package-json/read.js
+++ b/core/server/lib/fs/package-json/read.js
@@ -1,25 +1,24 @@
/**
* Dependencies
*/
-var Promise = require('bluebird'),
- _ = require('lodash'),
- join = require('path').join,
- fs = require('fs-extra'),
- parsePackageJson = require('./parse'),
- common = require('../../common'),
+const Promise = require('bluebird');
- notAPackageRegex = /^\.|_messages|README.md|node_modules|bower_components/i,
- packageJSONPath = 'package.json',
-
- readPackage,
- readPackages,
- processPackage;
+const _ = require('lodash');
+const join = require('path').join;
+const fs = require('fs-extra');
+const parsePackageJson = require('./parse');
+const common = require('../../common');
+const notAPackageRegex = /^\.|_messages|README.md|node_modules|bower_components/i;
+const packageJSONPath = 'package.json';
+let readPackage;
+let readPackages;
+let processPackage;
/**
* Recursively read directory and find the packages in it
*/
processPackage = function processPackage(absolutePath, packageName) {
- var pkg = {
+ const pkg = {
name: packageName,
path: absolutePath
};
@@ -39,7 +38,7 @@ processPackage = function processPackage(absolutePath, packageName) {
};
readPackage = function readPackage(packagePath, packageName) {
- var absolutePath = join(packagePath, packageName);
+ const absolutePath = join(packagePath, packageName);
return fs.stat(absolutePath)
.then(function (stat) {
if (!stat.isDirectory()) {
@@ -48,7 +47,7 @@ readPackage = function readPackage(packagePath, packageName) {
return processPackage(absolutePath, packageName)
.then(function gotPackage(pkg) {
- var res = {};
+ const res = {};
res[packageName] = pkg;
return res;
});
@@ -76,7 +75,7 @@ readPackages = function readPackages(packagePath) {
});
})
.map(function readPackageJson(packageName) {
- var absolutePath = join(packagePath, packageName);
+ const absolutePath = join(packagePath, packageName);
return processPackage(absolutePath, packageName);
})
.then(function (packages) {
diff --git a/core/server/lib/fs/read-csv.js b/core/server/lib/fs/read-csv.js
index 16e1bbfb19..dcdd8ec3ad 100644
--- a/core/server/lib/fs/read-csv.js
+++ b/core/server/lib/fs/read-csv.js
@@ -1,14 +1,15 @@
-const Promise = require('bluebird'),
- csvParser = require('csv-parser'),
- _ = require('lodash'),
- fs = require('fs-extra');
+const Promise = require('bluebird');
+const csvParser = require('csv-parser');
+const _ = require('lodash');
+const fs = require('fs-extra');
module.exports = function readCSV(options) {
- var columnsToExtract = options.columnsToExtract || [],
- results = [], rows = [];
+ const columnsToExtract = options.columnsToExtract || [];
+ let results = [];
+ const rows = [];
return new Promise(function (resolve, reject) {
- var readFile = fs.createReadStream(options.path);
+ const readFile = fs.createReadStream(options.path);
readFile.on('err', function (err) {
reject(err);
@@ -18,8 +19,11 @@ module.exports = function readCSV(options) {
rows.push(row);
})
.on('end', function () {
- // If CSV is single column - return all values including header
- var headers = _.keys(rows[0]), result = {}, columnMap = {};
+ // If CSV is single column - return all values including header
+ const headers = _.keys(rows[0]);
+
+ let result = {};
+ const columnMap = {};
if (columnsToExtract.length === 1 && headers.length === 1) {
results = _.map(rows, function (value) {
result = {};
@@ -27,8 +31,8 @@ module.exports = function readCSV(options) {
return result;
});
} else {
- // If there are multiple columns in csv file
- // try to match headers using lookup value
+ // If there are multiple columns in csv file
+ // try to match headers using lookup value
_.map(columnsToExtract, function findMatches(column) {
_.each(headers, function checkheader(header) {
@@ -39,7 +43,7 @@ module.exports = function readCSV(options) {
});
results = _.map(rows, function evaluateRow(row) {
- var result = {};
+ const result = {};
_.each(columnMap, function returnMatches(value, key) {
result[key] = row[value];
});
diff --git a/core/server/lib/ghost-version.js b/core/server/lib/ghost-version.js
index db9583f09b..acdf01db1c 100644
--- a/core/server/lib/ghost-version.js
+++ b/core/server/lib/ghost-version.js
@@ -1,7 +1,7 @@
-const semver = require('semver'),
- packageInfo = require('../../../package.json'),
- version = packageInfo.version,
- plainVersion = version.match(/^(\d+\.)?(\d+\.)?(\d+)/)[0];
+const semver = require('semver');
+const packageInfo = require('../../../package.json');
+const version = packageInfo.version;
+const plainVersion = version.match(/^(\d+\.)?(\d+\.)?(\d+)/)[0];
let _private = {};
diff --git a/core/server/lib/image/blog-icon.js b/core/server/lib/image/blog-icon.js
index 8ae04e9194..002d5d9921 100644
--- a/core/server/lib/image/blog-icon.js
+++ b/core/server/lib/image/blog-icon.js
@@ -1,18 +1,18 @@
-var sizeOf = require('image-size'),
- Promise = require('bluebird'),
- _ = require('lodash'),
- path = require('path'),
- config = require('../../config'),
- {i18n} = require('../common'),
- errors = require('@tryghost/errors'),
- urlUtils = require('../../lib/url-utils'),
- settingsCache = require('../../services/settings/cache'),
- storageUtils = require('../../adapters/storage/utils'),
- getIconDimensions,
- isIcoImageType,
- getIconType,
- getIconUrl,
- getIconPath;
+const sizeOf = require('image-size');
+const Promise = require('bluebird');
+const _ = require('lodash');
+const path = require('path');
+const config = require('../../config');
+const {i18n} = require('../common');
+const errors = require('@tryghost/errors');
+const urlUtils = require('../../lib/url-utils');
+const settingsCache = require('../../services/settings/cache');
+const storageUtils = require('../../adapters/storage/utils');
+let getIconDimensions;
+let isIcoImageType;
+let getIconType;
+let getIconUrl;
+let getIconPath;
/**
* Get dimensions for ico file from its real file storage path
@@ -23,7 +23,7 @@ var sizeOf = require('image-size'),
*/
getIconDimensions = function getIconDimensions(path) {
return new Promise(function getIconSize(resolve, reject) {
- var dimensions;
+ let dimensions;
try {
dimensions = sizeOf(path);
@@ -60,7 +60,7 @@ getIconDimensions = function getIconDimensions(path) {
* @description Takes a path and returns boolean value.
*/
isIcoImageType = function isIcoImageType(icon) {
- var blogIcon = icon || settingsCache.get('icon');
+ const blogIcon = icon || settingsCache.get('icon');
return blogIcon.match(/.ico$/i) ? true : false;
};
@@ -73,7 +73,7 @@ isIcoImageType = function isIcoImageType(icon) {
* @description Takes a path and returns boolean value.
*/
getIconType = function getIconType(icon) {
- var blogIcon = icon || settingsCache.get('icon');
+ const blogIcon = icon || settingsCache.get('icon');
return isIcoImageType(blogIcon) ? 'x-icon' : 'png';
};
@@ -86,7 +86,7 @@ getIconType = function getIconType(icon) {
* exists, we're returning the default `favicon.ico`
*/
getIconUrl = function getIconUrl(absolut) {
- var blogIcon = settingsCache.get('icon');
+ const blogIcon = settingsCache.get('icon');
if (absolut) {
if (blogIcon) {
@@ -111,7 +111,7 @@ getIconUrl = function getIconUrl(absolut) {
* exists, we're returning the default `favicon.ico`
*/
getIconPath = function getIconPath() {
- var blogIcon = settingsCache.get('icon');
+ const blogIcon = settingsCache.get('icon');
if (blogIcon) {
return storageUtils.getLocalFileStoragePath(blogIcon);
diff --git a/core/server/lib/image/cached-image-size-from-url.js b/core/server/lib/image/cached-image-size-from-url.js
index ffaead479f..2520fe799b 100644
--- a/core/server/lib/image/cached-image-size-from-url.js
+++ b/core/server/lib/image/cached-image-size-from-url.js
@@ -1,8 +1,8 @@
-var debug = require('ghost-ignition').debug('utils:image-size-cache'),
- imageSize = require('./image-size'),
- errors = require('@tryghost/errors'),
- {logging} = require('../common'),
- cache = {};
+const debug = require('ghost-ignition').debug('utils:image-size-cache');
+const imageSize = require('./image-size');
+const errors = require('@tryghost/errors');
+const {logging} = require('../common');
+const cache = {};
/**
* Get cached image size from URL
diff --git a/core/server/lib/image/gravatar.js b/core/server/lib/image/gravatar.js
index ae0cddaea8..cd949f05c3 100644
--- a/core/server/lib/image/gravatar.js
+++ b/core/server/lib/image/gravatar.js
@@ -1,10 +1,10 @@
-var Promise = require('bluebird'),
- crypto = require('crypto'),
- config = require('../../config'),
- request = require('../request');
+const Promise = require('bluebird');
+const crypto = require('crypto');
+const config = require('../../config');
+const request = require('../request');
module.exports.lookup = function lookup(userData, timeout) {
- var gravatarUrl = '//www.gravatar.com/avatar/' +
+ let gravatarUrl = '//www.gravatar.com/avatar/' +
crypto.createHash('md5').update(userData.email.toLowerCase().trim()).digest('hex') +
'?s=250';
diff --git a/core/server/lib/mobiledoc.js b/core/server/lib/mobiledoc.js
index 2e395a1349..38be181dc5 100644
--- a/core/server/lib/mobiledoc.js
+++ b/core/server/lib/mobiledoc.js
@@ -1,7 +1,9 @@
const common = require('./common');
const config = require('../config');
-let cardFactory, cards, mobiledocHtmlRenderer;
+let cardFactory;
+let cards;
+let mobiledocHtmlRenderer;
module.exports = {
get blankDocument() {
diff --git a/core/server/lib/promise/pipeline.js b/core/server/lib/promise/pipeline.js
index 18d99b5dc3..98be6651cb 100644
--- a/core/server/lib/promise/pipeline.js
+++ b/core/server/lib/promise/pipeline.js
@@ -4,21 +4,21 @@
* Based on pipeline.js from when.js:
* https://github.com/cujojs/when/blob/3.7.4/pipeline.js
*/
-var Promise = require('bluebird');
+const Promise = require('bluebird');
function pipeline(tasks /* initial arguments */) {
- var args = Array.prototype.slice.call(arguments, 1),
+ const args = Array.prototype.slice.call(arguments, 1);
- runTask = function (task, args) {
- // Self-optimizing function to run first task with multiple
- // args using apply, but subsequent tasks via direct invocation
- runTask = function (task, arg) {
- return task(arg);
- };
-
- return task.apply(null, args);
+ let runTask = function (task, args) {
+ // Self-optimizing function to run first task with multiple
+ // args using apply, but subsequent tasks via direct invocation
+ runTask = function (task, arg) {
+ return task(arg);
};
+ return task.apply(null, args);
+ };
+
// Resolve any promises for the arguments passed in first
return Promise.all(args).then(function (args) {
// Iterate through the tasks passing args from one into the next
diff --git a/core/server/lib/request.js b/core/server/lib/request.js
index 47b80e5aa0..c9a80e1a03 100644
--- a/core/server/lib/request.js
+++ b/core/server/lib/request.js
@@ -1,10 +1,10 @@
-var got = require('got'),
- _ = require('lodash'),
- validator = require('../data/validation').validator,
- errors = require('@tryghost/errors'),
- ghostVersion = require('./ghost-version');
+const got = require('got');
+const _ = require('lodash');
+const validator = require('../data/validation').validator;
+const errors = require('@tryghost/errors');
+const ghostVersion = require('./ghost-version');
-var defaultOptions = {
+const defaultOptions = {
headers: {
'user-agent': 'Ghost/' + ghostVersion.original + ' (https://github.com/TryGhost/Ghost)'
}
@@ -19,7 +19,7 @@ module.exports = function request(url, options) {
}));
}
- var mergedOptions = _.merge({}, defaultOptions, options);
+ const mergedOptions = _.merge({}, defaultOptions, options);
return got(url, mergedOptions);
};
diff --git a/core/server/lib/security/identifier.js b/core/server/lib/security/identifier.js
index 73f5176aa0..31f0c7a558 100644
--- a/core/server/lib/security/identifier.js
+++ b/core/server/lib/security/identifier.js
@@ -13,10 +13,10 @@ _private.getRandomInt = function (min, max) {
* @api private
*/
module.exports.uid = function uid(maxLength) {
- var buf = [],
- chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
- charLength = chars.length,
- i;
+ const buf = [];
+ const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+ const charLength = chars.length;
+ let i;
for (i = 0; i < maxLength; i = i + 1) {
buf.push(chars[_private.getRandomInt(0, charLength - 1)]);
diff --git a/core/server/lib/security/password.js b/core/server/lib/security/password.js
index 28e5667576..697e0be986 100644
--- a/core/server/lib/security/password.js
+++ b/core/server/lib/security/password.js
@@ -1,9 +1,9 @@
const Promise = require('bluebird');
module.exports.hash = function hash(plainPassword) {
- const bcrypt = require('bcryptjs'),
- bcryptGenSalt = Promise.promisify(bcrypt.genSalt),
- bcryptHash = Promise.promisify(bcrypt.hash);
+ const bcrypt = require('bcryptjs');
+ const bcryptGenSalt = Promise.promisify(bcrypt.genSalt);
+ const bcryptHash = Promise.promisify(bcrypt.hash);
return bcryptGenSalt().then(function (salt) {
return bcryptHash(plainPassword, salt);
@@ -11,8 +11,8 @@ module.exports.hash = function hash(plainPassword) {
};
module.exports.compare = function compare(plainPassword, hashedPassword) {
- const bcrypt = require('bcryptjs'),
- bcryptCompare = Promise.promisify(bcrypt.compare);
+ const bcrypt = require('bcryptjs');
+ const bcryptCompare = Promise.promisify(bcrypt.compare);
return bcryptCompare(plainPassword, hashedPassword);
};
diff --git a/core/server/lib/security/tokens.js b/core/server/lib/security/tokens.js
index 4429585bef..973c853d80 100644
--- a/core/server/lib/security/tokens.js
+++ b/core/server/lib/security/tokens.js
@@ -3,8 +3,8 @@ const crypto = require('crypto');
module.exports.generateFromContent = function generateFromContent(options) {
options = options || {};
- const hash = crypto.createHash('sha256'),
- content = options.content;
+ const hash = crypto.createHash('sha256');
+ const content = options.content;
let text = '';
@@ -17,10 +17,10 @@ module.exports.generateFromContent = function generateFromContent(options) {
module.exports.generateFromEmail = function generateFromEmail(options) {
options = options || {};
- const hash = crypto.createHash('sha256'),
- expires = options.expires,
- email = options.email,
- secret = options.secret;
+ const hash = crypto.createHash('sha256');
+ const expires = options.expires;
+ const email = options.email;
+ const secret = options.secret;
let text = '';
@@ -36,12 +36,12 @@ module.exports.resetToken = {
generateHash: function generateHash(options) {
options = options || {};
- var hash = crypto.createHash('sha256'),
- expires = options.expires,
- email = options.email,
- dbHash = options.dbHash,
- password = options.password,
- text = '';
+ const hash = crypto.createHash('sha256');
+ const expires = options.expires;
+ const email = options.email;
+ const dbHash = options.dbHash;
+ const password = options.password;
+ let text = '';
hash.update(String(expires));
hash.update(email.toLocaleLowerCase());
@@ -54,11 +54,11 @@ module.exports.resetToken = {
extract: function extract(options) {
options = options || {};
- var token = options.token,
- tokenText = Buffer.from(token, 'base64').toString('ascii'),
- parts,
- expires,
- email;
+ const token = options.token;
+ const tokenText = Buffer.from(token, 'base64').toString('ascii');
+ let parts;
+ let expires;
+ let email;
parts = tokenText.split('|');
@@ -78,13 +78,13 @@ module.exports.resetToken = {
compare: function compare(options) {
options = options || {};
- var tokenToCompare = options.token,
- parts = exports.resetToken.extract({token: tokenToCompare}),
- dbHash = options.dbHash,
- password = options.password,
- generatedToken,
- diff = 0,
- i;
+ const tokenToCompare = options.token;
+ const parts = exports.resetToken.extract({token: tokenToCompare});
+ const dbHash = options.dbHash;
+ const password = options.password;
+ let generatedToken;
+ let diff = 0;
+ let i;
if (isNaN(parts.expires)) {
return false;
diff --git a/core/server/models/base/index.js b/core/server/models/base/index.js
index 4ed1a5e234..d3dbf5f7c0 100644
--- a/core/server/models/base/index.js
+++ b/core/server/models/base/index.js
@@ -6,23 +6,23 @@
// accesses the models directly.
// All other parts of Ghost, including the frontend & admin UI are only allowed to access data via the API.
-const _ = require('lodash'),
- bookshelf = require('bookshelf'),
- moment = require('moment'),
- Promise = require('bluebird'),
- ObjectId = require('bson-objectid'),
- debug = require('ghost-ignition').debug('models:base'),
- config = require('../../config'),
- db = require('../../data/db'),
- common = require('../../lib/common'),
- security = require('../../lib/security'),
- schema = require('../../data/schema'),
- urlUtils = require('../../lib/url-utils'),
- validation = require('../../data/validation'),
- plugins = require('../plugins');
+const _ = require('lodash');
-let ghostBookshelf,
- proto;
+const bookshelf = require('bookshelf');
+const moment = require('moment');
+const Promise = require('bluebird');
+const ObjectId = require('bson-objectid');
+const debug = require('ghost-ignition').debug('models:base');
+const config = require('../../config');
+const db = require('../../data/db');
+const common = require('../../lib/common');
+const security = require('../../lib/security');
+const schema = require('../../data/schema');
+const urlUtils = require('../../lib/url-utils');
+const validation = require('../../data/validation');
+const plugins = require('../plugins');
+let ghostBookshelf;
+let proto;
// ### ghostBookshelf
// Initializes a new Bookshelf instance called ghostBookshelf, for reference elsewhere in Ghost.
@@ -59,7 +59,7 @@ ghostBookshelf.plugin('bookshelf-relations', {
belongsToMany: {
after: function (existing, targets, options) {
// reorder tags/authors
- var queryOptions = {
+ const queryOptions = {
query: {
where: {}
}
@@ -222,7 +222,7 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
// Bookshelf `initialize` - declare a constructor-like method for model creation
initialize: function initialize() {
- var self = this;
+ const self = this;
// NOTE: triggered before `creating`/`updating`
this.on('saving', function onSaving(newObj, attrs, options) {
@@ -429,7 +429,7 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* date format is now in each db the same
*/
fixDatesWhenSave: function fixDates(attrs) {
- var self = this;
+ const self = this;
_.each(attrs, function each(value, key) {
if (value !== null
@@ -451,7 +451,8 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* - knex wraps the UTC value into a local JS Date
*/
fixDatesWhenFetch: function fixDates(attrs) {
- var self = this, dateMoment;
+ const self = this;
+ let dateMoment;
_.each(attrs, function each(value, key) {
if (value !== null
@@ -474,7 +475,7 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
// Convert integers to real booleans
fixBools: function fixBools(attrs) {
- var self = this;
+ const self = this;
_.each(attrs, function each(value, key) {
if (Object.prototype.hasOwnProperty.call(schema.tables[self.tableName], key)
&& schema.tables[self.tableName][key].type === 'bool') {
@@ -701,9 +702,9 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @return {Object} The filtered results of the passed in data, containing only what's allowed in the schema.
*/
filterData: function filterData(data) {
- var permittedAttributes = this.prototype.permittedAttributes(),
- filteredData = _.pick(data, permittedAttributes),
- sanitizedData = this.sanitizeData(filteredData);
+ const permittedAttributes = this.prototype.permittedAttributes();
+ const filteredData = _.pick(data, permittedAttributes);
+ const sanitizedData = this.sanitizeData(filteredData);
return sanitizedData;
},
@@ -730,7 +731,8 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* Sanitize relations.
*/
sanitizeData: function sanitizeData(data) {
- var tableName = _.result(this.prototype, 'tableName'), date;
+ const tableName = _.result(this.prototype, 'tableName');
+ let date;
_.each(data, (value, property) => {
if (value !== null
@@ -801,9 +803,9 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
});
}
- var options = _.cloneDeep(unfilteredOptions),
- extraAllowedProperties = filterConfig.extraAllowedProperties || [],
- permittedOptions;
+ let options = _.cloneDeep(unfilteredOptions);
+ const extraAllowedProperties = filterConfig.extraAllowedProperties || [];
+ let permittedOptions;
permittedOptions = this.permittedOptions(methodName, options);
permittedOptions = _.union(permittedOptions, extraAllowedProperties);
@@ -825,8 +827,8 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @return {Promise(ghostBookshelf.Collection)} Collection of all Models
*/
findAll: function findAll(unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'findAll'),
- itemCollection = this.forge();
+ const options = this.filterOptions(unfilteredOptions, 'findAll');
+ const itemCollection = this.forge();
// @TODO: we can't use order raw when running migrations (see https://github.com/tgriesser/knex/issues/2763)
if (this.orderDefaultRaw && !options.migrating) {
@@ -872,9 +874,9 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @param {Object} unfilteredOptions
*/
findPage: function findPage(unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'findPage'),
- itemCollection = this.forge(),
- requestedColumns = options.columns;
+ const options = this.filterOptions(unfilteredOptions, 'findPage');
+ const itemCollection = this.forge();
+ const requestedColumns = options.columns;
// Set this to true or pass ?debug=true as an API option to get output
itemCollection.debug = options.debug && config.get('env') !== 'production';
@@ -992,8 +994,8 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @return {Promise(ghostBookshelf.Model)} Newly Added Model
*/
add: function add(data, unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'add'),
- model;
+ const options = this.filterOptions(unfilteredOptions, 'add');
+ let model;
data = this.filterData(data);
model = this.forge(data);
@@ -1042,14 +1044,17 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
* @return {Promise(String)} Resolves to a unique slug string
*/
generateSlug: function generateSlug(Model, base, options) {
- var slug,
- slugTryCount = 1,
- baseName = Model.prototype.tableName.replace(/s$/, ''),
- // Look for a matching slug, append an incrementing number if so
- checkIfSlugExists, longSlug;
+ let slug;
+ let slugTryCount = 1;
+ const baseName = Model.prototype.tableName.replace(/s$/, '');
+
+ // Look for a matching slug, append an incrementing number if so
+ let checkIfSlugExists;
+
+ let longSlug;
checkIfSlugExists = function checkIfSlugExists(slugToFind) {
- var args = {slug: slugToFind};
+ const args = {slug: slugToFind};
// status is needed for posts
if (options && options.status) {
@@ -1057,7 +1062,7 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
}
return Model.findOne(args, options).then(function then(found) {
- var trimSpace;
+ let trimSpace;
if (!found) {
return slugToFind;
@@ -1127,7 +1132,9 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
},
parseOrderOption: function (order, withRelated) {
- var permittedAttributes, result, rules;
+ let permittedAttributes;
+ let result;
+ let rules;
permittedAttributes = this.prototype.permittedAttributes();
if (withRelated && withRelated.indexOf('count.posts') > -1) {
@@ -1137,7 +1144,9 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
rules = order.split(',');
_.each(rules, function (rule) {
- var match, field, direction;
+ let match;
+ let field;
+ let direction;
match = /^([a-z0-9_.]+)\s+(asc|desc)$/i.exec(rule.trim());
diff --git a/core/server/models/base/listeners.js b/core/server/models/base/listeners.js
index a7e6bf2278..da4d807a0f 100644
--- a/core/server/models/base/listeners.js
+++ b/core/server/models/base/listeners.js
@@ -1,8 +1,8 @@
-var moment = require('moment-timezone'),
- _ = require('lodash'),
- models = require('../../models'),
- common = require('../../lib/common'),
- sequence = require('../../lib/promise/sequence');
+const moment = require('moment-timezone');
+const _ = require('lodash');
+const models = require('../../models');
+const common = require('../../lib/common');
+const sequence = require('../../lib/promise/sequence');
/**
* WHEN timezone changes, we will:
@@ -13,9 +13,9 @@ common.events.on('settings.active_timezone.edited', function (settingModel, opti
options = options || {};
options = _.merge({}, options, {context: {internal: true}});
- var newTimezone = settingModel.attributes.value,
- previousTimezone = settingModel._previousAttributes.value,
- timezoneOffsetDiff = moment.tz(previousTimezone).utcOffset() - moment.tz(newTimezone).utcOffset();
+ const newTimezone = settingModel.attributes.value;
+ const previousTimezone = settingModel._previousAttributes.value;
+ const timezoneOffsetDiff = moment.tz(previousTimezone).utcOffset() - moment.tz(newTimezone).utcOffset();
// CASE: TZ was updated, but did not change
if (previousTimezone === newTimezone) {
@@ -44,7 +44,7 @@ common.events.on('settings.active_timezone.edited', function (settingModel, opti
return sequence(results.map(function (post) {
return function reschedulePostIfPossible() {
- var newPublishedAtMoment = moment(post.get('published_at')).add(timezoneOffsetDiff, 'minutes');
+ const newPublishedAtMoment = moment(post.get('published_at')).add(timezoneOffsetDiff, 'minutes');
/**
* CASE:
@@ -88,9 +88,9 @@ common.events.on('settings.active_timezone.edited', function (settingModel, opti
* to the settings model to create real lock.
*/
common.events.on('settings.notifications.edited', function (settingModel) {
- var allNotifications = JSON.parse(settingModel.attributes.value || []),
- options = {context: {internal: true}},
- skip = true;
+ let allNotifications = JSON.parse(settingModel.attributes.value || []);
+ const options = {context: {internal: true}};
+ let skip = true;
allNotifications = allNotifications.filter(function (notification) {
// Do not delete the release notification
diff --git a/core/server/models/base/utils.js b/core/server/models/base/utils.js
index 2dc365b5d1..16888ad79c 100644
--- a/core/server/models/base/utils.js
+++ b/core/server/models/base/utils.js
@@ -2,11 +2,13 @@
* # Utils
* Parts of the model code which can be split out and unit tested
*/
-var _ = require('lodash'),
- Promise = require('bluebird'),
- ObjectId = require('bson-objectid'),
- common = require('../../lib/common'),
- attach, detach;
+const _ = require('lodash');
+
+const Promise = require('bluebird');
+const ObjectId = require('bson-objectid');
+const common = require('../../lib/common');
+let attach;
+let detach;
/**
* Attach wrapper (please never call attach manual!)
@@ -24,8 +26,8 @@ var _ = require('lodash'),
attach = function attach(Model, effectedModelId, relation, modelsToAttach, options) {
options = options || {};
- var fetchedModel,
- localOptions = {transacting: options.transacting};
+ let fetchedModel;
+ const localOptions = {transacting: options.transacting};
return Model.forge({id: effectedModelId}).fetch(localOptions)
.then(function successFetchedModel(_fetchedModel) {
@@ -66,8 +68,8 @@ attach = function attach(Model, effectedModelId, relation, modelsToAttach, optio
detach = function detach(Model, effectedModelId, relation, modelsToAttach, options) {
options = options || {};
- var fetchedModel,
- localOptions = {transacting: options.transacting};
+ let fetchedModel;
+ const localOptions = {transacting: options.transacting};
return Model.forge({id: effectedModelId}).fetch(localOptions)
.then(function successFetchedModel(_fetchedModel) {
diff --git a/core/server/models/index.js b/core/server/models/index.js
index b494ef2c2d..7cd6a465ef 100644
--- a/core/server/models/index.js
+++ b/core/server/models/index.js
@@ -2,9 +2,7 @@
* Dependencies
*/
-var _ = require('lodash'),
- exports,
- models;
+const _ = require('lodash');
// enable event listeners
require('./base/listeners');
@@ -14,7 +12,7 @@ require('./base/listeners');
*/
exports = module.exports;
-models = [
+const models = [
'permission',
'post',
'role',
diff --git a/core/server/models/invite.js b/core/server/models/invite.js
index d75e835bc8..7246572a2f 100644
--- a/core/server/models/invite.js
+++ b/core/server/models/invite.js
@@ -6,15 +6,15 @@ const security = require('../lib/security');
const settingsCache = require('../services/settings/cache');
const ghostBookshelf = require('./base');
-let Invite,
- Invites;
+let Invite;
+let Invites;
Invite = ghostBookshelf.Model.extend({
tableName: 'invites',
toJSON: function (unfilteredOptions) {
- var options = Invite.filterOptions(unfilteredOptions, 'toJSON'),
- attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
+ const options = Invite.filterOptions(unfilteredOptions, 'toJSON');
+ const attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
delete attrs.token;
return attrs;
diff --git a/core/server/models/label.js b/core/server/models/label.js
index 2d92cb717d..7e3fd8a213 100644
--- a/core/server/models/label.js
+++ b/core/server/models/label.js
@@ -1,7 +1,8 @@
const ghostBookshelf = require('./base');
const common = require('../lib/common');
-let Label, Labels;
+let Label;
+let Labels;
Label = ghostBookshelf.Model.extend({
@@ -31,7 +32,7 @@ Label = ghostBookshelf.Model.extend({
},
onSaving: function onSaving(newLabel, attr, options) {
- var self = this;
+ const self = this;
ghostBookshelf.Model.prototype.onSaving.apply(this, arguments);
// Make sure name is trimmed of extra spaces
@@ -84,15 +85,15 @@ Label = ghostBookshelf.Model.extend({
},
permittedOptions: function permittedOptions(methodName) {
- var options = ghostBookshelf.Model.permittedOptions.call(this, methodName),
+ let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
- // whitelists for the `options` hash argument on methods, by method name.
- // these are the only options that can be passed to Bookshelf / Knex.
- validOptions = {
- findAll: ['columns'],
- findOne: ['columns'],
- destroy: ['destroyAll']
- };
+ // whitelists for the `options` hash argument on methods, by method name.
+ // these are the only options that can be passed to Bookshelf / Knex.
+ const validOptions = {
+ findAll: ['columns'],
+ findOne: ['columns'],
+ destroy: ['destroyAll']
+ };
if (validOptions[methodName]) {
options = options.concat(validOptions[methodName]);
@@ -102,7 +103,7 @@ Label = ghostBookshelf.Model.extend({
},
destroy: function destroy(unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']});
+ const options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']});
options.withRelated = ['members'];
return this.forge({id: options.id})
diff --git a/core/server/models/permission.js b/core/server/models/permission.js
index 57a67748c0..4f59f27cd8 100644
--- a/core/server/models/permission.js
+++ b/core/server/models/permission.js
@@ -1,7 +1,7 @@
const ghostBookshelf = require('./base');
-let Permission,
- Permissions;
+let Permission;
+let Permissions;
Permission = ghostBookshelf.Model.extend({
diff --git a/core/server/models/plugins/collision.js b/core/server/models/plugins/collision.js
index 89081cc180..08864fcc54 100644
--- a/core/server/models/plugins/collision.js
+++ b/core/server/models/plugins/collision.js
@@ -1,13 +1,12 @@
-var moment = require('moment-timezone'),
- Promise = require('bluebird'),
- _ = require('lodash'),
- common = require('../../lib/common');
+const moment = require('moment-timezone');
+const Promise = require('bluebird');
+const _ = require('lodash');
+const common = require('../../lib/common');
module.exports = function (Bookshelf) {
- var ParentModel = Bookshelf.Model,
- Model;
+ const ParentModel = Bookshelf.Model;
- Model = Bookshelf.Model.extend({
+ const Model = Bookshelf.Model.extend({
/**
* Update collision protection.
*
@@ -24,9 +23,9 @@ module.exports = function (Bookshelf) {
* the same current database values and both would succeed to update and override each other.
*/
sync: function timestamp(options) {
- var parentSync = ParentModel.prototype.sync.apply(this, arguments),
- originalUpdateSync = parentSync.update,
- self = this;
+ const parentSync = ParentModel.prototype.sync.apply(this, arguments);
+ const originalUpdateSync = parentSync.update;
+ const self = this;
// CASE: only enabled for posts table
if (this.tableName !== 'posts' ||
diff --git a/core/server/models/plugins/include-count.js b/core/server/models/plugins/include-count.js
index 5d62241977..5a7eec891b 100644
--- a/core/server/models/plugins/include-count.js
+++ b/core/server/models/plugins/include-count.js
@@ -1,13 +1,10 @@
-var _debug = require('ghost-ignition').debug._base,
- debug = _debug('ghost-query'),
- _ = require('lodash');
+const _debug = require('ghost-ignition').debug._base;
+const debug = _debug('ghost-query');
+const _ = require('lodash');
module.exports = function (Bookshelf) {
- var modelProto = Bookshelf.Model.prototype,
- Model,
- countQueryBuilder;
-
- countQueryBuilder = {
+ const modelProto = Bookshelf.Model.prototype;
+ const countQueryBuilder = {
tags: {
posts: function addPostCountToTags(model, options) {
model.query('columns', 'tags.*', function (qb) {
@@ -44,13 +41,13 @@ module.exports = function (Bookshelf) {
}
};
- Model = Bookshelf.Model.extend({
+ const Model = Bookshelf.Model.extend({
addCounts: function (options) {
if (!options) {
return;
}
- var tableName = _.result(this, 'tableName');
+ const tableName = _.result(this, 'tableName');
if (options.withRelated && options.withRelated.indexOf('count.posts') > -1) {
// remove post_count from withRelated
@@ -86,11 +83,11 @@ module.exports = function (Bookshelf) {
},
serialize: function serialize(options) {
- var attrs = modelProto.serialize.call(this, options),
- countRegex = /^(count)(__)(.*)$/;
+ const attrs = modelProto.serialize.call(this, options);
+ const countRegex = /^(count)(__)(.*)$/;
_.forOwn(attrs, function (value, key) {
- var match = key.match(countRegex);
+ const match = key.match(countRegex);
if (match) {
attrs[match[1]] = attrs[match[1]] || {};
attrs[match[1]][match[3]] = value;
diff --git a/core/server/models/plugins/pagination.js b/core/server/models/plugins/pagination.js
index 53da976c2e..7d47e5fb2e 100644
--- a/core/server/models/plugins/pagination.js
+++ b/core/server/models/plugins/pagination.js
@@ -1,11 +1,12 @@
// # Pagination
//
// Extends Bookshelf.Model with a `fetchPage` method. Handles everything to do with paginated requests.
-var _ = require('lodash'),
- common = require('../../lib/common'),
- defaults,
- paginationUtils,
- pagination;
+const _ = require('lodash');
+
+const common = require('../../lib/common');
+let defaults;
+let paginationUtils;
+let pagination;
/**
* ### Default pagination values
@@ -65,15 +66,16 @@ paginationUtils = {
* @returns {pagination} pagination metadata
*/
formatResponse: function formatResponse(totalItems, options) {
- var calcPages = Math.ceil(totalItems / options.limit) || 0,
- pagination = {
- page: options.page || defaults.page,
- limit: options.limit,
- pages: calcPages === 0 ? 1 : calcPages,
- total: totalItems,
- next: null,
- prev: null
- };
+ const calcPages = Math.ceil(totalItems / options.limit) || 0;
+
+ const pagination = {
+ page: options.page || defaults.page,
+ limit: options.limit,
+ pages: calcPages === 0 ? 1 : calcPages,
+ total: totalItems,
+ next: null,
+ prev: null
+ };
if (pagination.pages > 1) {
if (pagination.page === 1) {
@@ -142,9 +144,10 @@ pagination = function pagination(bookshelf) {
options = paginationUtils.parseOptions(options);
// Get the table name and idAttribute for this model
- var tableName = _.result(this.constructor.prototype, 'tableName'),
- idAttribute = _.result(this.constructor.prototype, 'idAttribute'),
- self = this;
+ const tableName = _.result(this.constructor.prototype, 'tableName');
+
+ const idAttribute = _.result(this.constructor.prototype, 'idAttribute');
+ const self = this;
let countPromise;
if (options.transacting) {
diff --git a/core/server/models/post.js b/core/server/models/post.js
index a83eefe9f0..76c9c68bc1 100644
--- a/core/server/models/post.js
+++ b/core/server/models/post.js
@@ -111,7 +111,7 @@ Post = ghostBookshelf.Model.extend({
return;
}
- var status = model.get('status');
+ const status = model.get('status');
model.emitChange('added', options);
@@ -263,20 +263,22 @@ Post = ghostBookshelf.Model.extend({
onSaving: function onSaving(model, attr, options) {
options = options || {};
- var self = this,
- title,
- i,
- // Variables to make the slug checking more readable
- newTitle = this.get('title'),
- newStatus = this.get('status'),
- olderStatus = this.previous('status'),
- prevTitle = this.previous('title'),
- prevSlug = this.previous('slug'),
- publishedAt = this.get('published_at'),
- publishedAtHasChanged = this.hasDateChanged('published_at', {beforeWrite: true}),
- generatedFields = ['html', 'plaintext'],
- tagsToSave,
- ops = [];
+ const self = this;
+ let title;
+ let i;
+
+ // Variables to make the slug checking more readable
+ const newTitle = this.get('title');
+
+ const newStatus = this.get('status');
+ const olderStatus = this.previous('status');
+ const prevTitle = this.previous('title');
+ const prevSlug = this.previous('slug');
+ const publishedAt = this.get('published_at');
+ const publishedAtHasChanged = this.hasDateChanged('published_at', {beforeWrite: true});
+ const generatedFields = ['html', 'plaintext'];
+ let tagsToSave;
+ const ops = [];
// CASE: disallow published -> scheduled
// @TODO: remove when we have versioning based on updated_at
@@ -635,8 +637,8 @@ Post = ghostBookshelf.Model.extend({
* Otherwise we return what is requested e.g. `?formats=mobiledoc,plaintext`
*/
formatsToJSON: function formatsToJSON(attrs, options) {
- var defaultFormats = ['html'],
- formatsToKeep = options.formats || defaultFormats;
+ const defaultFormats = ['html'];
+ const formatsToKeep = options.formats || defaultFormats;
// Iterate over all known formats, and if they are not in the keep list, remove them
_.each(Post.allowedFormats, function (format) {
@@ -649,8 +651,8 @@ Post = ghostBookshelf.Model.extend({
},
toJSON: function toJSON(unfilteredOptions) {
- var options = Post.filterOptions(unfilteredOptions, 'toJSON'),
- attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
+ const options = Post.filterOptions(unfilteredOptions, 'toJSON');
+ let attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
attrs = this.formatsToJSON(attrs, options);
@@ -769,17 +771,17 @@ Post = ghostBookshelf.Model.extend({
* @return {Array} Keys allowed in the `options` hash of the model's method.
*/
permittedOptions: function permittedOptions(methodName) {
- var options = ghostBookshelf.Model.permittedOptions.call(this, methodName),
+ let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
- // whitelists for the `options` hash argument on methods, by method name.
- // these are the only options that can be passed to Bookshelf / Knex.
- validOptions = {
- findOne: ['columns', 'importing', 'withRelated', 'require', 'filter'],
- findPage: ['status'],
- findAll: ['columns', 'filter'],
- destroy: ['destroyAll', 'destroyBy'],
- edit: ['filter', 'send_email_when_published']
- };
+ // whitelists for the `options` hash argument on methods, by method name.
+ // these are the only options that can be passed to Bookshelf / Knex.
+ const validOptions = {
+ findOne: ['columns', 'importing', 'withRelated', 'require', 'filter'],
+ findPage: ['status'],
+ findAll: ['columns', 'filter'],
+ destroy: ['destroyAll', 'destroyBy'],
+ edit: ['filter', 'send_email_when_published']
+ };
// The post model additionally supports having a formats option
options.push('formats');
@@ -822,8 +824,8 @@ Post = ghostBookshelf.Model.extend({
* @return {Object} The filtered results of the passed in data, containing only what's allowed in the schema.
*/
filterData: function filterData(data) {
- var filteredData = ghostBookshelf.Model.filterData.apply(this, arguments),
- extraData = _.pick(data, this.prototype.relationships);
+ const filteredData = ghostBookshelf.Model.filterData.apply(this, arguments);
+ const extraData = _.pick(data, this.prototype.relationships);
_.merge(filteredData, extraData);
return filteredData;
diff --git a/core/server/models/relations/authors.js b/core/server/models/relations/authors.js
index a0141ce1ec..2beabd9e33 100644
--- a/core/server/models/relations/authors.js
+++ b/core/server/models/relations/authors.js
@@ -291,9 +291,9 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
* @param {[type]} options has context and id. Context is the user doing the destroy, id is the user to destroy
*/
destroyByAuthor: function destroyByAuthor(unfilteredOptions) {
- let options = this.filterOptions(unfilteredOptions, 'destroyByAuthor', {extraAllowedProperties: ['id']}),
- postCollection = Posts.forge(),
- authorId = options.id;
+ let options = this.filterOptions(unfilteredOptions, 'destroyByAuthor', {extraAllowedProperties: ['id']});
+ let postCollection = Posts.forge();
+ let authorId = options.id;
if (!authorId) {
return Promise.reject(new common.errors.NotFoundError({
@@ -332,9 +332,14 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
},
permissible: function permissible(postModelOrId, action, context, unsafeAttrs, loadedPermissions, hasUserPermission, hasApiKeyPermission) {
- var self = this,
- postModel = postModelOrId,
- origArgs, isContributor, isAuthor, isEdit, isAdd, isDestroy;
+ const self = this;
+ const postModel = postModelOrId;
+ let origArgs;
+ let isContributor;
+ let isAuthor;
+ let isEdit;
+ let isAdd;
+ let isDestroy;
// If we passed in an id instead of a model, get the model
// then check the permissions
diff --git a/core/server/models/role.js b/core/server/models/role.js
index 0bcdb3ee8f..2cbe00caaf 100644
--- a/core/server/models/role.js
+++ b/core/server/models/role.js
@@ -1,10 +1,9 @@
-var _ = require('lodash'),
- ghostBookshelf = require('./base'),
- Promise = require('bluebird'),
- common = require('../lib/common'),
-
- Role,
- Roles;
+const _ = require('lodash');
+const ghostBookshelf = require('./base');
+const Promise = require('bluebird');
+const common = require('../lib/common');
+let Role;
+let Roles;
Role = ghostBookshelf.Model.extend({
@@ -34,14 +33,14 @@ Role = ghostBookshelf.Model.extend({
* @return {Array} Keys allowed in the `options` hash of the model's method.
*/
permittedOptions: function permittedOptions(methodName) {
- var options = ghostBookshelf.Model.permittedOptions.call(this, methodName),
+ let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
- // whitelists for the `options` hash argument on methods, by method name.
- // these are the only options that can be passed to Bookshelf / Knex.
- validOptions = {
- findOne: ['withRelated'],
- findAll: ['withRelated']
- };
+ // whitelists for the `options` hash argument on methods, by method name.
+ // these are the only options that can be passed to Bookshelf / Knex.
+ const validOptions = {
+ findOne: ['withRelated'],
+ findAll: ['withRelated']
+ };
if (validOptions[methodName]) {
options = options.concat(validOptions[methodName]);
diff --git a/core/server/models/settings.js b/core/server/models/settings.js
index d7245df1e0..9d747e0771 100644
--- a/core/server/models/settings.js
+++ b/core/server/models/settings.js
@@ -1,15 +1,15 @@
-const Promise = require('bluebird'),
- _ = require('lodash'),
- uuid = require('uuid'),
- crypto = require('crypto'),
- keypair = require('keypair'),
- ghostBookshelf = require('./base'),
- common = require('../lib/common'),
- validation = require('../data/validation'),
- settingsCache = require('../services/settings/cache'),
- internalContext = {context: {internal: true}};
-
-let Settings, defaultSettings;
+const Promise = require('bluebird');
+const _ = require('lodash');
+const uuid = require('uuid');
+const crypto = require('crypto');
+const keypair = require('keypair');
+const ghostBookshelf = require('./base');
+const common = require('../lib/common');
+const validation = require('../data/validation');
+const settingsCache = require('../services/settings/cache');
+const internalContext = {context: {internal: true}};
+let Settings;
+let defaultSettings;
const doBlock = fn => fn();
@@ -37,21 +37,22 @@ const getGhostKey = doBlock(() => {
// It's much easier for us to work with it as a single level
// instead of iterating those categories every time
function parseDefaultSettings() {
- var defaultSettingsInCategories = require('../data/schema/').defaultSettings,
- defaultSettingsFlattened = {},
- dynamicDefault = {
- db_hash: () => uuid.v4(),
- public_hash: () => crypto.randomBytes(15).toString('hex'),
- // @TODO: session_secret would ideally be named "admin_session_secret"
- session_secret: () => crypto.randomBytes(32).toString('hex'),
- members_session_secret: () => crypto.randomBytes(32).toString('hex'),
- theme_session_secret: () => crypto.randomBytes(32).toString('hex'),
- members_public_key: () => getMembersKey('public'),
- members_private_key: () => getMembersKey('private'),
- members_email_auth_secret: () => crypto.randomBytes(64).toString('hex'),
- ghost_public_key: () => getGhostKey('public'),
- ghost_private_key: () => getGhostKey('private')
- };
+ const defaultSettingsInCategories = require('../data/schema/').defaultSettings;
+ const defaultSettingsFlattened = {};
+
+ const dynamicDefault = {
+ db_hash: () => uuid.v4(),
+ public_hash: () => crypto.randomBytes(15).toString('hex'),
+ // @TODO: session_secret would ideally be named "admin_session_secret"
+ session_secret: () => crypto.randomBytes(32).toString('hex'),
+ members_session_secret: () => crypto.randomBytes(32).toString('hex'),
+ theme_session_secret: () => crypto.randomBytes(32).toString('hex'),
+ members_public_key: () => getMembersKey('public'),
+ members_private_key: () => getMembersKey('private'),
+ members_email_auth_secret: () => crypto.randomBytes(64).toString('hex'),
+ ghost_public_key: () => getGhostKey('public'),
+ ghost_private_key: () => getGhostKey('private')
+ };
_.each(defaultSettingsInCategories, function each(settings, categoryName) {
_.each(settings, function each(setting, settingName) {
@@ -121,7 +122,7 @@ Settings = ghostBookshelf.Model.extend({
},
onValidate: function onValidate() {
- var self = this;
+ const self = this;
return ghostBookshelf.Model.prototype.onValidate.apply(this, arguments)
.then(function then() {
@@ -170,8 +171,8 @@ Settings = ghostBookshelf.Model.extend({
},
edit: function (data, unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'edit'),
- self = this;
+ const options = this.filterOptions(unfilteredOptions, 'edit');
+ const self = this;
if (!Array.isArray(data)) {
data = [data];
@@ -218,8 +219,8 @@ Settings = ghostBookshelf.Model.extend({
},
populateDefaults: function populateDefaults(unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'populateDefaults'),
- self = this;
+ const options = this.filterOptions(unfilteredOptions, 'populateDefaults');
+ const self = this;
if (!options.context) {
options.context = internalContext.context;
@@ -228,13 +229,14 @@ Settings = ghostBookshelf.Model.extend({
return this
.findAll(options)
.then(function checkAllSettings(allSettings) {
- var usedKeys = allSettings.models.map(function mapper(setting) {
- return setting.get('key');
- }),
- insertOperations = [];
+ const usedKeys = allSettings.models.map(function mapper(setting) {
+ return setting.get('key');
+ });
+
+ const insertOperations = [];
_.each(getDefaultSettings(), function forEachDefault(defaultSetting, defaultSettingKey) {
- var isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1;
+ const isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1;
if (isMissingFromDB) {
defaultSetting.value = defaultSetting.getDefaultValue();
insertOperations.push(Settings.forge(defaultSetting).save(null, options));
diff --git a/core/server/models/tag.js b/core/server/models/tag.js
index f3245ad891..5ca5ef582e 100644
--- a/core/server/models/tag.js
+++ b/core/server/models/tag.js
@@ -1,7 +1,8 @@
const ghostBookshelf = require('./base');
const common = require('../lib/common');
-let Tag, Tags;
+let Tag;
+let Tags;
Tag = ghostBookshelf.Model.extend({
@@ -37,7 +38,7 @@ Tag = ghostBookshelf.Model.extend({
},
onSaving: function onSaving(newTag, attr, options) {
- var self = this;
+ const self = this;
ghostBookshelf.Model.prototype.onSaving.apply(this, arguments);
@@ -61,8 +62,8 @@ Tag = ghostBookshelf.Model.extend({
},
toJSON: function toJSON(unfilteredOptions) {
- var options = Tag.filterOptions(unfilteredOptions, 'toJSON'),
- attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
+ const options = Tag.filterOptions(unfilteredOptions, 'toJSON');
+ const attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
// @NOTE: this serialization should be moved into api layer, it's not being moved as it's not used
attrs.parent = attrs.parent || attrs.parent_id;
@@ -94,15 +95,15 @@ Tag = ghostBookshelf.Model.extend({
},
permittedOptions: function permittedOptions(methodName) {
- var options = ghostBookshelf.Model.permittedOptions.call(this, methodName),
+ let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
- // whitelists for the `options` hash argument on methods, by method name.
- // these are the only options that can be passed to Bookshelf / Knex.
- validOptions = {
- findAll: ['columns'],
- findOne: ['columns', 'visibility'],
- destroy: ['destroyAll']
- };
+ // whitelists for the `options` hash argument on methods, by method name.
+ // these are the only options that can be passed to Bookshelf / Knex.
+ const validOptions = {
+ findAll: ['columns'],
+ findOne: ['columns', 'visibility'],
+ destroy: ['destroyAll']
+ };
if (validOptions[methodName]) {
options = options.concat(validOptions[methodName]);
@@ -112,7 +113,7 @@ Tag = ghostBookshelf.Model.extend({
},
destroy: function destroy(unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']});
+ const options = this.filterOptions(unfilteredOptions, 'destroy', {extraAllowedProperties: ['id']});
options.withRelated = ['posts'];
return this.forge({id: options.id})
diff --git a/core/server/models/user.js b/core/server/models/user.js
index 6a8a27ea10..53400c2f32 100644
--- a/core/server/models/user.js
+++ b/core/server/models/user.js
@@ -1,24 +1,26 @@
-const _ = require('lodash'),
- Promise = require('bluebird'),
- validator = require('validator'),
- ObjectId = require('bson-objectid'),
- ghostBookshelf = require('./base'),
- baseUtils = require('./base/utils'),
- common = require('../lib/common'),
- security = require('../lib/security'),
- imageLib = require('../lib/image'),
- pipeline = require('../lib/promise/pipeline'),
- validation = require('../data/validation'),
- permissions = require('../services/permissions'),
- activeStates = ['active', 'warn-1', 'warn-2', 'warn-3', 'warn-4'],
- /**
- * inactive: owner user before blog setup, suspended users
- * locked user: imported users, they get a random password
- */
- inactiveStates = ['inactive', 'locked'],
- allStates = activeStates.concat(inactiveStates);
+const _ = require('lodash');
+const Promise = require('bluebird');
+const validator = require('validator');
+const ObjectId = require('bson-objectid');
+const ghostBookshelf = require('./base');
+const baseUtils = require('./base/utils');
+const common = require('../lib/common');
+const security = require('../lib/security');
+const imageLib = require('../lib/image');
+const pipeline = require('../lib/promise/pipeline');
+const validation = require('../data/validation');
+const permissions = require('../services/permissions');
+const activeStates = ['active', 'warn-1', 'warn-2', 'warn-3', 'warn-4'];
-let User, Users;
+/**
+ * inactive: owner user before blog setup, suspended users
+ * locked user: imported users, they get a random password
+ */
+const inactiveStates = ['inactive', 'locked'];
+
+const allStates = activeStates.concat(inactiveStates);
+let User;
+let Users;
User = ghostBookshelf.Model.extend({
@@ -106,9 +108,9 @@ User = ghostBookshelf.Model.extend({
* Generating a slug requires a db call to look for conflicting slugs
*/
onSaving: function onSaving(newPage, attr, options) {
- var self = this,
- tasks = [],
- passwordValidation = {};
+ const self = this;
+ const tasks = [];
+ let passwordValidation = {};
ghostBookshelf.Model.prototype.onSaving.apply(this, arguments);
@@ -210,8 +212,8 @@ User = ghostBookshelf.Model.extend({
},
toJSON: function toJSON(unfilteredOptions) {
- var options = User.filterOptions(unfilteredOptions, 'toJSON'),
- attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
+ const options = User.filterOptions(unfilteredOptions, 'toJSON');
+ const attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
// remove password hash for security reasons
delete attrs.password;
@@ -247,7 +249,7 @@ User = ghostBookshelf.Model.extend({
},
hasRole: function hasRole(roleName) {
- var roles = this.related('roles');
+ const roles = this.related('roles');
return roles.some(function getRole(role) {
return role.get('name') === roleName;
@@ -336,18 +338,18 @@ User = ghostBookshelf.Model.extend({
* @return {Array} Keys allowed in the `options` hash of the model's method.
*/
permittedOptions: function permittedOptions(methodName, options) {
- var permittedOptionsToReturn = ghostBookshelf.Model.permittedOptions.call(this, methodName),
+ let permittedOptionsToReturn = ghostBookshelf.Model.permittedOptions.call(this, methodName);
- // whitelists for the `options` hash argument on methods, by method name.
- // these are the only options that can be passed to Bookshelf / Knex.
- validOptions = {
- findOne: ['withRelated', 'status'],
- setup: ['id'],
- edit: ['withRelated', 'importPersistUser'],
- add: ['importPersistUser'],
- findPage: ['status'],
- findAll: ['filter']
- };
+ // whitelists for the `options` hash argument on methods, by method name.
+ // these are the only options that can be passed to Bookshelf / Knex.
+ const validOptions = {
+ findOne: ['withRelated', 'status'],
+ setup: ['id'],
+ edit: ['withRelated', 'importPersistUser'],
+ add: ['importPersistUser'],
+ findPage: ['status'],
+ findAll: ['filter']
+ };
if (validOptions[methodName]) {
permittedOptionsToReturn = permittedOptionsToReturn.concat(validOptions[methodName]);
@@ -377,11 +379,11 @@ User = ghostBookshelf.Model.extend({
* **See:** [ghostBookshelf.Model.findOne](base.js.html#Find%20One)
*/
findOne: function findOne(dataToClone, unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'findOne'),
- query,
- status,
- data = _.cloneDeep(dataToClone),
- lookupRole = data.role;
+ const options = this.filterOptions(unfilteredOptions, 'findOne');
+ let query;
+ let status;
+ let data = _.cloneDeep(dataToClone);
+ const lookupRole = data.role;
// Ensure only valid fields/columns are added to query
if (options.columns) {
@@ -428,9 +430,9 @@ User = ghostBookshelf.Model.extend({
* **See:** [ghostBookshelf.Model.edit](base.js.html#edit)
*/
edit: function edit(data, unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'edit'),
- self = this,
- ops = [];
+ const options = this.filterOptions(unfilteredOptions, 'edit');
+ const self = this;
+ const ops = [];
if (data.roles && data.roles.length > 1) {
return Promise.reject(
@@ -454,7 +456,7 @@ User = ghostBookshelf.Model.extend({
ops.push(function update() {
return ghostBookshelf.Model.edit.call(self, data, options).then((user) => {
- var roleId;
+ let roleId;
if (!data.roles) {
return user;
@@ -506,11 +508,11 @@ User = ghostBookshelf.Model.extend({
* **See:** [ghostBookshelf.Model.add](base.js.html#Add)
*/
add: function add(dataToClone, unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'add'),
- self = this,
- data = _.cloneDeep(dataToClone),
- userData = this.filterData(data),
- roles;
+ const options = this.filterOptions(unfilteredOptions, 'add');
+ const self = this;
+ const data = _.cloneDeep(dataToClone);
+ let userData = this.filterData(data);
+ let roles;
// check for too many roles
if (data.roles && data.roles.length > 1) {
@@ -599,10 +601,10 @@ User = ghostBookshelf.Model.extend({
* @TODO: kill setup function?
*/
setup: function setup(data, unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'setup'),
- self = this,
- userData = this.filterData(data),
- passwordValidation = {};
+ const options = this.filterOptions(unfilteredOptions, 'setup');
+ const self = this;
+ const userData = this.filterData(data);
+ let passwordValidation = {};
passwordValidation = validation.validatePassword(userData.password, userData.email, data.blogTitle);
@@ -649,9 +651,9 @@ User = ghostBookshelf.Model.extend({
},
permissible: function permissible(userModelOrId, action, context, unsafeAttrs, loadedPermissions, hasUserPermission, hasApiKeyPermission) {
- var self = this,
- userModel = userModelOrId,
- origArgs;
+ const self = this;
+ const userModel = userModelOrId;
+ let origArgs;
// If we passed in a model without its related roles, we need to fetch it again
if (_.isObject(userModelOrId) && !_.isObject(userModelOrId.related('roles'))) {
@@ -674,7 +676,7 @@ User = ghostBookshelf.Model.extend({
}
// Build up the original args but substitute with actual model
- var newArgs = [foundUserModel].concat(origArgs);
+ const newArgs = [foundUserModel].concat(origArgs);
return self.permissible.apply(self, newArgs);
});
@@ -792,7 +794,7 @@ User = ghostBookshelf.Model.extend({
// Finds the user by email, and checks the password
// @TODO: shorten this function and rename...
check: function check(object) {
- var self = this;
+ const self = this;
return this.getByEmail(object.email)
.then((user) => {
@@ -835,8 +837,8 @@ User = ghostBookshelf.Model.extend({
},
isPasswordCorrect: function isPasswordCorrect(object) {
- var plainPassword = object.plainPassword,
- hashedPassword = object.hashedPassword;
+ const plainPassword = object.plainPassword;
+ const hashedPassword = object.hashedPassword;
if (!plainPassword || !hashedPassword) {
return Promise.reject(new common.errors.ValidationError({
@@ -960,7 +962,7 @@ User = ghostBookshelf.Model.extend({
// When multi-user support is added, email addresses must be deduplicated with case insensitivity, so that
// joe@bloggs.com and JOE@BLOGGS.COM cannot be created as two separate users.
getByEmail: function getByEmail(email, unfilteredOptions) {
- var options = ghostBookshelf.Model.filterOptions(unfilteredOptions, 'getByEmail');
+ const options = ghostBookshelf.Model.filterOptions(unfilteredOptions, 'getByEmail');
// We fetch all users and process them in JS as there is no easy way to make this query across all DBs
// Although they all support `lower()`, sqlite can't case transform unicode characters
@@ -969,7 +971,7 @@ User = ghostBookshelf.Model.extend({
options.require = true;
return Users.forge().fetch(options).then(function then(users) {
- var userWithEmail = users.find(function findUser(user) {
+ const userWithEmail = users.find(function findUser(user) {
return user.get('email').toLowerCase() === email.toLowerCase();
});
diff --git a/core/server/models/webhook.js b/core/server/models/webhook.js
index 177174af00..9fa9a79d9d 100644
--- a/core/server/models/webhook.js
+++ b/core/server/models/webhook.js
@@ -1,8 +1,7 @@
-const Promise = require('bluebird'),
- ghostBookshelf = require('./base');
-
-let Webhook,
- Webhooks;
+const Promise = require('bluebird');
+const ghostBookshelf = require('./base');
+let Webhook;
+let Webhooks;
Webhook = ghostBookshelf.Model.extend({
tableName: 'webhooks',
@@ -42,8 +41,8 @@ Webhook = ghostBookshelf.Model.extend({
}
}, {
findAllByEvent: function findAllByEvent(event, unfilteredOptions) {
- var options = this.filterOptions(unfilteredOptions, 'findAll'),
- webhooksCollection = Webhooks.forge();
+ const options = this.filterOptions(unfilteredOptions, 'findAll');
+ const webhooksCollection = Webhooks.forge();
return webhooksCollection
.query('where', 'event', '=', event)
@@ -51,11 +50,11 @@ Webhook = ghostBookshelf.Model.extend({
},
getByEventAndTarget: function getByEventAndTarget(event, targetUrl, unfilteredOptions) {
- var options = ghostBookshelf.Model.filterOptions(unfilteredOptions, 'getByEventAndTarget');
+ const options = ghostBookshelf.Model.filterOptions(unfilteredOptions, 'getByEventAndTarget');
options.require = true;
return Webhooks.forge().fetch(options).then(function then(webhooks) {
- var webhookWithEventAndTarget = webhooks.find(function findWebhook(webhook) {
+ const webhookWithEventAndTarget = webhooks.find(function findWebhook(webhook) {
return webhook.get('event').toLowerCase() === event.toLowerCase()
&& webhook.get('target_url').toLowerCase() === targetUrl.toLowerCase();
});
diff --git a/core/server/public/members.js b/core/server/public/members.js
index 79ebe49e1f..ea4decaece 100644
--- a/core/server/public/members.js
+++ b/core/server/public/members.js
@@ -1,5 +1,5 @@
Array.prototype.forEach.call(document.querySelectorAll('form[data-members-form]'), function (form){
- var errorEl = form.querySelector('[data-members-error]');
+ const errorEl = form.querySelector('[data-members-error]');
function submitHandler(event) {
form.removeEventListener('submit', submitHandler);
event.preventDefault();
@@ -7,13 +7,13 @@ Array.prototype.forEach.call(document.querySelectorAll('form[data-members-form]'
errorEl.innerText = '';
}
form.classList.remove('success', 'invalid', 'error');
- var input = event.target.querySelector('input[data-members-email]');
- var email = input.value;
- var emailType = undefined;
- var labels = [];
+ const input = event.target.querySelector('input[data-members-email]');
+ const email = input.value;
+ let emailType = undefined;
+ const labels = [];
- var labelInputs = event.target.querySelectorAll('input[data-members-label]') || [];
- for (var i = 0;i < labelInputs.length; ++i) {
+ const labelInputs = event.target.querySelectorAll('input[data-members-label]') || [];
+ for (let i = 0;i < labelInputs.length; ++i) {
labels.push(labelInputs[i].value);
}
@@ -49,16 +49,16 @@ Array.prototype.forEach.call(document.querySelectorAll('form[data-members-form]'
});
Array.prototype.forEach.call(document.querySelectorAll('[data-members-plan]'), function (el) {
- var errorEl = el.querySelector('[data-members-error]');
+ const errorEl = el.querySelector('[data-members-error]');
function clickHandler(event) {
el.removeEventListener('click', clickHandler);
event.preventDefault();
- var plan = el.dataset.membersPlan;
- var successUrl = el.dataset.membersSuccess;
- var cancelUrl = el.dataset.membersCancel;
- var checkoutSuccessUrl;
- var checkoutCancelUrl;
+ const plan = el.dataset.membersPlan;
+ const successUrl = el.dataset.membersSuccess;
+ const cancelUrl = el.dataset.membersCancel;
+ let checkoutSuccessUrl;
+ let checkoutCancelUrl;
if (successUrl) {
checkoutSuccessUrl = (new URL(successUrl, window.location.href)).href;
@@ -98,7 +98,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-plan]'), f
return res.json();
});
}).then(function (result) {
- var stripe = Stripe(result.publicKey);
+ const stripe = Stripe(result.publicKey);
return stripe.redirectToCheckout({
sessionId: result.sessionId
});
@@ -120,11 +120,11 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-plan]'), f
});
Array.prototype.forEach.call(document.querySelectorAll('[data-members-edit-billing]'), function (el) {
- var errorEl = el.querySelector('[data-members-error]');
- var membersSuccess = el.dataset.membersSuccess;
- var membersCancel = el.dataset.membersCancel;
- var successUrl;
- var cancelUrl;
+ const errorEl = el.querySelector('[data-members-error]');
+ const membersSuccess = el.dataset.membersSuccess;
+ const membersCancel = el.dataset.membersCancel;
+ let successUrl;
+ let cancelUrl;
if (membersSuccess) {
successUrl = (new URL(membersSuccess, window.location.href)).href;
@@ -167,7 +167,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-edit-billi
return res.json();
});
}).then(function (result) {
- var stripe = Stripe(result.publicKey);
+ const stripe = Stripe(result.publicKey);
return stripe.redirectToCheckout({
sessionId: result.sessionId
});
@@ -210,14 +210,14 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-signout]')
});
Array.prototype.forEach.call(document.querySelectorAll('[data-members-cancel-subscription]'), function (el) {
- var errorEl = el.parentElement.querySelector('[data-members-error]');
+ const errorEl = el.parentElement.querySelector('[data-members-error]');
function clickHandler(event) {
el.removeEventListener('click', clickHandler);
event.preventDefault();
el.classList.remove('error');
el.classList.add('loading');
- var subscriptionId = el.dataset.membersCancelSubscription;
+ const subscriptionId = el.dataset.membersCancelSubscription;
if (errorEl) {
errorEl.innerText = '';
@@ -260,14 +260,14 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-cancel-sub
});
Array.prototype.forEach.call(document.querySelectorAll('[data-members-continue-subscription]'), function (el) {
- var errorEl = el.parentElement.querySelector('[data-members-error]');
+ const errorEl = el.parentElement.querySelector('[data-members-error]');
function clickHandler(event) {
el.removeEventListener('click', clickHandler);
event.preventDefault();
el.classList.remove('error');
el.classList.add('loading');
- var subscriptionId = el.dataset.membersContinueSubscription;
+ const subscriptionId = el.dataset.membersContinueSubscription;
if (errorEl) {
errorEl.innerText = '';
@@ -309,7 +309,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-continue-s
el.addEventListener('click', clickHandler);
});
-var url = new URL(window.location);
+const url = new URL(window.location);
if (url.searchParams.get('token')) {
url.searchParams.delete('token');
window.history.replaceState({}, document.title, url.href);
diff --git a/core/server/public/members.min.js b/core/server/public/members.min.js
index 915751dbbb..496fa588ea 100644
--- a/core/server/public/members.min.js
+++ b/core/server/public/members.min.js
@@ -1 +1,16 @@
-Array.prototype.forEach.call(document.querySelectorAll("form[data-members-form]"),function(i){var c=i.querySelector("[data-members-error]");i.addEventListener("submit",function r(e){i.removeEventListener("submit",r),e.preventDefault(),c&&(c.innerText=""),i.classList.remove("success","invalid","error");for(var t=e.target.querySelector("input[data-members-email]").value,n=void 0,a=[],o=e.target.querySelectorAll("input[data-members-label]")||[],s=0;s
Hey there! This is for 0.9.0 version
', - dismissible: true, - top: true - }] - }; + const createCustomNotification = updateCheck.__get__('createCustomNotification'); + + const notification = { + id: 1, + custom: 0, + messages: [{ + id: uuid.v4(), + version: '0.9.x', + content: 'Hey there! This is for 0.9.0 version
', + dismissible: true, + top: true + }] + }; NotificationsAPI.__set__('ghostVersion.full', '0.8.1'); @@ -185,7 +186,7 @@ describe('Update Check', function () { should.exist(results.notifications); results.notifications.length.should.eql(1); - var targetNotification = _.find(results.notifications, {id: notification.messages[0].id}); + const targetNotification = _.find(results.notifications, {id: notification.messages[0].id}); should.exist(targetNotification); targetNotification.dismissible.should.eql(notification.messages[0].dismissible); @@ -198,18 +199,19 @@ describe('Update Check', function () { }); it('release notification version format is wrong', function (done) { - var createCustomNotification = updateCheck.__get__('createCustomNotification'), - notification = { - id: 1, - custom: 0, - messages: [{ - id: uuid.v4(), - version: '0.9.x', - content: 'Hey there! This is for 0.9 version
', - dismissible: true, - top: true - }] - }; + const createCustomNotification = updateCheck.__get__('createCustomNotification'); + + const notification = { + id: 1, + custom: 0, + messages: [{ + id: uuid.v4(), + version: '0.9.x', + content: 'Hey there! This is for 0.9 version
', + dismissible: true, + top: true + }] + }; NotificationsAPI.__set__('ghostVersion.full', '0.8.1'); @@ -224,18 +226,19 @@ describe('Update Check', function () { }); it('blog version format is wrong', function (done) { - var createCustomNotification = updateCheck.__get__('createCustomNotification'), - notification = { - id: 1, - custom: 0, - messages: [{ - id: uuid.v4(), - version: '0.9.x', - content: 'Hey there! This is for 0.9.0 version
', - dismissible: true, - top: true - }] - }; + const createCustomNotification = updateCheck.__get__('createCustomNotification'); + + const notification = { + id: 1, + custom: 0, + messages: [{ + id: uuid.v4(), + version: '0.9.x', + content: 'Hey there! This is for 0.9.0 version
', + dismissible: true, + top: true + }] + }; NotificationsAPI.__set__('ghostVersion.full', '0.8'); @@ -250,19 +253,20 @@ describe('Update Check', function () { }); it('should create a custom notification', function (done) { - var createCustomNotification = updateCheck.__get__('createCustomNotification'), - notification = { - id: 1, - custom: 1, - messages: [{ - id: uuid.v4(), - version: 'custom1', - content: 'How about migrating your blog?
', - dismissible: false, - top: true, - type: 'warn' - }] - }; + const createCustomNotification = updateCheck.__get__('createCustomNotification'); + + const notification = { + id: 1, + custom: 1, + messages: [{ + id: uuid.v4(), + version: 'custom1', + content: 'How about migrating your blog?
', + dismissible: false, + top: true, + type: 'warn' + }] + }; createCustomNotification(notification).then(function () { return api.notifications.browse(testUtils.context.internal); @@ -271,7 +275,7 @@ describe('Update Check', function () { should.exist(results.notifications); results.notifications.length.should.eql(1); - var targetNotification = _.find(results.notifications, {id: notification.messages[0].id}); + const targetNotification = _.find(results.notifications, {id: notification.messages[0].id}); should.exist(targetNotification); targetNotification.dismissible.should.eql(notification.messages[0].dismissible); targetNotification.top.should.eql(notification.messages[0].top); @@ -281,19 +285,20 @@ describe('Update Check', function () { }); it('should not add duplicates', function (done) { - var createCustomNotification = updateCheck.__get__('createCustomNotification'), - notification = { - id: 1, - custom: 1, - messages: [{ - id: uuid.v4(), - version: 'custom1', - content: 'How about migrating your blog?
', - dismissible: false, - top: true, - type: 'warn' - }] - }; + const createCustomNotification = updateCheck.__get__('createCustomNotification'); + + const notification = { + id: 1, + custom: 1, + messages: [{ + id: uuid.v4(), + version: 'custom1', + content: 'How about migrating your blog?
', + dismissible: false, + top: true, + type: 'warn' + }] + }; createCustomNotification(notification) .then(function () { @@ -325,15 +330,16 @@ describe('Update Check', function () { beforeEach(testUtils.setup('roles', 'settings', 'perms:setting', 'perms:init')); it('receives a notifications with messages', function (done) { - var updateCheckResponse = updateCheck.__get__('updateCheckResponse'), - createNotificationSpy = sinon.spy(), - message = { - id: uuid.v4(), - version: '^0.11.11', - content: 'Test', - dismissible: true, - top: true - }; + const updateCheckResponse = updateCheck.__get__('updateCheckResponse'); + const createNotificationSpy = sinon.spy(); + + const message = { + id: uuid.v4(), + version: '^0.11.11', + content: 'Test', + dismissible: true, + top: true + }; updateCheck.__set__('createCustomNotification', createNotificationSpy); @@ -346,26 +352,29 @@ describe('Update Check', function () { }); it('receives multiple notifications', function (done) { - var updateCheckResponse = updateCheck.__get__('updateCheckResponse'), - createNotificationSpy = sinon.spy(), - message1 = { - id: uuid.v4(), - version: '^0.11.11', - content: 'Test1', - dismissible: true, - top: true - }, - message2 = { - id: uuid.v4(), - version: '^0', - content: 'Test2', - dismissible: true, - top: false - }, - notifications = [ - {version: '0.11.12', messages: [message1]}, - {version: 'custom1', messages: [message2]} - ]; + const updateCheckResponse = updateCheck.__get__('updateCheckResponse'); + const createNotificationSpy = sinon.spy(); + + const message1 = { + id: uuid.v4(), + version: '^0.11.11', + content: 'Test1', + dismissible: true, + top: true + }; + + const message2 = { + id: uuid.v4(), + version: '^0', + content: 'Test2', + dismissible: true, + top: false + }; + + const notifications = [ + {version: '0.11.12', messages: [message1]}, + {version: 'custom1', messages: [message2]} + ]; updateCheck.__set__('createCustomNotification', createNotificationSpy); @@ -378,34 +387,38 @@ describe('Update Check', function () { }); it('ignores some custom notifications which are not marked as group', function (done) { - var updateCheckResponse = updateCheck.__get__('updateCheckResponse'), - createNotificationSpy = sinon.spy(), - message1 = { - id: uuid.v4(), - version: '^0.11.11', - content: 'Test1', - dismissible: true, - top: true - }, - message2 = { - id: uuid.v4(), - version: '^0', - content: 'Test2', - dismissible: true, - top: false - }, - message3 = { - id: uuid.v4(), - version: '^0', - content: 'Test2', - dismissible: true, - top: false - }, - notifications = [ - {version: '0.11.12', messages: [message1]}, - {version: 'all1', messages: [message2], custom: 1}, - {version: 'migration1', messages: [message3], custom: 1} - ]; + const updateCheckResponse = updateCheck.__get__('updateCheckResponse'); + const createNotificationSpy = sinon.spy(); + + const message1 = { + id: uuid.v4(), + version: '^0.11.11', + content: 'Test1', + dismissible: true, + top: true + }; + + const message2 = { + id: uuid.v4(), + version: '^0', + content: 'Test2', + dismissible: true, + top: false + }; + + const message3 = { + id: uuid.v4(), + version: '^0', + content: 'Test2', + dismissible: true, + top: false + }; + + const notifications = [ + {version: '0.11.12', messages: [message1]}, + {version: 'all1', messages: [message2], custom: 1}, + {version: 'migration1', messages: [message3], custom: 1} + ]; updateCheck.__set__('createCustomNotification', createNotificationSpy); @@ -418,34 +431,38 @@ describe('Update Check', function () { }); it('group matches', function (done) { - var updateCheckResponse = updateCheck.__get__('updateCheckResponse'), - createNotificationSpy = sinon.spy(), - message1 = { - id: uuid.v4(), - version: '^0.11.11', - content: 'Test1', - dismissible: true, - top: true - }, - message2 = { - id: uuid.v4(), - version: '^0', - content: 'Test2', - dismissible: true, - top: false - }, - message3 = { - id: uuid.v4(), - version: '^0', - content: 'Test2', - dismissible: true, - top: false - }, - notifications = [ - {version: '0.11.12', messages: [message1], custom: 0}, - {version: 'all1', messages: [message2], custom: 1}, - {version: 'migration1', messages: [message3], custom: 1} - ]; + const updateCheckResponse = updateCheck.__get__('updateCheckResponse'); + const createNotificationSpy = sinon.spy(); + + const message1 = { + id: uuid.v4(), + version: '^0.11.11', + content: 'Test1', + dismissible: true, + top: true + }; + + const message2 = { + id: uuid.v4(), + version: '^0', + content: 'Test2', + dismissible: true, + top: false + }; + + const message3 = { + id: uuid.v4(), + version: '^0', + content: 'Test2', + dismissible: true, + top: false + }; + + const notifications = [ + {version: '0.11.12', messages: [message1], custom: 0}, + {version: 'all1', messages: [message2], custom: 1}, + {version: 'migration1', messages: [message3], custom: 1} + ]; updateCheck.__set__('createCustomNotification', createNotificationSpy); @@ -460,18 +477,20 @@ describe('Update Check', function () { }); it('single custom notification received, group matches', function (done) { - var updateCheckResponse = updateCheck.__get__('updateCheckResponse'), - createNotificationSpy = sinon.spy(), - message1 = { - id: uuid.v4(), - version: '^0.11.11', - content: 'Custom', - dismissible: true, - top: true - }, - notifications = [ - {version: 'something', messages: [message1], custom: 1} - ]; + const updateCheckResponse = updateCheck.__get__('updateCheckResponse'); + const createNotificationSpy = sinon.spy(); + + const message1 = { + id: uuid.v4(), + version: '^0.11.11', + content: 'Custom', + dismissible: true, + top: true + }; + + const notifications = [ + {version: 'something', messages: [message1], custom: 1} + ]; updateCheck.__set__('createCustomNotification', createNotificationSpy); @@ -486,18 +505,20 @@ describe('Update Check', function () { }); it('single custom notification received, group does not match', function (done) { - var updateCheckResponse = updateCheck.__get__('updateCheckResponse'), - createNotificationSpy = sinon.spy(), - message1 = { - id: uuid.v4(), - version: '^0.11.11', - content: 'Custom', - dismissible: true, - top: true - }, - notifications = [ - {version: 'something', messages: [message1], custom: 1} - ]; + const updateCheckResponse = updateCheck.__get__('updateCheckResponse'); + const createNotificationSpy = sinon.spy(); + + const message1 = { + id: uuid.v4(), + version: '^0.11.11', + content: 'Custom', + dismissible: true, + top: true + }; + + const notifications = [ + {version: 'something', messages: [message1], custom: 1} + ]; updateCheck.__set__('createCustomNotification', createNotificationSpy); @@ -522,15 +543,16 @@ describe('Update Check', function () { }); it('[default]', function () { - var updateCheckRequest = updateCheck.__get__('updateCheckRequest'), - updateCheckDataSpy = sinon.stub(), - hostname, - reqObj, - data = { - ghost_version: '0.11.11', - blog_id: 'something', - npm_version: 'something' - }; + const updateCheckRequest = updateCheck.__get__('updateCheckRequest'); + const updateCheckDataSpy = sinon.stub(); + let hostname; + let reqObj; + + const data = { + ghost_version: '0.11.11', + blog_id: 'something', + npm_version: 'something' + }; updateCheck.__set__('request', function (_hostname, _reqObj) { hostname = _hostname; @@ -556,10 +578,10 @@ describe('Update Check', function () { }); it('privacy flag is used', function () { - var updateCheckRequest = updateCheck.__get__('updateCheckRequest'), - updateCheckDataSpy = sinon.stub(), - reqObj, - hostname; + const updateCheckRequest = updateCheck.__get__('updateCheckRequest'); + const updateCheckDataSpy = sinon.stub(); + let reqObj; + let hostname; configUtils.set({ privacy: { @@ -599,10 +621,10 @@ describe('Update Check', function () { }); it('received 500 from the service', function () { - var updateCheckRequest = updateCheck.__get__('updateCheckRequest'), - updateCheckDataSpy = sinon.stub(), - reqObj, - hostname; + const updateCheckRequest = updateCheck.__get__('updateCheckRequest'); + const updateCheckDataSpy = sinon.stub(); + let reqObj; + let hostname; updateCheck.__set__('request', function (_hostname, _reqObj) { hostname = _hostname; @@ -632,10 +654,10 @@ describe('Update Check', function () { }); it('received 404 from the service', function () { - var updateCheckRequest = updateCheck.__get__('updateCheckRequest'), - updateCheckDataSpy = sinon.stub(), - reqObj, - hostname; + const updateCheckRequest = updateCheck.__get__('updateCheckRequest'); + const updateCheckDataSpy = sinon.stub(); + let reqObj; + let hostname; updateCheck.__set__('request', function (_hostname, _reqObj) { hostname = _hostname; @@ -666,10 +688,10 @@ describe('Update Check', function () { }); it('custom url', function () { - var updateCheckRequest = updateCheck.__get__('updateCheckRequest'), - updateCheckDataSpy = sinon.stub(), - reqObj, - hostname; + const updateCheckRequest = updateCheck.__get__('updateCheckRequest'); + const updateCheckDataSpy = sinon.stub(); + let reqObj; + let hostname; configUtils.set({ updateCheck: { diff --git a/test/unit/adapters/scheduling/SchedulingDefault_spec.js b/test/unit/adapters/scheduling/SchedulingDefault_spec.js index 4aeb51c380..a57fed12f5 100644 --- a/test/unit/adapters/scheduling/SchedulingDefault_spec.js +++ b/test/unit/adapters/scheduling/SchedulingDefault_spec.js @@ -1,14 +1,14 @@ -var should = require('should'), - sinon = require('sinon'), - moment = require('moment'), - _ = require('lodash'), - express = require('express'), - bodyParser = require('body-parser'), - http = require('http'), - SchedulingDefault = require('../../../../core/server/adapters/scheduling/SchedulingDefault'); +const should = require('should'); +const sinon = require('sinon'); +const moment = require('moment'); +const _ = require('lodash'); +const express = require('express'); +const bodyParser = require('body-parser'); +const http = require('http'); +const SchedulingDefault = require('../../../../core/server/adapters/scheduling/SchedulingDefault'); describe('Scheduling Default Adapter', function () { - var scope = {}; + const scope = {}; beforeEach(function () { scope.adapter = new SchedulingDefault(); @@ -23,7 +23,7 @@ describe('Scheduling Default Adapter', function () { sinon.stub(scope.adapter, 'run'); sinon.stub(scope.adapter, '_execute'); - var dates = [ + const dates = [ moment().add(1, 'day').subtract(30, 'seconds').toDate(), moment().add(7, 'minutes').toDate(), @@ -128,10 +128,11 @@ describe('Scheduling Default Adapter', function () { it('run', function (done) { // 1000 jobs, but only the number x are under 1 minute - var timestamps = _.map(_.range(1000), function (i) { - return moment().add(i, 'seconds').valueOf(); - }), - allJobs = {}; + const timestamps = _.map(_.range(1000), function (i) { + return moment().add(i, 'seconds').valueOf(); + }); + + const allJobs = {}; sinon.stub(scope.adapter, '_execute').callsFake(function (nextJobs) { Object.keys(nextJobs).length.should.eql(121); @@ -164,12 +165,14 @@ describe('Scheduling Default Adapter', function () { }); it('execute', function (done) { - var pinged = 0, - jobs = 3, - timestamps = _.map(_.range(jobs), function (i) { - return moment().add(i * 50, 'milliseconds').valueOf(); - }), - nextJobs = {}; + let pinged = 0; + const jobs = 3; + + const timestamps = _.map(_.range(jobs), function (i) { + return moment().add(i * 50, 'milliseconds').valueOf(); + }); + + const nextJobs = {}; sinon.stub(scope.adapter, 'run'); sinon.stub(scope.adapter, '_pingUrl').callsFake(function () { @@ -192,9 +195,9 @@ describe('Scheduling Default Adapter', function () { }); it('delete job (unschedule)', function (done) { - var pinged = 0, - jobsToDelete = {}, - jobsToExecute = {}; + let pinged = 0; + const jobsToDelete = {}; + const jobsToExecute = {}; sinon.stub(scope.adapter, 'run'); sinon.stub(scope.adapter, '_pingUrl').callsFake(function () { @@ -237,10 +240,10 @@ describe('Scheduling Default Adapter', function () { }); it('pingUrl (PUT)', function (done) { - var app = express(), - server = http.createServer(app), - wasPinged = false, - reqBody; + const app = express(); + const server = http.createServer(app); + let wasPinged = false; + let reqBody; app.use(bodyParser.json()); @@ -271,10 +274,10 @@ describe('Scheduling Default Adapter', function () { }); it('pingUrl (GET)', function (done) { - var app = express(), - server = http.createServer(app), - wasPinged = false, - reqQuery; + const app = express(); + const server = http.createServer(app); + let wasPinged = false; + let reqQuery; app.get('/ping', function (req, res) { wasPinged = true; @@ -298,10 +301,10 @@ describe('Scheduling Default Adapter', function () { }); it('pingUrl (PUT, and detect publish in the past)', function (done) { - var app = express(), - server = http.createServer(app), - wasPinged = false, - reqBody; + const app = express(); + const server = http.createServer(app); + let wasPinged = false; + let reqBody; app.use(bodyParser.json()); @@ -327,10 +330,10 @@ describe('Scheduling Default Adapter', function () { }); it('pingUrl (GET, and detect publish in the past)', function (done) { - var app = express(), - server = http.createServer(app), - wasPinged = false, - reqQuery; + const app = express(); + const server = http.createServer(app); + let wasPinged = false; + let reqQuery; app.get('/ping', function (req, res) { wasPinged = true; @@ -354,11 +357,11 @@ describe('Scheduling Default Adapter', function () { }); it('pingUrl, but blog returns 503', function (done) { - var app = express(), - server = http.createServer(app), - returned500Count = 0, - returned200 = false, - reqBody; + const app = express(); + const server = http.createServer(app); + let returned500Count = 0; + let returned200 = false; + let reqBody; scope.adapter.retryTimeoutInMs = 10; diff --git a/test/unit/adapters/scheduling/index_spec.js b/test/unit/adapters/scheduling/index_spec.js index 65ebeee309..4819e7ea84 100644 --- a/test/unit/adapters/scheduling/index_spec.js +++ b/test/unit/adapters/scheduling/index_spec.js @@ -1,11 +1,11 @@ -var should = require('should'), - sinon = require('sinon'), - rewire = require('rewire'), - Promise = require('bluebird'), - postScheduling = require('../../../../core/server/adapters/scheduling/post-scheduling'); +const should = require('should'); +const sinon = require('sinon'); +const rewire = require('rewire'); +const Promise = require('bluebird'); +const postScheduling = require('../../../../core/server/adapters/scheduling/post-scheduling'); describe('Scheduling', function () { - var scope = {}; + const scope = {}; before(function () { sinon.stub(postScheduling, 'init').returns(Promise.resolve()); diff --git a/test/unit/adapters/scheduling/post-scheduling/index_spec.js b/test/unit/adapters/scheduling/post-scheduling/index_spec.js index 55d1e72fb2..ca346f5915 100644 --- a/test/unit/adapters/scheduling/post-scheduling/index_spec.js +++ b/test/unit/adapters/scheduling/post-scheduling/index_spec.js @@ -1,19 +1,19 @@ -var should = require('should'), - sinon = require('sinon'), - Promise = require('bluebird'), - moment = require('moment'), - testUtils = require('../../../../utils'), - common = require('../../../../../core/server/lib/common'), - models = require('../../../../../core/server/models'), - api = require('../../../../../core/server/api'), - schedulingUtils = require('../../../../../core/server/adapters/scheduling/utils'), - SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'), - postScheduling = require('../../../../../core/server/adapters/scheduling/post-scheduling'), - urlUtils = require('../../../../../core/server/lib/url-utils'); +const should = require('should'); +const sinon = require('sinon'); +const Promise = require('bluebird'); +const moment = require('moment'); +const testUtils = require('../../../../utils'); +const common = require('../../../../../core/server/lib/common'); +const models = require('../../../../../core/server/models'); +const api = require('../../../../../core/server/api'); +const schedulingUtils = require('../../../../../core/server/adapters/scheduling/utils'); +const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); +const postScheduling = require('../../../../../core/server/adapters/scheduling/post-scheduling'); +const urlUtils = require('../../../../../core/server/lib/url-utils'); // NOTE: to be unskiped and corrected once default scheduler code is migrated describe.skip('Scheduling: Post Scheduling', function () { - var scope = { + const scope = { events: {}, scheduledPosts: [], apiUrl: 'localhost:1111/', diff --git a/test/unit/adapters/scheduling/utils_spec.js b/test/unit/adapters/scheduling/utils_spec.js index 46658fc341..fa3cc04c54 100644 --- a/test/unit/adapters/scheduling/utils_spec.js +++ b/test/unit/adapters/scheduling/utils_spec.js @@ -1,12 +1,12 @@ -var should = require('should'), - fs = require('fs-extra'), - configUtils = require('../../../utils/configUtils'), - config = require('../../../../core/server/config'), - schedulingUtils = require('../../../../core/server/adapters/scheduling/utils'); +const should = require('should'); +const fs = require('fs-extra'); +const configUtils = require('../../../utils/configUtils'); +const config = require('../../../../core/server/config'); +const schedulingUtils = require('../../../../core/server/adapters/scheduling/utils'); const schedulingPath = configUtils.config.getContentPath('adapters') + 'scheduling/'; describe('Scheduling: utils', function () { - var scope = {adapter: null}; + const scope = {adapter: null}; before(function () { if (!fs.existsSync(schedulingPath)) { @@ -40,7 +40,7 @@ describe('Scheduling: utils', function () { } }); - var jsFile = '' + + const jsFile = '' + 'var util = require(\'util\');' + 'var SchedulingBase = require(\'../../../core/server/adapters/scheduling/SchedulingBase\');' + 'var AnotherAdapter = function (){ SchedulingBase.call(this); };' + @@ -63,7 +63,7 @@ describe('Scheduling: utils', function () { describe('error', function () { it('create with adapter, but missing fn\'s', function (done) { scope.adapter = schedulingPath + 'bad-adapter.js'; - var jsFile = '' + + const jsFile = '' + 'var util = require(\'util\');' + 'var SchedulingBase = require(\'../../../core/server/adapters/scheduling/SchedulingBase\');' + 'var BadAdapter = function (){ SchedulingBase.call(this); };' + diff --git a/test/unit/adapters/storage/LocalFileStorage_spec.js b/test/unit/adapters/storage/LocalFileStorage_spec.js index fbff030d24..1c2b7629f4 100644 --- a/test/unit/adapters/storage/LocalFileStorage_spec.js +++ b/test/unit/adapters/storage/LocalFileStorage_spec.js @@ -1,21 +1,21 @@ -var should = require('should'), - sinon = require('sinon'), - fs = require('fs-extra'), - moment = require('moment'), - Promise = require('bluebird'), - path = require('path'), - common = require('../../../../core/server/lib/common'), - LocalFileStore = require('../../../../core/server/adapters/storage/LocalFileStorage'), - localFileStore, - configUtils = require('../../../utils/configUtils'); +const should = require('should'); +const sinon = require('sinon'); +const fs = require('fs-extra'); +const moment = require('moment'); +const Promise = require('bluebird'); +const path = require('path'); +const common = require('../../../../core/server/lib/common'); +const LocalFileStore = require('../../../../core/server/adapters/storage/LocalFileStorage'); +let localFileStore; +const configUtils = require('../../../utils/configUtils'); describe('Local File System Storage', function () { - var image, - momentStub; + let image; + let momentStub; function fakeDate(mm, yyyy) { - var month = parseInt(mm, 10), - year = parseInt(yyyy, 10); + const month = parseInt(mm, 10); + const year = parseInt(yyyy, 10); momentStub.withArgs('YYYY').returns(year.toString()); momentStub.withArgs('MM').returns(month < 10 ? '0' + month.toString() : month.toString()); @@ -206,7 +206,7 @@ describe('Local File System Storage', function () { describe('when a custom content path is used', function () { beforeEach(function () { - var configPaths = configUtils.defaultConfig.paths; + const configPaths = configUtils.defaultConfig.paths; configUtils.set('paths:contentPath', configPaths.appRoot + '/var/ghostcms'); }); @@ -221,7 +221,7 @@ describe('Local File System Storage', function () { // @TODO: remove path.join mock... describe('on Windows', function () { - var truePathSep = path.sep; + const truePathSep = path.sep; beforeEach(function () { sinon.stub(path, 'join'); diff --git a/test/unit/adapters/storage/index_spec.js b/test/unit/adapters/storage/index_spec.js index c0820bd1a9..938a36a64c 100644 --- a/test/unit/adapters/storage/index_spec.js +++ b/test/unit/adapters/storage/index_spec.js @@ -1,13 +1,13 @@ -var should = require('should'), - fs = require('fs-extra'), - StorageBase = require('ghost-storage-base'), - configUtils = require('../../../utils/configUtils'), - storage = require('../../../../core/server/adapters/storage'), - LocalFileStorage = require('../../../../core/server/adapters/storage/LocalFileStorage'); +const should = require('should'); +const fs = require('fs-extra'); +const StorageBase = require('ghost-storage-base'); +const configUtils = require('../../../utils/configUtils'); +const storage = require('../../../../core/server/adapters/storage'); +const LocalFileStorage = require('../../../../core/server/adapters/storage/LocalFileStorage'); const storagePath = configUtils.config.getContentPath('adapters') + 'storage/'; describe('storage: index_spec', function () { - var scope = {adapter: null}; + const scope = {adapter: null}; before(function () { if (!fs.existsSync(storagePath)) { @@ -25,7 +25,7 @@ describe('storage: index_spec', function () { }); it('default image storage is local file storage', function () { - var chosenStorage = storage.getStorage(); + const chosenStorage = storage.getStorage(); (chosenStorage instanceof StorageBase).should.eql(true); (chosenStorage instanceof LocalFileStorage).should.eql(true); }); @@ -39,7 +39,7 @@ describe('storage: index_spec', function () { } }); - var jsFile = '' + + const jsFile = '' + '\'use strict\';' + 'var StorageBase = require(\'ghost-storage-base\');' + 'class AnotherAdapter extends StorageBase {' + @@ -49,7 +49,9 @@ describe('storage: index_spec', function () { 'delete(){}' + 'read(){}' + '}' + - 'module.exports = AnotherAdapter', chosenStorage; + 'module.exports = AnotherAdapter'; + + let chosenStorage; fs.writeFileSync(scope.adapter, jsFile); @@ -71,7 +73,7 @@ describe('storage: index_spec', function () { } }); - var jsFile = '' + + const jsFile = '' + '\'use strict\';' + 'var StorageBase = require(\'ghost-storage-base\');' + 'class AnotherAdapter extends StorageBase {' + diff --git a/test/unit/adapters/storage/utils_spec.js b/test/unit/adapters/storage/utils_spec.js index acd67419ec..216e1948b6 100644 --- a/test/unit/adapters/storage/utils_spec.js +++ b/test/unit/adapters/storage/utils_spec.js @@ -1,13 +1,13 @@ -var should = require('should'), - sinon = require('sinon'), - urlUtils = require('../../../../core/server/lib/url-utils'), +const should = require('should'); +const sinon = require('sinon'); +const urlUtils = require('../../../../core/server/lib/url-utils'); - // Stuff we are testing - storageUtils = require('../../../../core/server/adapters/storage/utils'); +// Stuff we are testing +const storageUtils = require('../../../../core/server/adapters/storage/utils'); describe('storage utils', function () { - var urlForStub, - urlGetSubdirStub; + let urlForStub; + let urlGetSubdirStub; beforeEach(function () { urlForStub = sinon.stub(); @@ -19,8 +19,8 @@ describe('storage utils', function () { describe('fn: getLocalFileStoragePath', function () { it('should return local file storage path for absolute URL', function () { - var url = 'http://myblog.com/content/images/2017/07/ghost-logo.png', - result; + const url = 'http://myblog.com/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -36,8 +36,8 @@ describe('storage utils', function () { // See https://github.com/TryGhost/Ghost/blob/master/core/server/web/shared/middlewares/url-redirects.js#L76 // TODO: Change the code to make this test work it.skip('should return local file storage path for https request, when blog setup as http', function () { - var url = 'https://myblog.com/content/images/2017/07/ghost-logo.png', - result; + const url = 'https://myblog.com/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -50,8 +50,8 @@ describe('storage utils', function () { }); it('should return local file storage path for absolute URL with subdirectory', function () { - var url = 'http://myblog.com/blog/content/images/2017/07/ghost-logo.png', - result; + const url = 'http://myblog.com/blog/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -64,8 +64,8 @@ describe('storage utils', function () { }); it('should return local file storage path for relative URL', function () { - var filePath = '/content/images/2017/07/ghost-logo.png', - result; + const filePath = '/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -78,8 +78,8 @@ describe('storage utils', function () { }); it('should return local file storage path for relative URL with subdirectory', function () { - var filePath = '/blog/content/images/2017/07/ghost-logo.png', - result; + const filePath = '/blog/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -92,8 +92,8 @@ describe('storage utils', function () { }); it('should not sanitize URL if not local file storage', function () { - var url = 'http://example-blog.com/ghost-logo.png', - result; + const url = 'http://example-blog.com/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -108,8 +108,8 @@ describe('storage utils', function () { describe('fn: isLocalImage', function () { it('should return true when absolute URL and local file', function () { - var url = 'http://myblog.com/content/images/2017/07/ghost-logo.png', - result; + const url = 'http://myblog.com/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -125,8 +125,8 @@ describe('storage utils', function () { // See https://github.com/TryGhost/Ghost/blob/master/core/server/web/shared/middlewares/url-redirects.js#L76 // TODO: Change the code to make this test work it.skip('should return local file storage path for https request, when blog setup as http', function () { - var url = 'https://myblog.com/content/images/2017/07/ghost-logo.png', - result; + const url = 'https://myblog.com/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -139,8 +139,8 @@ describe('storage utils', function () { }); it('should return true when absolute URL with subdirectory and local file', function () { - var url = 'http://myblog.com/blog/content/images/2017/07/ghost-logo.png', - result; + const url = 'http://myblog.com/blog/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -153,8 +153,8 @@ describe('storage utils', function () { }); it('should return true when relative URL and local file', function () { - var url = '/content/images/2017/07/ghost-logo.png', - result; + const url = '/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -167,8 +167,8 @@ describe('storage utils', function () { }); it('should return true when relative URL and local file', function () { - var url = '/blog/content/images/2017/07/ghost-logo.png', - result; + const url = '/blog/content/images/2017/07/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); @@ -181,8 +181,8 @@ describe('storage utils', function () { }); it('should return false when no local file', function () { - var url = 'http://somewebsite.com/ghost-logo.png', - result; + const url = 'http://somewebsite.com/ghost-logo.png'; + let result; urlForStub = sinon.stub(urlUtils, 'urlFor'); urlForStub.withArgs('home').returns('http://myblog.com/'); diff --git a/test/unit/apps/amp/amp_components_spec.js b/test/unit/apps/amp/amp_components_spec.js index ee0b66603d..5698572a8a 100644 --- a/test/unit/apps/amp/amp_components_spec.js +++ b/test/unit/apps/amp/amp_components_spec.js @@ -1,14 +1,15 @@ -var should = require('should'), +const should = require('should'); - // Stuff we are testing - ampComponentsHelper = require('../../../../core/frontend/apps/amp/lib/helpers/amp_components'); +// Stuff we are testing +const ampComponentsHelper = require('../../../../core/frontend/apps/amp/lib/helpers/amp_components'); describe('{{amp_components}} helper', function () { it('adds script tag for a gif', function () { - var post = { - html: '
'
- },
- rendered;
+ const post = {
+ html: ''
+ };
+
+ let rendered;
rendered = ampComponentsHelper.call(
{relativeUrl: '/post/amp/', safeVersion: '0.3', context: ['amp', 'post'], post: post},
@@ -19,10 +20,11 @@ describe('{{amp_components}} helper', function () {
});
it('adds script tag for an iframe tag', function () {
- var post = {
- html: ''
- },
- rendered;
+ const post = {
+ html: ''
+ };
+
+ let rendered;
rendered = ampComponentsHelper.call(
{relativeUrl: '/post/amp/', safeVersion: '0.3', context: ['amp', 'post'], post: post},
@@ -33,10 +35,11 @@ describe('{{amp_components}} helper', function () {
});
it('adds script tag for a youtube embed', function () {
- var post = {
- html: ''
- },
- rendered;
+ const post = {
+ html: ''
+ };
+
+ let rendered;
rendered = ampComponentsHelper.call(
{relativeUrl: '/post/amp/', safeVersion: '0.3', context: ['amp', 'post'], post: post},
@@ -47,13 +50,14 @@ describe('{{amp_components}} helper', function () {
});
it('adds scripts for youtube embeds and iframes', function () {
- var post = {
- html: `
+ const post = {
+ html: `
`
- },
- rendered;
+ };
+
+ let rendered;
rendered = ampComponentsHelper.call(
{relativeUrl: '/post/amp/', safeVersion: '0.3', context: ['amp', 'post'], post: post},
@@ -65,10 +69,11 @@ describe('{{amp_components}} helper', function () {
});
it('adds script tag for an audio tag', function () {
- var post = {
- html: ''
- },
- rendered;
+ const post = {
+ html: ''
+ };
+
+ let rendered;
rendered = ampComponentsHelper.call(
{relativeUrl: '/post/amp/', safeVersion: '0.3', context: ['amp', 'post'], post: post},
@@ -79,8 +84,8 @@ describe('{{amp_components}} helper', function () {
});
it('returns if no html is provided', function () {
- var post = {},
- rendered;
+ const post = {};
+ let rendered;
rendered = ampComponentsHelper.call(
{relativeUrl: '/post/amp/', safeVersion: '0.3', context: ['amp', 'post'], post: post},
diff --git a/test/unit/apps/amp/amp_content_spec.js b/test/unit/apps/amp/amp_content_spec.js
index a628ab8f53..8ef7010b48 100644
--- a/test/unit/apps/amp/amp_content_spec.js
+++ b/test/unit/apps/amp/amp_content_spec.js
@@ -1,8 +1,8 @@
-var should = require('should'),
- rewire = require('rewire'),
- nock = require('nock'),
- urlUtils = require('../../../utils/urlUtils'),
- ampContentHelper = rewire('../../../../core/frontend/apps/amp/lib/helpers/amp_content');
+const should = require('should');
+const rewire = require('rewire');
+const nock = require('nock');
+const urlUtils = require('../../../utils/urlUtils');
+const ampContentHelper = rewire('../../../../core/frontend/apps/amp/lib/helpers/amp_content');
// TODO: Amperize really needs to get stubbed, so we can test returning errors
// properly and make this test faster!
@@ -12,12 +12,13 @@ describe('{{amp_content}} helper', function () {
});
it('can render content', function (done) {
- var testData = {
- html: 'Hello World',
- updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
- id: 1
- },
- ampResult = ampContentHelper.call(testData);
+ const testData = {
+ html: 'Hello World',
+ updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
+ id: 1
+ };
+
+ const ampResult = ampContentHelper.call(testData);
ampResult.then(function (rendered) {
should.exist(rendered);
@@ -27,11 +28,12 @@ describe('{{amp_content}} helper', function () {
});
it('returns if no html is provided', function (done) {
- var testData = {
- updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
- id: 1
- },
- ampResult = ampContentHelper.call(testData);
+ const testData = {
+ updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
+ id: 1
+ };
+
+ const ampResult = ampContentHelper.call(testData);
ampResult.then(function (rendered) {
should.exist(rendered);
@@ -42,14 +44,15 @@ describe('{{amp_content}} helper', function () {
describe('Cache', function () {
it('can render content from cache', function (done) {
- var testData = {
- html: 'Hello World',
- updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
- id: 1
- },
- ampCachedResult,
- ampResult = ampContentHelper.call(testData),
- amperizeCache = ampContentHelper.__get__('amperizeCache');
+ const testData = {
+ html: 'Hello World',
+ updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
+ id: 1
+ };
+
+ let ampCachedResult;
+ const ampResult = ampContentHelper.call(testData);
+ const amperizeCache = ampContentHelper.__get__('amperizeCache');
ampResult.then(function (rendered) {
should.exist(rendered);
@@ -70,18 +73,20 @@ describe('{{amp_content}} helper', function () {
});
it('fetches new AMP HTML if post was changed', function (done) {
- var testData1 = {
- html: 'Hello World',
- updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
- id: 1
- },
- testData2 = {
- html: 'Hello Ghost',
- updated_at: 'Wed Jul 30 2016 18:17:22 GMT+0200 (CEST)',
- id: 1
- },
- ampResult = ampContentHelper.call(testData1),
- amperizeCache = ampContentHelper.__get__('amperizeCache');
+ const testData1 = {
+ html: 'Hello World',
+ updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
+ id: 1
+ };
+
+ const testData2 = {
+ html: 'Hello Ghost',
+ updated_at: 'Wed Jul 30 2016 18:17:22 GMT+0200 (CEST)',
+ id: 1
+ };
+
+ let ampResult = ampContentHelper.call(testData1);
+ const amperizeCache = ampContentHelper.__get__('amperizeCache');
ampResult.then(function (rendered) {
should.exist(rendered);
@@ -124,13 +129,14 @@ describe('{{amp_content}} helper', function () {
.get('/content/images/2019/06/test.jpg')
.reply(200, GIF1x1);
- var testData = {
- html: '
',
- updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
- id: 1
- },
- expectedResult = '',
+ updated_at: 'Wed Jul 27 2016 18:17:22 GMT+0200 (CEST)',
+ id: 1
+ };
+
+ const expectedResult = 'audio element.audio element.