Skip to content

Commit faf5699

Browse files
Merge branch 'master' into greenkeeper/@robotlegsjs/core-0.0.6
2 parents f79d492 + 9dea251 commit faf5699

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"homepage": "https://github.com/RobotlegsJS/RobotlegsJS-SignalCommandMap#readme",
5959
"dependencies": {
6060
"@robotlegsjs/core": "^0.0.6",
61-
"@robotlegsjs/signals": "^0.0.10"
61+
"@robotlegsjs/signals": "^0.0.11"
6262
},
6363
"devDependencies": {
6464
"@types/bluebird": "^3.5.11",
@@ -96,7 +96,7 @@
9696
"reflect-metadata": "^0.1.10",
9797
"remap-istanbul": "^0.9.5",
9898
"rimraf": "^2.6.2",
99-
"sinon": "^3.2.1",
99+
"sinon": "^4.0.0",
100100
"sinon-chai": "^2.13.0",
101101
"source-map-support": "^0.4.18",
102102
"ts-loader": "^2.3.7",

yarn.lock

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
dependencies:
99
inversify "^4.3.0"
1010

11-
"@robotlegsjs/signals@^0.0.10":
12-
version "0.0.10"
13-
resolved "https://registry.npmjs.org/@robotlegsjs/signals/-/signals-0.0.10.tgz#7828c70a239106762eaef21a9759a9b7208c3b7e"
11+
"@robotlegsjs/signals@0.0.11":
12+
version "0.0.11"
13+
resolved "https://registry.npmjs.org/@robotlegsjs/signals/-/signals-0.0.11.tgz#627fdcc549d85badabbaa0b38f884e1ee852c826"
1414

1515
"@types/bluebird@^3.5.11":
1616
version "3.5.11"
@@ -3184,6 +3184,10 @@ lodash.escape@^3.0.0:
31843184
dependencies:
31853185
lodash._root "^3.0.0"
31863186

3187+
lodash.get@^4.4.2:
3188+
version "4.4.2"
3189+
resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
3190+
31873191
lodash.isarguments@^3.0.0:
31883192
version "3.1.0"
31893193
resolved "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -3537,14 +3541,15 @@ negotiator@0.6.1:
35373541
version "0.6.1"
35383542
resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
35393543

3540-
nise@^1.0.1:
3541-
version "1.0.1"
3542-
resolved "https://registry.npmjs.org/nise/-/nise-1.0.1.tgz#0da92b10a854e97c0f496f6c2845a301280b3eef"
3544+
nise@^1.1.0:
3545+
version "1.1.0"
3546+
resolved "https://registry.npmjs.org/nise/-/nise-1.1.0.tgz#37e41b9bf0041ccb83d1bf03e79440bbc0db10ad"
35433547
dependencies:
35443548
formatio "^1.2.0"
35453549
just-extend "^1.1.22"
35463550
lolex "^1.6.0"
35473551
path-to-regexp "^1.7.0"
3552+
text-encoding "^0.6.4"
35483553

35493554
node-emoji@^1.0.4:
35503555
version "1.8.1"
@@ -4640,15 +4645,16 @@ sinon-chai@^2.13.0:
46404645
version "2.13.0"
46414646
resolved "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.13.0.tgz#b9a42e801c20234bfc2f43b29e6f4f61b60990c4"
46424647

4643-
sinon@^3.2.1:
4644-
version "3.2.1"
4645-
resolved "https://registry.npmjs.org/sinon/-/sinon-3.2.1.tgz#d8adabd900730fd497788a027049c64b08be91c2"
4648+
sinon@4.0.0:
4649+
version "4.0.0"
4650+
resolved "https://registry.npmjs.org/sinon/-/sinon-4.0.0.tgz#a54a5f0237aa1dd2215e5e81c89b42b50c4fdb6b"
46464651
dependencies:
46474652
diff "^3.1.0"
46484653
formatio "1.2.0"
4654+
lodash.get "^4.4.2"
46494655
lolex "^2.1.2"
46504656
native-promise-only "^0.8.1"
4651-
nise "^1.0.1"
4657+
nise "^1.1.0"
46524658
path-to-regexp "^1.7.0"
46534659
samsam "^1.1.3"
46544660
text-encoding "0.6.4"
@@ -5024,7 +5030,7 @@ test-exclude@^4.1.1:
50245030
read-pkg-up "^1.0.1"
50255031
require-main-filename "^1.0.1"
50265032

5027-
text-encoding@0.6.4:
5033+
text-encoding@0.6.4, text-encoding@^0.6.4:
50285034
version "0.6.4"
50295035
resolved "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
50305036

0 commit comments

Comments
 (0)