Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade clsx to v2 #9822

Merged
merged 4 commits into from
May 6, 2024
Merged

Upgrade clsx to v2 #9822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
349e79a
Upgrade clsx to v2
MohammedFaragallah May 3, 2024
941e7cd
merge next
MohammedFaragallah May 3, 2024
20e1848
fix yarn
MohammedFaragallah May 3, 2024
3fd6e33
Deduplicate clsx dep
djhi May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/crm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@mui/material": "^5.15.15",
"@nivo/bar": "^0.80.0",
"@nivo/core": "^0.80.0",
"clsx": "^1.1.1",
"clsx": "^2.1.1",
"date-fns": "^3.6.0",
"faker": "~5.4.0",
"lodash": "~4.17.5",
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@mui/material": "^5.15.15",
"@types/recharts": "^1.8.10",
"@vitejs/plugin-react": "^2.2.0",
"clsx": "^1.1.1",
"clsx": "^2.1.1",
"data-generator-retail": "^5.0.0-alpha.0",
"date-fns": "^3.6.0",
"fakerest": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"dependencies": {
"@tanstack/react-query": "^5.8.4",
"clsx": "^1.1.1",
"clsx": "^2.1.1",
"date-fns": "^3.6.0",
"eventemitter3": "^4.0.7",
"hotscript": "^1.0.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-input-rich-text/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@tiptap/pm": "^2.0.3",
"@tiptap/react": "^2.0.3",
"@tiptap/starter-kit": "^2.0.3",
"clsx": "^1.1.1"
"clsx": "^2.1.1"
},
"peerDependencies": {
"@mui/icons-material": "^5.15.15",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-no-code/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@tanstack/react-query": "^5.8.4",
"clsx": "^1.1.1",
"clsx": "^2.1.1",
"date-fns": "^3.6.0",
"inflection": "^3.0.0",
"lodash": "~4.17.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"dependencies": {
"@tanstack/react-query": "^5.8.4",
"autosuggest-highlight": "^3.1.1",
"clsx": "^1.1.1",
"clsx": "^2.1.1",
"css-mediaquery": "^0.1.2",
"dompurify": "^2.4.3",
"hotscript": "^1.0.12",
Expand Down
27 changes: 10 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9205,17 +9205,10 @@ __metadata:
languageName: node
linkType: hard

"clsx@npm:^1.1.1":
version: 1.1.1
resolution: "clsx@npm:1.1.1"
checksum: 5c34e1d5623e3dce0dbf22eedd4f3cc7cd0dee6b1b1ef3ad49d042c9d86372a1dc7788c2ca3213ec08e65ad0e91572ae7cb77183a478c9977bd5327e8f43ffe5
languageName: node
linkType: hard

"clsx@npm:^2.1.0":
version: 2.1.0
resolution: "clsx@npm:2.1.0"
checksum: c09c00ad14f638366ca814097e6cab533dfa1972a358da5b557be487168acbb25b4c1395e89ffa842a8a61ba87a462d2b4885bc9d4f8410b598f3cb339599cdb
"clsx@npm:^2.1.0, clsx@npm:^2.1.1":
version: 2.1.1
resolution: "clsx@npm:2.1.1"
checksum: c4c8eb865f8c82baab07e71bfa8897c73454881c4f99d6bc81585aecd7c441746c1399d08363dc096c550cceaf97bd4ce1e8854e1771e9998d9f94c4fe075839
languageName: node
linkType: hard

Expand Down Expand Up @@ -10447,7 +10440,7 @@ __metadata:
"@types/react-dom": "npm:^18.2.16"
"@types/recharts": "npm:^1.8.10"
"@vitejs/plugin-react": "npm:^4.2.1"
clsx: "npm:^1.1.1"
clsx: "npm:^2.1.1"
data-generator-retail: "npm:^5.0.0-alpha.0"
date-fns: "npm:^3.6.0"
fakerest: "npm:^3.0.0"
Expand Down Expand Up @@ -18691,7 +18684,7 @@ __metadata:
"@types/node": "npm:^20.10.7"
"@types/node-polyglot": "npm:^0.4.31"
"@types/react": "npm:^18.2.37"
clsx: "npm:^1.1.1"
clsx: "npm:^2.1.1"
cross-env: "npm:^5.2.0"
date-fns: "npm:^3.6.0"
eventemitter3: "npm:^4.0.7"
Expand Down Expand Up @@ -18879,7 +18872,7 @@ __metadata:
"@tiptap/react": "npm:^2.0.3"
"@tiptap/starter-kit": "npm:^2.0.3"
"@tiptap/suggestion": "npm:^2.0.3"
clsx: "npm:^1.1.1"
clsx: "npm:^2.1.1"
data-generator-retail: "npm:^5.0.0-beta.0"
ra-core: "npm:^5.0.0-beta.0"
ra-data-fakerest: "npm:^5.0.0-beta.0"
Expand Down Expand Up @@ -18927,7 +18920,7 @@ __metadata:
"@tanstack/react-query": "npm:^5.8.4"
"@testing-library/react": "npm:^14.1.2"
"@testing-library/user-event": "npm:^14.5.1"
clsx: "npm:^1.1.1"
clsx: "npm:^2.1.1"
cross-env: "npm:^5.2.0"
date-fns: "npm:^3.6.0"
inflection: "npm:^3.0.0"
Expand Down Expand Up @@ -18965,7 +18958,7 @@ __metadata:
"@types/react-is": "npm:^18.2.4"
"@types/react-transition-group": "npm:^4.4.9"
autosuggest-highlight: "npm:^3.1.1"
clsx: "npm:^1.1.1"
clsx: "npm:^2.1.1"
cross-env: "npm:^5.2.0"
css-mediaquery: "npm:^0.1.2"
dompurify: "npm:^2.4.3"
Expand Down Expand Up @@ -19099,7 +19092,7 @@ __metadata:
"@types/react": "npm:^18.2.37"
"@types/react-dom": "npm:^18.2.16"
"@vitejs/plugin-react": "npm:^4.2.1"
clsx: "npm:^1.1.1"
clsx: "npm:^2.1.1"
date-fns: "npm:^3.6.0"
faker: "npm:~5.4.0"
lodash: "npm:~4.17.5"
Expand Down