Skip to content

Commit 4fc96f9

Browse files
committed
chore: upgrade major versions
1 parent a1c0fd3 commit 4fc96f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+8161
-7654
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/node_modules
33
/coverage
44
/public
5+
/src/utils/shadcn.ts

.eslintrc.cjs

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
module.exports = {
2+
parser: '@typescript-eslint/parser',
3+
settings: {
4+
react: {
5+
version: 'detect',
6+
},
7+
'import/parsers': {
8+
'@typescript-eslint/parser': ['.ts', '.tsx'],
9+
},
10+
'import/resolver': {
11+
typescript: {
12+
alwaysTryTypes: true,
13+
},
14+
},
15+
},
16+
env: {
17+
browser: true,
18+
node: true,
19+
es6: true,
20+
},
21+
parserOptions: {
22+
ecmaFeatures: {
23+
jsx: true,
24+
},
25+
ecmaVersion: 'esnext',
26+
},
27+
plugins: ['@typescript-eslint', 'import'],
28+
extends: [
29+
'eslint:recommended',
30+
'plugin:@typescript-eslint/recommended',
31+
'plugin:import/errors',
32+
'plugin:import/warnings',
33+
'plugin:import/typescript',
34+
'plugin:react/recommended',
35+
'plugin:react-hooks/recommended',
36+
'plugin:prettier/recommended',
37+
],
38+
rules: {
39+
'react/no-unknown-property': ['error', { ignore: ['css'] }],
40+
'react/prop-types': 'off',
41+
'@typescript-eslint/ban-ts-comment': 'off',
42+
'@typescript-eslint/no-explicit-any': 'off',
43+
'@typescript-eslint/no-unused-vars': 'off',
44+
'import/order': [
45+
'error',
46+
{
47+
groups: [
48+
'builtin',
49+
'external',
50+
'internal',
51+
'unknown',
52+
'parent',
53+
'sibling',
54+
'index',
55+
'object',
56+
'type',
57+
],
58+
'newlines-between': 'always',
59+
pathGroups: [
60+
{
61+
pattern: '@/**',
62+
group: 'internal',
63+
position: 'before',
64+
},
65+
{
66+
pattern: 'react*',
67+
group: 'external',
68+
position: 'before',
69+
},
70+
],
71+
pathGroupsExcludedImportTypes: ['builtin'],
72+
distinctGroup: false,
73+
alphabetize: {
74+
order: 'asc',
75+
caseInsensitive: true,
76+
},
77+
},
78+
],
79+
},
80+
}

.eslintrc.js

-36
This file was deleted.
File renamed without changes.

components.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"$schema": "https://ui.shadcn.com/schema.json",
3+
"style": "new-york",
4+
"rsc": false,
5+
"tsx": true,
6+
"tailwind": {
7+
"config": "tailwind.config.cjs",
8+
"css": "src/styles/shadcn.css",
9+
"baseColor": "neutral",
10+
"cssVariables": true
11+
},
12+
"aliases": {
13+
"components": "@/components",
14+
"utils": "@/utils/shadcn"
15+
}
16+
}

craco.config.cjs

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// eslint-disable-next-line @typescript-eslint/no-var-requires
2+
const pkg = require('./package.json')
3+
4+
process.env.REACT_APP_VERSION = pkg.version
5+
6+
/**
7+
* @type {import('@craco/types').CracoConfig}
8+
*/
9+
const config = {
10+
eslint: {
11+
enable: true,
12+
mode: 'file',
13+
},
14+
style: {
15+
postcss: {
16+
mode: 'file',
17+
},
18+
},
19+
webpack: {
20+
alias: {
21+
'@': `${__dirname}/src`,
22+
},
23+
},
24+
babel: {
25+
plugins: ['babel-plugin-macros', '@emotion/babel-plugin'],
26+
presets: [
27+
'@babel/preset-react',
28+
{ runtime: 'automatic', importSource: '@emotion/react' },
29+
],
30+
},
31+
}
32+
33+
module.exports = config

craco.config.js

-19
This file was deleted.

package.json

