Merge branch 'master' into user-panel

# Conflicts: # package.json
arvinxx · Sep 21, 2021 · b13cf01 · b13cf01
2 parents a18eb9b + 143becc
commit b13cf01
Show file tree

Hide file tree

Showing 2 changed files with 464 additions and 123 deletions.
diff --git a/package.json b/package.json
@@ -98,8 +98,8 @@
     "eslint": "^7.7.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^2.2.1",
-    "father-build": "^1.19.6",
-    "fs-extra": "^9.1.0",
+    "father-build": "^1.20.0",
+    "fs-extra": "^10.0.0",
     "gh-pages": "^3.1.0",
     "husky": "^4.0.0",
     "jest": "^26.4.2",
@@ -124,14 +124,17 @@
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typedoc": "^0.21.0",
-    "typescript": "^4.2.4",
+    "typescript": "4.2.4",
     "umi": "^3.4.2",
     "utility-types": "^3.10.0",
     "webpack": "^5.26.1",
     "webpack-bundle-analyzer": "^4.1.0",
     "webpack-cli": "^4.5.0",
     "dayjs": "^1.10.5"
   },
+  "resolutions": {
+    "typescript": "4.2.4"
+  },
   "engines": {
     "node": ">=8.0.0"
   }