Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit cf84fcf

Browse files
committed
chore(package.json): backport package.json/yarn.lock changes from master
1 parent f63bc3c commit cf84fcf

File tree

2 files changed

+87
-61
lines changed

2 files changed

+87
-61
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"gulp-sourcemaps": "^1.2.2",
5757
"gulp-uglify": "^1.0.1",
5858
"gulp-util": "^3.0.1",
59-
"jasmine-core": "^2.4.0",
59+
"jasmine-core": "2.5.2",
6060
"jasmine-node": "^2.0.0",
6161
"jasmine-reporters": "^2.2.0",
6262
"jquery": "^3.2.1",
@@ -78,7 +78,7 @@
7878
"npm-run": "^4.1.0",
7979
"open-sans-fontface": "^1.4.0",
8080
"promises-aplus-tests": "~2.1.0",
81-
"protractor": "^4.0.10",
81+
"protractor": "^5.1.2",
8282
"q": "~1.0.0",
8383
"q-io": "^1.10.9",
8484
"qq": "^0.3.5",

yarn.lock

Lines changed: 85 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# yarn lockfile v1
33

44

5-
"@types/jasmine@^2.5.36":
6-
version "2.5.41"
7-
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.41.tgz#d5e86161a0af80d52062b310a33ed65b051a0713"
8-
95
"@types/node@^6.0.46":
106
version "6.0.63"
117
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.63.tgz#e08acbbd5946e0e95990b1c76f3ce5b7882a48eb"
@@ -14,9 +10,9 @@
1410
version "0.0.32"
1511
resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
1612

17-
"@types/selenium-webdriver@2.53.37":
18-
version "2.53.37"
19-
resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.37.tgz#34f743c20e53ae7100ede90870fde554df2447f8"
13+
"@types/selenium-webdriver@^2.53.35", "@types/selenium-webdriver@~2.53.39":
14+
version "2.53.42"
15+
resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.42.tgz#74cb77fb6052edaff2a8984ddafd88d419f25cac"
2016

2117
Base64@~0.2.0:
2218
version "0.2.1"
@@ -84,11 +80,11 @@ acorn@^3.0.4, acorn@^3.1.0:
8480
version "3.3.0"
8581
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
8682

87-
adm-zip@0.4.4:
83+
adm-zip@0.4.4, adm-zip@~0.4.3:
8884
version "0.4.4"
8985
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
9086

91-
adm-zip@0.4.7, adm-zip@^0.4.7, adm-zip@~0.4.3:
87+
adm-zip@^0.4.7:
9288
version "0.4.7"
9389
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"
9490

@@ -474,6 +470,12 @@ block-stream@*:
474470
dependencies:
475471
inherits "~2.0.0"
476472

473+
blocking-proxy@0.0.5:
474+
version "0.0.5"
475+
resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-0.0.5.tgz#462905e0dcfbea970f41aa37223dda9c07b1912b"
476+
dependencies:
477+
minimist "^1.2.0"
478+
477479
bluebird@^3.3.0, bluebird@^3.4.6:
478480
version "3.4.7"
479481
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
@@ -1473,9 +1475,9 @@ debug-fabulous@0.0.X:
14731475
lazy-debug-legacy "0.0.X"
14741476
object-assign "4.1.0"
14751477

1476-
debug@2, debug@2.6.0, debug@2.X, debug@^2.1.1:
1477-
version "2.6.0"
1478-
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
1478+
debug@2, debug@2.6.3:
1479+
version "2.6.3"
1480+
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
14791481
dependencies:
14801482
ms "0.7.2"
14811483

@@ -1491,15 +1493,15 @@ debug@2.3.3:
14911493
dependencies:
14921494
ms "0.7.2"
14931495

1494-
debug@2.6.1:
1495-
version "2.6.1"
1496-
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
1496+
debug@2.6.0, debug@2.X, debug@^2.1.1:
1497+
version "2.6.0"
1498+
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
14971499
dependencies:
14981500
ms "0.7.2"
14991501

1500-
debug@2.6.3:
1501-
version "2.6.3"
1502-
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
1502+
debug@2.6.1:
1503+
version "2.6.1"
1504+
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
15031505
dependencies:
15041506
ms "0.7.2"
15051507

@@ -2509,7 +2511,7 @@ glob2base@^0.0.12:
25092511
dependencies:
25102512
find-index "^0.1.1"
25112513

2512-
glob@3.2.11, glob@^3.2.11:
2514+
glob@3.2.11:
25132515
version "3.2.11"
25142516
resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
25152517
dependencies:
@@ -3475,14 +3477,10 @@ jade@0.26.3:
34753477
commander "0.6.1"
34763478
mkdirp "0.3.0"
34773479

