Skip to content

Commit

Permalink
Upgrade node/yarn (#615)
Browse files Browse the repository at this point in the history
* 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 3c92b4f.
  • Loading branch information
bernardwang authored Feb 3, 2020
1 parent 22e48ca commit e26d55c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11.15.0
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -11,7 +11,7 @@ branches:
cache: yarn
language: node_js
node_js:
- '8'
- '11.15.0'
notifications:
email: false
sudo: required
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}": [
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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==
Expand Down

0 comments on commit e26d55c

Please sign in to comment.