Merge branch 'master' into snyk-upgrade-3900cf32031948819fdc6dfce04e67e8

anyulled · Oct 7, 2020 · 3707acf · 3707acf
2 parents f69f418 + 1259b58
commit 3707acf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -3,15 +3,23 @@
   "description": "Initialization From Redux State using Redux Form",
   "version": "0.0.11",
   "dependencies": {
-    "redux-form-website-template": "0.0.41",
-    "redux-form": "7.0.4",
+    "redux-form": "7.4.2",
+    "redux-form-website-template": "0.0.124",
     "redux": "3.7.2",
-    "react-redux": "5.0.6",
+
+
     "react-dom": "15.6.2",
-    "react": "15.6.1"
+
+
+
+    "react-redux": "7.2.1",
+
+
+    "react": "15.6.2"
+
   },
   "devDependencies": {
-    "react-scripts": "1.0.0"
+    "react-scripts": "3.4.3"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ], "automerge":true
+}
diff --git a/src/package.json b/src/package.json
@@ -8,7 +8,7 @@
     "redux-form-website-template": "0.0.41",
     "redux-form": "7.0.4",
     "redux": "3.7.2",
-    "react-redux": "5.0.6",
+    "react-redux": "7.2.1",
     "react-dom": "15.6.1",
     "react": "15.6.1"
   }