diff --git a/Gruntfile.js b/Gruntfile.js index 4fd3d3e45a..d925b9d03f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -78,7 +78,7 @@ var overrides = require('./core/server/overrides'), }, // ### grunt-express-server - // Start a Ghost expess server for use in development and testing + // Start a Ghost express server for use in development and testing express: { options: { script: 'index.js', diff --git a/core/server/admin/app.js b/core/server/admin/app.js index 35075162b4..1da56c707c 100644 --- a/core/server/admin/app.js +++ b/core/server/admin/app.js @@ -1,4 +1,4 @@ -var debug = require('debug')('ghost:admin'), +var debug = require('ghost-ignition').debug('admin'), config = require('../config'), express = require('express'), // Admin only middleware diff --git a/core/server/admin/controller.js b/core/server/admin/controller.js index 2b42a12018..23c3dba7b2 100644 --- a/core/server/admin/controller.js +++ b/core/server/admin/controller.js @@ -1,4 +1,4 @@ -var debug = require('debug')('ghost:admin:controller'), +var debug = require('ghost-ignition').debug('admin:controller'), _ = require('lodash'), path = require('path'), config = require('../config'), diff --git a/core/server/admin/serviceworker.js b/core/server/admin/serviceworker.js index 66f1498d0d..65fc56ce26 100644 --- a/core/server/admin/serviceworker.js +++ b/core/server/admin/serviceworker.js @@ -1,4 +1,4 @@ -var debug = require('debug')('ghost:admin:serviceworker'), +var debug = require('ghost-ignition').debug('admin:serviceworker'), path = require('path'); // Route: index diff --git a/core/server/api/app.js b/core/server/api/app.js index 1108323c6b..1d51469558 100644 --- a/core/server/api/app.js +++ b/core/server/api/app.js @@ -1,5 +1,5 @@ // # API routes -var debug = require('debug')('ghost:api'), +var debug = require('ghost-ignition').debug('api'), express = require('express'), tmpdir = require('os').tmpdir, diff --git a/core/server/api/themes.js b/core/server/api/themes.js index 61b4abc0ca..3b8b60f754 100644 --- a/core/server/api/themes.js +++ b/core/server/api/themes.js @@ -1,6 +1,6 @@ // # Themes API // RESTful API for Themes -var debug = require('debug')('ghost:api:themes'), +var debug = require('ghost-ignition').debug('api:themes'), Promise = require('bluebird'), fs = require('fs-extra'), errors = require('../errors'), diff --git a/core/server/app.js b/core/server/app.js index 8e29f7ecce..227e388165 100644 --- a/core/server/app.js +++ b/core/server/app.js @@ -1,4 +1,4 @@ -var debug = require('debug')('ghost:app'), +var debug = require('ghost-ignition').debug('app'), express = require('express'), // app requires diff --git a/core/server/auth/passport.js b/core/server/auth/passport.js index d18336e871..bf716672f9 100644 --- a/core/server/auth/passport.js +++ b/core/server/auth/passport.js @@ -3,7 +3,7 @@ var ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy GhostOAuth2Strategy = require('passport-ghost').Strategy, passport = require('passport'), _ = require('lodash'), - debug = require('debug')('ghost:auth'), + debug = require('ghost-ignition').debug('auth'), Promise = require('bluebird'), authStrategies = require('./auth-strategies'), errors = require('../errors'), diff --git a/core/server/blog/app.js b/core/server/blog/app.js index 83ee0de7de..9aac43079c 100644 --- a/core/server/blog/app.js +++ b/core/server/blog/app.js @@ -1,4 +1,4 @@ -var debug = require('debug')('ghost:blog'), +var debug = require('ghost-ignition').debug('blog'), path = require('path'), // App requires diff --git a/core/server/config/index.js b/core/server/config/index.js index 709241deb7..96d5992078 100644 --- a/core/server/config/index.js +++ b/core/server/config/index.js @@ -1,6 +1,6 @@ var Nconf = require('nconf'), path = require('path'), - _debug = require('debug'), + _debug = require('ghost-ignition').debug._base, debug = _debug('ghost:config'), localUtils = require('./utils'), env = process.env.NODE_ENV || 'development', diff --git a/core/server/controllers/frontend/index.js b/core/server/controllers/frontend/index.js index 73b68896e9..78c6d58522 100644 --- a/core/server/controllers/frontend/index.js +++ b/core/server/controllers/frontend/index.js @@ -4,14 +4,14 @@ /*global require, module */ -var debug = require('debug')('ghost:channels:single'), - api = require('../../api'), - utils = require('../../utils'), - filters = require('../../filters'), - templates = require('./templates'), +var debug = require('ghost-ignition').debug('channels:single'), + api = require('../../api'), + utils = require('../../utils'), + filters = require('../../filters'), + templates = require('./templates'), handleError = require('./error'), formatResponse = require('./format-response'), - postLookup = require('./post-lookup'), + postLookup = require('./post-lookup'), setResponseContext = require('./context'), setRequestIsSecure = require('./secure'), diff --git a/core/server/controllers/frontend/render-channel.js b/core/server/controllers/frontend/render-channel.js index 08abbc1ae2..daf9a68ae5 100644 --- a/core/server/controllers/frontend/render-channel.js +++ b/core/server/controllers/frontend/render-channel.js @@ -1,15 +1,15 @@ -var debug = require('debug')('ghost:channels:render'), - _ = require('lodash'), - errors = require('../../errors'), - i18n = require('../../i18n'), - filters = require('../../filters'), - safeString = require('../../utils/index').safeString, - handleError = require('./error'), - fetchData = require('./fetch-data'), - formatResponse = require('./format-response'), +var debug = require('ghost-ignition').debug('channels:render'), + _ = require('lodash'), + errors = require('../../errors'), + i18n = require('../../i18n'), + filters = require('../../filters'), + safeString = require('../../utils/index').safeString, + handleError = require('./error'), + fetchData = require('./fetch-data'), + formatResponse = require('./format-response'), setResponseContext = require('./context'), setRequestIsSecure = require('./secure'), - templates = require('./templates'); + templates = require('./templates'); function renderChannel(req, res, next) { debug('renderChannel called'); diff --git a/core/server/ghost-server.js b/core/server/ghost-server.js index b7e2847aff..182dd7350a 100644 --- a/core/server/ghost-server.js +++ b/core/server/ghost-server.js @@ -1,6 +1,6 @@ // # Ghost Server // Handles the creation of an HTTP Server for Ghost -var debug = require('debug')('ghost:server'), +var debug = require('ghost-ignition').debug('server'), Promise = require('bluebird'), fs = require('fs'), path = require('path'), diff --git a/core/server/index.js b/core/server/index.js index 1ffcd32370..dab4d4d6ad 100644 --- a/core/server/index.js +++ b/core/server/index.js @@ -13,7 +13,7 @@ require('./overrides'); // Module dependencies -var debug = require('debug')('ghost:boot:init'), +var debug = require('ghost-ignition').debug('boot:init'), // Config should be first require, as it triggers the initial load of the config files config = require('./config'), Promise = require('bluebird'), diff --git a/core/server/middleware/custom-redirects.js b/core/server/middleware/custom-redirects.js index 00cb5cb23c..0978ea505f 100644 --- a/core/server/middleware/custom-redirects.js +++ b/core/server/middleware/custom-redirects.js @@ -1,6 +1,6 @@ var fs = require('fs-extra'), _ = require('lodash'), - debug = require('debug')('ghost:custom-redirects'), + debug = require('ghost-ignition').debug('custom-redirects'), config = require('../config'), errors = require('../errors'), logging = require('../logging'); diff --git a/core/server/middleware/url-redirects.js b/core/server/middleware/url-redirects.js index 045a1059a4..f5c405ba62 100644 --- a/core/server/middleware/url-redirects.js +++ b/core/server/middleware/url-redirects.js @@ -1,5 +1,5 @@ var url = require('url'), - debug = require('debug')('ghost:url-redirects'), + debug = require('ghost-ignition').debug('url-redirects'), utils = require('../utils'), urlRedirects, _private = {}; diff --git a/core/server/settings/cache.js b/core/server/settings/cache.js index 9911b974ea..336ca4ee85 100644 --- a/core/server/settings/cache.js +++ b/core/server/settings/cache.js @@ -1,7 +1,7 @@ // It's important to keep the requires absolutely minimal here, // As this cache is used in SO many other areas, we may open ourselves to // circular dependency bugs. -var debug = require('debug')('ghost:settings:cache'), +var debug = require('ghost-ignition').debug('settings:cache'), _ = require('lodash'), events = require('../events'), /** diff --git a/core/server/themes/index.js b/core/server/themes/index.js index c6da856b24..0fa98cd8ea 100644 --- a/core/server/themes/index.js +++ b/core/server/themes/index.js @@ -1,4 +1,4 @@ -var debug = require('debug')('ghost:themes'), +var debug = require('ghost-ignition').debug('themes'), events = require('../events'), errors = require('../errors'), logging = require('../logging'), diff --git a/core/server/themes/loader.js b/core/server/themes/loader.js index 6d80aebfb4..5bec4ba868 100644 --- a/core/server/themes/loader.js +++ b/core/server/themes/loader.js @@ -1,4 +1,4 @@ -var debug = require('debug')('ghost:themes:loader'), +var debug = require('ghost-ignition').debug('themes:loader'), config = require('../config'), themeList = require('./list'), read = require('../utils/packages').read, diff --git a/core/test/utils/index.js b/core/test/utils/index.js index 2afe639bfc..e0d2a343b9 100644 --- a/core/test/utils/index.js +++ b/core/test/utils/index.js @@ -4,7 +4,7 @@ var Promise = require('bluebird'), fs = require('fs-extra'), path = require('path'), Module = require('module'), - debug = require('debug')('ghost:test'), + debug = require('ghost-ignition').debug('test'), ObjectId = require('bson-objectid'), uuid = require('uuid'), KnexMigrator = require('knex-migrator'), diff --git a/index.js b/index.js index 18e2295cb6..6c26bc914e 100644 --- a/index.js +++ b/index.js @@ -2,7 +2,7 @@ // Orchestrates the startup of Ghost when run from command line. var startTime = Date.now(), - debug = require('debug')('ghost:boot:index'), + debug = require('ghost-ignition').debug('boot:index'), ghost, express, logging, errors, utils, parentApp; debug('First requires...'); diff --git a/package.json b/package.json index 1f64aae604..d685c98df5 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,6 @@ "cookie-session": "1.3.0", "cors": "2.8.4", "csv-parser": "1.11.0", - "debug": "2.6.8", "downsize": "0.0.8", "express": "4.15.3", "express-brute": "1.0.1", @@ -50,7 +49,7 @@ "extract-zip-fork": "1.5.1", "fs-extra": "3.0.1", "ghost-gql": "0.0.6", - "ghost-ignition": "2.8.13", + "ghost-ignition": "2.8.14", "ghost-storage-base": "0.0.1", "glob": "5.0.15", "gscan": "1.1.7", diff --git a/yarn.lock b/yarn.lock index 7f4d888fa9..0a910254af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -287,10 +287,6 @@ beeper@^1.0.0, beeper@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" -bignumber.js@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-3.1.2.tgz#f3bdb99ad5268a15fc1f0bed2fb018e2693fe236" - bignumber.js@4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.0.2.tgz#2d1dc37ee5968867ecea90b6da4d16e68608d21d" @@ -1748,9 +1744,9 @@ ghost-gql@0.0.6: dependencies: lodash "^4.17.4" -ghost-ignition@2.8.13: - version "2.8.13" - resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-2.8.13.tgz#70832d033aa0e46469ccc0d667f6b547d9962db4" +ghost-ignition@2.8.14: + version "2.8.14" + resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-2.8.14.tgz#a648c1d3de1d2932c4029f4a024f6db4eb037c5a" dependencies: bunyan "1.8.5" bunyan-loggly "1.1.0" @@ -3623,7 +3619,7 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -mysql@2.14.1: +mysql@2.14.1, mysql@^2.11.1: version "2.14.1" resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.14.1.tgz#e9324015e810a50abda94855cab41edfad56284a" dependencies: @@ -3632,14 +3628,6 @@ mysql@2.14.1: safe-buffer "5.1.1" sqlstring "2.2.0" -mysql@^2.11.1: - version "2.13.0" - resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.13.0.tgz#998f1f8ca46e2e3dd7149ce982413653986aae47" - dependencies: - bignumber.js "3.1.2" - readable-stream "1.1.14" - sqlstring "2.2.0" - nan@^2.3.3, nan@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" @@ -3693,7 +3681,7 @@ netjet@1.1.3: lru-cache "^4.0.0" posthtml "^0.9.0" -nock@9.0.14: +nock@9.0.14, nock@^9.0.2: version "9.0.14" resolved "https://registry.yarnpkg.com/nock/-/nock-9.0.14.tgz#2211550253173ce298bcd89fca825e83813ca72b" dependencies: @@ -3707,19 +3695,6 @@ nock@9.0.14: qs "^6.0.2" semver "^5.3.0" -nock@^9.0.2: - version "9.0.13" - resolved "https://registry.yarnpkg.com/nock/-/nock-9.0.13.tgz#d0bc39ef43d3179981e22b2e8ea069f916c5781a" - dependencies: - chai ">=1.9.2 <4.0.0" - debug "^2.2.0" - deep-equal "^1.0.0" - json-stringify-safe "^5.0.1" - lodash "~4.17.2" - mkdirp "^0.5.0" - propagate "0.4.0" - qs "^6.0.2" - node-pre-gyp@^0.6.34, node-pre-gyp@~0.6.31: version "0.6.34" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7" @@ -4527,7 +4502,7 @@ read@1.0.x: dependencies: mute-stream "~0.0.4" -readable-stream@1.1, readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.1.12, readable-stream@~1.1.9: +readable-stream@1.1, readable-stream@1.1.x, readable-stream@^1.1.12, readable-stream@~1.1.9: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" dependencies: @@ -4536,7 +4511,7 @@ readable-stream@1.1, readable-stream@1.1.14, readable-stream@1.1.x, readable-str isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@2.3.3: +readable-stream@2.3.3, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -4548,7 +4523,7 @@ readable-stream@2.3.3: string_decoder "~1.0.3" util-deprecate "~1.0.1" -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5: +readable-stream@^2.0.0: version "2.2.9" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8" dependencies: @@ -4769,14 +4744,10 @@ run-sequence@1.2.2: chalk "*" gulp-util "*" -safe-buffer@5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" -safe-buffer@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" - safe-json-stringify@~1: version "1.0.4" resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911" @@ -4813,11 +4784,7 @@ secure-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca" -"semver@2 || 3 || 4 || 5", semver@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - -semver@5.4.1: +"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.3.0: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"