Skip to content

Commit

Permalink
Update to Angular 13 and remove tslint/codelyzer
Browse files Browse the repository at this point in the history
  • Loading branch information
sinedied committed Feb 21, 2023
1 parent ff8fc0b commit 8dc1160
Show file tree
Hide file tree
Showing 11 changed files with 1,867 additions and 2,569 deletions.
11 changes: 3 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint/tslint"],
"plugins": ["@angular-eslint/eslint-plugin", "@typescript-eslint"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:@angular-eslint/recommended",
"prettier",
"prettier/@typescript-eslint",
"eslint-config-prettier"
],
"env": {
Expand All @@ -29,6 +29,7 @@
"@typescript-eslint/restrict-plus-operands": "off",
"@typescript-eslint/no-floating-promises": "off",
"@typescript-eslint/restrict-template-expressions": "off",
"@typescript-eslint/no-unsafe-argument": "off",
"no-shadow": "off",

"@typescript-eslint/member-ordering": [
Expand Down Expand Up @@ -59,12 +60,6 @@
"eqeqeq": ["error", "always", { "null": "ignore" }],
"prefer-const": "error",
"object-shorthand": ["error", "always", { "avoidExplicitReturnArrows": true }],
"@typescript-eslint/tslint/config": [
"error",
{
"lintFile": "./tslint.json"
}
],
"@typescript-eslint/no-unused-vars": [
"warn",
{
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.angular/cache
######################
# Project Specific
######################
Expand Down
47 changes: 23 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,31 @@
"node_modules"
],
"dependencies": {
"@angular/common": "12.2.17",
"@angular/compiler": "12.2.17",
"@angular/core": "12.2.17",
"@angular/forms": "12.2.17",
"@angular/localize": "12.2.17",
"@angular/platform-browser": "12.2.17",
"@angular/platform-browser-dynamic": "12.2.17",
"@angular/router": "12.2.17",
"@fortawesome/angular-fontawesome": "0.9.0",
"@angular/common": "13.3.12",
"@angular/compiler": "13.3.12",
"@angular/core": "13.3.12",
"@angular/forms": "13.3.12",
"@angular/localize": "13.3.12",
"@angular/platform-browser": "13.3.12",
"@angular/platform-browser-dynamic": "13.3.12",
"@angular/router": "13.3.12",
"@fortawesome/angular-fontawesome": "0.10.2",
"@fortawesome/fontawesome-svg-core": "1.2.27",
"@fortawesome/free-brands-svg-icons": "5.12.0",
"@fortawesome/free-solid-svg-icons": "5.12.0",
"@ng-bootstrap/ng-bootstrap": "10.0.0",
"@ng-bootstrap/ng-bootstrap": "11.0.1",
"@ngx-translate/core": "13.0.0",
"@ngx-translate/http-loader": "6.0.0",
"@scarf/scarf": "^1.1.1",
"bootstrap": "4.5.3",
"echarts": "5.4.0",
"jquery": "3.6.1",
"moment": "2.24.0",
"ng-jhipster": "0.16.0",
"ngx-cookie": "5.0.2",
"ngx-echarts": "8.0.1",
"ngx-infinite-scroll": "10.0.1",
"ngx-webstorage": "5.0.0",
"ngx-infinite-scroll": "13.1.0",
"ngx-webstorage": "8.0.0",
"popper.js": "1.16.1",
"resize-observer-polyfill": "1.5.1",
"rxjs": "6.6.7",
Expand All @@ -44,22 +45,21 @@
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-builders/custom-webpack": "12.1.3",
"@angular-builders/jest": "12.1.2",
"@angular-devkit/build-angular": "~12.2.18",
"@angular/cli": "12.2.18",
"@angular/compiler-cli": "12.2.17",
"@angular-builders/custom-webpack": "13.1.0",
"@angular-builders/jest": "13.0.4",
"@angular-devkit/build-angular": "~13.3.10",
"@angular-eslint/eslint-plugin": "13.5.0",
"@angular/cli": "13.3.10",
"@angular/compiler-cli": "13.3.12",
"@openapitools/openapi-generator-cli": "1.0.10-4.2.3",
"@types/echarts": "^4.6.0",
"@types/google.analytics": "0.0.40",
"@types/jest": "27.5.2",
"@types/node": "12.12.17",
"@typescript-eslint/eslint-plugin": "4.25",
"@typescript-eslint/eslint-plugin-tslint": "4.25",
"@typescript-eslint/parser": "4.25",
"@typescript-eslint/eslint-plugin": "5.15.0",
"@typescript-eslint/parser": "5.15.0",
"browser-sync": "2.27.10",
"browser-sync-webpack-plugin": "2.3.0",
"codelyzer": "^6.0.0",
"copy-webpack-plugin": "11.0.0",
"eslint": "7.32.0",
"eslint-config-prettier": "6.7.0",
Expand All @@ -70,7 +70,7 @@
"jest": "27.5.1",
"jest-date-mock": "1.0.7",
"jest-junit": "15.0.0",
"jest-preset-angular": "9",
"jest-preset-angular": "11.1.2",
"jest-sonar-reporter": "2.0.0",
"lint-staged": "8.2.1",
"moment-locales-webpack-plugin": "^1.2.0",
Expand All @@ -79,8 +79,7 @@
"reflect-metadata": "0.1.13",
"rimraf": "3.0.0",
"ts-jest": "^29.0.3",
"tslint": "~6.1.0",
"typescript": "4.3.5",
"typescript": "4.6.4",
"webpack": "5.75.0",
"webpack-bundle-analyzer": "4.7.0",
"webpack-merge": "5.8.0",
Expand Down
3 changes: 0 additions & 3 deletions postcss.config.js

This file was deleted.

3 changes: 1 addition & 2 deletions src/main/webapp/app/account/account.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import { accountState } from './account.route';
PasswordResetFinishComponent,
SettingsComponent,
DeleteAccountDialogComponent
],
entryComponents: [DeleteAccountDialogComponent]
]
})
export class AccountModule {}
3 changes: 1 addition & 2 deletions src/main/webapp/app/admin/health/health.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { healthRoute } from './health.route';

