From 37bd36bd00c9d6be2a6c74437815b64c25b34152 Mon Sep 17 00:00:00 2001 From: Bryce Kahle Date: Tue, 12 Dec 2017 14:18:01 -0800 Subject: [PATCH] Install npm modules if any of the npm lock files change Fixes #113 --- run-build-functions.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/run-build-functions.sh b/run-build-functions.sh index 8223d0e8..111ff23a 100755 --- a/run-build-functions.sh +++ b/run-build-functions.sh @@ -106,7 +106,9 @@ run_npm() { fi fi - if install_deps package.json $NODE_VERSION $NETLIFY_CACHE_DIR/package-sha + if install_deps package.json $NODE_VERSION $NETLIFY_CACHE_DIR/package-sha || \ + install_deps package-lock.json $NODE_VERSION $NETLIFY_CACHE_DIR/package-lock-sha || \ + install_deps npm-shrinkwrap.json $NODE_VERSION $NETLIFY_CACHE_DIR/package-shrinkwrap-sha then echo "Installing NPM modules using NPM version $(npm --version)" run_npm_set_temp @@ -118,6 +120,14 @@ run_npm() { fi echo "$(shasum package.json)-$NODE_VERSION" > $NETLIFY_CACHE_DIR/package-sha + if [ -f package-lock.json ] + then + echo "$(shasum package-lock.json)-$NODE_VERSION" > $NETLIFY_CACHE_DIR/package-lock-sha + fi + if [ -f npm-shrinkwrap.json ] + then + echo "$(shasum npm-shrinkwrap.json)-$NODE_VERSION" > $NETLIFY_CACHE_DIR/package-shrinkwrap-sha + fi fi export PATH=$(npm bin):$PATH }