Skip to content

Commit 99bdf47

Browse files
committed
Replace merge-class-names with clsx
1 parent 9b33cd0 commit 99bdf47

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"license": "MIT",
4545
"dependencies": {
4646
"@wojtekmaj/date-utils": "^1.0.0",
47+
"clsx": "^1.2.1",
4748
"get-user-locale": "^1.4.0",
48-
"merge-class-names": "^1.1.1",
4949
"prop-types": "^15.6.0"
5050
},
5151
"devDependencies": {

src/Clock.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import mergeClassNames from 'merge-class-names';
3+
import clsx from 'clsx';
44
import { getHours, getMinutes, getSeconds } from '@wojtekmaj/date-utils';
55

66
import Hand from './Hand';
@@ -152,7 +152,7 @@ export default function Clock({
152152

153153
return (
154154
<time
155-
className={mergeClassNames('react-clock', className)}
155+
className={clsx('react-clock', className)}
156156
dateTime={value instanceof Date ? value.toISOString() : value}
157157
style={{
158158
width: `${size}px`,

test/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2483,6 +2483,13 @@ __metadata:
24832483
languageName: node
24842484
linkType: hard
24852485

2486+
"clsx@npm:^1.2.1":
2487+
version: 1.2.1
2488+
resolution: "clsx@npm:1.2.1"
2489+
checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
2490+
languageName: node
2491+
linkType: hard
2492+
24862493
"color-convert@npm:^1.9.0":
24872494
version: 1.9.3
24882495
resolution: "color-convert@npm:1.9.3"
@@ -4418,13 +4425,6 @@ __metadata:
44184425
languageName: node
44194426
linkType: hard
44204427

4421-
"merge-class-names@npm:^1.1.1":
4422-
version: 1.4.2
4423-
resolution: "merge-class-names@npm:1.4.2"
4424-
checksum: 569c333ab0d7fa1e06ae6e637d58e0d4623d7b165ea78d085c1bbd042568d8793bb7ce54ec55580679416046b11fc6eaf4956d68d19964cb320edc034e182c1d
4425-
languageName: node
4426-
linkType: hard
4427-
44284428
"merge-descriptors@npm:1.0.1":
44294429
version: 1.0.1
44304430
resolution: "merge-descriptors@npm:1.0.1"
@@ -5247,8 +5247,8 @@ __metadata:
52475247
resolution: "react-clock@portal:../::locator=react-clock-test-page%40workspace%3A."
52485248
dependencies:
52495249
"@wojtekmaj/date-utils": ^1.0.0
5250+
clsx: ^1.2.1
52505251
get-user-locale: ^1.4.0
5251-
merge-class-names: ^1.1.1
52525252
prop-types: ^15.6.0
52535253
peerDependencies:
52545254
react: ^16.8.0 || ^17.0.0 || ^18.0.0

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2728,6 +2728,13 @@ __metadata:
27282728
languageName: node
27292729
linkType: hard
27302730

2731+
"clsx@npm:^1.2.1":
2732+
version: 1.2.1
2733+
resolution: "clsx@npm:1.2.1"
2734+
checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
2735+
languageName: node
2736+
linkType: hard
2737+
27312738
"co@npm:^4.6.0":
27322739
version: 4.6.0
27332740
resolution: "co@npm:4.6.0"
@@ -5199,13 +5206,6 @@ __metadata:
51995206
languageName: node
52005207
linkType: hard
52015208

5202-
"merge-class-names@npm:^1.1.1":
5203-
version: 1.4.2
5204-
resolution: "merge-class-names@npm:1.4.2"
5205-
checksum: 569c333ab0d7fa1e06ae6e637d58e0d4623d7b165ea78d085c1bbd042568d8793bb7ce54ec55580679416046b11fc6eaf4956d68d19964cb320edc034e182c1d
5206-
languageName: node
5207-
linkType: hard
5208-
52095209
"merge-stream@npm:^2.0.0":
52105210
version: 2.0.0
52115211
resolution: "merge-stream@npm:2.0.0"
@@ -5947,14 +5947,14 @@ __metadata:
59475947
"@testing-library/jest-dom": ^5.15.0
59485948
"@testing-library/react": ^13.4.0
59495949
"@wojtekmaj/date-utils": ^1.0.0
5950+
clsx: ^1.2.1
59505951
eslint: ^8.26.0
59515952
eslint-config-wojtekmaj: ^0.7.1
59525953
get-user-locale: ^1.4.0
59535954
husky: ^8.0.0
59545955
jest: ^29.0.0
59555956
jest-environment-jsdom: ^29.0.0
59565957
less: ^4.0.0
5957-
merge-class-names: ^1.1.1
59585958
prettier: ^2.7.0
59595959
pretty-quick: ^3.1.0
59605960
prop-types: ^15.6.0

0 commit comments

Comments
 (0)