3478-
jasmine-core@^2.4.0, jasmine-core@~2.5.2:
3480+
jasmine-core@2.5.2, jasmine-core@~2.5.2:
34793481
version "2.5.2"
34803482
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.5.2.tgz#6f61bd79061e27f43e6f9355e44b3c6cab6ff297"
34813483

3482-
jasmine-core@~2.4.0:
3483-
version "2.4.1"
3484-
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.4.1.tgz#6f83ab3a0f16951722ce07d206c773d57cc838be"
3485-
34863484
jasmine-growl-reporter@~0.2.0:
34873485
version "0.2.1"
34883486
resolved "https://registry.yarnpkg.com/jasmine-growl-reporter/-/jasmine-growl-reporter-0.2.1.tgz#d5f0a37b92f6a83fd5c6482b809495c90a8b55fe"
@@ -3509,25 +3507,17 @@ jasmine-reporters@^2.2.0:
35093507
mkdirp "^0.5.1"
35103508
xmldom "^0.1.22"
35113509

3512-
jasmine@2.4.1:
3513-
version "2.4.1"
3514-
resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.4.1.tgz#9016dda453213d27ac6d43dc4ea97315a189085e"
3515-
dependencies:
3516-
exit "^0.1.2"
3517-
glob "^3.2.11"
3518-
jasmine-core "~2.4.0"
3519-
3520-
jasmine@^2.4.1:
3510+
jasmine@^2.4.1, jasmine@^2.5.3:
35213511
version "2.5.3"
35223512
resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.5.3.tgz#5441f254e1fc2269deb1dfd93e0e57d565ff4d22"
35233513
dependencies:
35243514
exit "^0.1.2"
35253515
glob "^7.0.6"
35263516
jasmine-core "~2.5.2"
35273517

3528-
jasminewd2@0.0.10:
3529-
version "0.0.10"
3530-
resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-0.0.10.tgz#94f48ae2bc946cad643035467b4bb7ea9c1075ef"
3518+
jasminewd2@^2.1.0:
3519+
version "2.1.0"
3520+
resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.1.0.tgz#da595275d1ae631de736ac0a7c7d85c9f73ef652"
35313521

35323522
jodid25519@^1.0.0:
35333523
version "1.0.2"
@@ -4988,25 +4978,25 @@ protochain@^1.0.5:
49884978
version "1.0.5"
49894979
resolved "https://registry.yarnpkg.com/protochain/-/protochain-1.0.5.tgz#991c407e99de264aadf8f81504b5e7faf7bfa260"
49904980

4991-
protractor@^4.0.10:
4992-
version "4.0.14"
4993-
resolved "https://registry.yarnpkg.com/protractor/-/protractor-4.0.14.tgz#efc4a877fac3a182a9dded26cd5869f4762fd172"
4981+
protractor@^5.1.2:
4982+
version "5.1.2"
4983+
resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.1.2.tgz#9b221741709a4c62d5cd53c6aadd54a71137e95f"
49944984
dependencies:
4995-
"@types/jasmine" "^2.5.36"
49964985
"@types/node" "^6.0.46"
49974986
"@types/q" "^0.0.32"
4998-
"@types/selenium-webdriver" "2.53.37"
4999-
adm-zip "0.4.7"
4987+
"@types/selenium-webdriver" "~2.53.39"
4988+
blocking-proxy "0.0.5"
50004989
chalk "^1.1.3"
50014990
glob "^7.0.3"
5002-
jasmine "2.4.1"
5003-
jasminewd2 "0.0.10"
4991+
jasmine "^2.5.3"
4992+
jasminewd2 "^2.1.0"
50044993
optimist "~0.6.0"
50054994
q "1.4.1"
50064995
saucelabs "~1.3.0"
5007-
selenium-webdriver "2.53.3"
4996+
selenium-webdriver "3.0.1"
50084997
source-map-support "~0.4.0"
5009-
webdriver-manager "^10.3.0"
4998+
webdriver-js-extender "^1.0.0"
4999+
webdriver-manager "^12.0.6"
50105000

50115001
proxy-addr@~1.1.3:
50125002
version "1.1.3"
@@ -5483,9 +5473,9 @@ right-pad@^1.0.1:
54835473
version "1.0.1"
54845474
resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
54855475

5486-
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@~2.5.1, rimraf@~2.5.4:
5487-
version "2.5.4"
5488-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
5476+
rimraf@2, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0:
5477+
version "2.6.1"
5478+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
54895479
dependencies:
54905480
glob "^7.0.5"
54915481

