Skip to content

Commit fbf25bd

Browse files
committed
Updated from generator v11.0.0
1 parent 6c36812 commit fbf25bd

6 files changed

Lines changed: 42 additions & 46 deletions

File tree

.browserslistrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@ last 2 Edge major versions
1414
last 2 Safari major versions
1515
last 2 iOS major versions
1616
Firefox ESR
17-
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
18-
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

jest.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
require('jest-preset-angular/ngcc-jest-processor');
2-
const { pathsToModuleNameMapper } = require('ts-jest/utils');
1+
const { pathsToModuleNameMapper } = require('ts-jest');
32
// In the following statement, replace `./tsconfig` with the path to your `tsconfig` file
43
// which contains the path mapping (ie the `compilerOptions.paths` option):
54
const { compilerOptions } = require('./tsconfig.json');

package.json

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve:sw": "npm run build -s && npx http-server ./dist -p 4200",
1010
"lint": "ng lint && stylelint \"src/**/*.scss\"",
1111
"test": "npm run write:env -s && ng test",
12-
"test:ci": "npm run write:env -s && npm run lint -s && ng test --configuration=ci",
12+
"test:ci": "npm run write:env -s && npm run lint -s && ng run ng-x-rocket:test:ci",
1313
"translations:extract": "ngx-translate-extract --input ./src --output ./src/translations/template.json --format=json --clean --sort",
1414
"docs": "hads ./docs -o",
1515
"write:env": "ngx-scripts env npm_package_version",
@@ -19,63 +19,62 @@
1919
"generate": "ng generate"
2020
},
2121
"dependencies": {
22-
"@angular/animations": "~13.1.0",
23-
"@angular/common": "~13.1.0",
24-
"@angular/compiler": "~13.1.0",
25-
"@angular/core": "~13.1.0",
26-
"@angular/forms": "~13.1.0",
27-
"@angular/localize": "~13.1.0",
28-
"@angular/platform-browser": "~13.1.0",
29-
"@angular/platform-browser-dynamic": "~13.1.0",
30-
"@angular/router": "~13.1.0",
22+
"@angular/animations": "~14.1.3",
23+
"@angular/common": "~14.1.3",
24+
"@angular/compiler": "~14.1.3",
25+
"@angular/core": "~14.1.3",
26+
"@angular/forms": "~14.1.3",
27+
"@angular/localize": "~14.1.3",
28+
"@angular/platform-browser": "~14.1.3",
29+
"@angular/platform-browser-dynamic": "~14.1.3",
30+
"@angular/router": "~14.1.3",
3131
"@ngx-translate/core": "^14.0.0",
32-
"@angular/service-worker": "~13.1.0",
33-
"@ng-bootstrap/ng-bootstrap": "^12.0.0-beta.4",
32+
"@angular/service-worker": "~14.1.3",
33+
"@ng-bootstrap/ng-bootstrap": "^13.0.0",
3434
"@popperjs/core": "^2.11.0",
3535
"bootstrap": "^5.0.2",
36-
"@fortawesome/fontawesome-free": "^5.15.1",
37-
"rxjs": "^7.4.0",
36+
"@fortawesome/fontawesome-free": "^6.1.2",
37+
"rxjs": "^7.5.0",
3838
"tslib": "^2.3.0",
3939
"zone.js": "~0.11.4"
4040
},
4141
"devDependencies": {
42-
"@angular-builders/jest": "^13.0.0",
43-
"@angular-devkit/build-angular": "~13.1.0",
44-
"@angular-eslint/builder": "~13.0.1",
45-
"@angular-eslint/eslint-plugin": "~13.0.1",
46-
"@angular-eslint/eslint-plugin-template": "~13.0.1",
47-
"@angular-eslint/schematics": "~13.0.1",
48-
"@angular-eslint/template-parser": "~13.0.1",
49-
"@angular/cli": "~13.1.0",
50-
"@angular/compiler-cli": "~13.1.0",
51-
"@angular/language-service": "~13.1.0",
42+
"@angular-builders/jest": "^14.0.1",
43+
"@angular-devkit/build-angular": "~14.1.3",
44+
"@angular-eslint/builder": "~14.0.3",
45+
"@angular-eslint/eslint-plugin": "~14.0.3",
46+
"@angular-eslint/eslint-plugin-template": "~14.0.3",
47+
"@angular-eslint/schematics": "~14.0.3",
48+
"@angular-eslint/template-parser": "~14.0.3",
49+
"@angular/cli": "~14.1.3",
50+
"@angular/compiler-cli": "~14.1.3",
51+
"@angular/language-service": "~14.1.3",
5252
"@biesbjerg/ngx-translate-extract": "^7.0.3",
5353
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
54-
"@ngx-rocket/scripts": "^5.2.1",
54+
"@ngx-rocket/scripts": "^5.2.2",
5555
"@ngneat/until-destroy": "^9.0.0",
56-
"@typescript-eslint/eslint-plugin": "~5.6.0",
57-
"@typescript-eslint/parser": "~5.6.0",
58-
"@types/jest": "^27.0.3",
59-
"@types/node": "^12.20.37",
56+
"@typescript-eslint/eslint-plugin": "~5.34.0",
57+
"@typescript-eslint/parser": "~5.34.0",
58+
"@types/jest": "^28.1.8",
59+
"@types/node": "^14.18.26",
6060
"eslint": "^8.3.0",
6161
"eslint-plugin-import": "latest",
6262
"eslint-plugin-jsdoc": "latest",
6363
"eslint-plugin-prefer-arrow": "latest",
6464
"hads": "^3.0.0",
65-
"htmlhint": "^1.0.0",
6665
"https-proxy-agent": "^5.0.0",
67-
"jest": "^27.0.6",
68-
"ts-jest": "^27.0.5",
66+
"jest": "^28.1.3",
67+
"ts-jest": "^28.0.8",
6968
"prettier": "^2.2.1",
7069
"stylelint-config-prettier": "^9.0.3",
7170
"pretty-quick": "^3.1.0",
72-
"husky": "^7.0.1",
73-
"stylelint": "~14.1.0",
74-
"stylelint-config-recommended-scss": "~5.0.2",
75-
"stylelint-config-standard": "~24.0.0",
71+
"husky": "^8.0.1",
72+
"stylelint": "~14.11.0",
73+
"stylelint-config-recommended-scss": "~7.0.0",
74+
"stylelint-config-standard": "~28.0.0",
7675
"postcss": "^8.4.5",
7776
"ts-node": "^10.1.0",
78-
"typescript": "~4.4.3"
77+
"typescript": "~4.7.4"
7978
},
8079
"prettier": {
8180
"singleQuote": true,

src/app/i18n/language-selector.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div [ngClass]="{ 'nav-item': inNavbar }" ngbDropdown>
2-
<a *ngIf="inNavbar; else button" id="language-dropdown" class="nav-link" ngbDropdownToggle>
2+
<a *ngIf="inNavbar; else button" id="language-dropdown" class="nav-link" ngbDropdownToggle display="dynamic">
33
{{currentLanguage | translate}}
44
</a>
55
<ng-template #button>

src/app/shell/header/header.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
</a>
1919
</div>
2020
<div class="navbar-nav ml-auto">
21-
<app-language-selector [inNavbar]="true" menuClass="dropdown-menu dropdown-menu-right"></app-language-selector>
22-
<div class="nav-item" ngbDropdown>
21+
<app-language-selector [inNavbar]="true"></app-language-selector>
22+
<div class="nav-item" ngbDropdown display="dynamic">
2323
<a id="user-dropdown" class="nav-link" ngbDropdownToggle>
2424
<i class="fas fa-user-circle"></i>
2525
</a>
26-
<div ngbDropdownMenu aria-labelledby="user-dropdown" class="dropdown-menu dropdown-menu-right">
26+
<div ngbDropdownMenu aria-labelledby="user-dropdown">
2727
<h6 class="dropdown-header">
2828
<span translate>Logged in as</span> <b>{{username}}</b></h6>
2929
<div class="dropdown-divider"></div>

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"importHelpers": true,
1717
"strict": true,
1818
"suppressImplicitAnyIndexErrors": true,
19-
"target": "es2017",
19+
"target": "es2020",
2020
"typeRoots": [
2121
"node_modules/@types"
2222
],

0 commit comments

Comments
 (0)