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 <gmc@equinoxinitiative.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json
index 0da3579..98b5293 100644 (file)
--- a/Open-ILS/src/eg2/package.json
+++ b/Open-ILS/src/eg2/package.json
@@ -32,6 +32,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 96ec3b8..a9a2476 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.common
+++ b/Open-ILS/src/extras/install/Makefile.common
@@ -32,11 +32,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