From 8a416bc87064ad5dc4b19fb89eefa5a20fcad6b2 Mon Sep 17 00:00:00 2001 From: Pedro Romano Date: Wed, 15 Nov 2017 18:47:05 +0000 Subject: [PATCH 1/3] Enable `engine-strict=true` by default for npm. --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..b6f27f13 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true From 93dbf33fb550313e1cdc2540ab64521696b34cf9 Mon Sep 17 00:00:00 2001 From: Pedro Romano Date: Wed, 15 Nov 2017 18:47:38 +0000 Subject: [PATCH 2/3] Downgrade `joi` to a version that supports Node.js 6. --- package-lock.json | 84 +++++++++++++++++------------------------------ package.json | 2 +- 2 files changed, 32 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec4b3068..a58cd940 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1658,13 +1658,6 @@ "integrity": "sha512-rz0ng/c+fX+zACpLgDB8fnUQ845WSU06f4hlhk4K8TJxmR6f5hyvitu9a9JdMD7aq/P4E0XdG1uaab2OiXgHlA==", "requires": { "punycode": "2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" - } } }, "isexe": { @@ -1684,20 +1677,13 @@ "integrity": "sha512-Cu/kb+4HiNSejAPhSaN1VukdNTTi/r4/e+yykqjlG/IW+1gZH5b4+Bq3whDX4tvbYugta3r8KTMUiqT3fIGxuQ==" }, "joi": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/joi/-/joi-13.0.2.tgz", - "integrity": "sha512-kVka3LaHQyENvcMW4WJPSepGM43oCofcKxfs9HbbKd/FrwBAAt4lNNTPKOzSMmV53GIspmNO4U3O2TzoGvxxCA==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-12.0.0.tgz", + "integrity": "sha512-z0FNlV4NGgjQN1fdtHYXf5kmgludM65fG/JlXzU6+rwkt9U5UWuXVYnXa2FpK0u6+qBuCmrm5byPNuiiddAHvQ==", "requires": { - "hoek": "5.0.2", + "hoek": "4.2.0", "isemail": "3.0.0", - "topo": "3.0.0" - }, - "dependencies": { - "hoek": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.2.tgz", - "integrity": "sha512-NA10UYP9ufCtY2qYGkZktcQXwVyYK4zK0gkaFSB96xhtlo6V8tKXdQgx8eHolQTRemaW0uLn8BhjhwqrOU+QLQ==" - } + "topo": "2.0.2" } }, "js-tokens": { @@ -2344,9 +2330,9 @@ "dev": true }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=", "dev": true }, "native-promise-only": { @@ -4406,9 +4392,9 @@ "dev": true }, "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", + "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" }, "qs": { "version": "6.5.1", @@ -4911,7 +4897,7 @@ "superagent": "3.8.1", "swagger-converter": "0.1.7", "traverse": "0.6.6", - "z-schema": "3.18.4" + "z-schema": "3.19.0" }, "dependencies": { "path-to-regexp": { @@ -4996,18 +4982,11 @@ } }, "topo": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.0.tgz", - "integrity": "sha512-Tlu1fGlR90iCdIPURqPiufqAlCZYzLjHYVVbcFWDMcX7+tK8hdZWAfsMrD/pBul9jqHHwFjNdf1WaxA9vTRRhw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", + "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "requires": { - "hoek": "5.0.2" - }, - "dependencies": { - "hoek": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.2.tgz", - "integrity": "sha512-NA10UYP9ufCtY2qYGkZktcQXwVyYK4zK0gkaFSB96xhtlo6V8tKXdQgx8eHolQTRemaW0uLn8BhjhwqrOU+QLQ==" - } + "hoek": "4.2.0" } }, "tough-cookie": { @@ -5016,6 +4995,13 @@ "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "requires": { "punycode": "1.4.1" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + } } }, "traverse": { @@ -5092,14 +5078,6 @@ "dev": true, "requires": { "punycode": "2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=", - "dev": true - } } }, "use-strict": { @@ -5129,7 +5107,7 @@ "integrity": "sha1-6DgcvrtbX9DKjSsJ9qAYGhWNs00=", "dev": true, "requires": { - "nan": "2.7.0", + "nan": "2.8.0", "node-pre-gyp": "0.6.39" } }, @@ -5144,9 +5122,9 @@ } }, "validator": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz", - "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/validator/-/validator-9.1.1.tgz", + "integrity": "sha512-1TGGX1GKilfmcEa9rm+9nI9AqIUQK8oj4jZI0DmTGLTPM5jmowBBhyBIHCks73+P1QPZk2i6oOYUq583uOetHQ==", "dev": true }, "vary": { @@ -5297,15 +5275,15 @@ "dev": true }, "z-schema": { - "version": "3.18.4", - "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz", - "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==", + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.19.0.tgz", + "integrity": "sha512-V94f3ODuluBS4kQLLjNhwoMek0dyIXCsvNu/A17dAyJ6sMhT5KkJQwSn07R0naByLIXJWMDk+ruMfI/3G3hS4Q==", "dev": true, "requires": { "commander": "2.11.0", "lodash.get": "4.4.2", "lodash.isequal": "4.5.0", - "validator": "8.2.0" + "validator": "9.1.1" } } } diff --git a/package.json b/package.json index 0b11dda0..164f0126 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "express": "4.16.2", "express-graphql": "0.6.11", "graphql": "0.11.7", - "joi": "13.0.2", + "joi": "12.0.0", "lodash.assign": "4.2.0", "lodash.isequal": "4.5.0", "lodash.omit": "4.5.0", From de531bbcaa637bfa49df3b02c81653be74ec567d Mon Sep 17 00:00:00 2001 From: Pedro Romano Date: Wed, 15 Nov 2017 18:49:51 +0000 Subject: [PATCH 3/3] Update CHANGELOG and bump package version for release. --- CHANGELOG.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5247fba7..a8aa2b77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +- 2017-11-15 - v4.1.1 +- 2017-11-15 - Downgrade Joi to a version supported by Node.js v6. +- 2017-11-15 - Force `engine-strict=true` when running npm. - 2017-11-14 - v4.1.0 - 2017-11-14 - New configuration option to disable automatic id generation. - 2017-11-14 - Update GraphQL dependencies to latest versions. diff --git a/package.json b/package.json index 164f0126..b803df23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jsonapi-server", - "version": "4.1.0", + "version": "4.1.1", "description": "A config driven NodeJS framework implementing json:api", "keywords": [ "jsonapi",