0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00

Merge pull request #7402 from kirrg001/tooling/latest-lodash-bookshelf-knex

🛠  update lodash,knex and bookshelf to latest versions
This commit is contained in:
Hannah Wolfe 2016-09-26 09:39:57 +01:00 committed by GitHub
commit 6d092ada99
2 changed files with 3 additions and 34 deletions

View file

@ -8,24 +8,3 @@ var moment = require('moment-timezone');
* - be careful when you work with date operations, therefor always wrap a date into moment * - be careful when you work with date operations, therefor always wrap a date into moment
*/ */
moment.tz.setDefault('UTC'); moment.tz.setDefault('UTC');
// jscs:disable
var _ = require('lodash'),
toPairs = require('lodash.topairs'),
fromPairs = require('lodash.frompairs'),
toString = require('lodash.tostring'),
pickBy = require('lodash.pickby'),
uniqBy = require('lodash.uniqby'),
orderBy = require('lodash.orderby'),
omitBy = require('lodash.omitby');
/**
* lodash 4.x functions we use
*/
_.toPairs = toPairs;
_.fromPairs = fromPairs;
_.toString = toString;
_.omitBy = omitBy;
_.uniqBy = uniqBy;
_.pickBy = pickBy;
_.orderBy = orderBy;

View file

@ -30,7 +30,7 @@
"bcryptjs": "2.3.0", "bcryptjs": "2.3.0",
"bluebird": "3.4.6", "bluebird": "3.4.6",
"body-parser": "1.15.2", "body-parser": "1.15.2",
"bookshelf": "0.9.4", "bookshelf": "0.10.1",
"chalk": "1.1.3", "chalk": "1.1.3",
"cheerio": "0.22.0", "cheerio": "0.22.0",
"compression": "1.6.2", "compression": "1.6.2",
@ -51,15 +51,8 @@
"intl": "1.2.4", "intl": "1.2.4",
"intl-messageformat": "1.3.0", "intl-messageformat": "1.3.0",
"jsonpath": "0.2.7", "jsonpath": "0.2.7",
"knex": "0.10.0", "knex": "0.12.1",
"lodash": "3.10.1", "lodash": "4.16.0",
"lodash.frompairs": "4.0.1",
"lodash.omitby": "4.6.0",
"lodash.orderby": "4.6.0",
"lodash.pickby": "4.6.0",
"lodash.topairs": "4.3.0",
"lodash.tostring": "4.1.4",
"lodash.uniqby": "4.7.0",
"moment": "2.15.1", "moment": "2.15.1",
"moment-timezone": "0.5.5", "moment-timezone": "0.5.5",
"morgan": "1.7.0", "morgan": "1.7.0",
@ -123,9 +116,6 @@
}, },
"greenkeeper": { "greenkeeper": {
"ignore": [ "ignore": [
"bookshelf",
"knex",
"lodash",
"glob", "glob",
"mysql", "mysql",
"nodemailer", "nodemailer",