Skip to content

Commit 679340e

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # package.json
2 parents 524f4df + 5bb5fb9 commit 679340e

2 files changed

Lines changed: 27 additions & 26 deletions

File tree

‎package.json‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
{
2-
"name": "@js-smart/react-kit",
3-
"version": "5.22.1",
4-
"private": false,
5-
"license": "MIT",
6-
"type": "module",
7-
"scripts": {
8-
"nx": "nx",
9-
"start": "nx serve react-kit-demo",
10-
"build": "nx build react-kit",
11-
"build:demo": "nx build react-kit-demo",
12-
"test": "nx test react-kit ",
13-
"update": "nx migrate latest"
14-
},
15-
"dependencies": {
16-
"@axa-fr/react-oidc": "^7.26.3",
17-
"@emotion/react": "11.14.0",
18-
"@emotion/styled": "11.14.1",
19-
"@js-temporal/polyfill": "^0.5.1",
20-
"@mui/icons-material": "^7.3.7",
21-
"@mui/material": "^7.3.4",
22-
"@mui/x-data-grid": "^8.27.0",
23-
"@tanstack/react-router": "^1.161.1",
24-
"date-fns": "^4.1.0",
25-
"react": "^19.2.4",
26-
"react-dom": "^19.2.4"
2+
"name": "@js-smart/react-kit",
3+
"version": "5.23.0",
4+
"private": false,
5+
"license": "MIT",
6+
"type": "module",
7+
"scripts": {
8+
"nx": "nx",
9+
"start": "nx serve react-kit-demo",
10+
"build": "nx build react-kit",
11+
"build:demo": "nx build react-kit-demo",
12+
"test": "nx test react-kit ",
13+
"update": "nx migrate latest"
14+
},
15+
"dependencies": {
16+
"@axa-fr/react-oidc": "^7.26.3",
17+
"@emotion/react": "11.14.0",
18+
"@emotion/styled": "11.14.1",
19+
"@js-temporal/polyfill": "^0.5.1",
20+
"@mui/icons-material": "^7.3.7",
21+
"@mui/material": "^7.3.4",
22+
"@mui/x-data-grid": "^8.27.0",
23+
"@tanstack/react-router": "^1.161.1",
24+
"date-fns": "^4.1.0",
25+
"react": "^19.2.4",
26+
"react-dom": "^19.2.4"
27+
},
2728
},
2829
"devDependencies": {
2930
"@babel/core": "^7.28.0",

‎react-kit/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@js-smart/react-kit",
33
"private": false,
4-
"version": "5.22.1",
4+
"version": "5.23.0",
55
"main": "./index.js",
66
"types": "./index.d.ts",
77
"publishConfig": {

0 commit comments

Comments
 (0)