Skip to content

Commit 497a802

Browse files
committed
Merge branch 'master' of github.com:barajs/bara-example
2 parents 3f37e2c + dd49223 commit 497a802

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"electron-updater": "4.0.6",
3232
"jsonfile": "5.0.0",
3333
"mkdirp": "0.5.1",
34-
"react": "16.8.3",
34+
"react": "16.8.6",
3535
"react-dom": "16.8.6",
3636
"react-native": "0.59.4"
3737
},
@@ -45,11 +45,11 @@
4545
"@types/mkdirp": "0.5.2",
4646
"@types/node": "11.13.4",
4747
"@types/react": "16.8.13",
48-
"@types/react-native": "0.57.43",
48+
"@types/react-native": "0.57.45",
4949
"@types/react-test-renderer": "16.8.1",
5050
"concurrently": "4.1.0",
5151
"cross-env": "5.2.0",
52-
"electron": "4.1.0",
52+
"electron": "4.1.4",
5353
"electron-builder": "20.39.0",
5454
"electron-devtools-installer": "2.2.4",
5555
"husky": "1.3.1",
@@ -59,9 +59,9 @@
5959
"npm-run-all": "4.1.5",
6060
"prettier": "1.17.0",
6161
"react-scripts": "2.1.8",
62-
"react-test-renderer": "16.8.3",
62+
"react-test-renderer": "16.8.6",
6363
"shx": "0.3.2",
64-
"tslint": "5.15.0",
64+
"tslint": "5.16.0",
6565
"tslint-config-airbnb": "5.11.1",
6666
"tslint-config-prettier": "1.18.0",
6767
"tslint-react": "4.0.0",

yarn.lock

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,10 +1279,10 @@
12791279
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
12801280
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
12811281

1282-
"@types/[email protected].43":
1283-
version "0.57.43"
1284-
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.43.tgz#a4d3fa7be905a8e28b7682220335dacefffd816f"
1285-
integrity sha512-hYt5a+Kj/Cy0102b+WZpNhnm1AWNz6HnVYwk41BSDZpDoJweo1BuJv1FStd6ClzCdTPJlfImF8ZqpM2xDoO2aA==
1282+
"@types/[email protected].45":
1283+
version "0.57.45"
1284+
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.45.tgz#bc341b2fbe879aec6d52f799f7342f674e045c4f"
1285+
integrity sha512-XHo3buFjgCs5WmycCBoc71QAa+mayQgDf+igRKgt3rle8rxW/fKtQny6quSabR+YcT55PsOE2qBQ4S5ra9ds2g==
12861286
dependencies:
12871287
"@types/prop-types" "*"
12881288
"@types/react" "*"
@@ -4221,10 +4221,10 @@ [email protected]:
42214221
semver "^5.6.0"
42224222
source-map-support "^0.5.9"
42234223

4224-
4225-
version "4.1.0"
4226-
resolved "https://registry.yarnpkg.com/electron/-/electron-4.1.0.tgz#ecba9c83de271e8ba7637332ece9ed023c6ea3f0"
4227-
integrity sha512-q/yTi9dT5UEFK/s+vOQaHNkTHWiRK9kEBYVJt34nmWc9piW42hXT+nhKUEHHhccMPr3q18gG0iPZqeR+LG76ow==
4224+
4225+
version "4.1.4"
4226+
resolved "https://registry.yarnpkg.com/electron/-/electron-4.1.4.tgz#41ba9e041f38c25c62a7db806884410654df058f"
4227+
integrity sha512-MelOjntJvd33izEjR6H4N/Uii7y535z/b2BuYXJGLNSHL6o1IlyhUQmfiT87kWABayERgeuYERgvsyf956OOFw==
42284228
dependencies:
42294229
"@types/node" "^10.12.18"
42304230
electron-download "^4.1.0"
@@ -10299,7 +10299,7 @@ react-error-overlay@^5.1.4:
1029910299
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.4.tgz#88dfb88857c18ceb3b9f95076f850d7121776991"
1030010300
integrity sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg==
1030110301

10302-
react-is@^16.8.1, react-is@^16.8.3:
10302+
react-is@^16.8.1, react-is@^16.8.6:
1030310303
version "16.8.6"
1030410304
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
1030510305
integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
@@ -10438,15 +10438,15 @@ [email protected]:
1043810438
optionalDependencies:
1043910439
fsevents "1.2.4"
1044010440

10441-
10442-
version "16.8.3"
10443-
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.3.tgz#230006af264cc46aeef94392e04747c21839e05e"
10444-
integrity sha512-rjJGYebduKNZH0k1bUivVrRLX04JfIQ0FKJLPK10TAb06XWhfi4gTobooF9K/DEFNW98iGac3OSxkfIJUN9Mdg==
10441+
10442+
version "16.8.6"
10443+
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
10444+
integrity sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==
1044510445
dependencies:
1044610446
object-assign "^4.1.1"
1044710447
prop-types "^15.6.2"
10448-
react-is "^16.8.3"
10449-
scheduler "^0.13.3"
10448+
react-is "^16.8.6"
10449+
scheduler "^0.13.6"
1045010450

1045110451
react-timer-mixin@^0.13.4:
1045210452
version "0.13.4"
@@ -10461,15 +10461,15 @@ react-transform-hmr@^1.0.4:
1046110461
global "^4.3.0"
1046210462
react-proxy "^1.1.7"
1046310463

10464-
10465-
version "16.8.3"
10466-
resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
10467-
integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
10464+
10465+
version "16.8.6"
10466+
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
10467+
integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
1046810468
dependencies:
1046910469
loose-envify "^1.1.0"
1047010470
object-assign "^4.1.1"
1047110471
prop-types "^15.6.2"
10472-
scheduler "^0.13.3"
10472+
scheduler "^0.13.6"
1047310473

1047410474
1047510475
version "3.2.2"
@@ -11055,7 +11055,7 @@ sax@~1.1.1:
1105511055
resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240"
1105611056
integrity sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA=
1105711057

11058-
scheduler@^0.13.3, scheduler@^0.13.6:
11058+
scheduler@^0.13.6:
1105911059
version "0.13.6"
1106011060
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
1106111061
integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
@@ -12230,12 +12230,12 @@ [email protected]:
1223012230
dependencies:
1223112231
tsutils "^3.9.1"
1223212232

12233-
tslint@5.15.0:
12234-
version "5.15.0"
12235-
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
12236-
integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
12233+
tslint@5.16.0:
12234+
version "5.16.0"
12235+
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.16.0.tgz#ae61f9c5a98d295b9a4f4553b1b1e831c1984d67"
12236+
integrity sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==
1223712237
dependencies:
12238-
babel-code-frame "^6.22.0"
12238+
"@babel/code-frame" "^7.0.0"
1223912239
builtin-modules "^1.1.1"
1224012240
chalk "^2.3.0"
1224112241
commander "^2.12.1"

0 commit comments

Comments
 (0)