Merge pull request #242 from leclercb/develop

Merge develop into master
leclercb · May 20, 2021 · 7f8c285 · 7f8c285
2 parents 9216b31 + 3299b7d
commit 7f8c285
Show file tree

Hide file tree

Showing 2 changed files with 862 additions and 785 deletions.
diff --git a/package.json b/package.json
@@ -20,20 +20,20 @@
         "postinstall": "husky install"
     },
     "dependencies": {
-        "@aws-amplify/datastore": "^2.9.16",
-        "@craco/craco": "^6.1.1",
+        "@aws-amplify/datastore": "^3.0.2",
+        "@craco/craco": "^6.1.2",
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/react-fontawesome": "^0.1.14",
-        "antd": "^4.15.1",
-        "aws-amplify": "^3.3.27",
+        "antd": "^4.15.6",
+        "aws-amplify": "^4.0.2",
         "axios": "^0.21.1",
         "craco-antd": "^1.19.0",
         "electron-is-dev": "^2.0.0",
-        "electron-log": "^4.3.4",
-        "electron-updater": "^4.3.8",
-        "fs-extra": "^9.1.0",
-        "googleapis": "^71.0.0",
+        "electron-log": "^4.3.5",
+        "electron-updater": "^4.3.9",
+        "fs-extra": "^10.0.0",
+        "googleapis": "^73.0.0",
         "https-proxy-agent": "^5.0.0",
         "inputmask-core": "^2.2.0",
         "jspdf": "^2.3.1",
@@ -44,22 +44,22 @@
         "mousetrap": "^1.6.5",
         "qs": "^6.10.1",
         "react": "^17.0.2",
-        "react-big-calendar": "^0.33.2",
+        "react-big-calendar": "^0.33.3",
         "react-color": "^2.19.3",
         "react-dnd": "^14.0.2",
         "react-dnd-html5-backend": "^14.0.0",
         "react-dom": "^17.0.2",
         "react-draggable": "^4.4.3",
         "react-joyride": "^2.3.0",
-        "react-redux": "^7.2.3",
+        "react-redux": "^7.2.4",
         "react-responsive": "^8.2.0",
         "react-rte": "^0.16.3",
         "react-scripts": "4.0.3",
         "react-split-pane": "^0.1.92",
         "react-stripe-elements": "^6.1.2",
         "react-virtualized": "^9.22.3",
         "reduce-reducers": "^1.0.4",
-        "redux": "^4.0.5",
+        "redux": "^4.1.0",
         "redux-thunk": "^2.3.0",
         "redux-undo": "^1.0.1",
         "reselect": "^4.0.0",
@@ -70,12 +70,12 @@
         "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
         "babel-eslint": "^10.1.0",
         "babel-jest": "^26.6.3",
-        "electron": "^12.0.4",
+        "electron": "^12.0.9",
         "electron-builder": "^22.10.5",
-        "electron-devtools-installer": "^3.1.1",
+        "electron-devtools-installer": "^3.2.0",
         "enzyme": "^3.11.0",
         "enzyme-to-json": "^3.6.2",
-        "eslint": "^7.24.0",
+        "eslint": "^7.26.0",
         "eslint-plugin-react": "^7.23.2",
         "eslint-plugin-react-hooks": "^4.2.0",
         "husky": "^6.0.0",