Skip to content

Commit

Permalink
Merge pull request #257 from actiontech/feature/upgrad-dependencies
Browse files Browse the repository at this point in the history
Feature/upgrad dependencies
  • Loading branch information
Rain-1214 authored Apr 23, 2023
2 parents 8703ae6 + c2f2822 commit d8d82f8
Show file tree
Hide file tree
Showing 522 changed files with 69,927 additions and 71,056 deletions.
12 changes: 6 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"extends": [
"react-app",
"react-app/jest"
],
"extends": ["react-app", "react-app/jest"],
"rules": {
"no-console": "warn"
"no-console": "warn",
"testing-library/render-result-naming-convention": 0,
"testing-library/no-unnecessary-act": 0,
"testing-library/no-node-access": 0
},
"ignorePatterns": "src/api/**/*.ts"
}
}
6 changes: 3 additions & 3 deletions craco.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ module.exports = {
devServer: (config, { proxy }) => {
config.proxy = {
...(function () {
const url = [];
const url = ['/static/media'];
return url.reduce((acc, cur) => {
acc[cur] = {
target: 'http://localhost:4200',
target: 'http://124.70.158.246:8889',
secure: false,
changeOrigin: true,
ws: true,
Expand All @@ -99,7 +99,7 @@ module.exports = {
const res = {};
for (let i = 0; i < 10; i++) {
res[`/v${i}`] = {
target: 'http://10.186.63.35:10000',
target: 'http://124.70.158.246:8889',
secure: false,
changeOrigin: true,
ws: true,
Expand Down
73 changes: 38 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,56 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@ant-design/icons": "^4.5.0",
"@ant-design/icons": "^4.7.0",
"@ant-design/plots": "^1.2.1",
"@craco/craco": "^6.0.0",
"@material-ui/styles": "^4.11.3",
"@reduxjs/toolkit": "^1.5.0",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/react-hooks": "^5.1.2",
"@testing-library/user-event": "^12.1.10",
"@types/enzyme": "^3.10.8",
"@types/jest": "^26.0.15",
"@types/lodash": "^4.14.168",
"@types/node": "^12.0.0",
"@types/nprogress": "^0.2.0",
"@types/react": "^16.9.53",
"@types/react-dom": "^16.9.8",
"@types/react-redux": "^7.1.11",
"@types/react-router-dom": "^5.1.6",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@mui/material": "^5.11.16",
"@mui/styles": "^5.11.16",
"@mui/system": "^5.9.1",
"@reduxjs/toolkit": "^1.9.1",
"ahooks": "^3.7.5",
"antd": "^4.16.6",
"axios": "^0.21.1",
"craco-less": "^1.17.1",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.2",
"antd": "^4.24.8",
"axios": "^0.27.2",
"highlight.js": "^11.0.1",
"i18next": "^19.8.4",
"js-conditional-compile-loader": "^1.0.14",
"i18next": "^21.8.14",
"lodash": "^4.17.21",
"monaco-editor-webpack-plugin": "^3.0.1",
"msw": "^0.29.0",
"nprogress": "^0.2.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-grid-layout": "^1.3.4",
"react-i18next": "^11.8.0",
"react-i18next": "^11.18.6",
"react-monaco-editor": "^0.43.0",
"react-redux": "^7.2.2",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.1",
"typescript": "^4.2.3",
"react-redux": "^8.0.5",
"react-router-dom": "^6.3.0",
"typescript": "^5.0.2",
"use-resize-observer": "^9.0.2",
"web-vitals": "^0.2.4"
},
"devDependencies": {
"@cfaester/enzyme-adapter-react-18": "^0.7.0",
"@craco/craco": "^7.1.0",
"@testing-library/dom": "^9.2.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.3.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@types/enzyme": "^3.10.8",
"@types/jest": "^28.1.7",
"@types/lodash": "^4.14.168",
"@types/node": "^12.0.0",
"@types/nprogress": "^0.2.0",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/react-grid-layout": "^1.3.2",
"jest-canvas-mock": "^2.2.0"
"craco-less": "^2.0.0",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.2",
"jest-canvas-mock": "^2.2.0",
"js-conditional-compile-loader": "^1.0.14",
"msw": "^0.29.0",
"react-scripts": "5.0.1",
"monaco-editor-webpack-plugin": "^7.0.1"
},
"scripts": {
"start": "craco start",
Expand Down
6 changes: 3 additions & 3 deletions public/static/css/antd.dark.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/static/css/antd.dark.min.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/static/css/antd.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/static/css/antd.min.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit d8d82f8

Please sign in to comment.