From e26d55cba7e2e95079a0a330091d4dd9b0f44043 Mon Sep 17 00:00:00 2001
From: Bernard <bernardwang@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:05:43 -0600
Subject: [PATCH] Upgrade node/yarn (#615)

* Add resolutions to kss/nunjucks because kss has no recent updates

* Update package.json and add nvmrc

* Add yarn to package

* Update travis

* Update snapshots

* Revert "Update snapshots"

This reverts commit 3c92b4fdf23fd20f3203d96a6a1a81fb7d6d999d.
---
 .nvmrc       | 1 +
 .travis.yml  | 4 ++--
 package.json | 6 ++++--
 yarn.lock    | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 .nvmrc

diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000000..c5b7294eae
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+11.15.0
diff --git a/.travis.yml b/.travis.yml
index b020e55643..1e6072ea7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 dist: trusty
 before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.1.0
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1
   - export PATH="$HOME/.yarn/bin:$PATH"
   - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 --no-sandbox --disable-dev-shm-usage http://localhost &
 install:
@@ -11,7 +11,7 @@ branches:
 cache: yarn
 language: node_js
 node_js:
-  - '8'
+  - '11.15.0'
 notifications:
   email: false
 sudo: required
diff --git a/package.json b/package.json
index 4a48ec5cf5..b8ec54ed53 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,8 @@
     "yo": "2.0.6"
   },
   "engines": {
-    "node": ">=7.0.0"
+    "node": ">=11.0.0 <12.0.0",
+    "yarn": ">=1.21.1"
   },
   "lint-staged": {
     "*.{js,jsx}": [
@@ -119,7 +120,8 @@
     ]
   },
   "resolutions": {
-    "gulp-sass/node-sass": ">=4.7.2"
+    "gulp-sass/node-sass": ">=4.7.2",
+    "kss/nunjucks": ">=3.2.0"
   },
   "dependencies": {
     "axe-webdriverjs": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 7c277940a9..c4c9f9cf78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9467,7 +9467,7 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nunjucks@^3.0.1:
+nunjucks@>=3.2.0, nunjucks@^3.0.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.0.tgz#53e95f43c9555e822e8950008a201b1002d49933"
   integrity sha512-YS/qEQ6N7qCnUdm6EoYRBfJUdWNT0PpKbbRnogV2XyXbBm2STIP1O6yrdZHgwMVK7fIYUx7i8+yatEixnXSB1w==