diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df340003f967443f19f2fd4b9118b3e5dd279233..77edadaa65f4640b0eab18cd86b3cdc9659d2cea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,6 @@ include: ref: master file: eio-swe-angular-library/.gitlab-ci.yml variables: - SONAR_ENABLED: "false" + SONAR_ENABLED: "true" DEMO_ENABLED: "false" DIST_LIB: dist/libs/utils diff --git a/package.json b/package.json index 243570320ddc046fc25ee88f7562d09702b2bb25..851f9fa787540ff6a861ed803c1fb22479ddb59d 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,10 @@ "webpack": "^4.18.1", "webpack-bundle-analyzer": "^3.3.2" }, + "resolutions": { + "http-proxy": ">=1.18.1", + "tree-kill": ">=1.2.2" + }, "repository": { "type": "git", "url": "https://git.psu.edu/ais-swe/ux/utils" diff --git a/yarn.lock b/yarn.lock index e8ca579a56df3dea509a86b4c5080588d4f084c9..1f870370a57e7b21ee99e3e7aeb94fe921a223a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5695,10 +5695,10 @@ http-proxy-middleware@0.19.1: lodash "^4.17.11" micromatch "^3.1.10" -http-proxy@^1.17.0: - version "1.18.0" - resolved "https://nexus.ci.psu.edu/repository/npm-all/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" - integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== +http-proxy@>=1.18.1, http-proxy@^1.17.0: + version "1.18.1" + resolved "https://nexus.ci.psu.edu/repository/npm-all/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== dependencies: eventemitter3 "^4.0.0" follow-redirects "^1.0.0" @@ -11264,10 +11264,10 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -tree-kill@1.2.1: - version "1.2.1" - resolved "https://nexus.ci.psu.edu/repository/npm-all/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a" - integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q== +tree-kill@1.2.1, tree-kill@>=1.2.2: + version "1.2.2" + resolved "https://nexus.ci.psu.edu/repository/npm-all/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== trim-newlines@^1.0.0: version "1.0.0"