From fc8a567a9e76f4020cbe7f2a92b1d37b3939d470 Mon Sep 17 00:00:00 2001 From: stustison Date: Tue, 31 Jan 2017 10:16:09 -0700 Subject: [PATCH] DDF-2644 fixed broken bower dependency introduced with the catalog ui --- catalog/ui/catalog-ui-search/bower.json | 3 +- catalog/ui/catalog-ui-search/package.json | 3 +- catalog/ui/catalog-ui-search/yarn.lock | 77 ++++++++++++++--------- 3 files changed, 49 insertions(+), 34 deletions(-) diff --git a/catalog/ui/catalog-ui-search/bower.json b/catalog/ui/catalog-ui-search/bower.json index 98e718dd7c39..165b51bbffc0 100644 --- a/catalog/ui/catalog-ui-search/bower.json +++ b/catalog/ui/catalog-ui-search/bower.json @@ -11,7 +11,6 @@ "usng.js": "0.2.2", "jquery-file-upload": "9.5.7", "wellknown": "connexta/wellknown#4d9ae612e7e308509ec76400b258c9db1581ea82", - "bootstrap-select": "1.6.4", - "eonasdan-bootstrap-datetimepicker": "4.17.37" + "bootstrap-select": "1.6.4" } } diff --git a/catalog/ui/catalog-ui-search/package.json b/catalog/ui/catalog-ui-search/package.json index 58c3b88bcb98..293accb3f145 100644 --- a/catalog/ui/catalog-ui-search/package.json +++ b/catalog/ui/catalog-ui-search/package.json @@ -99,6 +99,7 @@ "terraformer": "1.0.5", "terraformer-wkt-parser": "1.1.0", "uuid": "2.0.2", - "vis": "4.15.0" + "vis": "4.15.0", + "eonasdan-bootstrap-datetimepicker": "4.17.45" } } diff --git a/catalog/ui/catalog-ui-search/yarn.lock b/catalog/ui/catalog-ui-search/yarn.lock index e5537d88767f..06675e84c354 100644 --- a/catalog/ui/catalog-ui-search/yarn.lock +++ b/catalog/ui/catalog-ui-search/yarn.lock @@ -1250,6 +1250,10 @@ bootstrap@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.2.0.tgz#a0726e7c12e79f4a2a504f8d1ee9f2850a83f637" +bootstrap@^3.3: + version "3.3.7" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71" + boundary-cells@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/boundary-cells/-/boundary-cells-2.0.1.tgz#e905a8d1419cf47cb36be3dbf525db5e24de0042" @@ -1889,7 +1893,7 @@ commander@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873" -commander@2.6.0: +commander@2.6.0, commander@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d" @@ -1899,7 +1903,7 @@ commander@2.8.x: dependencies: graceful-readlink ">= 1.0.0" -commander@2.9.x, commander@^2.6.0, commander@^2.8.1, commander@^2.9.0: +commander@2.9.x, commander@^2.8.1, commander@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" dependencies: @@ -1978,7 +1982,7 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@1.5.0, concat-stream@^1.4.1, concat-stream@^1.4.6: +concat-stream@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611" dependencies: @@ -1986,20 +1990,20 @@ concat-stream@1.5.0, concat-stream@^1.4.1, concat-stream@^1.4.6: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@~1.4.5: - version "1.4.10" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.10.tgz#acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36" +concat-stream@^1.4.1, concat-stream@^1.4.6, concat-stream@~1.5.0, concat-stream@~1.5.1: + version "1.5.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" dependencies: inherits "~2.0.1" - readable-stream "~1.1.9" + readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@~1.5.0, concat-stream@~1.5.1: - version "1.5.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" +concat-stream@~1.4.5: + version "1.4.10" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.10.tgz#acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36" dependencies: inherits "~2.0.1" - readable-stream "~2.0.0" + readable-stream "~1.1.9" typedarray "~0.0.5" config-chain@~1.1.8: @@ -2763,6 +2767,15 @@ entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" +eonasdan-bootstrap-datetimepicker@4.17.45: + version "4.17.45" + resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.45.tgz#def7e1423c9f2943a9f8bf2925c61af030079773" + dependencies: + bootstrap "^3.3" + jquery "^1.8.3 || ^2.0" + moment "^2.10" + moment-timezone "^0.4.0" + errno@^0.1.1, errno@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" @@ -2878,11 +2891,11 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@1.0.2, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2: +escape-string-regexp@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1" -escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: +escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -3822,7 +3835,7 @@ glob@3.2.3: inherits "2" minimatch "~0.2.11" -glob@7.0.5, glob@^7.0.5, glob@~7.0.0: +glob@7.0.5, glob@~7.0.0: version "7.0.5" resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95" dependencies: @@ -3833,7 +3846,7 @@ glob@7.0.5, glob@^7.0.5, glob@~7.0.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.1, glob@^7.0.0, glob@^7.1.1, glob@~7.1.1: +glob@7.1.1, glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -4052,7 +4065,7 @@ graceful-fs@4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.2.tgz#fe2239b7574972e67e41f808823f9bfa4a991e37" -graceful-fs@4.1.5: +graceful-fs@4.1.5, graceful-fs@^4.1.2: version "4.1.5" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.5.tgz#f4745e8caed5e0dd2ef21bb5e2d229a32e8093c0" @@ -4062,10 +4075,6 @@ graceful-fs@^3.0.1, graceful-fs@^3.0.2, graceful-fs@~3.0.0, graceful-fs@~3.0.1: dependencies: natives "^1.1.0" -graceful-fs@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.3.tgz#92033ce11113c41e2628d61fdfa40bc10dc0155c" - graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -4878,7 +4887,7 @@ jquery-ui@1.10.4: version "1.10.4" resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.10.4.tgz#a096fe5f4e0f2ab69a0585cf10455877f57506bd" -jquery@1.12.4, jquery@>=1.7.1: +jquery@1.12.4, jquery@>=1.7.1, "jquery@^1.8.3 || ^2.0": version "1.12.4" resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c" @@ -4890,14 +4899,14 @@ js-tokens@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5" -js-yaml@^3.1.0, js-yaml@^3.4.3, js-yaml@~3.6.1: +js-yaml@^3.1.0, js-yaml@~3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" dependencies: argparse "^1.0.7" esprima "^2.6.0" -js-yaml@~3.5.2: +js-yaml@^3.4.3, js-yaml@~3.5.2: version "3.5.5" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.5.5.tgz#0377c38017cabc7322b0d1fbcd25a491641f2fbe" dependencies: @@ -5793,7 +5802,13 @@ module-deps@^4.0.8: through2 "^2.0.0" xtend "^4.0.0" -moment@2.13.0: +moment-timezone@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz#81f598c3ad5e22cdad796b67ecd8d88d0f5baa06" + dependencies: + moment ">= 2.6.0" + +moment@2.13.0, "moment@>= 2.6.0", moment@^2.10: version "2.13.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.13.0.tgz#24162d99521e6d40f99ae6939e806d2139eaac52" @@ -7556,11 +7571,11 @@ resumer@~0.0.0: dependencies: through "~2.3.4" -retry@0.6.0, retry@~0.6.0: +retry@0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.6.0.tgz#1c010713279a6fd1e8def28af0c3ff1871caa537" -retry@0.6.1: +retry@0.6.1, retry@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/retry/-/retry-0.6.1.tgz#fdc90eed943fde11b893554b8cc63d0e899ba918" @@ -8194,14 +8209,14 @@ static-module@^1.0.0, static-module@^1.1.0, static-module@^1.1.2: static-eval "~0.2.0" through2 "~0.4.1" -statuses@1, statuses@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28" - -"statuses@>= 1.3.1 < 2", statuses@~1.3.0: +statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" +statuses@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28" + stream-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-1.0.0.tgz#bf9b4abfb42b274d751479e44e0ff2656b6f1193"