Skip to content

Commit 4ddc1f9

Browse files
author
vikasrohit
authored
Merge branch 'dev' into hotfix/maintenance_mode_if_project_api_down
2 parents 25f7e8d + f86682e commit 4ddc1f9

File tree

171 files changed

+29123
-10994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+29123
-10994
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ workflows:
9191
- test
9292
filters:
9393
branches:
94-
only: dev
94+
only: ['dev', 'feature/project_plan_v3']
9595
- deployTest02:
9696
requires:
9797
- test

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ This repository houses new Customer pages, using React, Redux, and Webpack.
2424

2525
## Installation
2626

27-
We use node 5.x and npm 3.x, so you may need to download a new version of node. The easiest way is to download [nvm](https://github.com/creationix/nvm). We have a `.nvmrc` file in the root of the project, so you can just run `nvm use` to switch to the correct version of node.
27+
We use node 8.9.x and npm 6.x, so you may need to download a new version of node. The easiest way is to download [nvm](https://github.com/creationix/nvm). We have a `.nvmrc` file in the root of the project, so you can just run `nvm use` to switch to the correct version of node.
2828

2929
Install dependencies by running the following in the root of the project:
3030
- `npm i`
31-
- **Note:** You must use npm 3. Type `npm -v` to ensure you have a 3.x version.
31+
- **Note:** You must use npm 6.x. Type `npm -v` to ensure you have the correct version.
3232

3333
## NPM Commands
3434
- To run locally, run `npm start` and head to `http://localhost:3000/new_project`
@@ -50,7 +50,6 @@ To contribute to the repository, please create a feature branch off of the dev b
5050

5151
### Updating npm-shrinkwrap.json
5252

53-
Use **npm v5+** for this.
5453
General workflow to update `npm-shrinkwrap.json` would be:
5554

5655
- `npm install --no-optional` - with old npm-shrinkwrap (--no-optional to skip fsevents)

0 commit comments

Comments
 (0)