Merge pull request #8715 from ever-co/fix/packages-update

[Chore] Package Updates

.cspell.json

@@ -59,7 +59,6 @@
 		"Codacy",
 		"codecov",
 		"Codegen",
-		"codelyzer",
 		"Codementor",
 		"codeql",
 		"commitlint",
@@ -546,7 +545,8 @@
 		"apistageda",
 		"elif",
 		"appleboy",
-		"apidemoda"
+		"apidemoda",
+		"forin"
 	],
 	"useGitignore": true,
 	"ignorePaths": [

.deploy/api/entrypoint.compose.sh

@@ -8,14 +8,5 @@ export WAIT_HOSTS=$DB_HOST:$DB_PORT
 # in Docker Compose we should wait other services start
 ./wait
 
-# echo 'Version of PM2 …'
-# pm2 --version
-
-# echo 'Resetting PM2 Metadata …'
-# pm2 reset all
-
-# echo 'Updating PM2 …'
-# pm2 update
-
 echo 'Starting …'
 exec "$@"

.deploy/api/entrypoint.prod.sh

@@ -3,14 +3,5 @@ set -ex
 
 # This Entrypoint used when we run Docker container outside of Docker Compose (e.g. in k8s)
 
-# echo 'Version of PM2 …'
-# pm2 --version
-
-# echo 'Resetting PM2 Metadata …'
-# pm2 reset all
-
-# echo 'Updating PM2 …'
-# pm2 update
-
 echo 'Starting …'
 exec "$@"

apps/desktop-timer/package.json

@@ -40,7 +40,7 @@
 		"@angular/forms": "18.2.12",
 		"@angular/material": "18.2.14",
 		"@angular/router": "18.2.12",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",
 		"@grpc/grpc-js": "^1.6.7",

apps/desktop-timer/src/package.json

@@ -131,7 +131,7 @@
 		]
 	},
 	"dependencies": {
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",
 		"@gauzy/contracts": "file:../../../dist/packages/contracts",

apps/desktop/package.json

@@ -41,7 +41,7 @@
 		"@angular/forms": "18.2.12",
 		"@angular/material": "18.2.14",
 		"@angular/router": "18.2.12",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",
 		"@grpc/grpc-js": "^1.6.7",

apps/desktop/src/package.json

@@ -142,7 +142,7 @@
 	},
 	"dependencies": {
 		"@datorama/akita-ngdevtools": "^7.0.0",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@electron/remote": "^2.0.8",
 		"@gauzy/auth": "file:../../../dist/packages/auth",
 		"@gauzy/common": "file:../../../dist/packages/common",

apps/gauzy/package.json

@@ -40,15 +40,15 @@
 		"@asymmetrik/ngx-leaflet": "^18.0.1",
 		"@cloudinary/ng": "^2.0.0",
 		"@cloudinary/url-gen": "^1.14.0",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",
-		"@fortawesome/angular-fontawesome": "^0.10.1",
-		"@fortawesome/fontawesome-free": "^6.0.0",
-		"@fortawesome/fontawesome-svg-core": "^1.3.0",
-		"@fortawesome/free-brands-svg-icons": "^6.0.0",
-		"@fortawesome/free-regular-svg-icons": "^6.0.0",
-		"@fortawesome/free-solid-svg-icons": "^6.0.0",
+		"@fortawesome/angular-fontawesome": "^0.15.0",
+		"@fortawesome/fontawesome-free": "^6.7.2",
+		"@fortawesome/fontawesome-svg-core": "^6.7.2",
+		"@fortawesome/free-brands-svg-icons": "^6.7.2",
+		"@fortawesome/free-regular-svg-icons": "^6.7.2",
+		"@fortawesome/free-solid-svg-icons": "^6.7.2",
 		"@fullcalendar/angular": "^6.1.15",
 		"@fullcalendar/bootstrap": "^6.1.15",
 		"@fullcalendar/core": "^6.1.15",
@@ -126,7 +126,6 @@
 		"keycloak-js": "^11.0.2",
 		"leaflet": "^1.8.0",
 		"locutus": "^2.0.30",
-		"mobx": "^6.13.5",
 		"moment": "^2.30.1",
 		"moment-duration-format": "^2.3.2",
 		"moment-range": "^4.0.2",

apps/server-api/package.json

@@ -40,7 +40,7 @@
 		"@angular/forms": "18.2.12",
 		"@angular/material": "18.2.14",
 		"@angular/router": "18.2.12",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",
 		"@grpc/grpc-js": "^1.6.7",

apps/server-api/src/package.json

@@ -131,8 +131,9 @@
 	},
 	"dependencies": {
 		"@datorama/akita-ngdevtools": "^7.0.0",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@electron/remote": "^2.0.8",
+		"@fastify/swagger": "^9.4.0",
 		"@gauzy/auth": "file:../../../dist/packages/auth",
 		"@gauzy/utils": "file:../../../dist/packages/utils",
 		"@gauzy/config": "file:../../../dist/packages/config",
@@ -248,9 +249,6 @@
 		"@nestjsx/crud-typeorm": "^5.0.0-alpha.3",
 		"@opentelemetry/api": "^1.4.1",
 		"@sentry/hub": "^7.101.1",
-		"apollo-server-core": "^3.10.1",
-		"apollo-server-express": "^3.5.0",
-		"apollo-server-fastify": "^3.5.0",
 		"app-root-path": "^3.0.0",
 		"archiver": "^5.3.0",
 		"atlassian-connect-express": "^8.5.0",
@@ -277,7 +275,6 @@
 		"express": "^4.21.2",
 		"express-session": "^1.18.1",
 		"fast-json-stringify": "^2.4.1",
-		"fastify-swagger": "^4.12.4",
 		"fs-extra": "^10.1.0",
 		"graphql": "^16.10.0",
 		"graphql-playground-middleware-express": "^1.7.23",

apps/server/package.json

@@ -37,7 +37,7 @@
 		"@angular/forms": "18.2.12",
 		"@angular/material": "18.2.14",
 		"@angular/router": "18.2.12",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",
 		"@grpc/grpc-js": "^1.6.7",

apps/server/src/package.json

@@ -131,7 +131,7 @@
 	},
 	"dependencies": {
 		"@datorama/akita-ngdevtools": "^7.0.0",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@electron/remote": "^2.0.8",
 		"@gauzy/auth": "file:../../../dist/packages/auth",
 		"@gauzy/utils": "file:../../../dist/packages/utils",
@@ -215,6 +215,7 @@
 		"@aws-sdk/client-s3": "^3.717.0",
 		"@aws-sdk/s3-request-presigner": "^3.717.0",
 		"@faker-js/faker": "8.0.0-alpha.0",
+		"@fastify/swagger": "^9.4.0",
 		"@godaddy/terminus": "^4.12.1",
 		"@grpc/grpc-js": "^1.7.3",
 		"@honeycombio/opentelemetry-node": "0.6.1",
@@ -248,9 +249,6 @@
 		"@nestjsx/crud-typeorm": "^5.0.0-alpha.3",
 		"@opentelemetry/api": "^1.4.1",
 		"@sentry/hub": "^7.101.1",
-		"apollo-server-core": "^3.10.1",
-		"apollo-server-express": "^3.5.0",
-		"apollo-server-fastify": "^3.5.0",
 		"app-root-path": "^3.0.0",
 		"archiver": "^5.3.0",
 		"atlassian-connect-express": "^8.5.0",
@@ -277,7 +275,6 @@
 		"express": "^4.21.2",
 		"express-session": "^1.18.1",
 		"fast-json-stringify": "^2.4.1",
-		"fastify-swagger": "^4.12.4",
 		"fs-extra": "^10.1.0",
 		"graphql": "^16.10.0",
 		"graphql-playground-middleware-express": "^1.7.23",

package.json

@@ -391,6 +391,7 @@
 		"@angular/platform-browser-dynamic": "18.2.12",
 		"@angular/router": "18.2.12",
 		"@angular/service-worker": "18.2.12",
+		"@fortawesome/angular-fontawesome": "^0.15.0",
 		"@nebular/auth": "^14.0.2",
 		"@nebular/bootstrap": "^9.1.0-rc.6",
 		"@nebular/eva-icons": "^14.0.2",
@@ -410,6 +411,7 @@
 		"jsdom": "^23.0.1",
 		"lodash-es": "^4.17.21",
 		"minizlib": "^2.1.2",
+		"mobx": "~4.14.1",
 		"parse5": "^7.1.2",
 		"reflect-metadata": "^0.2.2",
 		"rxjs": "^7.8.0",
@@ -424,9 +426,9 @@
 		"@angular-devkit/build-ng-packagr": "^0.1002.0",
 		"@angular-devkit/core": "^18.2.9",
 		"@angular-devkit/schematics": "18.2.9",
-		"@angular-eslint/eslint-plugin": "18.0.1",
-		"@angular-eslint/eslint-plugin-template": "18.0.1",
-		"@angular-eslint/template-parser": "18.0.1",
+		"@angular-eslint/eslint-plugin": "18.4.3",
+		"@angular-eslint/eslint-plugin-template": "18.4.3",
+		"@angular-eslint/template-parser": "18.4.3",
 		"@angular/cli": "~18.2.0",
 		"@angular/compiler-cli": "18.2.12",
 		"@commitlint/cli": "^19.6.1",
@@ -475,7 +477,6 @@
 		"angular-eslint": "^18.3.0",
 		"cloc": "^2.7.0",
 		"codecov": "^3.8.3",
-		"codelyzer": "^6.0.1",
 		"commitizen": "^4.2.1",
 		"concurrently": "^5.3.0",
 		"conventional-changelog": "^3.1.23",

packages/common/package.json

@@ -18,12 +18,12 @@
 		"lib:watch": "yarn nx build common --watch"
 	},
 	"dependencies": {
+		"@apollo/server": "^4.11.3",
 		"@gauzy/contracts": "^0.1.0",
 		"@mikro-orm/nestjs": "^6.0.2",
 		"@nestjs/common": "^10.4.15",
 		"@nestjs/core": "^10.4.15",
 		"@nestjs/typeorm": "^10.0.2",
-		"apollo-server-core": "^3.10.1",
 		"graphql": "^16.10.0",
 		"nest-knexjs": "^0.0.25",
 		"slugify": "^1.6.6",

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

@@ -2,7 +2,7 @@ import { DynamicModule, Type } from '@nestjs/common';
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 import { MikroOrmModuleOptions } from '@mikro-orm/nestjs';
 import { KnexModuleOptions } from 'nest-knexjs';
-import { PluginDefinition } from 'apollo-server-core';
+import { ApolloServerPlugin } from '@apollo/server';
 import { AbstractLogger } from './IAbstractLogger';
 import { CustomEmbeddedFields } from '../custom-embedded-field-types';
 
@@ -32,7 +32,7 @@ export interface GraphqlConfigurationOptions {
 	 * An array of Apollo Server plugins.
 	 * @description Defines an array of plugins for Apollo Server.
 	 */
-	apolloServerPlugins?: PluginDefinition[];
+	apolloServerPlugins?: ApolloServerPlugin[];
 }
 
 /**

packages/core/package.json

@@ -30,6 +30,7 @@
         "@aws-sdk/client-s3": "^3.717.0",
         "@aws-sdk/s3-request-presigner": "^3.717.0",
         "@faker-js/faker": "8.0.0-alpha.0",
+        "@fastify/swagger": "^9.4.0",
         "@gauzy/auth": "^0.1.0",
         "@gauzy/common": "^0.1.0",
         "@gauzy/config": "^0.1.0",
@@ -94,9 +95,6 @@
         "@sentry/profiling-node": "^7.101.1",
         "@sentry/tracing": "^7.101.1",
         "@sentry/types": "^7.101.1",
-        "apollo-server-core": "^3.10.1",
-        "apollo-server-express": "^3.5.0",
-        "apollo-server-fastify": "^3.5.0",
         "app-root-path": "^3.0.0",
         "archiver": "^5.3.0",
         "atlassian-connect-express": "^8.5.0",
@@ -123,7 +121,6 @@
         "express": "^4.21.2",
         "express-session": "^1.18.1",
         "fast-json-stringify": "^2.4.1",
-        "fastify-swagger": "^4.12.4",
         "fs-extra": "^10.1.0",
         "graphql": "^16.10.0",
         "graphql-playground-middleware-express": "^1.7.23",

packages/desktop-ui-lib/package.json

@@ -25,11 +25,11 @@
 		"@angular/platform-browser": "18.2.12",
 		"@angular/platform-browser-dynamic": "18.2.12",
 		"@angular/router": "18.2.12",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@datorama/akita-ngdevtools": "^7.0.0",
 		"@electron/remote": "^2.0.8",
-		"@fortawesome/angular-fontawesome": "^0.10.1",
-		"@fortawesome/free-solid-svg-icons": "^6.0.0",
+		"@fortawesome/angular-fontawesome": "^0.15.0",
+		"@fortawesome/free-solid-svg-icons": "^6.7.2",
 		"@gauzy/contracts": "^0.1.0",
 		"@gauzy/desktop-window": "^0.1.0",
 		"@kurkle/color": "^0.3.2",

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

@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { TimeTrackerStatusService } from './time-tracker-status.service';
-import { TimeTrackerStatusComponent } from './time-tracker-status.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { TranslateModule } from '@ngx-translate/core';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { NbTooltipModule } from '@nebular/theme';
+import { TimeTrackerStatusService } from './time-tracker-status.service';
+import { TimeTrackerStatusComponent } from './time-tracker-status.component';
 
 @NgModule({
 	declarations: [TimeTrackerStatusComponent],

packages/plugins/product-reviews/package.json

@@ -32,9 +32,9 @@
 		"@nestjs/common": "^10.4.15",
 		"@nestjs/swagger": "^8.1.0",
 		"@nestjs/typeorm": "^10.0.2",
-		"apollo-server-core": "^3.10.1",
 		"chalk": "^4.1.0",
 		"class-validator": "^0.14.0",
+		"graphql-tag": "^2.12.6",
 		"tslib": "^2.6.2",
 		"typeorm": "^0.3.20"
 	},

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

@@ -1,9 +1,9 @@
-import { gql } from 'apollo-server-core';
+import { gql } from 'graphql-tag';
 
 export const schemaExtensions = gql`
-	type ProductReview {
-		id: ID!
-		body: String
-		rating: Float!
-	}
+    type ProductReview {
+        id: ID!
+        body: String
+        rating: Float!
+    }
 `;

packages/ui-core/package.json

@@ -36,14 +36,14 @@
 		"@angular/platform-browser": "18.2.12",
 		"@angular/router": "18.2.12",
 		"@asymmetrik/ngx-leaflet": "^18.0.1",
-		"@datorama/akita": "^7.1.1",
+		"@datorama/akita": "^8.0.1",
 		"@electron/remote": "^2.0.8",
-		"@fortawesome/angular-fontawesome": "^0.10.1",
-		"@fortawesome/fontawesome-free": "^6.0.0",
-		"@fortawesome/fontawesome-svg-core": "^1.3.0",
-		"@fortawesome/free-brands-svg-icons": "^6.0.0",
-		"@fortawesome/free-regular-svg-icons": "^6.0.0",
-		"@fortawesome/free-solid-svg-icons": "^6.0.0",
+		"@fortawesome/angular-fontawesome": "^0.15.0",
+		"@fortawesome/fontawesome-free": "^6.7.2",
+		"@fortawesome/fontawesome-svg-core": "^6.7.2",
+		"@fortawesome/free-brands-svg-icons": "^6.7.2",
+		"@fortawesome/free-regular-svg-icons": "^6.7.2",
+		"@fortawesome/free-solid-svg-icons": "^6.7.2",
 		"@fullcalendar/angular": "^6.1.15",
 		"@fullcalendar/bootstrap": "^6.1.15",
 		"@fullcalendar/core": "^6.1.15",

packages/ui-core/tsconfig.json

@@ -10,11 +10,11 @@
 		"noFallthroughCasesInSwitch": true,
 		"baseUrl": ".",
 		"paths": {
+			"@fullcalendar/*": ["./node_modules/@fullcalendar/*"],
 			"@ngx-translate/*": ["./node_modules/@ngx-translate/*"],
 			"ngx-draggable-dom": ["./node_modules/ngx-draggable-dom"],
 			"ngx-permissions": ["./node_modules/ngx-permissions"],
 			"ngx-infinite-scroll": ["./node_modules/ngx-infinite-scroll"],
-			"@fullcalendar/*": ["./node_modules/@fullcalendar/*"],
 			"@gauzy/ui-core/*": ["./*/src/index.ts"],
 			"@gauzy/ui-config": ["./../../dist/packages/ui-config"]
 		}

tslint.json

@@ -1,7 +1,6 @@
 {
 	"rulesDirectory": [
-		"node_modules/@nx/workspace/src/tslint",
-		"node_modules/codelyzer"
+		"node_modules/@nx/workspace/src/tslint"
 	],
 	"extends": ["tslint-config-prettier"],
 	"rules": {