@@ -5495,9 +5485,9 @@ rimraf@2.4.3:
54955485
dependencies:
54965486
glob "^5.0.14"
54975487

5498-
rimraf@^2.6.0:
5499-
version "2.6.1"
5500-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
5488+
rimraf@^2.2.8, rimraf@^2.5.1, rimraf@~2.5.1, rimraf@~2.5.4:
5489+
version "2.5.4"
5490+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
55015491
dependencies:
55025492
glob "^7.0.5"
55035493

@@ -5568,11 +5558,20 @@ sax@0.6.x:
55685558
version "0.6.1"
55695559
resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"
55705560

5571-
sax@^1.1.1:
5561+
sax@>=0.6.0, sax@^1.1.1:
55725562
version "1.2.2"
55735563
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
55745564

5575-
selenium-webdriver@2.53.3, selenium-webdriver@^2.53.1:
5565+
selenium-webdriver@3.0.1:
5566+
version "3.0.1"
5567+
resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz#a2dea5da4a97f6672e89e7ca7276cefa365147a7"
5568+
dependencies:
5569+
adm-zip "^0.4.7"
5570+
rimraf "^2.5.4"
5571+
tmp "0.0.30"
5572+
xml2js "^0.4.17"
5573+
5574+
selenium-webdriver@^2.53.1, selenium-webdriver@^2.53.2:
55765575
version "2.53.3"
55775576
resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz#d29ff5a957dff1a1b49dc457756e4e4bfbdce085"
55785577
dependencies:
@@ -6260,13 +6259,19 @@ tmp@0.0.24:
62606259
version "0.0.24"
62616260
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.24.tgz#d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12"
62626261

6263-
tmp@0.0.31:
6262+
tmp@0.0.30:
6263+
version "0.0.30"
6264+
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
6265+
dependencies:
6266+
os-tmpdir "~1.0.1"
6267+
6268+
tmp@0.0.31, tmp@0.0.x:
62646269
version "0.0.31"
62656270
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
62666271
dependencies:
62676272
os-tmpdir "~1.0.1"
62686273

6269-
tmp@0.0.x, tmp@^0.0.29:
6274+
tmp@^0.0.29:
62706275
version "0.0.29"
62716276
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
62726277
dependencies:
@@ -6657,9 +6662,16 @@ weak-map@1.0.0:
66576662
version "1.0.0"
66586663
resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.0.tgz#b66e56a9df0bd25a76bbf1b514db129080614a37"
66596664

6660-
webdriver-manager@^10.3.0:
6661-
version "10.3.0"
6662-
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-10.3.0.tgz#99314588a0b1dbe688c441d74288c6cb1875fa8b"
6665+
webdriver-js-extender@^1.0.0:
6666+
version "1.0.0"
6667+
resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
6668+
dependencies:
6669+
"@types/selenium-webdriver" "^2.53.35"
6670+
selenium-webdriver "^2.53.2"
6671+
6672+
webdriver-manager@^12.0.6:
6673+
version "12.0.6"
6674+
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.0.6.tgz#3df1a481977010b4cbf8c9d85c7a577828c0e70b"
66636675
dependencies:
66646676
adm-zip "^0.4.7"
66656677
chalk "^1.1.1"
@@ -6671,6 +6683,7 @@ webdriver-manager@^10.3.0:
66716683
request "^2.78.0"
66726684
rimraf "^2.5.2"
66736685
semver "^5.3.0"
6686+
xml2js "^0.4.17"
66746687

66756688
which@^1.2.1, which@^1.2.10, which@^1.2.12, which@^1.2.9, which@~1.2.1:
66766689
version "1.2.12"
@@ -6777,10 +6790,23 @@ xml2js@0.4.4:
67776790
sax "0.6.x"
67786791
xmlbuilder ">=1.0.0"
67796792

6793+
xml2js@^0.4.17:
6794+
version "0.4.17"
6795+
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.17.tgz#17be93eaae3f3b779359c795b419705a8817e868"
6796+
dependencies:
6797+
sax ">=0.6.0"
6798+
xmlbuilder "^4.1.0"
6799+
67806800
xmlbuilder@8.2.2, xmlbuilder@>=1.0.0:
67816801
version "8.2.2"
67826802
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
67836803

6804+
xmlbuilder@^4.1.0:
6805+
version "4.2.1"
6806+
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
6807+
dependencies:
6808+
lodash "^4.0.0"
6809+
67846810
xmldom@^0.1.22:
67856811
version "0.1.27"
67866812
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"

0 commit comments

Comments
 (0)