Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'greenkeeper/sinon-7.2.4' into develop

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-03-31 20:01:38 +02:00
parent 07909ac93a 03283d2e52
commit 4ff56b17e7
2 changed files with 136 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+135 -23
View File
@@ -260,9 +260,20 @@
}
},
"@sinonjs/samsam": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-2.1.3.tgz",
"integrity": "sha512-8zNeBkSKhU9a5cRNbpCKau2WWPfan+Q2zDlcXvXyhn9EsMqgYs4qzo0XHNVlXC6ABQL8fT6nV+zzo5RTHJzyXw==",
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.1.1.tgz",
"integrity": "sha512-ILlwvQUwAiaVBzr3qz8oT1moM7AIUHqUc2UmEjQcH9lLe+E+BZPwUMuc9FFojMswRK4r96x5zDTTrowMLw/vuA==",
"dev": true,
"requires": {
"@sinonjs/commons": "^1.0.2",
"array-from": "^2.1.1",
"lodash": "^4.17.11"
}
},
"@sinonjs/text-encoding": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
"integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
"dev": true
},
"@slack/client": {
@@ -683,7 +694,12 @@
"blueimp-md5": "^2.10.0",
"json3": "^3.3.2",
"lodash": "^4.17.4",
<<<<<<< HEAD
"query-string": "5",
"ua-parser-js": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d"
=======
"query-string": "5"
>>>>>>> develop
},
"dependencies": {
"ua-parser-js": {
@@ -1188,6 +1204,12 @@
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
},
"array-from": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
"integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
"dev": true
},
"array-initial": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
@@ -5026,7 +5048,12 @@
"optional": true
=======
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
<<<<<<< HEAD
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
"optional": true
=======
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
>>>>>>> develop
>>>>>>> develop
},
"got": {
@@ -8061,7 +8088,12 @@
"optional": true
=======
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
<<<<<<< HEAD
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"optional": true
=======
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
>>>>>>> develop
>>>>>>> develop
}
}
@@ -8151,7 +8183,12 @@
"optional": true
=======
"resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
<<<<<<< HEAD
"integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
"optional": true
=======
"integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
>>>>>>> develop
>>>>>>> develop
},
"get-stream": {
@@ -8172,7 +8209,12 @@
"optional": true
=======
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
<<<<<<< HEAD
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"optional": true
=======
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
>>>>>>> develop
>>>>>>> develop
}
}
@@ -8621,7 +8663,12 @@
"optional": true
=======
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
<<<<<<< HEAD
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
"optional": true
=======
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
>>>>>>> develop
>>>>>>> develop
},
"got": {
@@ -11177,6 +11224,10 @@
},
"balanced-match": {
"version": "1.0.0",
<<<<<<< HEAD
"bundled": true,
"optional": true
=======
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
@@ -11189,10 +11240,15 @@
"optional": true,
=======
"bundled": true
>>>>>>> develop
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"balanced-match": "^1.0.0",
@@ -11206,6 +11262,10 @@
},
"code-point-at": {
"version": "1.1.0",
<<<<<<< HEAD
"bundled": true,
"optional": true
=======
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
@@ -11224,14 +11284,21 @@
"optional": true
=======
"bundled": true
>>>>>>> develop
},
"concat-map": {
"version": "0.0.1",
"bundled": true
"bundled": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
<<<<<<< HEAD
"bundled": true,
"optional": true
=======
"bundled": true
>>>>>>> develop
>>>>>>> develop
},
"core-util-is": {
@@ -11335,12 +11402,17 @@
},
"inherits": {
"version": "2.0.3",
<<<<<<< HEAD
"bundled": true,
"optional": true
=======
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"optional": true
=======
"bundled": true
>>>>>>> develop
>>>>>>> develop
},
"ini": {
@@ -11356,6 +11428,10 @@
"optional": true,
=======
"bundled": true,
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"number-is-nan": "^1.0.0"
@@ -11374,6 +11450,10 @@
"optional": true,
=======
"bundled": true,
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"brace-expansion": "^1.1.7"
@@ -11381,6 +11461,10 @@
},
"minimist": {
"version": "0.0.8",
<<<<<<< HEAD
"bundled": true,
"optional": true
=======
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
@@ -11393,10 +11477,15 @@
"optional": true,
=======
"bundled": true
>>>>>>> develop
},
"minipass": {
"version": "2.3.5",
"bundled": true,
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"safe-buffer": "^5.1.2",
@@ -11419,6 +11508,10 @@
"optional": true,
=======
"bundled": true,
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"minimist": "0.0.8"
@@ -11492,12 +11585,17 @@
},
"number-is-nan": {
"version": "1.0.1",
<<<<<<< HEAD
"bundled": true,
"optional": true
=======
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"optional": true
=======
"bundled": true
>>>>>>> develop
>>>>>>> develop
},
"object-assign": {
@@ -11513,6 +11611,10 @@
"optional": true,
=======
"bundled": true,
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"wrappy": "1"
@@ -11624,6 +11726,10 @@
"optional": true,
=======
"bundled": true,
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"code-point-at": "^1.0.0",
@@ -17504,16 +17610,16 @@
}
},
"nise": {
"version": "1.4.8",
"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz",
"integrity": "sha512-kGASVhuL4tlAV0tvA34yJYZIVihrUt/5bDwpp4tTluigxUr2bBlJeDXmivb6NuEdFkqvdv/Ybb9dm16PSKUhtw==",
"version": "1.4.10",
"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz",
"integrity": "sha512-sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA==",
"dev": true,
"requires": {
"@sinonjs/formatio": "^3.1.0",
"@sinonjs/text-encoding": "^0.7.1",
"just-extend": "^4.0.2",
"lolex": "^2.3.2",
"path-to-regexp": "^1.7.0",
"text-encoding": "^0.6.4"
"path-to-regexp": "^1.7.0"
},
"dependencies": {
"isarray": {
@@ -23482,20 +23588,18 @@
}
},
"sinon": {
"version": "6.3.5",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz",
"integrity": "sha512-xgoZ2gKjyVRcF08RrIQc+srnSyY1JDJtxu3Nsz07j1ffjgXoY6uPLf/qja6nDBZgzYYEovVkFryw2+KiZz11xQ==",
"version": "7.2.4",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.4.tgz",
"integrity": "sha512-FGlcfrkiBRfaEIKRw8s/9mk4nP4AMGswvKFixLo+AzsOhskjaBCHAHGLMd8pCJpQGS+9ZI71px6qoQUyvADeyA==",
"dev": true,
"requires": {
"@sinonjs/commons": "^1.0.2",
"@sinonjs/formatio": "^3.0.0",
"@sinonjs/samsam": "^2.1.2",
"@sinonjs/commons": "^1.3.0",
"@sinonjs/formatio": "^3.1.0",
"@sinonjs/samsam": "^3.1.1",
"diff": "^3.5.0",
"lodash.get": "^4.4.2",
"lolex": "^2.7.5",
"nise": "^1.4.5",
"supports-color": "^5.5.0",
"type-detect": "^4.0.8"
"lolex": "^3.1.0",
"nise": "^1.4.10",
"supports-color": "^5.5.0"
},
"dependencies": {
"diff": {
@@ -23505,9 +23609,9 @@
"dev": true
},
"lolex": {
"version": "2.7.5",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
"integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz",
"integrity": "sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==",
"dev": true
},
"supports-color": {
@@ -25725,6 +25829,10 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
"integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"buffer": "^5.2.1",
@@ -25748,6 +25856,10 @@
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
"integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
<<<<<<< HEAD
"optional": true,
=======
>>>>>>> develop
>>>>>>> develop
"requires": {
"base64-js": "^1.0.2",
package.json
+1 -1
View File
@@ -185,7 +185,7 @@
"puppeteer": "^1.5.0",
"require-again": "^2.0.0",
"selenium-server": "^3.12.0",
"sinon": "^6.3.5",
"sinon": "^7.2.4",
"sinon-chai": "^3.0.0",
"sinon-stub-promise": "^4.0.0",
"webpack-bundle-analyzer": "^2.12.0",