Add v3.12.1

content/themes/casper/package.json

@@ -2,7 +2,7 @@
     "name": "casper",
     "description": "A clean, minimal default theme for the Ghost publishing platform",
     "demo": "https://demo.ghost.io",
-    "version": "3.0.10",
+    "version": "3.0.11",
     "engines": {
         "ghost": ">=3.0.0",
         "ghost-api": "v3"

content/themes/casper/renovate.json

@@ -1,8 +1,5 @@
 {
   "extends": [
     "@tryghost:theme"
-  ],
-  "node": {
-    "supportPolicy": ["lts_latest"]
-  }
+  ]
 }

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

@@ -1,7 +1,7 @@
 const debug = require('ghost-ignition').debug('services:apps');
 const Promise = require('bluebird');
-const common = require('../../lib/common');
-const config = require('../../config');
+const common = require('../../../server/lib/common');
+const config = require('../../../server/config');
 const loader = require('./loader');
 
 module.exports = {

core/server/services/apps/loader.js → core/frontend/services/apps/loader.js

@@ -1,8 +1,8 @@
 const path = require('path');
 const _ = require('lodash');
 const Promise = require('bluebird');
-const common = require('../../lib/common');
-const config = require('../../config');
+const common = require('../../../server/lib/common');
+const config = require('../../../server/config');
 const Proxy = require('./proxy');
 
 // Get the full path to an app by name

core/server/services/apps/proxy.js → core/frontend/services/apps/proxy.js

@@ -1,5 +1,5 @@
-const helpers = require('../../../frontend/helpers/register');
-const routingService = require('../../../frontend/services/routing');
+const helpers = require('../../helpers/register');
+const routingService = require('../../services/routing');
 
 module.exports.getInstance = function getInstance() {
     const appRouter = routingService.registry.getRouter('appRouter');

core/server/index.js

@@ -19,6 +19,7 @@ let parentApp;
 
 // Frontend Components
 const themeService = require('../frontend/services/themes');
+const appService = require('../frontend/services/apps');
 
 function initialiseServices() {
     // CASE: When Ghost is ready with bootstrapping (db migrations etc.), we can trigger the router creation.
@@ -30,7 +31,6 @@ function initialiseServices() {
     routing.bootstrap.start(themeService.getApiVersion());
 
     const permissions = require('./services/permissions'),
-        apps = require('./services/apps'),
         xmlrpc = require('./services/xmlrpc'),
         slack = require('./services/slack'),
         {mega} = require('./services/mega'),
@@ -46,7 +46,7 @@ function initialiseServices() {
         slack.listen(),
         mega.listen(),
         webhooks.listen(),
-        apps.init(),
+        appService.init(),
         scheduling.init({
             schedulerUrl: config.get('scheduling').schedulerUrl,
             active: config.get('scheduling').active,

core/server/lib/image/blog-icon.js

@@ -3,7 +3,8 @@ var sizeOf = require('image-size'),
     _ = require('lodash'),
     path = require('path'),
     config = require('../../config'),
-    common = require('../common'),
+    {i18n} = require('../common'),
+    errors = require('@tryghost/errors'),
     urlUtils = require('../../lib/url-utils'),
     settingsCache = require('../../services/settings/cache'),
     storageUtils = require('../../adapters/storage/utils'),
@@ -41,8 +42,8 @@ getIconDimensions = function getIconDimensions(path) {
                 height: dimensions.height
             });
         } catch (err) {
-            return reject(new common.errors.ValidationError({
-                message: common.i18n.t('errors.utils.blogIcon.error', {
+            return reject(new errors.ValidationError({
+                message: i18n.t('errors.utils.blogIcon.error', {
                     file: path,
                     error: err.message
                 })

core/server/lib/image/cached-image-size-from-url.js

@@ -1,6 +1,7 @@
 var debug = require('ghost-ignition').debug('utils:image-size-cache'),
     imageSize = require('./image-size'),
-    common = require('../common'),
+    errors = require('@tryghost/errors'),
+    {logging} = require('../common'),
     cache = {};
 
 /**
@@ -24,15 +25,15 @@ function getCachedImageSizeFromUrl(url) {
             debug('Cached image:', url);
 
             return cache[url];
-        }).catch(common.errors.NotFoundError, function () {
+        }).catch(errors.NotFoundError, function () {
             debug('Cached image (not found):', url);
             // in case of error we just attach the url
             cache[url] = url;
 
             return cache[url];
         }).catch(function (err) {
             debug('Cached image (error):', url);
-            common.logging.error(err);
+            logging.error(err);
 
             // in case of error we just attach the url
             cache[url] = url;

core/server/lib/image/image-size.js

@@ -6,7 +6,8 @@ const Promise = require('bluebird');
 const _ = require('lodash');
 const request = require('../request');
 const urlUtils = require('../../lib/url-utils');
-const common = require('../common');
+const {i18n} = require('../common');
+const errors = require('@tryghost/errors');
 const config = require('../../config');
 const storage = require('../../adapters/storage');
 const storageUtils = require('../../adapters/storage/utils');
@@ -54,7 +55,7 @@ function _probeImageSizeFromUrl(url) {
     // probe-image-size uses `request` npm module which doesn't have our `got`
     // override with custom URL validation so it needs duplicating here
     if (_.isEmpty(url) || !validator.isURL(url)) {
-        return Promise.reject(new common.errors.InternalServerError({
+        return Promise.reject(new errors.InternalServerError({
             message: 'URL empty or invalid.',
             code: 'URL_MISSING_INVALID',
             context: url
@@ -147,32 +148,32 @@ const getImageSizeFromUrl = (imagePath) => {
             height: dimensions.height
         };
     }).catch({code: 'URL_MISSING_INVALID'}, (err) => {
-        return Promise.reject(new common.errors.InternalServerError({
+        return Promise.reject(new errors.InternalServerError({
             message: err.message,
             code: 'IMAGE_SIZE_URL',
             statusCode: err.statusCode,
             context: err.url || imagePath
         }));
     }).catch({code: 'ETIMEDOUT'}, {statusCode: 408}, (err) => {
-        return Promise.reject(new common.errors.InternalServerError({
+        return Promise.reject(new errors.InternalServerError({
             message: 'Request timed out.',
             code: 'IMAGE_SIZE_URL',
             statusCode: err.statusCode,
             context: err.url || imagePath
         }));
     }).catch({code: 'ENOENT'}, {statusCode: 404}, (err) => {
-        return Promise.reject(new common.errors.NotFoundError({
+        return Promise.reject(new errors.NotFoundError({
             message: 'Image not found.',
             code: 'IMAGE_SIZE_URL',
             statusCode: err.statusCode,
             context: err.url || imagePath
         }));
     }).catch(function (err) {
-        if (common.errors.utils.isIgnitionError(err)) {
+        if (errors.utils.isIgnitionError(err)) {
             return Promise.reject(err);
         }
 
-        return Promise.reject(new common.errors.InternalServerError({
+        return Promise.reject(new errors.InternalServerError({
             message: 'Unknown Request error.',
             code: 'IMAGE_SIZE_URL',
             statusCode: err.statusCode,
@@ -221,7 +222,7 @@ const getImageSizeFromStoragePath = (imagePath) => {
             };
         })
         .catch({code: 'ENOENT'}, (err) => {
-            return Promise.reject(new common.errors.NotFoundError({
+            return Promise.reject(new errors.NotFoundError({
                 message: err.message,
                 code: 'IMAGE_SIZE_STORAGE',
                 err: err,
@@ -232,11 +233,11 @@ const getImageSizeFromStoragePath = (imagePath) => {
                 }
             }));
         }).catch((err) => {
-            if (common.errors.utils.isIgnitionError(err)) {
+            if (errors.utils.isIgnitionError(err)) {
                 return Promise.reject(err);
             }
 
-            return Promise.reject(new common.errors.InternalServerError({
+            return Promise.reject(new errors.InternalServerError({
                 message: err.message,
                 code: 'IMAGE_SIZE_STORAGE',
                 err: err,
@@ -279,8 +280,8 @@ const getImageSizeFromPath = (path) => {
                 height: dimensions.height
             });
         } catch (err) {
-            return reject(new common.errors.ValidationError({
-                message: common.i18n.t('errors.utils.images.invalidDimensions', {
+            return reject(new errors.ValidationError({
+                message: i18n.t('errors.utils.images.invalidDimensions', {
                     file: path,
                     error: err.message
                 })

core/server/lib/image/index.js

@@ -13,9 +13,5 @@ module.exports = {
 
     get imageSizeCache() {
         return require('./cached-image-size-from-url');
-    },
-
-    get manipulator() {
-        return require('./manipulator');
     }
 };