Skip to content

Commit befc8cb

Browse files
rahul-rocketrahul-rocket
authored
Merge pull request #8715 from ever-co/fix/packages-update
[Chore] Package Updates
2 parents 0826b1b + f092455 commit befc8cb

File tree

24 files changed

+220
-1117
lines changed

24 files changed

+220
-1117
lines changed

‎.cspell.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
"Codacy",
6060
"codecov",
6161
"Codegen",
62-
"codelyzer",
6362
"Codementor",
6463
"codeql",
6564
"commitlint",
@@ -546,7 +545,8 @@
546545
"apistageda",
547546
"elif",
548547
"appleboy",
549-
"apidemoda"
548+
"apidemoda",
549+
"forin"
550550
],
551551
"useGitignore": true,
552552
"ignorePaths": [

‎.deploy/api/entrypoint.compose.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,5 @@ export WAIT_HOSTS=$DB_HOST:$DB_PORT
88
# in Docker Compose we should wait other services start
99
./wait
1010

11-
# echo 'Version of PM2 …'
12-
# pm2 --version
13-
14-
# echo 'Resetting PM2 Metadata …'
15-
# pm2 reset all
16-
17-
# echo 'Updating PM2 …'
18-
# pm2 update
19-
2011
echo 'Starting …'
2112
exec "$@"

‎.deploy/api/entrypoint.prod.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,5 @@ set -ex
33

44
# This Entrypoint used when we run Docker container outside of Docker Compose (e.g. in k8s)
55

6-
# echo 'Version of PM2 …'
7-
# pm2 --version
8-
9-
# echo 'Resetting PM2 Metadata …'
10-
# pm2 reset all
11-
12-
# echo 'Updating PM2 …'
13-
# pm2 update
14-
156
echo 'Starting …'
167
exec "$@"

‎apps/desktop-timer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@angular/forms": "18.2.12",
4141
"@angular/material": "18.2.14",
4242
"@angular/router": "18.2.12",
43-
"@datorama/akita": "^7.1.1",
43+
"@datorama/akita": "^8.0.1",
4444
"@datorama/akita-ngdevtools": "^7.0.0",
4545
"@electron/remote": "^2.0.8",
4646
"@grpc/grpc-js": "^1.6.7",

‎apps/desktop-timer/src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
]
132132
},
133133
"dependencies": {
134-
"@datorama/akita": "^7.1.1",
134+
"@datorama/akita": "^8.0.1",
135135
"@datorama/akita-ngdevtools": "^7.0.0",
136136
"@electron/remote": "^2.0.8",
137137
"@gauzy/contracts": "file:../../../dist/packages/contracts",

‎apps/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@angular/forms": "18.2.12",
4242
"@angular/material": "18.2.14",
4343
"@angular/router": "18.2.12",
44-
"@datorama/akita": "^7.1.1",
44+
"@datorama/akita": "^8.0.1",
4545
"@datorama/akita-ngdevtools": "^7.0.0",
4646
"@electron/remote": "^2.0.8",
4747
"@grpc/grpc-js": "^1.6.7",

‎apps/desktop/src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
},
143143
"dependencies": {
144144
"@datorama/akita-ngdevtools": "^7.0.0",
145-
"@datorama/akita": "^7.1.1",
145+
"@datorama/akita": "^8.0.1",
146146
"@electron/remote": "^2.0.8",
147147
"@gauzy/auth": "file:../../../dist/packages/auth",
148148
"@gauzy/common": "file:../../../dist/packages/common",

‎apps/gauzy/package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
"@asymmetrik/ngx-leaflet": "^18.0.1",
4141
"@cloudinary/ng": "^2.0.0",
4242
"@cloudinary/url-gen": "^1.14.0",
43-
"@datorama/akita": "^7.1.1",
43+
"@datorama/akita": "^8.0.1",
4444
"@datorama/akita-ngdevtools": "^7.0.0",
4545
"@electron/remote": "^2.0.8",
46-
"@fortawesome/angular-fontawesome": "^0.10.1",
47-
"@fortawesome/fontawesome-free": "^6.0.0",
48-
"@fortawesome/fontawesome-svg-core": "^1.3.0",
49-
"@fortawesome/free-brands-svg-icons": "^6.0.0",
50-
"@fortawesome/free-regular-svg-icons": "^6.0.0",
51-
"@fortawesome/free-solid-svg-icons": "^6.0.0",
46+
"@fortawesome/angular-fontawesome": "^0.15.0",
47+
"@fortawesome/fontawesome-free": "^6.7.2",
48+
"@fortawesome/fontawesome-svg-core": "^6.7.2",
49+
"@fortawesome/free-brands-svg-icons": "^6.7.2",
50+
"@fortawesome/free-regular-svg-icons": "^6.7.2",
51+
"@fortawesome/free-solid-svg-icons": "^6.7.2",
5252
"@fullcalendar/angular": "^6.1.15",
5353
"@fullcalendar/bootstrap": "^6.1.15",
5454
"@fullcalendar/core": "^6.1.15",
@@ -126,7 +126,6 @@
126126
"keycloak-js": "^11.0.2",
127127
"leaflet": "^1.8.0",
128128
"locutus": "^2.0.30",
129-
"mobx": "^6.13.5",
130129
"moment": "^2.30.1",
131130
"moment-duration-format": "^2.3.2",
132131
"moment-range": "^4.0.2",

‎apps/server-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@angular/forms": "18.2.12",
4141
"@angular/material": "18.2.14",
4242
"@angular/router": "18.2.12",
43-
"@datorama/akita": "^7.1.1",
43+
"@datorama/akita": "^8.0.1",
4444
"@datorama/akita-ngdevtools": "^7.0.0",
4545
"@electron/remote": "^2.0.8",
4646
"@grpc/grpc-js": "^1.6.7",

‎apps/server-api/src/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@
131131
},
132132
"dependencies": {
133133
"@datorama/akita-ngdevtools": "^7.0.0",
134-
"@datorama/akita": "^7.1.1",
134+
"@datorama/akita": "^8.0.1",
135135
"@electron/remote": "^2.0.8",
136+
"@fastify/swagger": "^9.4.0",
136137
"@gauzy/auth": "file:../../../dist/packages/auth",
137138
"@gauzy/utils": "file:../../../dist/packages/utils",
138139
"@gauzy/config": "file:../../../dist/packages/config",
@@ -248,9 +249,6 @@
248249
"@nestjsx/crud-typeorm": "^5.0.0-alpha.3",
249250
"@opentelemetry/api": "^1.4.1",
250251
"@sentry/hub": "^7.101.1",
251-
"apollo-server-core": "^3.10.1",
252-
"apollo-server-express": "^3.5.0",
253-
"apollo-server-fastify": "^3.5.0",
254252
"app-root-path": "^3.0.0",
255253
"archiver": "^5.3.0",
256254
"atlassian-connect-express": "^8.5.0",
@@ -277,7 +275,6 @@
277275
"express": "^4.21.2",
278276
"express-session": "^1.18.1",
279277
"fast-json-stringify": "^2.4.1",
280-
"fastify-swagger": "^4.12.4",
281278
"fs-extra": "^10.1.0",
282279
"graphql": "^16.10.0",
283280
"graphql-playground-middleware-express": "^1.7.23",

‎apps/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@angular/forms": "18.2.12",
3838
"@angular/material": "18.2.14",
3939
"@angular/router": "18.2.12",
40-
"@datorama/akita": "^7.1.1",
40+
"@datorama/akita": "^8.0.1",
4141
"@datorama/akita-ngdevtools": "^7.0.0",
4242
"@electron/remote": "^2.0.8",
4343
"@grpc/grpc-js": "^1.6.7",

‎apps/server/src/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
},
132132
"dependencies": {
133133
"@datorama/akita-ngdevtools": "^7.0.0",
134-
"@datorama/akita": "^7.1.1",
134+
"@datorama/akita": "^8.0.1",
135135
"@electron/remote": "^2.0.8",
136136
"@gauzy/auth": "file:../../../dist/packages/auth",
137137
"@gauzy/utils": "file:../../../dist/packages/utils",
@@ -215,6 +215,7 @@
215215
"@aws-sdk/client-s3": "^3.717.0",
216216
"@aws-sdk/s3-request-presigner": "^3.717.0",
217217
"@faker-js/faker": "8.0.0-alpha.0",
218+
"@fastify/swagger": "^9.4.0",
218219
"@godaddy/terminus": "^4.12.1",
219220
"@grpc/grpc-js": "^1.7.3",
220221
"@honeycombio/opentelemetry-node": "0.6.1",
@@ -248,9 +249,6 @@
248249
"@nestjsx/crud-typeorm": "^5.0.0-alpha.3",
249250
"@opentelemetry/api": "^1.4.1",
250251
"@sentry/hub": "^7.101.1",
251-
"apollo-server-core": "^3.10.1",
252-
"apollo-server-express": "^3.5.0",
253-
"apollo-server-fastify": "^3.5.0",
254252
"app-root-path": "^3.0.0",
255253
"archiver": "^5.3.0",
256254
"atlassian-connect-express": "^8.5.0",
@@ -277,7 +275,6 @@
277275
"express": "^4.21.2",
278276
"express-session": "^1.18.1",
279277
"fast-json-stringify": "^2.4.1",
280-
"fastify-swagger": "^4.12.4",
281278
"fs-extra": "^10.1.0",
282279
"graphql": "^16.10.0",
283280
"graphql-playground-middleware-express": "^1.7.23",

‎package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@
391391
"@angular/platform-browser-dynamic": "18.2.12",
392392
"@angular/router": "18.2.12",
393393
"@angular/service-worker": "18.2.12",
394+
"@fortawesome/angular-fontawesome": "^0.15.0",
394395
"@nebular/auth": "^14.0.2",
395396
"@nebular/bootstrap": "^9.1.0-rc.6",
396397
"@nebular/eva-icons": "^14.0.2",
@@ -410,6 +411,7 @@
410411
"jsdom": "^23.0.1",
411412
"lodash-es": "^4.17.21",
412413
"minizlib": "^2.1.2",
414+
"mobx": "~4.14.1",
413415
"parse5": "^7.1.2",
414416
"reflect-metadata": "^0.2.2",
415417
"rxjs": "^7.8.0",
@@ -424,9 +426,9 @@
424426
"@angular-devkit/build-ng-packagr": "^0.1002.0",
425427
"@angular-devkit/core": "^18.2.9",
426428
"@angular-devkit/schematics": "18.2.9",
427-
"@angular-eslint/eslint-plugin": "18.0.1",
428-
"@angular-eslint/eslint-plugin-template": "18.0.1",
429-
"@angular-eslint/template-parser": "18.0.1",
429+
"@angular-eslint/eslint-plugin": "18.4.3",
430+
"@angular-eslint/eslint-plugin-template": "18.4.3",
431+
"@angular-eslint/template-parser": "18.4.3",
430432
"@angular/cli": "~18.2.0",
431433
"@angular/compiler-cli": "18.2.12",
432434
"@commitlint/cli": "^19.6.1",
@@ -475,7 +477,6 @@
475477
"angular-eslint": "^18.3.0",
476478
"cloc": "^2.7.0",
477479
"codecov": "^3.8.3",
478-
"codelyzer": "^6.0.1",
479480
"commitizen": "^4.2.1",
480481
"concurrently": "^5.3.0",
481482
"conventional-changelog": "^3.1.23",

‎packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"lib:watch": "yarn nx build common --watch"
1919
},
2020
"dependencies": {
21+
"@apollo/server": "^4.11.3",
2122
"@gauzy/contracts": "^0.1.0",
2223
"@mikro-orm/nestjs": "^6.0.2",
2324
"@nestjs/common": "^10.4.15",
2425
"@nestjs/core": "^10.4.15",
2526
"@nestjs/typeorm": "^10.0.2",
26-
"apollo-server-core": "^3.10.1",
2727
"graphql": "^16.10.0",
2828
"nest-knexjs": "^0.0.25",
2929
"slugify": "^1.6.6",

‎packages/common/src/lib/interfaces/IApplicationPluginConfig.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { DynamicModule, Type } from '@nestjs/common';
22
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
33
import { MikroOrmModuleOptions } from '@mikro-orm/nestjs';
44
import { KnexModuleOptions } from 'nest-knexjs';
5-
import { PluginDefinition } from 'apollo-server-core';
5+
import { ApolloServerPlugin } from '@apollo/server';
66
import { AbstractLogger } from './IAbstractLogger';
77
import { CustomEmbeddedFields } from '../custom-embedded-field-types';
88

@@ -32,7 +32,7 @@ export interface GraphqlConfigurationOptions {
3232
* An array of Apollo Server plugins.
3333
* @description Defines an array of plugins for Apollo Server.
3434
*/
35-
apolloServerPlugins?: PluginDefinition[];
35+
apolloServerPlugins?: ApolloServerPlugin[];
3636
}
3737

3838
/**

‎packages/core/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"@aws-sdk/client-s3": "^3.717.0",
3131
"@aws-sdk/s3-request-presigner": "^3.717.0",
3232
"@faker-js/faker": "8.0.0-alpha.0",
33+
"@fastify/swagger": "^9.4.0",
3334
"@gauzy/auth": "^0.1.0",
3435
"@gauzy/common": "^0.1.0",
3536
"@gauzy/config": "^0.1.0",
@@ -94,9 +95,6 @@
9495
"@sentry/profiling-node": "^7.101.1",
9596
"@sentry/tracing": "^7.101.1",
9697
"@sentry/types": "^7.101.1",
97-
"apollo-server-core": "^3.10.1",
98-
"apollo-server-express": "^3.5.0",
99-
"apollo-server-fastify": "^3.5.0",
10098
"app-root-path": "^3.0.0",
10199
"archiver": "^5.3.0",
102100
"atlassian-connect-express": "^8.5.0",
@@ -123,7 +121,6 @@
123121
"express": "^4.21.2",
124122
"express-session": "^1.18.1",
125123
"fast-json-stringify": "^2.4.1",
126-
"fastify-swagger": "^4.12.4",
127124
"fs-extra": "^10.1.0",
128125
"graphql": "^16.10.0",
129126
"graphql-playground-middleware-express": "^1.7.23",

‎packages/desktop-ui-lib/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
"@angular/platform-browser": "18.2.12",
2626
"@angular/platform-browser-dynamic": "18.2.12",
2727
"@angular/router": "18.2.12",
28-
"@datorama/akita": "^7.1.1",
28+
"@datorama/akita": "^8.0.1",
2929
"@datorama/akita-ngdevtools": "^7.0.0",
3030
"@electron/remote": "^2.0.8",
31-
"@fortawesome/angular-fontawesome": "^0.10.1",
32-
"@fortawesome/free-solid-svg-icons": "^6.0.0",
31+
"@fortawesome/angular-fontawesome": "^0.15.0",
32+
"@fortawesome/free-solid-svg-icons": "^6.7.2",
3333
"@gauzy/contracts": "^0.1.0",
3434
"@gauzy/desktop-window": "^0.1.0",
3535
"@kurkle/color": "^0.3.2",

‎packages/desktop-ui-lib/src/lib/time-tracker/time-tracker-status/time-tracker-status.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
3-
import { TimeTrackerStatusService } from './time-tracker-status.service';
4-
import { TimeTrackerStatusComponent } from './time-tracker-status.component';
5-
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
63
import { TranslateModule } from '@ngx-translate/core';
4+
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
75
import { NbTooltipModule } from '@nebular/theme';
6+
import { TimeTrackerStatusService } from './time-tracker-status.service';
7+
import { TimeTrackerStatusComponent } from './time-tracker-status.component';
88

99
@NgModule({
1010
declarations: [TimeTrackerStatusComponent],

‎packages/plugins/product-reviews/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"@nestjs/common": "^10.4.15",
3333
"@nestjs/swagger": "^8.1.0",
3434
"@nestjs/typeorm": "^10.0.2",
35-
"apollo-server-core": "^3.10.1",
3635
"chalk": "^4.1.0",
3736
"class-validator": "^0.14.0",
37+
"graphql-tag": "^2.12.6",
3838
"tslib": "^2.6.2",
3939
"typeorm": "^0.3.20"
4040
},

‎packages/plugins/product-reviews/src/lib/graphql/schema-extensions.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { gql } from 'apollo-server-core';
1+
import { gql } from 'graphql-tag';
22

33
export const schemaExtensions = gql`
4-
type ProductReview {
5-
id: ID!
6-
body: String
7-
rating: Float!
8-
}
4+
type ProductReview {
5+
id: ID!
6+
body: String
7+
rating: Float!
8+
}
99
`;

‎packages/ui-core/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"@angular/platform-browser": "18.2.12",
3737
"@angular/router": "18.2.12",
3838
"@asymmetrik/ngx-leaflet": "^18.0.1",
39-
"@datorama/akita": "^7.1.1",
39+
"@datorama/akita": "^8.0.1",
4040
"@electron/remote": "^2.0.8",
41-
"@fortawesome/angular-fontawesome": "^0.10.1",
42-
"@fortawesome/fontawesome-free": "^6.0.0",
43-
"@fortawesome/fontawesome-svg-core": "^1.3.0",
44-
"@fortawesome/free-brands-svg-icons": "^6.0.0",
45-
"@fortawesome/free-regular-svg-icons": "^6.0.0",
46-
"@fortawesome/free-solid-svg-icons": "^6.0.0",
41+
"@fortawesome/angular-fontawesome": "^0.15.0",
42+
"@fortawesome/fontawesome-free": "^6.7.2",
43+
"@fortawesome/fontawesome-svg-core": "^6.7.2",
44+
"@fortawesome/free-brands-svg-icons": "^6.7.2",
45+
"@fortawesome/free-regular-svg-icons": "^6.7.2",
46+
"@fortawesome/free-solid-svg-icons": "^6.7.2",
4747
"@fullcalendar/angular": "^6.1.15",
4848
"@fullcalendar/bootstrap": "^6.1.15",
4949
"@fullcalendar/core": "^6.1.15",

‎packages/ui-core/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"noFallthroughCasesInSwitch": true,
1111
"baseUrl": ".",
1212
"paths": {
13+
"@fullcalendar/*": ["./node_modules/@fullcalendar/*"],
1314
"@ngx-translate/*": ["./node_modules/@ngx-translate/*"],
1415
"ngx-draggable-dom": ["./node_modules/ngx-draggable-dom"],
1516
"ngx-permissions": ["./node_modules/ngx-permissions"],
1617
"ngx-infinite-scroll": ["./node_modules/ngx-infinite-scroll"],
17-
"@fullcalendar/*": ["./node_modules/@fullcalendar/*"],
1818
"@gauzy/ui-core/*": ["./*/src/index.ts"],
1919
"@gauzy/ui-config": ["./../../dist/packages/ui-config"]
2020
}

‎tslint.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"rulesDirectory": [
3-
"node_modules/@nx/workspace/src/tslint",
4-
"node_modules/codelyzer"
3+
"node_modules/@nx/workspace/src/tslint"
54
],
65
"extends": ["tslint-config-prettier"],
76
"rules": {

0 commit comments

Comments
 (0)