Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(node): upgrade dev setup to Node v12 #4088

Merged
merged 1 commit into from
Sep 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8
12
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ jobs:
- make install-js
script:
- make test-js
- make lint-js lint-css format
- make lint-js
- make lint-css
- make format
- make -C components
- make -C protocol-designer
- make -C labware-library
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ Your computer will need the following tools installed to be able to develop with
pyenv install 3.6.4
```

- Node v8 LTS (Carbon) - [nvm][] is optional, but recommended
- Node v12 - [nvm][] is optional, but recommended

```shell
nvm install lts/carbon
nvm install 12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this just be nvm install?

Copy link
Contributor Author

@mcous mcous Sep 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That will work if the user is in the opentrons directory, but the instruction to clone the repository doesn't come until later in this doc. We definitely need to expand and rework this section for better OS-specific instructions, so that's a good thing to keep in mind

```

- [yarn][yarn-install] - JavaScript package manager
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ cache:

install:
# read node version from the first line of .nvmrc
- ps: $env:nodejs_version = (Get-Content -Path .nvmrc)[0]
- ps: $env:nodejs_version = Get-Content -Path .nvmrc
- ps: Install-Product node $env:nodejs_version x64
# install dev dependencies
- cmd: '%MAKE% -j 2 install'
Expand Down
2 changes: 1 addition & 1 deletion components/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function CowButton(props) {

Usage requirements for dependent projects:

- Node lts/carbon (v8) and yarn
- Node v12 and yarn
- The following `dependencies` (peer dependencies of `@opentrons/components`)
- `react`: `^16.8.6`,
- `react-router-dom`: `^4.2.2`,
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"path": "cz-conventional-changelog"
}
},
"engines": {
"node": ">=12"
},
"devDependencies": {
"@babel/cli": "^7.6.0",
"@babel/core": "^7.6.0",
Expand Down Expand Up @@ -112,6 +115,9 @@
"webpack-dev-server": "^3.8.1",
"webpack-merge": "^4.2.2",
"worker-loader": "^2.0.0",
"ws": "3.1.0"
"ws": "7.1.2"
},
"resolutions": {
"watchpack": "^2.0.0-beta.7"
}
}
Loading