From 86cdca180c63a112cb09a84ed83732c98bc8840d Mon Sep 17 00:00:00 2001 From: Wojciech Maj Date: Wed, 20 Apr 2022 09:18:15 +0200 Subject: [PATCH 1/5] [breaking] Bump minimum React version to 16.8 --- package.json | 4 ++-- test/yarn.lock | 4 ++-- yarn.lock | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0aa19e2..063f4c4 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "rimraf": "^3.0.0" }, "peerDependencies": { - "react": "^16.3.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.3.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "resolutions": { "semver@7.0.0": "^7.0.0" diff --git a/test/yarn.lock b/test/yarn.lock index 377fd46..c14f577 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -1834,8 +1834,8 @@ __metadata: react-fit: ^1.4.0 react-time-picker: ^4.5.0 peerDependencies: - react: ^16.3.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 languageName: node linkType: soft diff --git a/yarn.lock b/yarn.lock index 13ee4cd..29b18d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1898,8 +1898,8 @@ __metadata: react-time-picker: ^4.5.0 rimraf: ^3.0.0 peerDependencies: - react: ^16.3.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 languageName: unknown linkType: soft From 5cd0eaf24bf5e5f466700e030e923ee5a607971d Mon Sep 17 00:00:00 2001 From: Wojciech Maj Date: Fri, 20 May 2022 09:07:50 +0200 Subject: [PATCH 2/5] Use dataset interface instead of getAttribute --- src/TimeRangePicker.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TimeRangePicker.jsx b/src/TimeRangePicker.jsx index f0674f0..fc2b0c8 100644 --- a/src/TimeRangePicker.jsx +++ b/src/TimeRangePicker.jsx @@ -108,7 +108,7 @@ export default class TimeRangePicker extends PureComponent { } if (openClockOnFocus) { - if (event.target.getAttribute('data-select') === 'true') { + if (event.target.dataset.select === 'true') { return; } From 928cfc2d7a7cb4d4f434a9ef43940ce00cbf01e1 Mon Sep 17 00:00:00 2001 From: Wojciech Maj Date: Mon, 25 Jul 2022 17:03:11 +0200 Subject: [PATCH 3/5] Update husky to 8.0.0 --- .github/workflows/ci.yml | 4 ++++ package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d32e5db..5d57fc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,8 @@ jobs: - name: Install dependencies run: yarn --immutable + env: + HUSKY: 0 - name: Run tests run: yarn lint @@ -44,6 +46,8 @@ jobs: - name: Install dependencies run: yarn --immutable + env: + HUSKY: 0 - name: Run tests run: yarn jest diff --git a/package.json b/package.json index 063f4c4..687a55e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "enzyme": "^3.10.0", "eslint": "^8.5.0", "eslint-config-wojtekmaj": "^0.6.5", - "husky": "^7.0.0", + "husky": "^8.0.0", "jest": "^27.0.0", "less": "^4.0.0", "prettier": "^2.5.0", diff --git a/yarn.lock b/yarn.lock index 29b18d9..199d5f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1883,7 +1883,7 @@ __metadata: enzyme: ^3.10.0 eslint: ^8.5.0 eslint-config-wojtekmaj: ^0.6.5 - husky: ^7.0.0 + husky: ^8.0.0 jest: ^27.0.0 less: ^4.0.0 make-event-props: ^1.1.0 @@ -3933,12 +3933,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^7.0.0": - version: 7.0.4 - resolution: "husky@npm:7.0.4" +"husky@npm:^8.0.0": + version: 8.0.1 + resolution: "husky@npm:8.0.1" bin: husky: lib/bin.js - checksum: c6ec4af63da2c9522da8674a20ad9b48362cc92704896cc8a58c6a2a39d797feb2b806f93fbd83a6d653fbdceb2c3b6e0b602c6b2e8565206ffc2882ef7db9e9 + checksum: 943a73a13d0201318fd30e83d299bb81d866bd245b69e6277804c3b462638dc1921694cb94c2b8c920a4a187060f7d6058d3365152865406352e934c5fff70dc languageName: node linkType: hard From 2e290a33490ba09e4d4322c9a74f06da29f876ac Mon Sep 17 00:00:00 2001 From: Wojciech Maj Date: Wed, 27 Jul 2022 12:26:09 +0200 Subject: [PATCH 4/5] Fix security vulnerability in terser dependency --- sample/yarn.lock | 81 ++++++++++++++++++++++++++++++++++++------------ test/yarn.lock | 76 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 123 insertions(+), 34 deletions(-) diff --git a/sample/yarn.lock b/sample/yarn.lock index 496a4e8..17955e7 100644 --- a/sample/yarn.lock +++ b/sample/yarn.lock @@ -1321,6 +1321,58 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.0": + version: 0.3.2 + resolution: "@jridgewell/gen-mapping@npm:0.3.2" + dependencies: + "@jridgewell/set-array": ^1.0.1 + "@jridgewell/sourcemap-codec": ^1.4.10 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882 + languageName: node + linkType: hard + +"@jridgewell/resolve-uri@npm:^3.0.3": + version: 3.1.0 + resolution: "@jridgewell/resolve-uri@npm:3.1.0" + checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267 + languageName: node + linkType: hard + +"@jridgewell/set-array@npm:^1.0.1": + version: 1.1.2 + resolution: "@jridgewell/set-array@npm:1.1.2" + checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e + languageName: node + linkType: hard + +"@jridgewell/source-map@npm:^0.3.2": + version: 0.3.2 + resolution: "@jridgewell/source-map@npm:0.3.2" + dependencies: + "@jridgewell/gen-mapping": ^0.3.0 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482 + languageName: node + linkType: hard + +"@jridgewell/sourcemap-codec@npm:^1.4.10": + version: 1.4.14 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" + checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97 + languageName: node + linkType: hard + +"@jridgewell/trace-mapping@npm:^0.3.9": + version: 0.3.14 + resolution: "@jridgewell/trace-mapping@npm:0.3.14" + dependencies: + "@jridgewell/resolve-uri": ^3.0.3 + "@jridgewell/sourcemap-codec": ^1.4.10 + checksum: b9537b9630ffb631aef9651a085fe361881cde1772cd482c257fe3c78c8fd5388d681f504a9c9fe1081b1c05e8f75edf55ee10fdb58d92bbaa8dbf6a7bd6b18c + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -1806,12 +1858,12 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1": - version: 8.7.0 - resolution: "acorn@npm:8.7.0" +"acorn@npm:^8.4.1, acorn@npm:^8.5.0": + version: 8.8.0 + resolution: "acorn@npm:8.8.0" bin: acorn: bin/acorn - checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0 + checksum: 7270ca82b242eafe5687a11fea6e088c960af712683756abf0791b68855ea9cace3057bd5e998ffcef50c944810c1e0ca1da526d02b32110e13c722aa959afdc languageName: node linkType: hard @@ -5515,13 +5567,6 @@ __metadata: languageName: node linkType: hard -"source-map@npm:~0.7.2": - version: 0.7.3 - resolution: "source-map@npm:0.7.3" - checksum: cd24efb3b8fa69b64bf28e3c1b1a500de77e84260c5b7f2b873f88284df17974157cc88d386ee9b6d081f08fdd8242f3fc05c953685a6ad81aad94c7393dedea - languageName: node - linkType: hard - "spdy-transport@npm:^3.0.0": version: 3.0.0 resolution: "spdy-transport@npm:3.0.0" @@ -5697,20 +5742,16 @@ __metadata: linkType: hard "terser@npm:^5.10.0, terser@npm:^5.7.2": - version: 5.10.0 - resolution: "terser@npm:5.10.0" + version: 5.14.2 + resolution: "terser@npm:5.14.2" dependencies: + "@jridgewell/source-map": ^0.3.2 + acorn: ^8.5.0 commander: ^2.20.0 - source-map: ~0.7.2 source-map-support: ~0.5.20 - peerDependencies: - acorn: ^8.5.0 - peerDependenciesMeta: - acorn: - optional: true bin: terser: bin/terser - checksum: 1080faeb6d5cd155bb39d9cc41d20a590eafc9869560d5285f255f6858604dcd135311e344188a106f87fedb12d096ad3799cfc2e65acd470b85d468b1c7bd4c + checksum: cabb50a640d6c2cfb351e4f43dc7bf7436f649755bb83eb78b2cacda426d5e0979bd44e6f92d713f3ca0f0866e322739b9ced888ebbce6508ad872d08de74fcc languageName: node linkType: hard diff --git a/test/yarn.lock b/test/yarn.lock index c14f577..8f69945 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -1356,6 +1356,58 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.0": + version: 0.3.2 + resolution: "@jridgewell/gen-mapping@npm:0.3.2" + dependencies: + "@jridgewell/set-array": ^1.0.1 + "@jridgewell/sourcemap-codec": ^1.4.10 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882 + languageName: node + linkType: hard + +"@jridgewell/resolve-uri@npm:^3.0.3": + version: 3.1.0 + resolution: "@jridgewell/resolve-uri@npm:3.1.0" + checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267 + languageName: node + linkType: hard + +"@jridgewell/set-array@npm:^1.0.1": + version: 1.1.2 + resolution: "@jridgewell/set-array@npm:1.1.2" + checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e + languageName: node + linkType: hard + +"@jridgewell/source-map@npm:^0.3.2": + version: 0.3.2 + resolution: "@jridgewell/source-map@npm:0.3.2" + dependencies: + "@jridgewell/gen-mapping": ^0.3.0 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482 + languageName: node + linkType: hard + +"@jridgewell/sourcemap-codec@npm:^1.4.10": + version: 1.4.14 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" + checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97 + languageName: node + linkType: hard + +"@jridgewell/trace-mapping@npm:^0.3.9": + version: 0.3.14 + resolution: "@jridgewell/trace-mapping@npm:0.3.14" + dependencies: + "@jridgewell/resolve-uri": ^3.0.3 + "@jridgewell/sourcemap-codec": ^1.4.10 + checksum: b9537b9630ffb631aef9651a085fe361881cde1772cd482c257fe3c78c8fd5388d681f504a9c9fe1081b1c05e8f75edf55ee10fdb58d92bbaa8dbf6a7bd6b18c + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -1888,12 +1940,12 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.7.0": - version: 8.7.0 - resolution: "acorn@npm:8.7.0" +"acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.0": + version: 8.8.0 + resolution: "acorn@npm:8.8.0" bin: acorn: bin/acorn - checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0 + checksum: 7270ca82b242eafe5687a11fea6e088c960af712683756abf0791b68855ea9cace3057bd5e998ffcef50c944810c1e0ca1da526d02b32110e13c722aa959afdc languageName: node linkType: hard @@ -6014,7 +6066,7 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.7.3, source-map@npm:~0.7.2": +"source-map@npm:^0.7.3": version: 0.7.3 resolution: "source-map@npm:0.7.3" checksum: cd24efb3b8fa69b64bf28e3c1b1a500de77e84260c5b7f2b873f88284df17974157cc88d386ee9b6d081f08fdd8242f3fc05c953685a6ad81aad94c7393dedea @@ -6219,20 +6271,16 @@ __metadata: linkType: hard "terser@npm:^5.10.0, terser@npm:^5.7.2": - version: 5.10.0 - resolution: "terser@npm:5.10.0" + version: 5.14.2 + resolution: "terser@npm:5.14.2" dependencies: + "@jridgewell/source-map": ^0.3.2 + acorn: ^8.5.0 commander: ^2.20.0 - source-map: ~0.7.2 source-map-support: ~0.5.20 - peerDependencies: - acorn: ^8.5.0 - peerDependenciesMeta: - acorn: - optional: true bin: terser: bin/terser - checksum: 1080faeb6d5cd155bb39d9cc41d20a590eafc9869560d5285f255f6858604dcd135311e344188a106f87fedb12d096ad3799cfc2e65acd470b85d468b1c7bd4c + checksum: cabb50a640d6c2cfb351e4f43dc7bf7436f649755bb83eb78b2cacda426d5e0979bd44e6f92d713f3ca0f0866e322739b9ced888ebbce6508ad872d08de74fcc languageName: node linkType: hard From ab6ae748e5b156043b70996fea24fbd341eb7aa9 Mon Sep 17 00:00:00 2001 From: Arjun Sharda <77706434+ArjunSharda@users.noreply.github.com> Date: Thu, 28 Jul 2022 09:07:58 -0500 Subject: [PATCH 5/5] Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d57fc5..e70845f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,10 +16,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: '16' @@ -37,10 +37,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: '16'