drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1879 from SergioCrisostomo/ci-fixes

Browse source 
Update Sinon to major v.3 because of peer dependencies
This commit is contained in:
Aresn 2017-09-14 14:37:32 +08:00 • committed by GitHub
commit 96a6522ed9
2 changed files with 95 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "iview",
"version": "2.3.0",
"version": "2.3.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -4717,6 +4717,15 @@
"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
"dev": true
},
"formatio": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz",
"integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=",
"dev": true,
"requires": {
"samsam": "1.2.1"
}
},
"forwarded": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.1.tgz",
@ -10135,6 +10144,12 @@
"array-includes": "3.0.3"
}
},
"just-extend": {
"version": "1.1.22",
"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.22.tgz",
"integrity": "sha1-MzCvdWyralQnAMZLLk5KoGLVL/8=",
"dev": true
},
"karma": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
@ -12704,6 +12719,12 @@
"dev": true,
"optional": true
},
"native-promise-only": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
"integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=",
"dev": true
},
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@ -12725,6 +12746,35 @@
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
"dev": true
},
"nise": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/nise/-/nise-1.0.1.tgz",
"integrity": "sha1-DakrEKhU6XwPSW9sKEWjASgLPu8=",
"dev": true,
"requires": {
"formatio": "1.2.0",
"just-extend": "1.1.22",
"lolex": "1.6.0",
"path-to-regexp": "1.7.0"
},
"dependencies": {
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
"path-to-regexp": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
"dev": true,
"requires": {
"isarray": "0.0.1"
}
}
}
},
"no-case": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@ -13832,6 +13882,12 @@
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
"dev": true
},
"samsam": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz",
"integrity": "sha1-7dOQk6MYQ3DLhZJDsr3yVefY6mc=",
"dev": true
},
"schema-utils": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
@ -14004,53 +14060,41 @@
"dev": true
},
"sinon": {
"version": "1.17.7",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
"integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-3.2.1.tgz",
"integrity": "sha512-KY3OLOWpek/I4NGAMHetuutVgS2aRgMR5g5/1LSYvPJ3qo2BopIvk3esFztPxF40RWf/NNNJzdFPriSkXUVK3A==",
"dev": true,
"requires": {
"formatio": "1.1.1",
"lolex": "1.3.2",
"samsam": "1.1.2",
"util": "0.10.3"
"diff": "3.2.0",
"formatio": "1.2.0",
"lolex": "2.1.2",
"native-promise-only": "0.8.1",
"nise": "1.0.1",
"path-to-regexp": "1.7.0",
"samsam": "1.2.1",
"text-encoding": "0.6.4",
"type-detect": "4.0.3"
},
"dependencies": {
"formatio": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
"integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
"dev": true,
"requires": {
"samsam": "1.1.2"
}
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
"lolex": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
"integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.1.2.tgz",
"integrity": "sha1-JpS5U8nqTQE+W4v7qJHJkQJbJik=",
"dev": true
},
"samsam": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
"integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
"dev": true
},
"util": {
"version": "0.10.3",
"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"path-to-regexp": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
"dev": true,
"requires": {
"inherits": "2.0.1"
},
"dependencies": {
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
"dev": true
}
"isarray": "0.0.1"
}
}
}
@ -14510,6 +14554,12 @@
"integrity": "sha1-IGvo4YiGC1FEJTdebxrom/sB/Y0=",
"dev": true
},
"text-encoding": {
"version": "0.6.4",
"resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
"integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
"dev": true
},
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@ -14618,6 +14668,12 @@
"prelude-ls": "1.1.2"
}
},
"type-detect": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz",
"integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo=",
"dev": true
},
"type-is": {
"version": "1.6.15",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",

2
package.json
View file

@ -85,7 +85,7 @@
"less-loader": "^2.2.3",
"lolex": "^1.5.2",
"mocha": "^3.5.3",
"sinon": "^1.17.7",
"sinon": "^3.2.1",
"sinon-chai": "^2.13.0",
"style-loader": "^0.13.1",
"url-loader": "^0.5.9",