diff --git a/angular.json b/angular.json index eac7b1f0c2da5cda619a6a912bfe174f6d5f7d37..6552477959c6a2a18a8b31fea0de313ba1e20e76 100644 --- a/angular.json +++ b/angular.json @@ -29,7 +29,7 @@ "./node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js", "./node_modules/css-vars-ponyfill/dist/css-vars-ponyfill.min.js", "./node_modules/@myuw-web-components/myuw-app-styles/dist/myuw-app-styles.min.js", - "./node_modules/@myuw-web-components/myuw-app-bar/dist/myuw-app-bar.min.js", + "./node_modules/enrollment-app-bar/dist/myuw-app-bar.min.js", "./node_modules/@myuw-web-components/myuw-drawer/dist/myuw-drawer.min.js", "./node_modules/@myuw-web-components/myuw-profile/dist/myuw-profile.min.js", "./node_modules/@myuw-web-components/myuw-help/dist/myuw-help.min.js" diff --git a/package-lock.json b/package-lock.json index e3e636cfb3efd9c1705ad792745a0dbad6abc9a0..0f857d9f298769f4140894699bb4bbb7e2fb9488 100644 --- a/package-lock.json +++ b/package-lock.json @@ -855,11 +855,6 @@ } } }, - "@myuw-web-components/myuw-app-bar": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@myuw-web-components/myuw-app-bar/-/myuw-app-bar-1.5.5.tgz", - "integrity": "sha512-ad9zzvL8NQmxUFbnhwhHA5m5q5QsB+NduSDr/vWaIRCxFefqgxpv4j8srWE+1Twc/b8vQrPolMnb6bKtpLJG2g==" - }, "@myuw-web-components/myuw-app-styles": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@myuw-web-components/myuw-app-styles/-/myuw-app-styles-1.2.3.tgz", @@ -3337,6 +3332,10 @@ "tapable": "^1.0.0" } }, + "enrollment-app-bar": { + "version": "git+http://git.doit.wisc.edu/adi-ia/enrollment-app-bar.git#9039fb66aa765b1307bbe80f961727a4bc7bfc17", + "from": "git+http://git.doit.wisc.edu/adi-ia/enrollment-app-bar.git" + }, "ent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", @@ -6268,9 +6267,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, "lodash.clonedeep": { @@ -6756,9 +6755,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -8978,9 +8977,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -10364,38 +10363,15 @@ "dev": true }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unique-filename": { diff --git a/package.json b/package.json index c1f6dae9b8a1e12403c74e212b59ef6c8ab745c0..25db344043a386e5a0dc10426c9eb64132e1c73f 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "@angular/platform-browser": "^7.2.15", "@angular/platform-browser-dynamic": "^7.2.15", "@angular/router": "^7.2.15", - "@myuw-web-components/myuw-app-bar": "^1.5.5", "@myuw-web-components/myuw-app-styles": "^1.2.3", "@myuw-web-components/myuw-drawer": "^1.2.0", "@myuw-web-components/myuw-help": "^1.3.1", @@ -40,6 +39,7 @@ "classlist.js": "^1.1.20150312", "core-js": "^2.6.0", "css-vars-ponyfill": "^1.17.2", + "enrollment-app-bar": "git+http://git.doit.wisc.edu/adi-ia/enrollment-app-bar.git", "intl": "^1.2.5", "rxjs": "^6.5.2", "tslib": "^1.9.0",