From 4835cd45a2751036fe42f3f31a56b5748e947947 Mon Sep 17 00:00:00 2001 From: Biyeun Buczyk Date: Tue, 21 Jul 2020 12:08:13 -0500 Subject: [PATCH 1/2] use npm version of ui-select --- package.json | 2 +- yarn.lock | 43 ++++++------------------------------------- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 751de818cc41..80ccbb936ccc 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "select2": "4.0.0", "topojson": "3.0.2", "uglify-js": "2.8.29", - "ui-select": "angular-ui/ui-select#v0.13.2", + "ui-select": "npm:ui-select#0.13.2", "underscore": "1.8.3", "xpath": "dimagi/js-xpath#v0.0.3", "zxcvbn": "4.2.0" diff --git a/yarn.lock b/yarn.lock index d6a70e33079b..91aa08ce09f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1092,7 +1092,7 @@ debug@~0.7.0: resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" integrity sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk= -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -2094,7 +2094,7 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -2707,11 +2707,6 @@ lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -2720,33 +2715,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._root@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" @@ -2757,11 +2730,6 @@ lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.union@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" @@ -4863,9 +4831,10 @@ uglify-to-browserify@~1.0.0: resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc= -ui-select@angular-ui/ui-select#v0.13.2: - version "0.13.2" - resolved "https://codeload.github.com/angular-ui/ui-select/tar.gz/a7dc9d0226130d288fbc97ad93930da38225234a" +"ui-select@npm:ui-select#0.13.2": + version "0.19.8" + resolved "https://registry.yarnpkg.com/ui-select/-/ui-select-0.19.8.tgz#74860848a7fd8bc494d9856d2f62776ea98637c1" + integrity sha1-dIYISKf9i8SU2YVtL2J3bqmGN8E= uid-number@0.0.6: version "0.0.6" From 794af25e05f20e514a21382b1b6c60a6a7dd6478 Mon Sep 17 00:00:00 2001 From: Biyeun Buczyk Date: Tue, 21 Jul 2020 13:55:30 -0500 Subject: [PATCH 2/2] hard ignore any yarn.lock changes in the diff when testing make requirements --- scripts/test-make-requirements.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/test-make-requirements.sh b/scripts/test-make-requirements.sh index 46285816ced1..f327f2f239e1 100755 --- a/scripts/test-make-requirements.sh +++ b/scripts/test-make-requirements.sh @@ -2,6 +2,8 @@ set -e make requirements +# we want to hard ignore any yarn.lock changes +git checkout -- yarn.lock git --no-pager diff git update-index -q --refresh if git diff-index --quiet HEAD --; then