Skip to content

Commit

Permalink
chore(deps): update all dependencies incl typeorm 0.2.0 -> 0.3.0 (#405)
Browse files Browse the repository at this point in the history
Major update of all dependencies
  • Loading branch information
annarhughes authored Apr 15, 2024
1 parent 1aaf01d commit 2457feb
Show file tree
Hide file tree
Showing 98 changed files with 5,292 additions and 6,442 deletions.
22 changes: 0 additions & 22 deletions .eslintrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Use NodeJs
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '20.x'
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Run prettier
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"source.fixAll.eslint": "explicit"
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"eslint.experimental.useFlatConfig": true,
"vetur.format.defaultFormatterOptions": {
"prettier": {
"singleQuote": true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine
FROM node:20-alpine

# Install git for devcontainers
RUN apk add --no-cache git
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ For a more detailed explanation of this project's key concepts and architecture,

### Prerequisites

- NodeJS v16.x
- NodeJS v20.x
- Yarn v1.x
- Docker

Expand Down Expand Up @@ -235,6 +235,7 @@ Formatting and linting is provided by ESLint and Prettier (see the relevant conf
Workspace settings for VSCode are included for consistent linting and formatting.

### Seed Local Database

If you're a volunteer, add data to your local database by seeding it with a backup file. Please [read our Tech Volunteer Guide](https://www.notion.so/chayn/Tech-volunteer-wiki-5356c7118c134863a2e092e9df6cbc34?pvs=4#0fb25ffde84f4854b2d9730200eee283) for directions on seeding the local database.

If you're staff and have access to Heroku, you also have the option to seed the database via the following script. Before you start, make sure:
Expand Down
28 changes: 28 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* eslint-disable */
const eslintJs = require('@eslint/js');
const tsEslint = require('typescript-eslint');
const eslintPrettier = require('eslint-config-prettier');

module.exports = [
eslintJs.configs.recommended,
...tsEslint.configs.recommended,
eslintPrettier,
{
languageOptions: {
globals: {
node: true,
require: true,
jest: true,
},
},
plugins: { tsEslint },
rules: {
'@/interface-name-prefix': 'off',
'@/explicit-function-return-type': 'off',
'@/explicit-module-boundary-types': 'off',
'@/no-explicit-any': 'off',
'@/no-unused-vars': ['error', { ignoreRestSiblings: true }],
},
ignores: ['eslint.config.js', 'dist/*'],
},
];
32 changes: 0 additions & 32 deletions ormconfig.ts

This file was deleted.

103 changes: 50 additions & 53 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,69 +21,66 @@
"test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json",
"typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js",
"seed": "bash ./staging_backup.sh -c",
"migration:generate": "yarn build && yarn typeorm -- migration:generate -n bloom-backend",
"migration:run": "yarn build && yarn typeorm -- migration:run",
"migration:revert": "yarn typeorm -- migration:revert",
"typeorm": "typeorm-ts-node-commonjs",
"migration:generate": "yarn typeorm -- -d ./src/typeorm.config.ts migration:generate ./src/migrations/bloom-backend",
"migration:run": "yarn typeorm migration:run -- -d ./src/typeorm.config.ts",
"migration:revert": "yarn typeorm -- -d ./src/typeorm.config.ts migration:revert",
"migration:show": "yarn build && yarn typeorm -- migration:show"
},
"dependencies": {
"@mailchimp/mailchimp_transactional": "^1.0.47",
"@nestjs/common": "^8.0.0",
"@nestjs/config": "^1.0.2",
"@nestjs/core": "^9.0.5",
"@nestjs/passport": "^8.0.1",
"@nestjs/platform-express": "^8.0.0",
"@nestjs/swagger": "^5.1.4",
"@nestjs/typeorm": "^8.0.2",
"@types/lodash": "^4.14.176",
"axios": "^0.24.0",
"class-transformer": "^0.4.0",
"class-validator": "^0.14.0",
"date-fns": "^2.30.0",
"dotenv": "^10.0.0",
"firebase": "^9.4.1",
"firebase-admin": "^10.0.0",
"@nestjs/common": "^10.3.6",
"@nestjs/config": "^3.2.2",
"@nestjs/core": "^10.3.6",
"@nestjs/platform-express": "^10.3.7",
"@nestjs/swagger": "^7.3.1",
"@nestjs/typeorm": "^10.0.2",
"axios": "^1.6.8",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
"firebase": "^10.10.0",
"firebase-admin": "^12.0.0",
"lodash": "^4.17.21",
"newrelic": "^11.8.0",
"passport": "^0.5.0",
"passport-firebase-jwt": "^1.2.1",
"pg": "^8.7.1",
"pg-connection-string": "^2.5.0",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rollbar": "^2.24.0",
"rxjs": "^7.2.0",
"storyblok-js-client": "^4.2.0",
"swagger-ui-express": "^4.1.6",
"typeorm": "^0.2.38"
"newrelic": "^11.15.0",
"pg": "^8.11.5",
"pg-connection-string": "^2.6.4",
"reflect-metadata": "^0.2.1",
"rimraf": "^5.0.5",
"rollbar": "^2.26.4",
"rxjs": "^7.8.1",
"storyblok-js-client": "^6.7.1",
"typeorm": "^0.3.20"
},
"devDependencies": {
"@golevelup/ts-jest": "^0.3.2",
"@nestjs/cli": "^8.0.0",
"@nestjs/schematics": "^8.0.0",
"@nestjs/testing": "^8.0.0",
"@types/express": "^4.17.13",
"@types/jest": "^27.0.1",
"@types/node": "^16.0.0",
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^4.28.2",
"@typescript-eslint/parser": "^4.28.2",
"eslint": "^7.30.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"jest": "^27.0.6",
"prettier": "^2.3.2",
"supertest": "^6.1.3",
"ts-jest": "^27.0.3",
"ts-loader": "^9.2.3",
"ts-node": "^10.0.0",
"tsconfig-paths": "^3.10.1",
"typescript": "^4.3.5"
"@eslint/js": "^9.0.0",
"@golevelup/ts-jest": "^0.5.0",
"@nestjs/cli": "^10.3.2",
"@nestjs/schematics": "^10.1.1",
"@nestjs/testing": "^10.3.6",
"@types/date-fns": "^2.6.0",
"@types/express": "^4.17.21",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.0",
"@types/node": "^20.12.5",
"@types/supertest": "^6.0.2",
"eslint": "^9.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"jest": "^29.7.0",
"prettier": "^3.2.5",
"supertest": "^6.3.4",
"ts-jest": "^29.1.2",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.4.5",
"typescript-eslint": "^7.6.0"
},
"engines": {
"node": "16.x",
"node": "20.x",
"yarn": "1.x"
},
"jest": {
Expand Down
16 changes: 6 additions & 10 deletions src/api/apiCalls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@ const apiCall = async ({
data,
url,
}: ApiCallRequestOptions): Promise<AxiosResponse> => {
try {
return await axios({
method: type,
url,
data,
headers,
});
} catch (error) {
throw error;
}
return await axios({
method: type,
url,
data,
headers,
});
};

export default apiCall;
Loading

0 comments on commit 2457feb

Please sign in to comment.