Moved errors,logging,i18n and events to lib/common

refs #9178

core/server/adapters/scheduling/SchedulingDefault.js

@@ -2,9 +2,9 @@ var util = require('util'),
     moment = require('moment'),
     request = require('superagent'),
     debug = require('ghost-ignition').debug('scheduling-default'),
-    SchedulingBase = require(__dirname + '/SchedulingBase'),
-    errors = require(__dirname + '/../../errors'),
-    logging = require(__dirname + '/../../logging');
+    SchedulingBase = require('./SchedulingBase'),
+    errors = require('../../lib/common/errors'),
+    logging = require('../../lib/common/logging');
 
 /**
  * allJobs is a sorted list by time attribute

core/server/adapters/scheduling/post-scheduling/index.js

@@ -1,8 +1,8 @@
 var Promise = require('bluebird'),
     moment = require('moment'),
     localUtils = require('../utils'),
-    events = require('../../../events'),
-    errors = require('../../../errors'),
+    events = require('../../../lib/common/events'),
+    errors = require('../../../lib/common/errors'),
     models = require('../../../models'),
     schedules = require('../../../api/schedules'),
     urlService = require('../../../services/url'),

core/server/adapters/scheduling/utils.js

@@ -1,7 +1,7 @@
 var _ = require('lodash'),
     Promise = require('bluebird'),
-    SchedulingBase = require(__dirname + '/SchedulingBase'),
-    errors = require(__dirname + '/../../errors'),
+    SchedulingBase = require('./SchedulingBase'),
+    errors = require('../../lib/common/errors'),
     cache = {};
 
 exports.createAdapter = function (options) {

core/server/adapters/storage/LocalFileStorage.js

@@ -9,11 +9,11 @@ var serveStatic = require('express').static,
     Promise = require('bluebird'),
     moment = require('moment'),
     config = require('../../config'),
-    errors = require('../../errors'),
-    i18n = require('../../i18n'),
+    errors = require('../../lib/common/errors'),
+    i18n = require('../../lib/common/i18n'),
     globalUtils = require('../../utils'),
     urlService = require('../../services/url'),
-    logging = require('../../logging'),
+    logging = require('../../lib/common/logging'),
     StorageBase = require('ghost-storage-base');
 
 class LocalFileStore extends StorageBase {

core/server/adapters/storage/index.js

@@ -1,4 +1,4 @@
-var errors = require('../../errors'),
+var errors = require('../../lib/common/errors'),
     config = require('../../config'),
     StorageBase = require('ghost-storage-base'),
     _ = require('lodash'),

core/server/adapters/storage/utils.js

@@ -1,7 +1,7 @@
 var urlService = require('../../services/url');
 
 /**
- * @TODO: move `index.js` to here - e.g. storageUtils.getStorage
+ * @TODO: move `events.js` to here - e.g. storageUtils.getStorage
  */
 
 /**

core/server/analytics-events.js

@@ -1,6 +1,6 @@
 var _ = require('lodash'),
     config = require('./config'),
-    events = require('./events'),
+    events = require('./lib/common/events'),
     Analytics = require('analytics-node'),
     analytics;
 

core/server/api/authentication.js

@@ -8,10 +8,10 @@ var Promise = require('bluebird'),
     apiUtils = require('./utils'),
     models = require('../models'),
     config = require('../config'),
-    errors = require('../errors'),
-    events = require('../events'),
-    i18n = require('../i18n'),
-    logging = require('../logging'),
+    errors = require('../lib/common/errors'),
+    events = require('../lib/common/events'),
+    i18n = require('../lib/common/i18n'),
+    logging = require('../lib/common/logging'),
     spamPrevention = require('../web/middleware/api/spam-prevention'),
     mailAPI = require('./mail'),
     settingsAPI = require('./settings'),
@@ -130,7 +130,7 @@ function setupTasks(setupData) {
 /**
  * ## Authentication API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 authentication = {
     /**

core/server/api/clients.js

@@ -5,15 +5,15 @@ var Promise = require('bluebird'),
     pipeline = require('../utils/pipeline'),
     apiUtils = require('./utils'),
     models = require('../models'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     docName = 'clients',
     clients;
 
 /**
  * ### Clients API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 clients = {
 

core/server/api/configuration.js

@@ -39,7 +39,7 @@ function getBaseConfig() {
  *
  * We need to load the client credentials dynamically.
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 configuration = {
 

core/server/api/db.js

@@ -10,15 +10,15 @@ var Promise = require('bluebird'),
     backupDatabase = require('../data/db/backup'),
     models = require('../models'),
     config = require('../config'),
-    errors = require('../errors'),
+    errors = require('../lib/common/errors'),
     urlService = require('../services/url'),
     docName = 'db',
     db;
 
 /**
  * ## DB API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 db = {
     /**

core/server/api/invites.js

@@ -6,9 +6,9 @@ var Promise = require('bluebird'),
     urlService = require('../services/url'),
     apiUtils = require('./utils'),
     models = require('../models'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
-    logging = require('../logging'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
+    logging = require('../lib/common/logging'),
     mailAPI = require('./mail'),
     settingsAPI = require('./settings'),
     docName = 'invites',

core/server/api/mail.js

@@ -5,7 +5,7 @@ var Promise = require('bluebird'),
     pipeline = require('../utils/pipeline'),
     apiUtils = require('./utils'),
     models = require('../models'),
-    i18n = require('../i18n'),
+    i18n = require('../lib/common/i18n'),
     mail = require('../mail'),
     notificationsAPI = require('./notifications'),
     docName = 'mail',
@@ -42,7 +42,7 @@ function sendMail(object) {
 /**
  * ## Mail API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  * @typedef Mail
  * @param mail
  */

