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

[TTAHUB-2652] upgrade to nodejs 20 #2148

Draft
wants to merge 171 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
171 commits
Select commit Hold shift + click to select a range
284190b
upgrade to nodejs 20
GarrettEHill May 15, 2024
a110f04
@trussworks/react-uswds update
GarrettEHill May 15, 2024
252fe4f
Update yarn-audit-known-issues
GarrettEHill May 15, 2024
b2a4384
Update package.json
GarrettEHill May 15, 2024
a48c95b
Update yarn.lock
GarrettEHill May 15, 2024
c8182dc
Update cache.ts
GarrettEHill May 15, 2024
b767a09
Update redis.ts
GarrettEHill May 16, 2024
90bc912
Update dbUtils.ts
GarrettEHill May 16, 2024
8b65d26
Update resource.test.js
GarrettEHill May 16, 2024
9c13f54
wrong expect
GarrettEHill May 16, 2024
6f48fb1
Update dbUtils.ts
GarrettEHill May 16, 2024
b7e44fa
Dropdown to Select
GarrettEHill May 16, 2024
d4dfa92
fix e2e tests
GarrettEHill May 16, 2024
38bb453
Update Close.js
GarrettEHill May 16, 2024
338f118
Update Close.js
GarrettEHill May 16, 2024
7a87f34
fix lint
GarrettEHill May 16, 2024
127a7c2
Update frontend/src/pages/TrainingReportForm/pages/eventSummary.js
GarrettEHill May 20, 2024
1048775
Update frontend/src/pages/TrainingReportForm/pages/completeEvent.js
GarrettEHill May 20, 2024
92a658b
Update frontend/src/pages/SessionForm/pages/completeSession.js
GarrettEHill May 20, 2024
3b34d24
Update frontend/src/pages/SessionForm/pages/sessionSummary.js
GarrettEHill May 20, 2024
ccbbf48
update typescript
GarrettEHill May 20, 2024
28b8fc6
Merge branch 'TTAHUB-2652/nodejs-20' of https://github.com/HHS/Head-S…
GarrettEHill May 20, 2024
e8e84cf
Update cache.ts
GarrettEHill May 20, 2024
b74efb4
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill May 21, 2024
93c6fc5
update react
GarrettEHill May 21, 2024
c8e5695
more updates
GarrettEHill May 21, 2024
8f46e47
front end changes
GarrettEHill May 22, 2024
1927bb0
eslint
GarrettEHill May 22, 2024
bd1dff4
lets try this
GarrettEHill May 24, 2024
82d5a98
Update package.json
GarrettEHill May 24, 2024
7cb666d
Update yarn.lock
GarrettEHill May 24, 2024
dea1019
Add eslint ignore to two files (pending further investigation)
thewatermethod May 24, 2024
b8c9a6e
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill May 24, 2024
c0a6c35
Update yarn-audit-known-issues
GarrettEHill May 24, 2024
6145f23
Merge branch 'TTAHUB-2652/nodejs-20' of https://github.com/HHS/Head-S…
GarrettEHill May 24, 2024
75386c6
putting files back
GarrettEHill May 28, 2024
3969596
render => element
GarrettEHill May 28, 2024
5b3e684
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 6, 2024
db19838
Lots of updates for React Router v6
thewatermethod Jun 6, 2024
3d5645c
More upgrade to RR v6 tasks
thewatermethod Jun 6, 2024
fc159de
Update known issues
thewatermethod Jun 6, 2024
bb88888
Capture rename in test
thewatermethod Jun 6, 2024
b9e6bea
Add described by to modals and add dev dependency explicitly per warn…
thewatermethod Jun 7, 2024
6f4d561
Fix regional dashboard test
thewatermethod Jun 7, 2024
ecfcd6d
Fix tests and nested routes for recipient record
thewatermethod Jun 7, 2024
8792477
Remove createMemoryHistory
thewatermethod Jun 7, 2024
0460c3d
Remove more memory history
thewatermethod Jun 7, 2024
a122bbd
More fixes for memory history
thewatermethod Jun 7, 2024
810f1cf
More memory-history refactor
thewatermethod Jun 7, 2024
258c839
fix simple-git
GarrettEHill Jun 7, 2024
d239f94
Merge branch 'TTAHUB-2652/nodejs-20' of https://github.com/HHS/Head-S…
GarrettEHill Jun 7, 2024
b9905a5
Create libmime+5.3.5.patch
GarrettEHill Jun 7, 2024
1fd6552
Create @fastify+busboy+2.1.1.patch
GarrettEHill Jun 7, 2024
a64c600
Update yarn.lock
GarrettEHill Jun 7, 2024
04f2fe3
Revert "Create @fastify+busboy+2.1.1.patch"
GarrettEHill Jun 7, 2024
4941278
Revert "Create libmime+5.3.5.patch"
GarrettEHill Jun 7, 2024
d20c1a9
Revert "fix simple-git"
GarrettEHill Jun 7, 2024
fa1aac2
Update tsconfig.json
GarrettEHill Jun 7, 2024
6e814e5
jest!!!!!!!!!!!!!!!!
GarrettEHill Jun 8, 2024
5498ce5
Update lockManager.test.js
GarrettEHill Jun 10, 2024
f535182
Update index.test.js
GarrettEHill Jun 10, 2024
e9ff99b
Update reportCache.test.js
GarrettEHill Jun 10, 2024
56df51b
Update files.test.js
GarrettEHill Jun 10, 2024
a142336
Update lockManager.test.js
GarrettEHill Jun 10, 2024
04db916
Update resource.test.js
GarrettEHill Jun 10, 2024
c0f6330
Update index.test.js
GarrettEHill Jun 10, 2024
9769a21
Update sessionReports.test.js
GarrettEHill Jun 10, 2024
ee42d83
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 10, 2024
6588f09
Update yarn.lock
GarrettEHill Jun 10, 2024
5df6520
update aws lib
GarrettEHill Jun 10, 2024
08b044d
lint
GarrettEHill Jun 10, 2024
7089c95
Update s3.test.js
GarrettEHill Jun 10, 2024
e81de1b
Update s3.test.js
GarrettEHill Jun 10, 2024
a4bbe85
Update s3.test.js
GarrettEHill Jun 11, 2024
ecbda8b
Merge remote-tracking branch 'origin/TTAHUB-2652/nodejs-20' into TTAH…
thewatermethod Jun 11, 2024
37a11a4
Fix tough cookie
thewatermethod Jun 11, 2024
9252145
Down to about 100 tests
thewatermethod Jun 11, 2024
50c4533
Skip these for now
thewatermethod Jun 11, 2024
e486a0e
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 11, 2024
224cc5f
Update jest in FE
thewatermethod Jun 11, 2024
c36b9ab
Merge remote-tracking branch 'origin/TTAHUB-2652/nodejs-20' into TTAH…
thewatermethod Jun 11, 2024
9643a8c
Remove unneeded pass through ref
thewatermethod Jun 11, 2024
b514f44
Revert "Update jest in FE"
thewatermethod Jun 12, 2024
3aedc42
Update react-admin and some tests
thewatermethod Jun 12, 2024
7f7c4de
Fix group test
thewatermethod Jun 13, 2024
c822b17
Fix more tests
thewatermethod Jun 13, 2024
7e38e21
Fix more tests
thewatermethod Jun 13, 2024
0cf3d53
Fix print goals
thewatermethod Jun 13, 2024
0250fd4
Fix borked imort
thewatermethod Jun 13, 2024
0245576
Fix national center test
thewatermethod Jun 13, 2024
3946598
Fix typo and add router to approved report test
thewatermethod Jun 13, 2024
8c19665
Update MyGroups & TR form test
thewatermethod Jun 13, 2024
c523a4c
fix TR roundup tests
thewatermethod Jun 13, 2024
0a66347
Update goals & objective tests
thewatermethod Jun 13, 2024
619bb3f
Fix ViewTrainingReport & ReviewSubmit tests
thewatermethod Jun 13, 2024
a9706c9
Fix MyAlerts & Approver tests
thewatermethod Jun 13, 2024
ed5c1ec
Fix Submitter
thewatermethod Jun 13, 2024
ce8a807
Update another batch of tests
thewatermethod Jun 13, 2024
3152e54
Redo request errors admin page, fix assorted bugs found when testing
thewatermethod Jun 14, 2024
f6e5ed2
Add test for new hook
thewatermethod Jun 14, 2024
4f50cd9
More diag interface
thewatermethod Jun 14, 2024
4910822
Add error details test
thewatermethod Jun 14, 2024
a28c855
Remove unused component
thewatermethod Jun 14, 2024
af0f4c5
Add tests for new admin
thewatermethod Jun 14, 2024
376290a
site alerts appear to be restyled
thewatermethod Jun 14, 2024
2d5503a
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 14, 2024
0492ffd
some fixes
GarrettEHill Jun 17, 2024
9a973b9
Update authMiddleware.test.js
GarrettEHill Jun 17, 2024
9a2d29b
Update yarn-audit-known-issues
GarrettEHill Jun 18, 2024
cccd0f6
fix bug
GarrettEHill Jun 18, 2024
dcdff51
fix tests
GarrettEHill Jun 18, 2024
0a204dd
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 20, 2024
23a6c79
Update programmaticTransaction.test.js
GarrettEHill Jun 20, 2024
3dd1676
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 21, 2024
553ee1d
more test fixes
GarrettEHill Jun 21, 2024
d389aeb
fix more tests
GarrettEHill Jun 22, 2024
ed2d165
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 24, 2024
27b0ba5
Update CourseList.js
GarrettEHill Jun 24, 2024
3666de8
Update CourseList.js
GarrettEHill Jun 24, 2024
c8a264c
Update programmaticTransaction.test.js
GarrettEHill Jun 24, 2024
4e8f89f
Update s3.ts
GarrettEHill Jun 24, 2024
17c44ab
move to a non-obsolete version
GarrettEHill Jun 24, 2024
16fb162
more updates
GarrettEHill Jun 24, 2024
c2cf4f5
Update Courses.js
GarrettEHill Jun 24, 2024
2ff84b9
Update CourseEdit.js
GarrettEHill Jun 24, 2024
8b9edbb
Update CourseEdit.js
GarrettEHill Jun 24, 2024
dab2640
Update CourseEdit.js
GarrettEHill Jun 24, 2024
7d7e374
Update files.test.js
GarrettEHill Jun 24, 2024
1bb9494
Update monitoring.test.js
GarrettEHill Jun 24, 2024
5327081
Update objectives.test.js
GarrettEHill Jun 24, 2024
e067695
id collision
GarrettEHill Jun 24, 2024
b25f29d
Update index.test.js
GarrettEHill Jun 24, 2024
b2230fb
Update index.test.js
GarrettEHill Jun 24, 2024
099b7c4
Update programmaticTransaction.test.js
GarrettEHill Jun 24, 2024
31c22a7
Update db.test.js
GarrettEHill Jun 25, 2024
8d2693c
Fix another router test
thewatermethod Jun 25, 2024
59f480a
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jun 25, 2024
f206981
it needs to use an invalid name for the fail path
GarrettEHill Jun 25, 2024
7c426af
Update ResourcesDashboardOverview.js
GarrettEHill Jun 25, 2024
318123e
Update programmaticTransaction.test.js
GarrettEHill Jun 25, 2024
0f0730d
better mocking
GarrettEHill Jun 25, 2024
a0f43ef
all test pass local, but one fail in ci. need to see whats going on i…
GarrettEHill Jun 26, 2024
c5c26cc
still trying to find the issue
GarrettEHill Jun 26, 2024
e604adb
20.12.2 is no longer supported on build pack... switch to 20.15.0
GarrettEHill Jul 11, 2024
9ecc585
Merge main
thewatermethod Jul 12, 2024
f8cac10
Commit notFound, exclude from lint
thewatermethod Jul 12, 2024
ac371b9
Update yarn-audit-known-issues
GarrettEHill Jul 12, 2024
d1f1a12
Update package.json
GarrettEHill Jul 12, 2024
14e5ece
add pre/post cleanup to fix intermittent failed migrations
GarrettEHill Jul 12, 2024
ef0ce2a
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jul 15, 2024
a3cf4eb
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jul 24, 2024
1d206bd
20.15.1
GarrettEHill Jul 30, 2024
a6d7015
Update programmaticTransaction.ts
GarrettEHill Jul 30, 2024
3ccadcf
Update yarn-audit-known-issues
GarrettEHill Jul 30, 2024
d08d4fb
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Jul 31, 2024
6262e33
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Aug 1, 2024
8613ef7
Update yarn-audit-known-issues
GarrettEHill Aug 1, 2024
62b9581
Update s3.test.js
GarrettEHill Aug 1, 2024
bd1594d
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Aug 1, 2024
975837e
Update s3.test.js
GarrettEHill Aug 1, 2024
06a42a0
fix leaking temp tables
GarrettEHill Aug 1, 2024
888b100
Update 20231027150000-remove-test-fei-goals.js
GarrettEHill Aug 1, 2024
c4da172
clean up temp tables
GarrettEHill Aug 1, 2024
8620e6a
Update 20240311000000-add-effectivedate_for_migrated_personnel.js
GarrettEHill Aug 1, 2024
4728a79
Update 20240625000000-correct-fei-root-cause.js
GarrettEHill Aug 1, 2024
d5202e5
Update 20240627000000-uncomplete_trs_and_remove_goals.js
GarrettEHill Aug 1, 2024
ecdb626
Monitor database does not need to be run twice on the same job
GarrettEHill Aug 2, 2024
5810b4e
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Aug 2, 2024
2e031ab
Update yarn.lock
GarrettEHill Aug 2, 2024
2402d8c
Update s3.test.js
GarrettEHill Aug 2, 2024
a44759f
Merge branch 'main' into TTAHUB-2652/nodejs-20
GarrettEHill Aug 21, 2024
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
9 changes: 2 additions & 7 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: cimg/node:18.20.3-browsers
- image: cimg/node:20.15.1-browsers
docker-postgres-executor:
docker:
- image: cimg/node:18.20.3-browsers
- image: cimg/node:20.15.1-browsers
environment:
DATABASE_URL: postgresql://postgres@localhost/ttasmarthub
- image: cimg/postgres:15.6
Expand Down Expand Up @@ -790,11 +790,6 @@ jobs:
name: Install playwright dependencies
command: |
npx playwright install
- run:
name: Monitor database
command: |
docker attach $(docker ps | grep postgres | awk '{print $1}')
background: true
- run:
name: Run playwright tests
command: yarn e2e:ci
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.3
20.15.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM node:18.20.3
FROM node:20.15.1
WORKDIR /app
RUN apt-get update && apt-get install lcov -y
2 changes: 1 addition & 1 deletion docker-compose.dss.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.2"
version: "3.7"
services:
server:
build:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.5"
version: "3.7"
services:
test-backend:
build:
Expand Down
17 changes: 10 additions & 7 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"@hookform/error-message": "^0.0.5",
"@react-hook/resize-observer": "^1.2.6",
"@trussworks/react-uswds": "^6.2.0",
"@silevis/reactgrid": "3.1",
"@trussworks/react-uswds": "4.1.1",
"@ttahub/common": "^2.1.5",
"@use-it/interval": "^1.0.0",
"async": "^3.2.3",
Expand All @@ -35,7 +35,6 @@
"prop-types": "^15.7.2",
"query-string": "^7.0.0",
"react": "^17.0.1",
"react-admin": "^3.19.12",
"react-app-polyfill": "^3.0.0",
"react-dom": "^17.0.1",
"react-draft-wysiwyg": "^1.14.6",
Expand All @@ -48,8 +47,8 @@
"react-js-pagination": "^3.0.3",
"react-plotly.js": "^2.5.1",
"react-responsive": "^8.1.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-router": "^6.23.1",
"react-router-dom": "^6.23.1",
"react-router-hash-link": "^2.3.1",
"react-router-prop-types": "^1.0.5",
"react-select": "^5.7.4",
Expand All @@ -61,7 +60,7 @@
"uuid": "^8.3.2"
},
"engines": {
"node": "18.20.3"
"node": "20.15.1"
},
"scripts": {
"start": "cross-env DISABLE_ESLINT_PLUGIN=true react-scripts start",
Expand Down Expand Up @@ -94,7 +93,7 @@
"minimatch": "^3.0.5",
"postcss": "^8.4.31",
"decode-uri-component": "^0.2.1",
"tough-cookie": "^4.0.0",
"tough-cookie": "4.0.0",
"ua-parser-js": "^0.7.33",
"webpack": "^5.76.1",
"yaml": "^2.2.2",
Expand Down Expand Up @@ -150,7 +149,10 @@
},
"babel": {
"presets": [
"@babel/preset-react"
"@babel/preset-react",
["react-app", {
"absoluteRuntime": false
}]
]
},
"browserslist": {
Expand All @@ -166,6 +168,7 @@
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@sheerun/mutationobserver-shim": "^0.3.3",
"@testing-library/dom": "^8.11.1",
"@testing-library/jest-dom": "^5.11.9",
Expand Down
Loading