Skip to content

Commit 5c87627

Browse files
authored
Merge pull request #1288 from Northeastern-Electric-Racing/#625-node-18-cleanup
#625 Migrate to Node 18
2 parents 3c27279 + c4d08be commit 5c87627

10 files changed

Lines changed: 21 additions & 31 deletions

File tree

.github/workflows/lint-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Node.js
2020
uses: actions/setup-node@v3
2121
with:
22-
node-version: 16.15.1
22+
node-version: 18.17.1
2323
cache: 'yarn'
2424
- name: Install modules
2525
run: yarn install && yarn prisma:generate

.github/workflows/prettier-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Node.js
2020
uses: actions/setup-node@v3
2121
with:
22-
node-version: 16.15.1
22+
node-version: 18.17.1
2323
cache: 'yarn'
2424
- name: Install modules
2525
run: yarn install

.github/workflows/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Node.js
2424
uses: actions/setup-node@v3
2525
with:
26-
node-version: 16.15.1
26+
node-version: 18.17.1
2727
cache: 'yarn'
2828
- name: Install modules
2929
run: yarn install && yarn prisma:generate

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:16.15.1
1+
FROM node:18.17.1
22
WORKDIR /base
33
COPY package.json .
44
COPY .yarn .

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@babel/preset-typescript": "^7.18.6",
4646
"@testing-library/jest-dom": "^5.16.4",
4747
"@types/jest": "^28.1.6",
48-
"@types/node": "^18.11.10",
48+
"@types/node": "18.17.1",
4949
"@types/nodemailer": "^6.4.7",
5050
"@types/react-query": "^1.2.9",
5151
"@typescript-eslint/eslint-plugin": "^4.18.0",

src/backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@types/express-pino-logger": "4.0.2",
3636
"@types/jsonwebtoken": "^8.5.9",
3737
"@types/multer": "^1.4.7",
38-
"@types/node": "^14.0.9",
38+
"@types/node": "18.17.1",
3939
"@types/supertest": "^2.0.12",
4040
"nodemon": "^2.0.16",
4141
"prisma": "^4.4.0",

src/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"devDependencies": {
4444
"@testing-library/dom": "^8.19.0",
4545
"@testing-library/react-hooks": "^8.0.1",
46-
"@types/node": "^12.0.0",
46+
"@types/node": "18.17.1",
4747
"@types/react": "^17.0.1",
4848
"@types/react-dom": "^17.0.1",
4949
"@types/react-helmet": "^6.1.6",

src/frontend/src/tests/pages/ChangeRequestDetailPage/ReviewChangeRequest.test.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { render, screen, routerWrapperBuilder } from '../../test-support/test-ut
77
import { routes } from '../../../utils/routes';
88
import { exampleStandardChangeRequest } from '../../test-support/test-data/change-requests.stub';
99
import ReviewChangeRequest from '../../../pages/ChangeRequestDetailPage/ReviewChangeRequest';
10+
import { ChangeRequestStatus } from 'shared';
1011

1112
const renderComponent = (modalShow: boolean, route: string) => {
1213
const RouterWrapper = routerWrapperBuilder({ path: routes.CHANGE_REQUESTS_BY_ID, route });
@@ -31,7 +32,10 @@ const renderComponent = (modalShow: boolean, route: string) => {
3132
workPackageNumber: 0
3233
},
3334
dateSubmitted: new Date(),
34-
type: 'ISSUE'
35+
type: 'ISSUE',
36+
wbsName: 'a',
37+
status: ChangeRequestStatus.Open,
38+
requestedReviewers: []
3539
}}
3640
modalShow={modalShow}
3741
handleClose={() => null}

src/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "",
1212
"license": "ISC",
1313
"devDependencies": {
14-
"@types/node": "^14.0.9",
14+
"@types/node": "18.17.1",
1515
"ts-node": "^8.10.1",
1616
"typescript": "^4.1.5"
1717
}

yarn.lock

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3806,24 +3806,10 @@ __metadata:
38063806
languageName: node
38073807
linkType: hard
38083808

3809-
"@types/node@npm:^12.0.0":
3810-
version: 12.20.55
3811-
resolution: "@types/node@npm:12.20.55"
3812-
checksum: e4f86785f4092706e0d3b0edff8dca5a13b45627e4b36700acd8dfe6ad53db71928c8dee914d4276c7fd3b6ccd829aa919811c9eb708a2c8e4c6eb3701178c37
3813-
languageName: node
3814-
linkType: hard
3815-
3816-
"@types/node@npm:^14.0.9":
3817-
version: 14.18.53
3818-
resolution: "@types/node@npm:14.18.53"
3819-
checksum: 3acbcf4e38cdc5999c824db5c6689ca8f4a185562aad5c0263d9859381d8590a16e6a72343aeb30d48ff9a7ac9b6ae259bcb8c2d594703a30d12277904524704
3820-
languageName: node
3821-
linkType: hard
3822-
3823-
"@types/node@npm:^18.11.10":
3824-
version: 18.16.19
3825-
resolution: "@types/node@npm:18.16.19"
3826-
checksum: 63c31f09616508aa7135380a4c79470a897b75f9ff3a70eb069e534dfabdec3f32fb0f9df5939127f1086614d980ddea0fa5e8cc29a49103c4f74cd687618aaf
3809+
"@types/node@npm:18.17.1":
3810+
version: 18.17.1
3811+
resolution: "@types/node@npm:18.17.1"
3812+
checksum: 56201bda9a2d05d68602df63b4e67b0545ac8c6d0280bd5fb31701350a978a577a027501fbf49db99bf177f2242ebd1244896bfd35e89042d5bd7dfebff28d4e
38273813
languageName: node
38283814
linkType: hard
38293815

@@ -5543,7 +5529,7 @@ __metadata:
55435529
"@types/express-pino-logger": 4.0.2
55445530
"@types/jsonwebtoken": ^8.5.9
55455531
"@types/multer": ^1.4.7
5546-
"@types/node": ^14.0.9
5532+
"@types/node": 18.17.1
55475533
"@types/supertest": ^2.0.12
55485534
body-parser: ^1.19.0
55495535
concat-stream: ^2.0.0
@@ -9644,7 +9630,7 @@ __metadata:
96449630
"@babel/preset-typescript": ^7.18.6
96459631
"@testing-library/jest-dom": ^5.16.4
96469632
"@types/jest": ^28.1.6
9647-
"@types/node": ^18.11.10
9633+
"@types/node": 18.17.1
96489634
"@types/nodemailer": ^6.4.7
96499635
"@types/react-query": ^1.2.9
96509636
"@typescript-eslint/eslint-plugin": ^4.18.0
@@ -9841,7 +9827,7 @@ __metadata:
98419827
"@testing-library/react-hooks": ^8.0.1
98429828
"@testing-library/user-event": ^12.6.3
98439829
"@types/file-saver": ^2.0.5
9844-
"@types/node": ^12.0.0
9830+
"@types/node": 18.17.1
98459831
"@types/react": ^17.0.1
98469832
"@types/react-dom": ^17.0.1
98479833
"@types/react-helmet": ^6.1.6
@@ -17771,7 +17757,7 @@ __metadata:
1777117757
version: 0.0.0-use.local
1777217758
resolution: "shared@workspace:src/shared"
1777317759
dependencies:
17774-
"@types/node": ^14.0.9
17760+
"@types/node": 18.17.1
1777517761
ts-node: ^8.10.1
1777617762
typescript: ^4.1.5
1777717763
languageName: unknown

0 commit comments

Comments
 (0)