Commit 96a6522ed91c54a3d95ef6c342002d5558b32314
Committed by
GitHub
Merge pull request #1879 from SergioCrisostomo/ci-fixes
Update Sinon to major v.3 because of peer dependencies
Showing
2 changed files
with
95 additions
and
39 deletions
Show diff stats
package-lock.json
1 | { | 1 | { |
2 | "name": "iview", | 2 | "name": "iview", |
3 | - "version": "2.3.0", | 3 | + "version": "2.3.2", |
4 | "lockfileVersion": 1, | 4 | "lockfileVersion": 1, |
5 | "requires": true, | 5 | "requires": true, |
6 | "dependencies": { | 6 | "dependencies": { |
@@ -4717,6 +4717,15 @@ | @@ -4717,6 +4717,15 @@ | ||
4717 | "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", | 4717 | "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", |
4718 | "dev": true | 4718 | "dev": true |
4719 | }, | 4719 | }, |
4720 | + "formatio": { | ||
4721 | + "version": "1.2.0", | ||
4722 | + "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", | ||
4723 | + "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", | ||
4724 | + "dev": true, | ||
4725 | + "requires": { | ||
4726 | + "samsam": "1.2.1" | ||
4727 | + } | ||
4728 | + }, | ||
4720 | "forwarded": { | 4729 | "forwarded": { |
4721 | "version": "0.1.1", | 4730 | "version": "0.1.1", |
4722 | "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.1.tgz", | 4731 | "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.1.tgz", |
@@ -10135,6 +10144,12 @@ | @@ -10135,6 +10144,12 @@ | ||
10135 | "array-includes": "3.0.3" | 10144 | "array-includes": "3.0.3" |
10136 | } | 10145 | } |
10137 | }, | 10146 | }, |
10147 | + "just-extend": { | ||
10148 | + "version": "1.1.22", | ||
10149 | + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.22.tgz", | ||
10150 | + "integrity": "sha1-MzCvdWyralQnAMZLLk5KoGLVL/8=", | ||
10151 | + "dev": true | ||
10152 | + }, | ||
10138 | "karma": { | 10153 | "karma": { |
10139 | "version": "1.7.1", | 10154 | "version": "1.7.1", |
10140 | "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", | 10155 | "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", |
@@ -12704,6 +12719,12 @@ | @@ -12704,6 +12719,12 @@ | ||
12704 | "dev": true, | 12719 | "dev": true, |
12705 | "optional": true | 12720 | "optional": true |
12706 | }, | 12721 | }, |
12722 | + "native-promise-only": { | ||
12723 | + "version": "0.8.1", | ||
12724 | + "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", | ||
12725 | + "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=", | ||
12726 | + "dev": true | ||
12727 | + }, | ||
12707 | "natural-compare": { | 12728 | "natural-compare": { |
12708 | "version": "1.4.0", | 12729 | "version": "1.4.0", |
12709 | "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", | 12730 | "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", |
@@ -12725,6 +12746,35 @@ | @@ -12725,6 +12746,35 @@ | ||
12725 | "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", | 12746 | "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", |
12726 | "dev": true | 12747 | "dev": true |
12727 | }, | 12748 | }, |
12749 | + "nise": { | ||
12750 | + "version": "1.0.1", | ||
12751 | + "resolved": "https://registry.npmjs.org/nise/-/nise-1.0.1.tgz", | ||
12752 | + "integrity": "sha1-DakrEKhU6XwPSW9sKEWjASgLPu8=", | ||
12753 | + "dev": true, | ||
12754 | + "requires": { | ||
12755 | + "formatio": "1.2.0", | ||
12756 | + "just-extend": "1.1.22", | ||
12757 | + "lolex": "1.6.0", | ||
12758 | + "path-to-regexp": "1.7.0" | ||
12759 | + }, | ||
12760 | + "dependencies": { | ||
12761 | + "isarray": { | ||
12762 | + "version": "0.0.1", | ||
12763 | + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", | ||
12764 | + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", | ||
12765 | + "dev": true | ||
12766 | + }, | ||
12767 | + "path-to-regexp": { | ||
12768 | + "version": "1.7.0", | ||
12769 | + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", | ||
12770 | + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", | ||
12771 | + "dev": true, | ||
12772 | + "requires": { | ||
12773 | + "isarray": "0.0.1" | ||
12774 | + } | ||
12775 | + } | ||
12776 | + } | ||
12777 | + }, | ||
12728 | "no-case": { | 12778 | "no-case": { |
12729 | "version": "2.3.2", | 12779 | "version": "2.3.2", |
12730 | "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", | 12780 | "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", |
@@ -13832,6 +13882,12 @@ | @@ -13832,6 +13882,12 @@ | ||
13832 | "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", | 13882 | "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", |
13833 | "dev": true | 13883 | "dev": true |
13834 | }, | 13884 | }, |
13885 | + "samsam": { | ||
13886 | + "version": "1.2.1", | ||
13887 | + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz", | ||
13888 | + "integrity": "sha1-7dOQk6MYQ3DLhZJDsr3yVefY6mc=", | ||
13889 | + "dev": true | ||
13890 | + }, | ||
13835 | "schema-utils": { | 13891 | "schema-utils": { |
13836 | "version": "0.3.0", | 13892 | "version": "0.3.0", |
13837 | "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", | 13893 | "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", |
@@ -14004,53 +14060,41 @@ | @@ -14004,53 +14060,41 @@ | ||
14004 | "dev": true | 14060 | "dev": true |
14005 | }, | 14061 | }, |
14006 | "sinon": { | 14062 | "sinon": { |
14007 | - "version": "1.17.7", | ||
14008 | - "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz", | ||
14009 | - "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=", | 14063 | + "version": "3.2.1", |
14064 | + "resolved": "https://registry.npmjs.org/sinon/-/sinon-3.2.1.tgz", | ||
14065 | + "integrity": "sha512-KY3OLOWpek/I4NGAMHetuutVgS2aRgMR5g5/1LSYvPJ3qo2BopIvk3esFztPxF40RWf/NNNJzdFPriSkXUVK3A==", | ||
14010 | "dev": true, | 14066 | "dev": true, |
14011 | "requires": { | 14067 | "requires": { |
14012 | - "formatio": "1.1.1", | ||
14013 | - "lolex": "1.3.2", | ||
14014 | - "samsam": "1.1.2", | ||
14015 | - "util": "0.10.3" | 14068 | + "diff": "3.2.0", |
14069 | + "formatio": "1.2.0", | ||
14070 | + "lolex": "2.1.2", | ||
14071 | + "native-promise-only": "0.8.1", | ||
14072 | + "nise": "1.0.1", | ||
14073 | + "path-to-regexp": "1.7.0", | ||
14074 | + "samsam": "1.2.1", | ||
14075 | + "text-encoding": "0.6.4", | ||
14076 | + "type-detect": "4.0.3" | ||
14016 | }, | 14077 | }, |
14017 | "dependencies": { | 14078 | "dependencies": { |
14018 | - "formatio": { | ||
14019 | - "version": "1.1.1", | ||
14020 | - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz", | ||
14021 | - "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=", | ||
14022 | - "dev": true, | ||
14023 | - "requires": { | ||
14024 | - "samsam": "1.1.2" | ||
14025 | - } | ||
14026 | - }, | ||
14027 | - "lolex": { | ||
14028 | - "version": "1.3.2", | ||
14029 | - "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz", | ||
14030 | - "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=", | 14079 | + "isarray": { |
14080 | + "version": "0.0.1", | ||
14081 | + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", | ||
14082 | + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", | ||
14031 | "dev": true | 14083 | "dev": true |
14032 | }, | 14084 | }, |
14033 | - "samsam": { | ||
14034 | - "version": "1.1.2", | ||
14035 | - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz", | ||
14036 | - "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=", | 14085 | + "lolex": { |
14086 | + "version": "2.1.2", | ||
14087 | + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.1.2.tgz", | ||
14088 | + "integrity": "sha1-JpS5U8nqTQE+W4v7qJHJkQJbJik=", | ||
14037 | "dev": true | 14089 | "dev": true |
14038 | }, | 14090 | }, |
14039 | - "util": { | ||
14040 | - "version": "0.10.3", | ||
14041 | - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", | ||
14042 | - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", | 14091 | + "path-to-regexp": { |
14092 | + "version": "1.7.0", | ||
14093 | + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", | ||
14094 | + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", | ||
14043 | "dev": true, | 14095 | "dev": true, |
14044 | "requires": { | 14096 | "requires": { |
14045 | - "inherits": "2.0.1" | ||
14046 | - }, | ||
14047 | - "dependencies": { | ||
14048 | - "inherits": { | ||
14049 | - "version": "2.0.1", | ||
14050 | - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", | ||
14051 | - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", | ||
14052 | - "dev": true | ||
14053 | - } | 14097 | + "isarray": "0.0.1" |
14054 | } | 14098 | } |
14055 | } | 14099 | } |
14056 | } | 14100 | } |
@@ -14510,6 +14554,12 @@ | @@ -14510,6 +14554,12 @@ | ||
14510 | "integrity": "sha1-IGvo4YiGC1FEJTdebxrom/sB/Y0=", | 14554 | "integrity": "sha1-IGvo4YiGC1FEJTdebxrom/sB/Y0=", |
14511 | "dev": true | 14555 | "dev": true |
14512 | }, | 14556 | }, |
14557 | + "text-encoding": { | ||
14558 | + "version": "0.6.4", | ||
14559 | + "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", | ||
14560 | + "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", | ||
14561 | + "dev": true | ||
14562 | + }, | ||
14513 | "text-table": { | 14563 | "text-table": { |
14514 | "version": "0.2.0", | 14564 | "version": "0.2.0", |
14515 | "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", | 14565 | "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", |
@@ -14618,6 +14668,12 @@ | @@ -14618,6 +14668,12 @@ | ||
14618 | "prelude-ls": "1.1.2" | 14668 | "prelude-ls": "1.1.2" |
14619 | } | 14669 | } |
14620 | }, | 14670 | }, |
14671 | + "type-detect": { | ||
14672 | + "version": "4.0.3", | ||
14673 | + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz", | ||
14674 | + "integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo=", | ||
14675 | + "dev": true | ||
14676 | + }, | ||
14621 | "type-is": { | 14677 | "type-is": { |
14622 | "version": "1.6.15", | 14678 | "version": "1.6.15", |
14623 | "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", | 14679 | "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", |
package.json
@@ -85,7 +85,7 @@ | @@ -85,7 +85,7 @@ | ||
85 | "less-loader": "^2.2.3", | 85 | "less-loader": "^2.2.3", |
86 | "lolex": "^1.5.2", | 86 | "lolex": "^1.5.2", |
87 | "mocha": "^3.5.3", | 87 | "mocha": "^3.5.3", |
88 | - "sinon": "^1.17.7", | 88 | + "sinon": "^3.2.1", |
89 | "sinon-chai": "^2.13.0", | 89 | "sinon-chai": "^2.13.0", |
90 | "style-loader": "^0.13.1", | 90 | "style-loader": "^0.13.1", |
91 | "url-loader": "^0.5.9", | 91 | "url-loader": "^0.5.9", |