Merge pull request #2969 from jaswilli/when

Update when.js dependency to version 3.2.3

core/server/api/db.js

@@ -5,7 +5,7 @@ var dataExport       = require('../data/export'),
     dataProvider     = require('../models'),
     fs               = require('fs-extra'),
     when             = require('when'),
-    nodefn           = require('when/node/function'),
+    nodefn           = require('when/node'),
     _                = require('lodash'),
     validation       = require('../data/validation'),
     errors           = require('../../server/errors'),

core/server/data/migration/index.js

@@ -2,7 +2,7 @@ var _               = require('lodash'),
     when            = require('when'),
     path            = require('path'),
     fs              = require('fs'),
-    nodefn          = require('when/node/function'),
+    nodefn          = require('when/node'),
     errors          = require('../../errors'),
     client          = require('../../models/base').client,
     knex            = require('../../models/base').knex,

core/server/mail.js

@@ -1,7 +1,7 @@
 var cp         = require('child_process'),
     _          = require('lodash'),
     when       = require('when'),
-    nodefn     = require('when/node/function'),
+    nodefn     = require('when/node'),
     nodemailer = require('nodemailer'),
     config     = require('./config');
 

core/server/models/user.js

@@ -1,7 +1,7 @@
 var _              = require('lodash'),
     when           = require('when'),
     errors         = require('../errors'),
-    nodefn         = require('when/node/function'),
+    nodefn         = require('when/node'),
     bcrypt         = require('bcryptjs'),
     Posts          = require('./post').Posts,
     ghostBookshelf = require('./base'),

core/server/storage/localfilesystem.js

@@ -4,7 +4,7 @@
 var _       = require('lodash'),
     express = require('express'),
     fs      = require('fs-extra'),
-    nodefn  = require('when/node/function'),
+    nodefn  = require('when/node'),
     path    = require('path'),
     when    = require('when'),
     errors  = require('../errors'),

core/server/update-check.js

@@ -24,7 +24,7 @@ var crypto   = require('crypto'),
     moment   = require('moment'),
     semver   = require('semver'),
     when     = require('when'),
-    nodefn   = require('when/node/function'),
+    nodefn   = require('when/node'),
     _        = require('lodash'),
     url      = require('url'),
 

core/test/utils/index.js

@@ -1,7 +1,7 @@
 var knex          = require('../../server/models/base').knex,
     when          = require('when'),
     sequence      = require('when/sequence'),
-    nodefn        = require('when/node/function'),
+    nodefn        = require('when/node'),
     _             = require('lodash'),
     fs            = require('fs-extra'),
     path          = require('path'),

package.json

@@ -60,7 +60,7 @@
         "static-favicon": "1.0.2",
         "unidecode": "0.1.3",
         "validator": "3.4.0",
-        "when": "2.7.0",
+        "when": "3.2.3",
         "xml": "0.0.12"
     },
     "optionalDependencies": {