From 3804caf904c2b54fb6f49c40f77ab0b515fa6e36 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Thu, 1 Aug 2019 10:58:09 +1000 Subject: [PATCH 1/2] chore: updated streamroller to v2, means we cannot support node v6 --- package-lock.json | 53 +++++++++++++++------------------- package.json | 4 +-- test/tap/configuration-test.js | 1 + 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8d0c043..a3bc784 100644 --- a/package-lock.json +++ b/package-lock.json @@ -278,14 +278,6 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, - "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "requires": { - "lodash": "^4.17.11" - } - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -1646,13 +1638,20 @@ "dev": true }, "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha1-TxicRKoSO4lfcigE9V6iPq3DSOk=", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==" + } } }, "fs.realpath": { @@ -2694,7 +2693,8 @@ "lodash": { "version": "4.17.14", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", + "dev": true }, "lodash._reinterpolate": { "version": "3.0.0", @@ -3854,24 +3854,19 @@ "dev": true }, "streamroller": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz", - "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.0.0.tgz", + "integrity": "sha512-F3YGsrfLJMqS2QB5NEV1qd8ZluCNw+srK3t/q3odEwXpy+FF9uR7pPg9YiJxi7jKKahMdZBPBL668lf3Lnk43A==", "requires": { - "async": "^2.6.2", - "date-format": "^2.0.0", - "debug": "^3.2.6", - "fs-extra": "^7.0.1", - "lodash": "^4.17.14" + "date-format": "^2.1.0", + "debug": "^4.1.1", + "fs-extra": "^8.1.0" }, "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } + "date-format": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", + "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==" } } }, @@ -4378,7 +4373,7 @@ "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=" + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, "uri-js": { "version": "4.2.2", diff --git a/package.json b/package.json index f3a2634..36db56b 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "url": "http://github.com/log4js-node/log4js-node/issues" }, "engines": { - "node": ">=6.0" + "node": ">=8.0" }, "scripts": { "clean": "find test -type f ! -name '*.json' ! -name '*.js' ! -name '.eslintrc' -delete && rm *.log", @@ -44,7 +44,7 @@ "debug": "^4.1.1", "flatted": "^2.0.0", "rfdc": "^1.1.4", - "streamroller": "^1.0.6" + "streamroller": "^2.0.0" }, "devDependencies": { "@log4js-node/sandboxed-module": "^2.2.1", diff --git a/test/tap/configuration-test.js b/test/tap/configuration-test.js index 05fcc0d..eed86dd 100644 --- a/test/tap/configuration-test.js +++ b/test/tap/configuration-test.js @@ -16,6 +16,7 @@ test('log4js configure', (batch) => { fileRead = 0; fakeFS = { + realpath: () => {}, // fs-extra looks for this ReadStream: realFS.ReadStream, // need to define these, because graceful-fs uses them WriteStream: realFS.WriteStream, closeSync: () => {}, From 886d5ae4b81b099fcfdff79bbe0cdece85d0cbc7 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Thu, 1 Aug 2019 11:12:51 +1000 Subject: [PATCH 2/2] chore: oops, missed out travis.yml --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65c2024..bee93c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ language: node_js dist: trusty sudo: false node_js: - - "12" - - "10" - - "8" - - "6" + - '12' + - '10' + - '8' after_success: - npm run codecov