From cabef43421ef712d766953007cae966172d54d65 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Sun, 3 Apr 2022 08:49:03 +0200 Subject: [PATCH] Revert "Switch to package-lock.json" This reverts commit 0163b7281a8791ed6a5681d0d09186a21a03ccd9. --- .github/workflows/ci.yml | 2 +- .github/workflows/update_deps.yml | 4 ++-- docker/Dockerfile | 2 +- update.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ade04e9d..c9040e99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: uses: actions/cache@v3 with: path: node_modules - key: ${{ runner.os }}-${{ steps.nodeversion.outputs.version }}-${{ hashFiles('package-lock.json') }} + key: ${{ runner.os }}-${{ steps.nodeversion.outputs.version }}-${{ hashFiles('npm-shrinkwrap.json') }} - name: Install dependencies if: steps.cache-node-modules.outputs.cache-hit != 'true' run: npm ci diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml index 95bc6d66..9615441b 100644 --- a/.github/workflows/update_deps.yml +++ b/.github/workflows/update_deps.yml @@ -15,9 +15,9 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 - - run: rm -rf package-lock.json + - run: rm -rf npm-shrinkwrap.json - run: npx npm-check-updates -u - - run: npm install + - run: npm install && npm shrinkwrap --dev - uses: peter-evans/create-pull-request@v3 with: commit-message: Update dependencies diff --git a/docker/Dockerfile b/docker/Dockerfile index 053e2045..22d30715 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,7 @@ COPY package.json ./ # Dependencies and build FROM base as dependencies_and_build -COPY package-lock.json tsconfig.json index.js ./ +COPY npm-shrinkwrap.json tsconfig.json index.js ./ COPY lib ./lib RUN apk add --no-cache --virtual .buildtools make gcc g++ python3 linux-headers git && \ diff --git a/update.sh b/update.sh index 7c2494cc..1cd10ee6 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ echo "Creating backup of configuration..." cp -R data data-backup echo "Updating..." -git checkout HEAD -- package-lock.json +git checkout HEAD -- npm-shrinkwrap.json git pull echo "Installing dependencies..."