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.

Sign up for GitHub

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

⬇️ Merge release v5.2 to dev branch with typeorm syntax updates for feature flag #1878

Merged
merged 5 commits into from
Sep 4, 2024
Merged

⬇️ Merge release v5.2 to dev branch with typeorm syntax updates for feature flag #1878

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9b3832
Merge release v5.2 to dev branch with typeorm syntax updates for ff
ppratikcr7 Aug 28, 2024
e278544
updates to datasource typeloader to remove excess changes to migratio…
ppratikcr7 Sep 3, 2024
b2012d7
Merge branch 'dev' of https://github.com/CarnegieLearningWeb/UpGrade …
ppratikcr7 Sep 4, 2024
de0ffed
Merge branch 'dev' of https://github.com/CarnegieLearningWeb/UpGrade …
ppratikcr7 Sep 4, 2024
26ecb81
fix for feature flag failed test case due to typeorm changes
ppratikcr7 Sep 4, 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
1 change: 1 addition & 0 deletions backend/packages/Upgrade/.env.docker.local.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ APP_BANNER=true
APP_DEMO=false
CACHING_ENABLED=false
CACHING_TTL=10
USE_NEW_RELIC=false

#
# LOGGING
Expand Down
227 changes: 128 additions & 99 deletions backend/packages/Upgrade/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions backend/packages/Upgrade/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"seed": "npm start db.seed",
"drop": "npm start db.drop",
"help": "npm start help",
"migration:generate": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:generate -n",
"migration:create": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:create -n",
"migration:run": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:run",
"migration:revert": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:revert"
"migration:generate": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:generate src/database/migrations/$name -d src/loaders/typeormLoader.ts",
"migration:create": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:create src/database/migrations/$name",
"migration:run": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:run -d src/loaders/typeormLoader.ts",
"migration:revert": "./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/typeorm migration:revert -d src/loaders/typeormLoader.ts"
},
"keywords": [],
"author": "",
Expand Down Expand Up @@ -53,7 +53,7 @@
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tslib": "^2.3.1",
"typeorm-seeding": "^1.2.0"
"typeorm-seeding": "^1.6.1"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.633.0",
Expand All @@ -64,7 +64,7 @@
"@golevelup/ts-jest": "^0.4.0",
"@nestjs/common": "^10.3.0",
"@nestjs/testing": "^10.3.0",
"@nestjs/typeorm": "^10.0.1",
"@nestjs/typeorm": "^10.0.2",
"@types/supertest": "^6.0.2",
"body-parser": "^1.20.1",
"cache-manager": "^5.3.2",
Expand Down Expand Up @@ -107,8 +107,7 @@
"swagger-ui-express": "^5.0.0",
"ts-jest": "^29.1.1",
"typedi": "^0.8.0",
"typeorm": "^0.2.20",
"typeorm-typedi-extensions": "^0.4.1",
"typeorm": "^0.3.20",
"typescript": "^5.3.3",
"uuid": "^9.0.1",
"winston": "^3.2.1",
Expand Down
Loading