Skip to content

Commit

Permalink
Merge pull request #206 from adhocteam/nodejs-update
Browse files Browse the repository at this point in the history
Update nodejs and yarn dep versions
  • Loading branch information
rahearn committed Mar 3, 2021
2 parents d0f5a95 + dbd0f53 commit 36f3803
Show file tree
Hide file tree
Showing 8 changed files with 621 additions and 529 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ executors:
docker-executor:
# for docker you must specify an image to use for the primary container
docker:
- image: circleci/node:14.15.4-browsers
- image: circleci/node:14.16.0-browsers
docker-postgres-executor:
docker:
- image: circleci/node:14.15.4-browsers
- image: circleci/node:14.16.0-browsers
environment:
DATABASE_URL: postgresql://postgres@localhost/ttasmarthub
- image: circleci/postgres:12.4-ram
Expand Down Expand Up @@ -143,16 +143,16 @@ jobs:
- create_combined_yarnlock
- restore_cache:
keys:
# To manually bust the cache, increment the version e.g. v3-yarn...
- v3-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
# To manually bust the cache, increment the version e.g. v4-yarn...
- v4-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
# If checksum is new, restore partial cache
- v3-yarn-deps-
- v4-yarn-deps-
- run: yarn deps
- save_cache:
paths:
- node_modules
- frontend/node_modules
key: v3-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
key: v4-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
- run:
name: Lint backend
command: yarn lint:ci
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.15.4
14.16.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM node:14.15.4
FROM node:14.16.0
WORKDIR /app
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ those services are already running on your machine.
#### Docker

1. Make sure Docker is installed. To check run `docker ps`.
2. Make sure you have Node 14.15.4 installed.
2. Make sure you have Node 14.16.0 installed.
3. Run `yarn docker:deps`. This builds the frontend and backend docker containers and install dependencies. You only need to run this step the first time you fire up the app and when dependencies are added/updated/removed.
4. Copy `.env.example` to `.env`.
6. Change the `AUTH_CLIENT_ID` and `AUTH_CLIENT_SECRET` variables to to values found in the "Values for local development" section of the "Development Credentials" document. If you don't have access to this document, please ask in the hs-vendors-ohs-tta channel of the gsa-tts slack channel.
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"uswds": "^2.9.0"
},
"engines": {
"node": "14.15.4"
"node": "14.16.0"
},
"scripts": {
"start": "react-scripts start",
Expand Down
526 changes: 286 additions & 240 deletions frontend/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Office of Head Start Training & Technical Assistance Data Platform\r =============================================",
"main": "index.js",
"engines": {
"node": "14.15.4"
"node": "14.16.0"
},
"scripts": {
"axe:ci": "axe --exit --load-delay 1000 `cat axe-urls` --dir ./reports/ --chromedriver-path=\"node_modules/chromedriver/bin/chromedriver\"",
Expand Down
602 changes: 324 additions & 278 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 36f3803

Please sign in to comment.