git.fiddlerwoaroof.com
Browse code

Merge branch 'versions'

Ed Langley authored on 08/06/2019 18:54:24
Showing 2 changed files
... ...
@@ -42,7 +42,7 @@
42 42
     "dotenv": "8.0.0",
43 43
     "dotenv-expand": "5.1.0",
44 44
     "enzyme": "^3.6.0",
45
-    "enzyme-adapter-react-16": "^1.13.2",
45
+    "enzyme-adapter-react-16": "^1.14.0",
46 46
     "enzyme-to-json": "^3.3.5",
47 47
     "eslint": "5.16.0",
48 48
     "eslint-plugin-flowtype": "2.50.1",
... ...
@@ -54,7 +54,7 @@
54 54
     "fs-extra": "8.0.1",
55 55
     "jest": "^24.8.0",
56 56
     "jest-pnp-resolver": "1.2.1",
57
-    "jest-resolve": "23.6.0",
57
+    "jest-resolve": "24.8.0",
58 58
     "jest-watch-typeahead": "^0.3.1",
59 59
     "prettier": "^1.18.0",
60 60
     "react": "^16.5.2",
... ...
@@ -87,23 +87,15 @@
87 87
     ]
88 88
   },
89 89
   "jest": {
90
+    "testEnvironment": "jsdom",
91
+    "testURL": "http://localhost",
90 92
     "collectCoverageFrom": [
91 93
       "src/**/*.js",
92 94
       "!src/**/*.d.ts"
93 95
     ],
94
-    "resolver": "jest-pnp-resolver",
95
-    "setupFiles": [
96
-      "react-app-polyfill/jsdom"
97
-    ],
98 96
     "testMatch": [
99 97
       "<rootDir>/src/**/tests/*.test.js"
100 98
     ],
101
-    "testEnvironment": "jsdom",
102
-    "testURL": "http://localhost",
103
-    "transform": {
104
-      "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
105
-      "^(?!.*\\.js$)": "<rootDir>/config/jest/fileTransform.js"
106
-    },
107 99
     "transformIgnorePatterns": [
108 100
       "[/\\\\]node_modules[/\\\\].+\\.js$"
109 101
     ],
... ...
@@ -3669,10 +3669,10 @@ entities@^1.1.1, entities@~1.1.1:
3669 3669
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
3670 3670
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
3671 3671
 
3672
-enzyme-adapter-react-16@^1.13.2:
3673
-  version "1.13.2"
3674
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.13.2.tgz#8a574d7cbbef7ef0cab2022e9bfc12aeaebb7ae5"
3675
-  integrity sha512-h0neTuAAFfQUgEZ+PPHVIMDFJ9+CGafI8AjojNlSVh4Fd1pLDgtl2OeVkm4yKF7RSgzrPAwugq4JW8Jjo2iRJA==
3672
+enzyme-adapter-react-16@^1.14.0:
3673
+  version "1.14.0"
3674
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.14.0.tgz#204722b769172bcf096cb250d33e6795c1f1858f"
3675
+  integrity sha512-7PcOF7pb4hJUvjY7oAuPGpq3BmlCig3kxXGi2kFx0YzJHppqX1K8IIV9skT1IirxXlu8W7bneKi+oQ10QRnhcA==
3676 3676
   dependencies:
3677 3677
     enzyme-adapter-utils "^1.12.0"
3678 3678
     has "^1.0.3"
... ...
@@ -5862,15 +5862,6 @@ jest-resolve-dependencies@^24.8.0:
5862 5862
     jest-regex-util "^24.3.0"
5863 5863
     jest-snapshot "^24.8.0"
5864 5864
 
5865
-jest-resolve@23.6.0:
5866
-  version "23.6.0"
5867
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
5868
-  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
5869
-  dependencies:
5870
-    browser-resolve "^1.11.3"
5871
-    chalk "^2.0.1"
5872
-    realpath-native "^1.0.0"
5873
-
5874 5865
 jest-resolve@24.7.1:
5875 5866
   version "24.7.1"
5876 5867
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.7.1.tgz#e4150198299298380a75a9fd55043fa3b9b17fde"
... ...
@@ -5882,7 +5873,7 @@ jest-resolve@24.7.1:
5882 5873
     jest-pnp-resolver "^1.2.1"
5883 5874
     realpath-native "^1.1.0"
5884 5875
 
5885
-jest-resolve@^24.8.0:
5876
+jest-resolve@24.8.0, jest-resolve@^24.8.0:
5886 5877
   version "24.8.0"
5887 5878
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f"
5888 5879
   integrity sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==
... ...
@@ -8778,7 +8769,7 @@ readdirp@^2.2.1:
8778 8769
     micromatch "^3.1.10"
8779 8770
     readable-stream "^2.0.2"
8780 8771
 
8781
-realpath-native@^1.0.0, realpath-native@^1.1.0:
8772
+realpath-native@^1.1.0:
8782 8773
   version "1.1.0"
8783 8774
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
8784 8775
   integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==