+70-45
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "yasd",
33
"version": "1.1.2",
44
"private": true,
5+
"type": "module",
56
"license": "MIT",
67
"scripts": {
78
"start": "craco start",
@@ -11,29 +12,41 @@
1112
"test": "craco test --watchAll=false",
1213
"test:watch": "craco test",
1314
"test:coverage": "craco test --coverage --runInBand --watchAll=false",
14-
"test:lint": "eslint . --ext .mjs,.js,.jsx,.ts,.tsx",
15+
"test:types": "tsc --noEmit",
16+
"test:types:watch": "tsc --noEmit --watch",
17+
"lint": "eslint . --ext .mjs,.js,.jsx,.ts,.tsx",
18+
"lint:fix": "yarn lint --fix",
1519
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
1620
"pub": "np --no-publish",
1721
"version": "npm run changelog && git add .",
1822
"snyk-protect": "snyk-protect",
1923
"prepare": "npm run snyk-protect && husky install",
20-
"verify-translation": "zx scripts/verify-translations.mjs"
24+
"verify-translation": "zx scripts/verify-translations.mjs",
25+
"shadcn": "shadcn-ui"
2126
},
2227
"dependencies": {
28+
"@babel/preset-react": "^7.22.5",
2329
"@chakra-ui/icons": "^1.0.16",
2430
"@commitlint/cli": "^12.0.1",
2531
"@commitlint/config-angular": "^12.0.1",
26-
"@craco/craco": "^6.1.1",
27-
"@emotion/cache": "^10",
28-
"@emotion/core": "^10.0.35",
29-
"@emotion/styled": "^10.0.27",
30-
"@loadable/component": "^5.14.1",
32+
"@craco/craco": "^7.1.0",
33+
"@craco/types": "^7.1.0",
34+
"@emotion/babel-plugin": "^11.11.0",
35+
"@emotion/cache": "^11.11.0",
36+
"@emotion/css": "^11.11.2",
37+
"@emotion/eslint-plugin": "^11.11.0",
38+
"@emotion/react": "^11.11.1",
39+
"@emotion/styled": "^11.11.0",
40+
"@loadable/component": "^5.15.3",
41+
"@radix-ui/react-dialog": "^1.0.4",
42+
"@radix-ui/react-icons": "^1.3.0",
43+
"@radix-ui/react-slot": "^1.0.2",
3144
"@snyk/protect": "^1.1198.0",
32-
"@sumup/circuit-ui": "^2.2.2",
33-
"@sumup/collector": "^1.0.1",
34-
"@sumup/design-tokens": "^2.0.1",
35-
"@sumup/icons": "^1.2.0",
36-
"@sumup/intl": "^1.1.3",
45+
"@sumup/circuit-ui": "^6.11.0",
46+
"@sumup/collector": "^1.6.1",
47+
"@sumup/design-tokens": "^5.3.0",
48+
"@sumup/icons": "^2.30.1",
49+
"@sumup/intl": "^1.5.0",
3750
"@testing-library/jest-dom": "^5.11.5",
3851
"@testing-library/react": "^11.1.0",
3952
"@testing-library/react-hooks": "^3.4.2",
@@ -48,81 +61,88 @@
4861
"@types/loadable__component": "^5.13.0",
4962
"@types/lodash-es": "^4.17.3",
5063
"@types/node": "^18.0.0",
51-
"@types/react": "^17.0.3",
64+
"@types/react": "^18.2.18",
5265
"@types/react-collapse": "^5.0.0",
53-
"@types/react-dom": "^17.0.3",
66+
"@types/react-dom": "^18.2.7",
5467
"@types/react-router-dom": "^5.1.5",
5568
"@types/react-tabs": "^2.3.2",
56-
"@types/react-virtualized": "^9.21.10",
69+
"@types/react-virtualized": "^9.21.22",
5770
"@types/semver": "^7.3.4",
5871
"@types/uuid": "^8.3.0",
59-
"@typescript-eslint/eslint-plugin": "^5.2.0",
60-
"@typescript-eslint/parser": "^5.2.0",
61-
"autoprefixer": "^9.8.6",
72+
"@typescript-eslint/eslint-plugin": "^6.2.1",
73+
"@typescript-eslint/parser": "^6.2.1",
74+
"autoprefixer": "^10.4.14",
6275
"await-to-js": "^3.0.0",
6376
"axios": "^0.21.0",
77+
"babel-plugin-twin": "^1.1.0",
6478
"bluebird": "^3.7.2",
6579
"bytes": "^3.1.0",
6680
"chart.js": "^2.9.4",
67-
"clsx": "^1.1.1",
81+
"class-variance-authority": "^0.7.0",
82+
"clsx": "^2.0.0",
6883
"codemirror": "^5.58.2",
6984
"dayjs": "^1.9.4",
70-
"emotion-theming": "^10.0.27",
85+
"emotion-theming": "^11.0.0",
7186
"enzyme": "^3.11.0",
7287
"enzyme-adapter-react-16": "^1.15.5",
7388
"enzyme-to-json": "^3.6.1",
74-
"eslint": "^7.32.0",
75-
"eslint-config-prettier": "^8.1.0",
76-
"eslint-plugin-import": "^2.22.1",
77-
"eslint-plugin-prettier": "^4.0.0",
78-
"eslint-plugin-react": "^7.21.5",
89+
"eslint": "^8.46.0",
90+
"eslint-config-prettier": "^8.9.0",
91+
"eslint-import-resolver-typescript": "^3.5.5",
92+
"eslint-plugin-import": "^2.28.0",
93+
"eslint-plugin-prettier": "^5.0.0",
94+
"eslint-plugin-react": "^7.33.1",
7995
"eslint-plugin-react-hooks": "^4.2.0",
8096
"framer-motion": "^4",
8197
"fs-extra": "^10.0.0",
8298
"husky": "^5.2.0",
8399
"i18next": "^20.3.1",
84100
"i18next-chained-backend": "^3.0.2",
85101
"i18next-http-backend": "^1.2.6",
86-
"i18next-resources-to-backend": "^1.0.0",
102+
"i18next-resources-to-backend": "^1.1.4",
87103
"identity-obj-proxy": "^3.0.0",
88104
"is-ip": "^3.1.0",
89105
"lint-staged": "^10.4.0",
90106
"lodash-es": "^4.17.15",
91-
"modern-normalize": "^1.0.0",
92-
"node-sass": "^6",
107+
"lucide-react": "^0.263.1",
108+
"node-sass": "^9.0.0",
93109
"np": "^7.4.0",
94110
"npm-debug-log-cleaner": "^1.0.3",
95-
"postcss": "^7",
96-
"postcss-import": "^12.0.1",
97-
"prettier": "^2.2.1",
111+
"postcss": "^8.4.27",
112+
"postcss-import": "^15.1.0",
113+
"prettier": "^3.0.0",
98114
"prop-types": "^15.7.2",
99-
"raw.macro": "^0.4.2",
100115
"re-resizable": "^6.7.0",
101-
"react": "^17.0.1",
116+
"react": "^18.2.0",
102117
"react-codemirror2": "^7.2.1",
103118
"react-collapse": "^5.0.1",
104-
"react-dom": "^17.0.1",
105-
"react-ga": "^3.1.2",
119+
"react-dom": "^18.2.0",
106120
"react-hook-form": "^7.8.4",
107121
"react-i18next": "^11.10.0",
108-
"react-router-dom": "^5.2.0",
109-
"react-scripts": "^4.0.3",
122+
"react-router-dom": "^6.14.2",
123+
"react-scripts": "^5.0.1",
110124
"react-scroll-to": "^3.0.0-beta.6",
111125
"react-tabs": "^3.1.1",
112126
"react-toastify": "^7.0.3",
113-
"react-virtualized": "^9.22.2",
114-
"rimraf": "^3.0.2",
127+
"react-virtualized": "^9.22.5",
128+
"rimraf": "^5.0.1",
115129
"semver": "^7.3.2",
130+
"shadcn-ui": "^0.3.0",
116131
"smoothscroll-polyfill": "^0.4.4",
117132
"store2": "^2.12.0",
118133
"swr": "^0.5.4",
119-
"tailwindcss": "^1.9.6",
120-
"ts-jest": "^26.4.2",
121-
"twin.macro": "^1.11.1",
122-
"typescript": "^4.0.3",
134+
"tailwind-merge": "^1.14.0",
135+
"tailwindcss": "^3.3.3",
136+
"tailwindcss-animate": "^1.0.6",
137+
"ts-jest": "^29.1.1",
138+
"twin.macro": "^3.4.0",
139+
"typescript": "^5.1.6",
123140
"use-is-in-viewport": "^1.0.9",
124-
"uuid": "^8.3.0",
125-
"zx": "~1.14.0"
141+
"uuid": "^9.0.0",
142+
"zx": "~7.2.3"
143+
},
144+
"resolutions": {
145+
"react-virtualized/**/@types/react": "^18"
126146
},
127147
"browserslist": {
128148
"production": [
@@ -135,6 +155,11 @@
135155
"last 1 safari version"
136156
]
137157
},
158+
"babelMacros": {
159+
"twin": {
160+
"preset": "emotion"
161+
}
162+
},
138163
"jest": {
139164
"transformIgnorePatterns": [
140165
"<rootDir>/node_modules/(?!lodash-es)",

postcss.config.cjs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
plugins: [
3+
require('postcss-import'),
4+
require('tailwindcss'),
5+
require('autoprefixer'),
6+
],
7+
}

0 commit comments

Comments
 (0)