chore: merge master

Author: simonguo

package.json

@@ -71,6 +71,7 @@
     "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "gh-pages": "^1.1.0",
+<<<<<<< HEAD
     "gulp": "^4.0.2",
     "gulp-less": "^5.0.0",
     "gulp-postcss": "^9.0.1",
@@ -90,5 +91,22 @@
     "webpack": "^5.73.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^3.11.2"
+=======
+    "html-loader": "^0.4.3",
+    "html-webpack-plugin": "^2.22.0",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "markdown-loader": "^5.0.0",
+    "react": "^16.4.2",
+    "react-dom": "^16.4.2",
+    "react-hot-loader": "^3.0.0-beta.6",
+    "react-test-renderer": "^16.1.1",
+    "rsuite": "^2.0.12",
+    "rsuite-theme": "^2.0.14",
+    "style-loader": "^0.13.1",
+    "url-loader": "^0.5.7",
+    "webpack": "^2.2.1",
+    "webpack-dev-server": "^3.1.11"
+>>>>>>> master
   }
 }