From: Galen Charlton Date: Wed, 29 May 2019 21:39:19 +0000 (-0400) Subject: LP#1830972: update pin and add comments about keeping things in sync X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c4cf4049fc7c8df091d5b54154d34c780c4956eb;p=working%2FEvergreen.git LP#1830972: update pin and add comments about keeping things in sync This patch updates the angular/cli version to ^7.0.7 to match package.json and adds comments about keeping the pin in sync between package.json and Makefile.common. Signed-off-by: Galen Charlton Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json index 1149eede8f..0f0df59ba5 100644 --- a/Open-ILS/src/eg2/package.json +++ b/Open-ILS/src/eg2/package.json @@ -31,6 +31,7 @@ "rxjs": "^6.4.0", "zone.js": "^0.8.29" }, + "//": "NOTE: version of angular/cli should be kept in sync with Open-ILS/src/extras/install/Makefile.common", "devDependencies": { "@angular-devkit/build-angular": "^0.10.7", "@angular/cli": "^7.0.7", diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common index c5422879a6..fb3f773f3e 100644 --- a/Open-ILS/src/extras/install/Makefile.common +++ b/Open-ILS/src/extras/install/Makefile.common @@ -29,11 +29,13 @@ install_libdbi: --with-pgsql-libdir=$$(pg_config --libdir) && make all install # NOTE: Use the NodeJS Binary +# ALSO NOTE: the version of angular/cli should be kept in sync with +# what's specified in Open-ILS/src/eg2/package.json install_nodejs_from_source: wget -N $(NODEJS_BINARY) tar -C /usr/local --strip-components 1 -xJf $(NODEJS_TARBIN) npm update - npm install -g @angular/cli + npm install -g @angular/cli@^7.0.7 clean: make -C $(LIBDBI) clean