core/server/api/notifications.js

@@ -7,8 +7,8 @@ var Promise = require('bluebird'),
     permissions = require('../permissions'),
     canThis = permissions.canThis,
     apiUtils = require('./utils'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     settingsAPI = require('./settings'),
     // Holds the persistent notifications
     notificationsStore = [],
@@ -17,7 +17,7 @@ var Promise = require('bluebird'),
 /**
  * ## Notification API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 notifications = {
 

core/server/api/posts.js

@@ -5,8 +5,8 @@ var Promise = require('bluebird'),
     pipeline = require('../utils/pipeline'),
     apiUtils = require('./utils'),
     models = require('../models'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     docName = 'posts',
     allowedIncludes = [
         'created_by', 'updated_by', 'published_by', 'author', 'tags', 'fields'
@@ -17,7 +17,7 @@ var Promise = require('bluebird'),
 /**
  * ### Posts API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 
 posts = {

core/server/api/redirects.js

@@ -5,8 +5,8 @@ const fs = require('fs-extra'),
     moment = require('moment'),
     path = require('path'),
     config = require('../config'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     globalUtils = require('../utils'),
     apiUtils = require('./utils'),
     customRedirectsMiddleware = require('../web/middleware/custom-redirects');

core/server/api/roles.js

@@ -12,7 +12,7 @@ var Promise = require('bluebird'),
 /**
  * ## Roles API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 roles = {
     /**

core/server/api/schedules.js

@@ -5,8 +5,8 @@ var Promise = require('bluebird'),
     apiUtils = require('./utils'),
     models = require('../models'),
     config = require('../config'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     postsAPI = require('../api/posts');
 
 /**

core/server/api/settings.js

@@ -5,8 +5,8 @@ var Promise = require('bluebird'),
     models = require('../models'),
     canThis = require('../permissions').canThis,
     apiUtils = require('./utils'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     settingsCache = require('../settings/cache'),
     docName = 'settings',
     settings,
@@ -118,7 +118,7 @@ canEditAllSettings = function (settingsInfo, options) {
 /**
  * ## Settings API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 settings = {
 

core/server/api/slack.js

@@ -1,13 +1,13 @@
 // # Slack API
 // API for sending Test Notifications to Slack
 var Promise = require('bluebird'),
-    events = require('../events'),
+    events = require('../lib/common/events'),
     slack;
 
 /**
  * ## Slack API Method
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  * @typedef Slack
  * @param slack
  */

core/server/api/slugs.js

@@ -4,16 +4,16 @@ var Promise = require('bluebird'),
     pipeline = require('../utils/pipeline'),
     apiUtils = require('./utils'),
     models = require('../models'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     docName = 'slugs',
     slugs,
     allowedTypes;
 
 /**
  * ## Slugs API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 slugs = {
 

core/server/api/subscribers.js

@@ -7,15 +7,15 @@ var Promise = require('bluebird'),
     globalUtils = require('../utils'),
     apiUtils = require('./utils'),
     models = require('../models'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     docName = 'subscribers',
     subscribers;
 
 /**
  * ### Subscribers API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 subscribers = {
     /**

core/server/api/tags.js

@@ -5,16 +5,16 @@ var Promise = require('bluebird'),
     pipeline = require('../utils/pipeline'),
     apiUtils = require('./utils'),
     models = require('../models'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     docName = 'tags',
     allowedIncludes = ['count.posts'],
     tags;
 
 /**
  * ### Tags API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 tags = {
     /**

core/server/api/themes.js

@@ -4,10 +4,10 @@ var debug = require('ghost-ignition').debug('api:themes'),
     Promise = require('bluebird'),
     fs = require('fs-extra'),
     apiUtils = require('./utils'),
-    errors = require('../errors'),
-    events = require('../events'),
-    i18n = require('../i18n'),
-    logging = require('../logging'),
+    errors = require('../lib/common/errors'),
+    events = require('../lib/common/events'),
+    i18n = require('../lib/common/i18n'),
+    logging = require('../lib/common/logging'),
     settingsModel = require('../models/settings').Settings,
     settingsCache = require('../settings/cache'),
     themeUtils = require('../themes'),
@@ -17,7 +17,7 @@ var debug = require('ghost-ignition').debug('api:themes'),
 /**
  * ## Themes API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 themes = {
     /**

core/server/api/upload.js

@@ -7,7 +7,7 @@ var Promise = require('bluebird'),
 /**
  * ## Upload API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 upload = {
 

core/server/api/users.js

@@ -6,8 +6,8 @@ var Promise = require('bluebird'),
     apiUtils = require('./utils'),
     canThis = require('../permissions').canThis,
     models = require('../models'),
-    errors = require('../errors'),
-    i18n = require('../i18n'),
+    errors = require('../lib/common/errors'),
+    i18n = require('../lib/common/i18n'),
     docName = 'users',
     // TODO: implement created_by, updated_by
     allowedIncludes = ['count.posts', 'permissions', 'roles', 'roles.permissions'],
@@ -16,7 +16,7 @@ var Promise = require('bluebird'),
 /**
  * ### Users API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](events.js.html#api%20methods)
  */
 users = {
     /**