Skip to content

Commit a2519fc

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # package.json
2 parents c53318e + 47087d2 commit a2519fc

File tree

1 file changed

+100
-100
lines changed

1 file changed

+100
-100
lines changed

package.json

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
11
{
2-
"name": "@js-smart/react-kit",
3-
"version": "5.15.0",
4-
"license": "MIT",
5-
"private": false,
6-
"type": "module",
7-
"scripts": {
8-
"nx": "nx",
9-
"start": "nx serve",
10-
"build": "nx build react-kit",
11-
"build:demo": "nx build",
12-
"test": "nx test react-kit ",
13-
"update": "nx migrate latest"
14-
},
15-
"dependencies": {
16-
"@axa-fr/react-oidc": "^7.26.0",
17-
"@emotion/react": "^11.14.0",
18-
"@emotion/styled": "^11.14.1",
19-
"@mui/icons-material": "^7.3.4",
20-
"@mui/material": "^7.3.4",
21-
"@mui/x-data-grid": "^7.29.9",
22-
"date-fns": "^4.1.0",
23-
"react": "^19.2.0",
24-
"react-dom": "^19.2.0",
25-
"react-router-dom": "^7.9.4"
26-
},
27-
"devDependencies": {
28-
"@babel/core": "^7.28.0",
29-
"@babel/preset-react": "^7.27.1",
30-
"@nx/cypress": "21.6.5",
31-
"@nx/devkit": "21.6.5",
32-
"@nx/eslint": "21.6.5",
33-
"@nx/eslint-plugin": "21.6.5",
34-
"@nx/js": "21.6.5",
35-
"@nx/react": "21.6.5",
36-
"@nx/vite": "21.6.5",
37-
"@nx/web": "21.6.5",
38-
"@nx/workspace": "21.6.5",
39-
"@semantic-release/git": "^10.0.1",
40-
"@semantic-release/npm": "^12.0.1",
41-
"@swc-node/register": "1.10.10",
42-
"@swc/cli": "0.6.0",
43-
"@swc/core": "1.11.24",
44-
"@swc/helpers": "0.5.17",
45-
"@testing-library/jest-dom": "^6.5.0",
46-
"@testing-library/react": "16.3.0",
47-
"@types/node": "22.15.14",
48-
"@types/react": "19.1.3",
49-
"@types/react-dom": "19.1.3",
50-
"@typescript-eslint/eslint-plugin": "8.46.1",
51-
"@typescript-eslint/parser": "8.46.1",
52-
"@vitejs/plugin-react": "^4.4.1",
53-
"@vitest/coverage-v8": "^3.1.3",
54-
"@vitest/ui": "^3.1.3",
55-
"eslint": "~9.26.0",
56-
"eslint-config-prettier": "10.1.2",
57-
"eslint-plugin-import": "2.31.0",
58-
"eslint-plugin-jsx-a11y": "6.10.2",
59-
"eslint-plugin-react": "7.37.5",
60-
"eslint-plugin-react-hooks": "5.2.0",
61-
"jest-mock": "^29.7.0",
62-
"jiti": "2.4.2",
63-
"jsdom": "~26.1.0",
64-
"nx": "21.6.5",
65-
"prettier": "^3.5.3",
66-
"sass": "^1.87.0",
67-
"semantic-release": "^24.2.3",
68-
"typescript": "5.9.3",
69-
"vite": "7.1.9",
70-
"vite-plugin-dts": "^4.5.3",
71-
"vite-plugin-mkcert": "^1.17.8",
72-
"vitest": "^3.1.3"
73-
},
74-
"peerDependencies": {
75-
"@emotion/react": "^11.14.0",
76-
"@emotion/styled": "^11.14.0",
77-
"@mui/icons-material": "^7.1.0",
78-
"@mui/material": "^7.1.0",
79-
"@mui/x-data-grid": "^8.2.0",
80-
"date-fns": "^4.1.0",
81-
"react": "^18.3.1 || ^19.0.0",
82-
"react-dom": "^18.3.1 || ^19.0.0",
83-
"react-router-dom": "^7.5.3"
84-
},
85-
"release": {
86-
"branches": [
87-
"main"
88-
],
89-
"plugins": [
90-
"@semantic-release/commit-analyzer",
91-
"@semantic-release/release-notes-generator",
92-
[
93-
"@semantic-release/npm",
94-
{
95-
"pkgRoot": "dist/react-kit"
96-
}
97-
],
98-
"@semantic-release/git",
99-
"@semantic-release/github"
100-
]
101-
}
2+
"name": "@js-smart/react-kit",
3+
"version": "5.15.0",
4+
"license": "MIT",
5+
"private": false,
6+
"type": "module",
7+
"scripts": {
8+
"nx": "nx",
9+
"start": "nx serve",
10+
"build": "nx build react-kit",
11+
"build:demo": "nx build",
12+
"test": "nx test react-kit ",
13+
"update": "nx migrate latest"
14+
},
15+
"dependencies": {
16+
"@axa-fr/react-oidc": "^7.26.0",
17+
"@emotion/react": "^11.14.0",
18+
"@emotion/styled": "^11.14.1",
19+
"@mui/icons-material": "^7.3.4",
20+
"@mui/material": "^7.3.4",
21+
"@mui/x-data-grid": "^7.29.9",
22+
"date-fns": "^4.1.0",
23+
"react": "^18.3.1 || ^19.0.0",
24+
"react-dom": "^18.3.1 || ^19.0.0",
25+
"react-router-dom": "^7.9.4"
26+
},
27+
"devDependencies": {
28+
"@babel/core": "^7.28.0",
29+
"@babel/preset-react": "^7.27.1",
30+
"@nx/cypress": "21.6.5",
31+
"@nx/devkit": "21.6.5",
32+
"@nx/eslint": "21.6.5",
33+
"@nx/eslint-plugin": "21.6.5",
34+
"@nx/js": "21.6.5",
35+
"@nx/react": "21.6.5",
36+
"@nx/vite": "21.6.5",
37+
"@nx/web": "21.6.5",
38+
"@nx/workspace": "21.6.5",
39+
"@semantic-release/git": "^10.0.1",
40+
"@semantic-release/npm": "^12.0.1",
41+
"@swc-node/register": "1.10.10",
42+
"@swc/cli": "0.6.0",
43+
"@swc/core": "1.11.24",
44+
"@swc/helpers": "0.5.17",
45+
"@testing-library/jest-dom": "^6.5.0",
46+
"@testing-library/react": "16.3.0",
47+
"@types/node": "22.15.14",
48+
"@types/react": "19.1.3",
49+
"@types/react-dom": "19.1.3",
50+
"@typescript-eslint/eslint-plugin": "8.46.1",
51+
"@typescript-eslint/parser": "8.46.1",
52+
"@vitejs/plugin-react": "^4.4.1",
53+
"@vitest/coverage-v8": "^3.1.3",
54+
"@vitest/ui": "^3.1.3",
55+
"eslint": "~9.26.0",
56+
"eslint-config-prettier": "10.1.2",
57+
"eslint-plugin-import": "2.31.0",
58+
"eslint-plugin-jsx-a11y": "6.10.2",
59+
"eslint-plugin-react": "7.37.5",
60+
"eslint-plugin-react-hooks": "5.2.0",
61+
"jest-mock": "^29.7.0",
62+
"jiti": "2.4.2",
63+
"jsdom": "~26.1.0",
64+
"nx": "21.6.5",
65+
"prettier": "^3.5.3",
66+
"sass": "^1.87.0",
67+
"semantic-release": "^24.2.3",
68+
"typescript": "5.9.3",
69+
"vite": "7.1.9",
70+
"vite-plugin-dts": "^4.5.3",
71+
"vite-plugin-mkcert": "^1.17.8",
72+
"vitest": "^3.1.3"
73+
},
74+
"peerDependencies": {
75+
"@emotion/react": "^11.14.0",
76+
"@emotion/styled": "^11.14.0",
77+
"@mui/icons-material": "^7.1.0",
78+
"@mui/material": "^7.1.0",
79+
"@mui/x-data-grid": "^8.2.0",
80+
"date-fns": "^4.1.0",
81+
"react": "^18.3.1 || ^19.0.0",
82+
"react-dom": "^18.3.1 || ^19.0.0",
83+
"react-router-dom": "^7.5.3"
84+
},
85+
"release": {
86+
"branches": [
87+
"main"
88+
],
89+
"plugins": [
90+
"@semantic-release/commit-analyzer",
91+
"@semantic-release/release-notes-generator",
92+
[
93+
"@semantic-release/npm",
94+
{
95+
"pkgRoot": "dist/react-kit"
96+
}
97+
],
98+
"@semantic-release/git",
99+
"@semantic-release/github"
100+
]
101+
}
102102
}

0 commit comments

Comments
 (0)