Skip to content

Commit

Permalink
feat: Update dependencies (#189)
Browse files Browse the repository at this point in the history
* feat: nx migrate and angular update

* feat: turn off no-unused-expressions

* fix: imports formatting in app.module.ts

* feat: update mongodb-memory-server, ical-generator and reflect-metadata

* fix: use NodeNext moduleResolution

* fix(ci): Node version 22

* revert: upgrade mean-stream/nestx

* feat: upgrade @mean-stream/nestx

* fix: module NodeNext in tsconfig

* feat: pnpm 9.12.0

* feat: NodeNext for tsconfig.spec.json

* test: Revert ts-jest to 29.2.3

See: kulshekhar/ts-jest#4198
See:  kulshekhar/ts-jest#4552

---------

Co-authored-by: Adrian Kunz <[email protected]>
  • Loading branch information
Morphclue and Clashsoft authored Oct 8, 2024
1 parent 18559a5 commit 6629b15
Show file tree
Hide file tree
Showing 9 changed files with 13,878 additions and 11,508 deletions.
1 change: 1 addition & 0 deletions .eslint-overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-expressions": "off",
"@typescript-eslint/no-unused-vars": ["error", {"ignoreRestSiblings": true}],
"quotes": ["error", "single"],
"import/order": [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Node.js LTS
uses: actions/setup-node@v4
with:
node-version: 'lts/*'
node-version: 22
cache: 'pnpm'
cache-dependency-path: pnpm-lock.yaml
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/src/mail/mail.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import {ConfigModule, ConfigService} from '@nestjs/config';
import {MailerModule} from '@nestjs-modules/mailer';
import {HandlebarsAdapter} from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';

import {MailService} from './mail/mail.service';
import {environment} from '../environment';
import {MailService} from './mail/mail.service';

@Module({
imports: [MailerModule.forRootAsync({
Expand Down
4 changes: 3 additions & 1 deletion apps/backend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
}
],
"compilerOptions": {
"esModuleInterop": true
"esModuleInterop": true,
"moduleResolution": "NodeNext",
"module": "NodeNext"
}
}
1 change: 0 additions & 1 deletion apps/backend/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
},
"include": [
Expand Down
10 changes: 5 additions & 5 deletions apps/frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {HTTP_INTERCEPTORS, HttpClientModule, provideHttpClient, withFetch} from '@angular/common/http';
import {HTTP_INTERCEPTORS, provideHttpClient, withFetch, withInterceptorsFromDi} from '@angular/common/http';
import {APP_INITIALIZER, isDevMode, NgModule} from '@angular/core';
import {ReactiveFormsModule} from '@angular/forms';
import {BrowserModule, provideClientHydration} from '@angular/platform-browser';
Expand Down Expand Up @@ -34,12 +34,12 @@ function initializeKeycloak(keycloak: KeycloakService) {

@NgModule({
declarations: [AppComponent],
bootstrap: [AppComponent],
imports: [
BrowserModule,
AppRoutingModule,
NgbModule,
ModalModule,
HttpClientModule,
ReactiveFormsModule,
AboutModule,
LegalModule,
Expand Down Expand Up @@ -71,10 +71,10 @@ function initializeKeycloak(keycloak: KeycloakService) {
provide: APP_INITIALIZER,
useFactory: initializeKeycloak,
multi: true,
deps: [KeycloakService]
}
deps: [KeycloakService],
},
provideHttpClient(withInterceptorsFromDi()),
],
bootstrap: [AppComponent],
})
export class AppModule {
}
2 changes: 1 addition & 1 deletion apps/frontend/src/app/poll/poll-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';

import {AutofillModalComponent, PostponeModalComponent} from '../modals';
import {ChooseDateComponent} from './choose-date/choose-date.component';
import {ChooseEventsComponent} from './choose-events/choose-events.component';
import {CreateEditPollComponent} from './create-poll/create-edit-poll.component';
import {IcalComponent} from './ical/ical.component';
import {AutofillModalComponent, PostponeModalComponent} from '../modals';

const routes: Routes = [
{path: 'create', component: CreateEditPollComponent, title: 'Create Poll | Apollusia'},
Expand Down
153 changes: 77 additions & 76 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,95 +14,95 @@
"build:keycloak": "nx build keycloak"
},
"private": true,
"packageManager": "pnpm@8.15.8",
"packageManager": "pnpm@9.12.0",
"devDependencies": {
"@angular-devkit/build-angular": "~17.3.7",
"@angular-devkit/core": "~17.3.7",
"@angular-devkit/schematics": "~17.3.7",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular/cli": "~17.3.7",
"@angular/compiler-cli": "~17.3.9",
"@angular/language-service": "~17.3.9",
"@angular-devkit/build-angular": "~18.2.6",
"@angular-devkit/core": "~18.2.6",
"@angular-devkit/schematics": "~18.2.6",
"@angular-eslint/eslint-plugin": "~18.3.1",
"@angular-eslint/eslint-plugin-template": "~18.3.1",
"@angular-eslint/template-parser": "~18.3.1",
"@angular/cli": "~18.2.6",
"@angular/compiler-cli": "18.2.6",
"@angular/language-service": "18.2.6",
"@gitopslovers/nx-sass": "^1.5.1",
"@nestjs/schematics": "10.1.1",
"@nestjs/testing": "10.3.9",
"@nx/angular": "19.3.1",
"@nx/cypress": "19.3.1",
"@nx/eslint": "19.3.1",
"@nx/eslint-plugin": "19.3.1",
"@nx/jest": "19.3.1",
"@nx/js": "19.3.1",
"@nx/nest": "19.3.1",
"@nx/node": "19.3.1",
"@nx/web": "19.3.1",
"@nx/webpack": "19.3.1",
"@nx/workspace": "19.3.1",
"@schematics/angular": "17.3.2",
"@types/express": "^4.17.21",
"@nestjs/schematics": "10.1.4",
"@nestjs/testing": "10.4.4",
"@nx/angular": "19.8.2",
"@nx/cypress": "19.8.2",
"@nx/eslint": "19.8.2",
"@nx/eslint-plugin": "19.8.2",
"@nx/jest": "19.8.2",
"@nx/js": "19.8.2",
"@nx/nest": "19.8.2",
"@nx/node": "19.8.2",
"@nx/web": "19.8.2",
"@nx/webpack": "19.8.2",
"@nx/workspace": "19.8.2",
"@schematics/angular": "18.2.6",
"@types/express": "^5.0.0",
"@types/file-saver": "^2.0.7",
"@types/jest": "^29.5.12",
"@types/markdown-it": "^14.1.1",
"@types/jest": "29.5.13",
"@types/markdown-it": "^14.1.2",
"@types/node": "20.14.8",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "6.20.0",
"@typescript-eslint/parser": "6.20.0",
"browser-sync": "^3.0.2",
"cypress": "^13.12.0",
"eslint": "8.57.0",
"@typescript-eslint/eslint-plugin": "8.7.0",
"@typescript-eslint/parser": "8.7.0",
"browser-sync": "^3.0.3",
"cypress": "13.15.0",
"eslint": "8.57.1",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-import": "^2.29.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"eslint-plugin-cypress": "3.5.0",
"eslint-plugin-import": "^2.30.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-environment-node": "^29.7.0",
"jest-preset-angular": "14.1.1",
"mongodb-memory-server": "^9.4.0",
"nx": "19.3.1",
"jest-preset-angular": "14.2.4",
"mongodb-memory-server": "^9.4.1",
"nx": "19.8.2",
"nx-stylelint": "17.1.5",
"prettier": "^3.3.2",
"sass": "1.77.6",
"stylelint": "16.6.1",
"prettier": "^3.3.3",
"sass": "1.79.4",
"stylelint": "16.9.0",
"stylelint-config-standard-scss": "13.1.0",
"ts-jest": "29.1.5",
"ts-jest": "29.2.3",
"ts-node": "10.9.2",
"typescript": "5.4.3"
},
"dependencies": {
"@angular/animations": "~17.3.9",
"@angular/common": "~17.3.9",
"@angular/compiler": "~17.3.9",
"@angular/core": "~17.3.9",
"@angular/forms": "~17.3.9",
"@angular/localize": "~17.3.9",
"@angular/platform-browser": "~17.3.9",
"@angular/platform-browser-dynamic": "~17.3.9",
"@angular/platform-server": "~17.3.9",
"@angular/pwa": "~17.3.7",
"@angular/router": "~17.3.9",
"@angular/service-worker": "~17.3.9",
"@angular/ssr": "~17.3.7",
"@mean-stream/nestx": "^0.12.0",
"@angular/animations": "18.2.6",
"@angular/common": "18.2.6",
"@angular/compiler": "18.2.6",
"@angular/core": "18.2.6",
"@angular/forms": "18.2.6",
"@angular/localize": "18.2.6",
"@angular/platform-browser": "18.2.6",
"@angular/platform-browser-dynamic": "18.2.6",
"@angular/platform-server": "18.2.6",
"@angular/pwa": "~18.2.6",
"@angular/router": "18.2.6",
"@angular/service-worker": "18.2.6",
"@angular/ssr": "~18.2.6",
"@mean-stream/nestx": "^0.12.1",
"@mean-stream/ngbx": "^0.13.0",
"@nestjs-modules/mailer": "^2.0.2",
"@nestjs/common": "^10.3.9",
"@nestjs/config": "^3.2.2",
"@nestjs/core": "^10.3.9",
"@nestjs/common": "^10.4.4",
"@nestjs/config": "^3.2.3",
"@nestjs/core": "^10.4.4",
"@nestjs/event-emitter": "^2.0.4",
"@nestjs/jwt": "^10.2.0",
"@nestjs/mongoose": "^10.0.6",
"@nestjs/mongoose": "^10.0.10",
"@nestjs/passport": "^10.0.3",
"@nestjs/platform-express": "^10.3.9",
"@nestjs/swagger": "^7.3.1",
"@nestjs/websockets": "^10.3.10",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@nestjs/platform-express": "^10.4.4",
"@nestjs/swagger": "^7.4.2",
"@nestjs/websockets": "^10.4.4",
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
"@swc-node/register": "^1.10.9",
"@swc/core": "^1.7.0",
"@swc/core": "^1.7.26",
"angular-calendar": "^0.31.1",
"angularx-flatpickr": "^7.3.0",
"axios": "^1.7.4",
"axios": "^1.7.7",
"base64-js": "^1.5.1",
"bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
Expand All @@ -114,22 +114,23 @@
"file-saver": "^2.0.5",
"flatpickr": "^4.6.13",
"handlebars": "^4.7.8",
"ical-generator": "^7.1.0",
"keycloak-angular": "^15.2.1",
"keycloak-js": "^24.0.4",
"ical-generator": "^7.2.0",
"keycloak-angular": "^16.0.1",
"keycloak-js": "^25.0.6",
"markdown-it": "^14.1.0",
"mongoose": "^8.4.3",
"ngx-cookie-service-ssr": "^17.1.0",
"ngx-countup": "^13.1.0",
"mongoose": "^8.7.0",
"ngx-cookie-service-ssr": "^18.0.0",
"ngx-countup": "^13.2.0",
"passport-jwt": "^4.0.1",
"reflect-metadata": "^0.1.14",
"rxjs": "~7.8.1",
"tslib": "^2.6.3",
"tslib": "^2.7.0",
"uuid": "^9.0.1",
"web-push": "^3.6.7",
"zone.js": "0.14.3"
"zone.js": "0.14.10"
},
"resolutions": {
"ws@>=8.0.0 <8.17.1": ">=8.17.1"
"ws@>=8.0.0 <8.17.1": ">=8.17.1",
"webpack@>=5.0.0-alpha.0 <5.94.0": ">=5.94.0"
}
}
Loading

0 comments on commit 6629b15

Please sign in to comment.