From d9e1d991ed4b88b2b2cf520d8418af50acf0dabd Mon Sep 17 00:00:00 2001 From: KevinAdu Date: Thu, 13 Jun 2019 16:34:25 +0900 Subject: [PATCH 1/3] Fix lint warnings --- index.js | 21 +++++++++++++++++---- test.js | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 3642878..936c6da 100644 --- a/index.js +++ b/index.js @@ -19,18 +19,31 @@ module.exports = { const periodOrdered = periodData.sort((a, b) => b.startYear - a.startYear); - if (gregorianYear < periodOrdered[periodOrdered.length - 1].startYear) return null; + if (gregorianYear < periodOrdered[periodOrdered.length - 1].startYear) + return null; const exactPeriod = periodOrdered.find((period, i) => { if (i === periodOrdered.length - 1) return true; if (gregorianYear > period.startYear) return true; - if (gregorianYear === period.startYear && gregorianMonth > period.startMonth) return true; - if (gregorianYear === period.startYear && gregorianMonth === period.startMonth && gregorianDay >= period.startDay) return true; + if ( + gregorianYear === period.startYear && + gregorianMonth > period.startMonth + ) { + return true; + } + if ( + gregorianYear === period.startYear && + gregorianMonth === period.startMonth && + gregorianDay >= period.startDay + ) { + return true; + } + return false; }); const updatedPeriod = Object.assign( - {currentJapaneseYear: gregorianYear - exactPeriod.startYear + 1}, + { currentJapaneseYear: gregorianYear - exactPeriod.startYear + 1 }, exactPeriod ); diff --git a/test.js b/test.js index 1c355ff..af719a2 100644 --- a/test.js +++ b/test.js @@ -28,7 +28,7 @@ describe("#japaneseYear", () => { expect(tokyoOlympicYear.currentJapaneseYear).to.equal(2); }); - it("should convert any date below the first recorded emperor calendar date to null", () => { + it("should convert any date below the first recorded emperor calendar date to null", () => { const gennaYear = japaneseYear(new Date(1615, 6, 1)); const firstAdYear = japaneseYear(new Date(1600, 1, 1)); From dc96a446a436a9ff50a21064205a9acf76acdbe5 Mon Sep 17 00:00:00 2001 From: KevinAdu Date: Thu, 13 Jun 2019 16:36:16 +0900 Subject: [PATCH 2/3] Updated README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index e1ed820..4fc5a36 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,14 @@ npm test ## Contributing +Bug reports and pull requests are welcome on GitHub at https://github.com/KevinAdu/nengo. + In lieu of a formal style guide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using the following command: ```bash npm run-script lint ``` + +## License + +The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT). From ee8d194b6fa6e3cda42a10f93107b66ca5116128 Mon Sep 17 00:00:00 2001 From: KevinAdu Date: Sun, 22 Sep 2019 16:14:45 +0900 Subject: [PATCH 3/3] Fixed security issues --- package-lock.json | 52 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index a05c417..8576ebc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -391,6 +391,12 @@ "jsbn": "~0.1.0" } }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -690,10 +696,13 @@ } }, "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", + "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.0.0" + } }, "eslint-visitor-keys": { "version": "1.0.0", @@ -1369,9 +1378,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, "log-driver": { @@ -2043,7 +2052,8 @@ "requires": { "ajv": "^6.9.1", "lodash": "^4.17.11", - "slice-ansi": "^2.1.0" + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" }, "dependencies": { "ajv": { @@ -2058,6 +2068,12 @@ "uri-js": "^4.2.2" } }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, "fast-deep-equal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", @@ -2069,6 +2085,26 @@ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } } } },