chore: Resolve conflicts

kulshekhar · Jan 22, 2020 · ed52e58 · ed52e58
1 parent 308fb72
commit ed52e58
Show file tree

Hide file tree

Showing 11 changed files with 22,387 additions and 12,025 deletions.
diff --git a/e2e/__templates__/default/package-lock.json b/e2e/__templates__/default/package-lock.json
diff --git a/e2e/__templates__/default/package.json b/e2e/__templates__/default/package.json
@@ -3,10 +3,10 @@
   "version": "0.0.0-tmpl.0",
   "private": true,
   "devDependencies": {
-    "@types/jest": "24.0.25",
+    "@types/jest": "24.9.0",
     "@types/node": "10.17.13",
-    "jest": "25.0.0",
-    "typescript": "3.7.4"
+    "jest": "25.1.0",
+    "typescript": "3.7.5"
   },
   "wantedDependencies": {
     "@types/jest": "latest",

diff --git a/e2e/__templates__/with-babel-7-string-config/package-lock.json b/e2e/__templates__/with-babel-7-string-config/package-lock.json
diff --git a/e2e/__templates__/with-babel-7-string-config/package.json b/e2e/__templates__/with-babel-7-string-config/package.json
@@ -3,12 +3,12 @@
   "version": "0.0.0-tmpl.0",
   "private": true,
   "devDependencies": {
-    "@babel/core": "7.7.7",
-    "@types/jest": "24.0.25",
+    "@babel/core": "7.8.3",
+    "@types/jest": "24.9.0",
     "@types/node": "10.17.13",
-    "babel-jest": "24.9.0",
-    "jest": "24.9.0",
-    "typescript": "3.7.4"
+    "babel-jest": "25.1.0",
+    "jest": "25.1.0",
+    "typescript": "3.7.5"
   },
   "wantedDependencies": {
     "@babel/core": "7",

diff --git a/e2e/__templates__/with-babel-7/package-lock.json b/e2e/__templates__/with-babel-7/package-lock.json
diff --git a/e2e/__templates__/with-babel-7/package.json b/e2e/__templates__/with-babel-7/package.json
@@ -3,12 +3,12 @@
   "version": "0.0.0-tmpl.0",
   "private": true,
   "devDependencies": {
-    "@babel/core": "7.7.7",
-    "@types/jest": "24.0.25",
+    "@babel/core": "7.8.3",
+    "@types/jest": "24.9.0",
     "@types/node": "10.17.13",
-    "babel-jest": "25.0.0",
-    "jest": "25.0.0",
-    "typescript": "3.7.4"
+    "babel-jest": "25.1.0",
+    "jest": "25.1.0",
+    "typescript": "3.7.5"
   },
   "wantedDependencies": {
     "@babel/core": "7",