Skip to content

Commit

Permalink
@okta/configuration-validation: buildConfigObject: support all config…
Browse files Browse the repository at this point in the history
… options (#529)

* buildConfigObject: support all config options

* Use lodash merge

* - portfinder 1.0.22 has a bug

http-party/node-portfinder#84
  • Loading branch information
aarongranick-okta authored Aug 19, 2019
1 parent 5b2f0c8 commit 040f733
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1897,7 +1897,6 @@ jasmine-core@~2.8.0:
jasmine-protractor-browser-log-reporter@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/jasmine-protractor-browser-log-reporter/-/jasmine-protractor-browser-log-reporter-1.0.0.tgz#78e16fc0290e9d2a7d73dad2b46ad4d805166b80"
integrity sha1-eOFvwCkOnSp9c9rStGrU2AUWa4A=
dependencies:
moment "^2.18.1"

Expand Down Expand Up @@ -2572,7 +2571,6 @@ mkdirp@^0.5.0, mkdirp@^0.5.1:
moment@^2.18.1:
version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==

[email protected]:
version "2.0.0"
Expand Down Expand Up @@ -2668,8 +2666,8 @@ node-jose@^1.0.0:
uuid "^3.3.2"

node-notifier@^5.2.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.1.tgz#7c0192cc63aedb25cd99619174daa27902b10903"
version "5.4.3"
resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
dependencies:
growly "^1.3.0"
is-wsl "^1.1.0"
Expand Down Expand Up @@ -3122,10 +3120,14 @@ q@^1.4.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"

[email protected], qs@^6.5.1:
[email protected]:
version "6.7.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"

qs@^6.5.1:
version "6.8.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.8.0.tgz#87b763f0d37ca54200334cd57bb2ef8f68a1d081"

qs@~6.5.2:
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
Expand Down Expand Up @@ -3916,8 +3918,8 @@ [email protected]:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"

uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
version "3.3.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"

validate-npm-package-license@^3.0.1:
version "3.0.4"
Expand Down Expand Up @@ -3964,10 +3966,9 @@ [email protected]:
"@types/selenium-webdriver" "^3.0.0"
selenium-webdriver "^3.0.1"

webdriver-manager@^12.0.6, webdriver-manager@^12.1.4:
webdriver-manager@^12.0.6:
version "12.1.6"
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.6.tgz#9e5410c506d1a7e0a7aa6af91ba3d5bb37f362b6"
integrity sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w==
dependencies:
adm-zip "^0.4.9"
chalk "^1.1.1"
Expand Down

0 comments on commit 040f733

Please sign in to comment.