From f55c71a34ed6671252911eb348c6c1294c8c40ca Mon Sep 17 00:00:00 2001
From: Daniel Tschinder <231804+danez@users.noreply.github.com>
Date: Fri, 30 Sep 2022 10:31:45 +0200
Subject: [PATCH] feat: update nvm and yarn to latest version (#829)

---
 Dockerfile           | 4 ++--
 focal.yaml           | 2 +-
 included_software.md | 2 +-
 run-build.sh         | 2 +-
 tests/node/yarn.bats | 7 +------
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 54003856..55d445ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -277,7 +277,7 @@ USER root
 
 RUN curl -o- -L https://yarnpkg.com/install.sh > /usr/local/bin/yarn-installer.sh
 
-ENV NVM_VERSION=0.38.0
+ENV NVM_VERSION=0.39.1
 
 # Install node.js, yarn, grunt, bower and elm
 USER buildbot
@@ -287,7 +287,7 @@ RUN git clone https://github.com/creationix/nvm.git ~/.nvm && \
     cd /
 
 ENV ELM_VERSION=0.19.1-5
-ENV YARN_VERSION=1.22.10
+ENV YARN_VERSION=1.22.19
 
 ENV NETLIFY_NODE_VERSION="16"
 
diff --git a/focal.yaml b/focal.yaml
index 111f2cbd..8536cf59 100644
--- a/focal.yaml
+++ b/focal.yaml
@@ -93,7 +93,7 @@ commandTests:
         echo "NPM: $(npm --version)"
     expectedOutput:
       - "Node: v16.*.*"
-      - "NVM: 0.38.0"
+      - "NVM: 0.39.1"
       - "Yarn: 1.22.*"
       - "NPM: 8.*.*"
 
diff --git a/included_software.md b/included_software.md
index 2c95c300..86cacd55 100644
--- a/included_software.md
+++ b/included_software.md
@@ -44,7 +44,7 @@ The specific patch versions included will depend on when the image was last buil
 
 * Node.js
   * Yarn - `YARN_VERSION`
-    * 1.22.10 (default)
+    * 1.22.19 (default)
     * Any version available via their installer.
   * NPM - `NPM_VERSION`
     * Version corresponding with Node.js version. (default)
diff --git a/run-build.sh b/run-build.sh
index 19cb37f6..8ddfa657 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -20,7 +20,7 @@ cd $NETLIFY_REPO_DIR
 
 : ${NODE_VERSION="16"}
 : ${RUBY_VERSION="2.7.2"}
-: ${YARN_VERSION="1.22.10"}
+: ${YARN_VERSION="1.22.19"}
 : ${GO_VERSION="1.17"}
 : ${PYTHON_VERSION="3.8"}
 
diff --git a/tests/node/yarn.bats b/tests/node/yarn.bats
index 11924345..a424ece5 100644
--- a/tests/node/yarn.bats
+++ b/tests/node/yarn.bats
@@ -9,7 +9,7 @@ load '../../node_modules/bats-file/load'
 YARN_CACHE_DIR=/opt/buildhome/.yarn_cache
 
 # So that we can speed up the `run_yarn` function and not require new yarn installs for tests
-YARN_DEFAULT_VERSION=1.22.10
+YARN_DEFAULT_VERSION=1.22.19
 
 setup() {
   TMP_DIR=$(setup_tmp_dir)
@@ -27,11 +27,6 @@ teardown() {
   cd - || return
 }
 
-@test 'yarn 1.22.10 is installed and available by default' {
-  run yarn --version
-  assert_output $YARN_DEFAULT_VERSION
-}
-
 @test 'run_yarn with a new yarn version correctly sets the new yarn binary in PATH' {
   local newYarnVersion=1.21.0
   # We can't use bats `run` because environmental changes aren't persisted