Skip to content

Commit 8cd6265

Browse files
authored
Merge pull request #160 from accounts-js/hotfix/types-node-conflicts
upgrade @types/node to 9.4.6
2 parents 90b8528 + 5797d9b commit 8cd6265

File tree

3 files changed

+15
-25
lines changed

3 files changed

+15
-25
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"devDependencies": {
3838
"@accounts/tslint-config-accounts": "0.0.6",
3939
"@types/jest": "22.2.0",
40-
"@types/node": "8.0.47",
40+
"@types/node": "9.4.6",
4141
"codecov": "3.0.0",
4242
"flow-bin": "0.66.0",
4343
"jest": "22.4.2",

packages/server/yarn.lock

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
# yarn lockfile v1
33

44

5-
"@accounts/common@^0.1.0-beta.2":
6-
version "0.1.0-beta.2"
7-
resolved "https://registry.yarnpkg.com/@accounts/common/-/common-0.1.0-beta.2.tgz#5ea493fac393b4e045c6007ab67aa4bf3e27dcb1"
8-
dependencies:
9-
lodash "^4.16.4"
10-
115
126
version "7.2.5"
137
resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-7.2.5.tgz#413159d570ec45fc3e7da7ea3f7bca6fb9300e72"
@@ -19,8 +13,8 @@
1913
resolved "https://registry.yarnpkg.com/@types/jwt-decode/-/jwt-decode-2.2.1.tgz#afdf5c527fcfccbd4009b5fd02d1e18241f2d2f2"
2014

2115
"@types/node@*":
22-
version "8.0.47"
23-
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
16+
version "9.4.6"
17+
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
2418

2519
babel-polyfill@^6.23.0:
2620
version "6.26.0"
@@ -64,13 +58,9 @@ [email protected]:
6458
version "0.0.1"
6559
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
6660

67-
core-js@^2.4.0:
68-
version "2.4.1"
69-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
70-
71-
core-js@^2.5.0:
72-
version "2.5.1"
73-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
61+
core-js@^2.4.0, core-js@^2.5.0:
62+
version "2.5.3"
63+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
7464

7565
7666
version "1.0.9"
@@ -170,8 +160,8 @@ lodash.once@^4.0.0:
170160
resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
171161

172162
lodash@^4.16.4:
173-
version "4.17.4"
174-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
163+
version "4.17.5"
164+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
175165

176166
minimatch@^3.0.4:
177167
version "3.0.4"
@@ -198,8 +188,8 @@ regenerator-runtime@^0.10.5:
198188
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
199189

200190
regenerator-runtime@^0.11.0:
201-
version "0.11.0"
202-
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
191+
version "0.11.1"
192+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
203193

204194
205195
version "2.6.2"
@@ -208,8 +198,8 @@ [email protected]:
208198
glob "^7.0.5"
209199

210200
safe-buffer@^5.0.1:
211-
version "5.0.1"
212-
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
201+
version "5.1.1"
202+
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
213203

214204
wrappy@1:
215205
version "1.0.2"

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
version "22.2.0"
2828
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.2.0.tgz#55ce83139f7ad1b48b414c3927746614c6963c0f"
2929

30-
"@types/node@8.0.47":
31-
version "8.0.47"
32-
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
30+
"@types/node@9.4.6":
31+
version "9.4.6"
32+
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
3333

3434
JSONStream@^1.0.4:
3535
version "1.3.2"

0 commit comments

Comments
 (0)