diff --git a/.gitignore b/.gitignore index 4d29575..03629a4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +.idea diff --git a/.prettierrc.js b/.prettierrc.js index 5011dac..b43b86c 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -10,6 +10,6 @@ module.exports = { singleQuote: true, jsxSingleQuote: false, endOfLine: 'lf', - parser: 'babel', + // parser: 'babel', // 解析器 和 typescript 冲突 proseWrap: 'always' } diff --git a/package.json b/package.json index 4fcc899..3b0b13d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", - "@types/axios": "^0.14.0", "@types/jest": "^24.0.0", "@types/node": "^12.0.0", "@types/react": "^16.9.0", @@ -17,7 +16,7 @@ "@types/redux-promise": "^0.5.28", "ali-oss": "^6.7.0", "antd": "4.2.0", - "axios": "^0.21.1", + "axios": "^0.26.0", "babel-plugin-import": "^1.12.2", "braft-editor": "^2.3.8", "classnames": "^2.2.6", @@ -28,17 +27,17 @@ "less": "^3.11.1", "less-loader": "^5.0.0", "moment": "^2.24.0", - "react": "^16.13.1", + "react": "^17.0.2", "react-canvas-nest": "^1.0.10", - "react-dom": "^16.13.1", - "react-redux": "^7.1.3", - "react-router-breadcrumbs-hoc": "^3.2.4", - "react-router-dom": "^5.1.2", + "react-dom": "^17.0.2", + "react-redux": "^7.2.6", + "react-router-breadcrumbs-hoc": "^4.1.0", + "react-router-dom": "^5.3.0", "react-scripts": "3.2.0", "redux": "^4.0.4", "redux-persist": "^6.0.0", "redux-promise": "^0.6.0", - "typescript": "^3.8.3" + "typescript": "^4.5.5" }, "scripts": { "start": "cross-env PORT=666 react-app-rewired start", @@ -61,6 +60,7 @@ ] }, "devDependencies": { + "@iconify/react": "^3.1.4", "compression-webpack-plugin": "^3.0.1", "customize-cra": "^0.8.0", "eslint": "^6.8.0", @@ -76,8 +76,9 @@ "eslint-plugin-react-hooks": "^2.3.0", "husky": "^3.0.9", "lint-staged": "^9.4.2", - "prettier": "1.18.2", - "react-app-rewired": "^2.1.5", + "msw": "^0.38.1", + "prettier": "^2.5.1", + "react-app-rewired": "^2.2.1", "redux-devtools": "^3.5.0", "uglifyjs-webpack-plugin": "^2.2.0", "webpack-bundle-analyzer": "^3.6.0" @@ -91,5 +92,8 @@ "hooks": { "pre-commit": "lint-staged" } + }, + "msw": { + "workerDirectory": "public" } } diff --git a/public/index.html b/public/index.html index 56a47cf..804a92d 100644 --- a/public/index.html +++ b/public/index.html @@ -31,7 +31,141 @@ -
+
+ +
+
+ +
+ +
+
敏捷开发平台3.0
+
+
+