Skip to content

Commit

Permalink
🛠 update lodash,knex and bookshelf to latest versions
Browse files Browse the repository at this point in the history
refs TryGhost#7189
- we had a memory leak after upgrading to knex 0.11.x
- knex has published a new version 0.12.x
- the memory leak does not longer exists
- knex has reverted their pool logic, see knex/knex#1665
  • Loading branch information
kirrg001 authored and mixonic committed Oct 28, 2016
1 parent 393aa65 commit 8d20067
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 34 deletions.
21 changes: 0 additions & 21 deletions core/server/overrides.js
Expand Up @@ -8,24 +8,3 @@ var moment = require('moment-timezone');
* - be careful when you work with date operations, therefor always wrap a date into moment
*/
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;
16 changes: 3 additions & 13 deletions package.json
Expand Up @@ -30,7 +30,7 @@
"bcryptjs": "2.3.0",
"bluebird": "3.4.6",
"body-parser": "1.15.2",
"bookshelf": "0.9.4",
"bookshelf": "0.10.1",
"chalk": "1.1.3",
"cheerio": "0.22.0",
"compression": "1.6.2",
Expand All @@ -51,15 +51,8 @@
"intl": "1.2.4",
"intl-messageformat": "1.3.0",
"jsonpath": "0.2.7",
"knex": "0.10.0",
"lodash": "3.10.1",
"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",
"knex": "0.12.1",
"lodash": "4.16.0",
"moment": "2.15.1",
"moment-timezone": "0.5.5",
"morgan": "1.7.0",
Expand Down Expand Up @@ -123,9 +116,6 @@
},
"greenkeeper": {
"ignore": [
"bookshelf",
"knex",
"lodash",
"glob",
"mysql",
"nodemailer",
Expand Down

0 comments on commit 8d20067

Please sign in to comment.