mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-01-06 22:40:14 -05:00
Added Node v10 Support (#10058)
* Added Node v10 Support no issue Signed-off-by: kirrg001 <katharina.irrgang@googlemail.com> * Bump amperize to version 0.3.8 no issue * Bump mysql to version 2.16.0 no issue - mysql 2.15.0 uses a deprecated notation for timers - e.g. timers.unenroll() * Bump sub dependencies no issue - e.g. knex-migrator used mysql 2.15.0 * Bump dependencies no issue * Replaced `new Buffer` with `Buffer.from` no issue - Buffer() is deprecated due to security and usability issues. - https://nodejs.org/en/docs/guides/buffer-constructor-deprecation/
This commit is contained in:
parent
781f5523bf
commit
4bd211b42a
4 changed files with 579 additions and 625 deletions
|
@ -1,6 +1,7 @@
|
||||||
language: node_js
|
language: node_js
|
||||||
# When changing node version also update it on lines 31 and 49.
|
# When changing node version also update it on lines 31 and 49.
|
||||||
node_js:
|
node_js:
|
||||||
|
- "10"
|
||||||
- "8"
|
- "8"
|
||||||
- "6"
|
- "6"
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ module.exports.generateFromContent = function generateFromContent(options) {
|
||||||
hash.update(content);
|
hash.update(content);
|
||||||
|
|
||||||
text += [content, hash.digest('base64')].join('|');
|
text += [content, hash.digest('base64')].join('|');
|
||||||
return new Buffer(text).toString('base64');
|
return Buffer.from(text).toString('base64');
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports.generateFromEmail = function generateFromEmail(options) {
|
module.exports.generateFromEmail = function generateFromEmail(options) {
|
||||||
|
@ -29,7 +29,7 @@ module.exports.generateFromEmail = function generateFromEmail(options) {
|
||||||
hash.update(String(secret));
|
hash.update(String(secret));
|
||||||
|
|
||||||
text += [expires, email, hash.digest('base64')].join('|');
|
text += [expires, email, hash.digest('base64')].join('|');
|
||||||
return new Buffer(text).toString('base64');
|
return Buffer.from(text).toString('base64');
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports.resetToken = {
|
module.exports.resetToken = {
|
||||||
|
@ -49,13 +49,13 @@ module.exports.resetToken = {
|
||||||
hash.update(String(dbHash));
|
hash.update(String(dbHash));
|
||||||
|
|
||||||
text += [expires, email, hash.digest('base64')].join('|');
|
text += [expires, email, hash.digest('base64')].join('|');
|
||||||
return new Buffer(text).toString('base64');
|
return Buffer.from(text).toString('base64');
|
||||||
},
|
},
|
||||||
extract: function extract(options) {
|
extract: function extract(options) {
|
||||||
options = options || {};
|
options = options || {};
|
||||||
|
|
||||||
var token = options.token,
|
var token = options.token,
|
||||||
tokenText = new Buffer(token, 'base64').toString('ascii'),
|
tokenText = Buffer.from(token, 'base64').toString('ascii'),
|
||||||
parts,
|
parts,
|
||||||
expires,
|
expires,
|
||||||
email;
|
email;
|
||||||
|
|
34
package.json
34
package.json
|
@ -25,30 +25,30 @@
|
||||||
"lint": "grunt lint"
|
"lint": "grunt lint"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^6.9.0 || ^8.9.0",
|
"node": "^6.9.0 || ^8.9.0 || ^10.12.0",
|
||||||
"cli": "^1.9.0"
|
"cli": "^1.9.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nexes/nql": "0.1.0",
|
"@nexes/nql": "0.1.0",
|
||||||
"amperize": "0.3.7",
|
"amperize": "0.3.8",
|
||||||
"analytics-node": "2.4.1",
|
"analytics-node": "2.4.1",
|
||||||
"archiver": "1.3.0",
|
"archiver": "1.3.0",
|
||||||
"bcryptjs": "2.4.3",
|
"bcryptjs": "2.4.3",
|
||||||
"bluebird": "3.5.1",
|
"bluebird": "3.5.2",
|
||||||
"body-parser": "1.18.3",
|
"body-parser": "1.18.3",
|
||||||
"bookshelf": "0.13.3",
|
"bookshelf": "0.13.3",
|
||||||
"bookshelf-relations": "0.2.1",
|
"bookshelf-relations": "0.2.1",
|
||||||
"brute-knex": "3.0.0",
|
"brute-knex": "3.0.0",
|
||||||
"bson-objectid": "1.2.3",
|
"bson-objectid": "1.2.4",
|
||||||
"chalk": "1.1.3",
|
"chalk": "1.1.3",
|
||||||
"cheerio": "0.22.0",
|
"cheerio": "0.22.0",
|
||||||
"compression": "1.7.2",
|
"compression": "1.7.3",
|
||||||
"connect-slashes": "1.3.1",
|
"connect-slashes": "1.3.1",
|
||||||
"cookie-session": "1.3.2",
|
"cookie-session": "1.3.2",
|
||||||
"cors": "2.8.4",
|
"cors": "2.8.4",
|
||||||
"csv-parser": "1.12.1",
|
"csv-parser": "1.12.1",
|
||||||
"downsize": "0.0.8",
|
"downsize": "0.0.8",
|
||||||
"express": "4.16.3",
|
"express": "4.16.4",
|
||||||
"express-brute": "1.0.1",
|
"express-brute": "1.0.1",
|
||||||
"express-hbs": "1.0.4",
|
"express-hbs": "1.0.4",
|
||||||
"express-query-boolean": "2.0.0",
|
"express-query-boolean": "2.0.0",
|
||||||
|
@ -69,16 +69,16 @@
|
||||||
"jsonpath": "1.0.0",
|
"jsonpath": "1.0.0",
|
||||||
"knex": "0.14.6",
|
"knex": "0.14.6",
|
||||||
"knex-migrator": "3.2.3",
|
"knex-migrator": "3.2.3",
|
||||||
"lodash": "4.17.10",
|
"lodash": "4.17.11",
|
||||||
"markdown-it": "8.4.1",
|
"markdown-it": "8.4.2",
|
||||||
"markdown-it-footnote": "3.0.1",
|
"markdown-it-footnote": "3.0.1",
|
||||||
"markdown-it-lazy-headers": "0.1.3",
|
"markdown-it-lazy-headers": "0.1.3",
|
||||||
"markdown-it-mark": "2.0.0",
|
"markdown-it-mark": "2.0.0",
|
||||||
"mobiledoc-dom-renderer": "0.6.5",
|
"mobiledoc-dom-renderer": "0.6.5",
|
||||||
"moment": "2.22.2",
|
"moment": "2.22.2",
|
||||||
"moment-timezone": "0.5.21",
|
"moment-timezone": "0.5.21",
|
||||||
"multer": "1.3.1",
|
"multer": "1.4.1",
|
||||||
"mysql": "2.15.0",
|
"mysql": "2.16.0",
|
||||||
"nconf": "0.10.0",
|
"nconf": "0.10.0",
|
||||||
"netjet": "1.3.0",
|
"netjet": "1.3.0",
|
||||||
"nodemailer": "0.7.1",
|
"nodemailer": "0.7.1",
|
||||||
|
@ -89,10 +89,10 @@
|
||||||
"passport-oauth2-client-password": "0.1.2",
|
"passport-oauth2-client-password": "0.1.2",
|
||||||
"path-match": "1.2.4",
|
"path-match": "1.2.4",
|
||||||
"rss": "1.2.2",
|
"rss": "1.2.2",
|
||||||
"sanitize-html": "1.18.2",
|
"sanitize-html": "1.19.1",
|
||||||
"semver": "5.5.0",
|
"semver": "5.6.0",
|
||||||
"simple-dom": "0.3.2",
|
"simple-dom": "0.3.2",
|
||||||
"simple-html-tokenizer": "0.5.5",
|
"simple-html-tokenizer": "0.5.7",
|
||||||
"superagent": "3.8.3",
|
"superagent": "3.8.3",
|
||||||
"unidecode": "0.1.8",
|
"unidecode": "0.1.8",
|
||||||
"uuid": "3.3.2",
|
"uuid": "3.3.2",
|
||||||
|
@ -101,14 +101,14 @@
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"sharp": "0.20.7",
|
"sharp": "0.20.7",
|
||||||
"sqlite3": "4.0.1"
|
"sqlite3": "4.0.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"eslint": "4.19.1",
|
"eslint": "4.19.1",
|
||||||
"eslint-plugin-ghost": "0.0.27",
|
"eslint-plugin-ghost": "0.0.27",
|
||||||
"grunt": "1.0.3",
|
"grunt": "1.0.3",
|
||||||
"grunt-bg-shell": "2.3.3",
|
"grunt-bg-shell": "2.3.3",
|
||||||
"grunt-cli": "1.2.0",
|
"grunt-cli": "1.3.1",
|
||||||
"grunt-contrib-clean": "1.1.0",
|
"grunt-contrib-clean": "1.1.0",
|
||||||
"grunt-contrib-compress": "1.4.3",
|
"grunt-contrib-compress": "1.4.3",
|
||||||
"grunt-contrib-copy": "1.0.0",
|
"grunt-contrib-copy": "1.0.0",
|
||||||
|
@ -132,10 +132,10 @@
|
||||||
"nock": "9.4.0",
|
"nock": "9.4.0",
|
||||||
"proxyquire": "2.1.0",
|
"proxyquire": "2.1.0",
|
||||||
"rewire": "3.0.2",
|
"rewire": "3.0.2",
|
||||||
"should": "13.2.1",
|
"should": "13.2.3",
|
||||||
"should-http": "0.1.1",
|
"should-http": "0.1.1",
|
||||||
"sinon": "4.4.6",
|
"sinon": "4.4.6",
|
||||||
"supertest": "3.1.0",
|
"supertest": "3.3.0",
|
||||||
"tmp": "0.0.33"
|
"tmp": "0.0.33"
|
||||||
},
|
},
|
||||||
"greenkeeper": {
|
"greenkeeper": {
|
||||||
|
|
Loading…
Reference in a new issue