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

Upgrade core dependencies + dev node variable #213

Closed
wants to merge 7 commits into from
Closed
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: install node
uses: actions/setup-node@v2
with:
node-version: "16"
node-version: "18"
- uses: bahmutov/npm-install@v1
- name: Linting
run: yarn lint
Expand All @@ -42,7 +42,7 @@ jobs:
- name: install node
uses: actions/setup-node@v2
with:
node-version: "16"
node-version: "18"
- uses: bahmutov/npm-install@v1
- name: Checks for duplicate definitions in the yarn lockfile
run: yarn yarn-deduplicate --fail
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: install node
uses: actions/setup-node@v2
with:
node-version: "16"
node-version: "18"
- uses: bahmutov/npm-install@v1

- run: yarn test --coverage --detectOpenHandles
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- name: install node
uses: actions/setup-node@v2
with:
node-version: "16"
node-version: "18"

- uses: bahmutov/npm-install@v1

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build environment
FROM node:16-alpine as build
FROM node:18-alpine as build
WORKDIR /app
# Install deps
COPY package.json /app/package.json
Expand All @@ -26,9 +26,6 @@ RUN apk update && apk add wget && rm -rf /var/cache/apk/* \
&& wget "https://s3.amazonaws.com/rds-downloads/rds-ca-2019-root.pem"
ENV dbCertPath /app/rds-ca-2019-root.pem

# Required for Prisma compatibility since Node 16.16
RUN apk add --update --no-cache openssl1.1-compat

ENV NODE_ENV=prod

ENTRYPOINT ["/app/entrypoint.sh"]
Expand Down
4 changes: 2 additions & 2 deletions babel.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"@babel/preset-env",
{
"targets": {
"node": "16"
"node": "18"
}
}
],
"@babel/preset-typescript"
],
"plugins": ["@babel/plugin-proposal-class-properties"],
"plugins": ["@babel/plugin-transform-class-properties"],
"ignore": ["node_modules"]
}
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,15 @@
},
"main": "yarn prod",
"dependencies": {
"@babel/core": "^7.10.2",
"@babel/node": "^7.0.0",
"@babel/core": "^7.23.7",
"@babel/helper-compilation-targets": "^7.23.6",
"@babel/node": "^7.22.19",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-transform-class-properties": "^7.23.3",
"@babel/register": "^7.0.0",
"@elastic/elasticsearch": "7.13.0",
"@elastic/elasticsearch": "6",
"@prisma/client": "^4.5.0",
"@types/node": "18",
"@typescript-eslint/typescript-estree": "^5.10.2",
"amplitude": "^5.2.0",
"apollo-server": "^3.6.2",
Expand All @@ -81,7 +84,7 @@
"express": "^4.17.3",
"fs-extra": "^10.0.0",
"got": "^11.8.2",
"graphql": "^16.3.0",
"graphql": "^16.8.1",
"graphql-type-json": "^0.3.0",
"he": "^1.2.0",
"jsonwebtoken": "^9.0.0",
Expand Down Expand Up @@ -116,7 +119,6 @@
"@types/jsonwebtoken": "^8.5.6",
"@types/lodash": "^4.14.150",
"@types/msgpack5": "^3.4.2",
"@types/node": "^14.18.0",
"@types/request": "^2.48.7",
"@types/request-promise-native": "^1.0.18",
"@types/urijs": "^1.19.17",
Expand Down Expand Up @@ -160,6 +162,6 @@
"Older versions may lead to unexpected errors due to dependency issues, etc."
],
"engines": {
"node": ">=16"
"node": "18.x"
}
}
3 changes: 2 additions & 1 deletion template.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ CLIENT_ORIGIN=http://localhost:5000
JWT_SECRET=

# This is only used for local development
POSTGRES_PASSWORD=default_password
POSTGRES_PASSWORD=default_password
NODE_ENV=dev
2 changes: 1 addition & 1 deletion tests/database/dumpProcessor.test.seq.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function createDummyCourseForTermId(termId: string): ParsedCourseSR {
minCredits: 2009,
lastUpdateTime: 0,
college: "Harvard University",
feeAmount: Number.MAX_SAFE_INTEGER,
feeAmount: 214748647, //Max value of a 32-bit integer (prisma ints are 32-bit)
feeDescription: "giving day :)",
};
}
Expand Down
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"resolveJsonModule": true,
"lib": ["es2021"],
"skipLibCheck": true,
"downlevelIteration": true
"downlevelIteration": true,
"jsx": "preserve",
"incremental": true
},
"exclude": ["node_modules"]
}
Loading
Loading