@NgModule({
imports: [JhonlineSharedModule, RouterModule.forChild([healthRoute])],
declarations: [HealthComponent, HealthModalComponent],
entryComponents: [HealthModalComponent]
declarations: [HealthComponent, HealthModalComponent]
})
export class HealthModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import { UserMgmtResetDialogComponent } from 'app/admin/user-management/user-man
UserManagementUpdateComponent,
UserManagementDeleteDialogComponent,
UserMgmtResetDialogComponent
],
entryComponents: [UserManagementDeleteDialogComponent]
]
})
export class UserManagementModule {}
7 changes: 0 additions & 7 deletions src/main/webapp/app/home/home.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,6 @@ import { DataDeletionDialogComponent } from 'app/home/your-generators/data-delet
CiCdOutputDialogComponent,
RemoveGeneratorDialogComponent,
DataDeletionDialogComponent
],
entryComponents: [
GeneratorOutputDialogComponent,
JdlOutputDialogComponent,
CiCdOutputDialogComponent,
RemoveGeneratorDialogComponent,
DataDeletionDialogComponent
]
})
export class JhonlineHomeModule {}
1 change: 0 additions & 1 deletion src/main/webapp/app/shared/shared.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import { RouterModule } from '@angular/router';
JhiGitProviderComponent,
JhiGitProviderAlertComponent
],
entryComponents: [LoginModalComponent],
exports: [
JhonlineSharedLibsModule,
AlertComponent,
Expand Down
20 changes: 0 additions & 20 deletions tslint.json

This file was deleted.

Loading

0 comments on commit 8dc1160

Please sign in to comment.