Skip to content

Commit 2f98e08

Browse files
denStrigodenStrigo
authored
feat: update to Angular 14 (#1)
* fix(angular 13): fix issues after updates to Angular 13 in rooms component and country orders component (#5965) * feat: update to Angular 14 * feat: update angular eslint packages eslint * feat: update nebular to 10 version * feat: update style import, remove ~
1 parent 1d78122 commit 2f98e08

38 files changed

+2931
-3045
lines changed

‎angular.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@
173173
}
174174
}
175175
},
176-
"defaultProject": "ngx-admin-demo",
177176
"schematics": {
178177
"@schematics/angular:component": {
179178
"prefix": "ngx",

‎package-lock.json‎

Lines changed: 2824 additions & 2932 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@
3030
"postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points --tsconfig \"./src/tsconfig.app.json\""
3131
},
3232
"dependencies": {
33-
"@angular/animations": "^13.3.12",
33+
"@angular/animations": "^14.2.12",
3434
"@angular/cdk": "12.1.0",
35-
"@angular/common": "^13.3.12",
36-
"@angular/compiler": "^13.3.12",
37-
"@angular/core": "^13.3.12",
38-
"@angular/forms": "^13.3.12",
35+
"@angular/common": "^14.2.12",
36+
"@angular/compiler": "^14.2.12",
37+
"@angular/core": "^14.2.12",
38+
"@angular/forms": "^14.2.12",
3939
"@angular/google-maps": "^12.2.13",
40-
"@angular/platform-browser": "^13.3.12",
41-
"@angular/platform-browser-dynamic": "^13.3.12",
42-
"@angular/router": "^13.3.12",
40+
"@angular/platform-browser": "^14.2.12",
41+
"@angular/platform-browser-dynamic": "^14.2.12",
42+
"@angular/router": "^14.2.12",
4343
"@asymmetrik/ngx-leaflet": "3.0.1",
44-
"@nebular/auth": "9.1.0-rc.8",
45-
"@nebular/eva-icons": "9.1.0-rc.8",
46-
"@nebular/security": "9.1.0-rc.8",
47-
"@nebular/theme": "9.1.0-rc.8",
44+
"@nebular/auth": "10.0.0",
45+
"@nebular/eva-icons": "10.0.0",
46+
"@nebular/security": "10.0.0",
47+
"@nebular/theme": "10.0.0",
4848
"@swimlane/ngx-charts": "^14.0.0",
4949
"angular2-chartjs": "0.4.1",
5050
"bootstrap": "4.3.1",
@@ -77,27 +77,27 @@
7777
"zone.js": "~0.11.4"
7878
},
7979
"devDependencies": {
80-
"@angular-devkit/build-angular": "^13.3.10",
81-
"@angular-eslint/builder": "13.5.0",
82-
"@angular-eslint/eslint-plugin": "13.5.0",
83-
"@angular-eslint/eslint-plugin-template": "13.5.0",
84-
"@angular-eslint/schematics": "13.5.0",
85-
"@angular-eslint/template-parser": "13.5.0",
86-
"@angular/cli": "^13.3.10",
87-
"@angular/compiler-cli": "^13.3.12",
88-
"@angular/language-service": "13.3.12",
80+
"@angular-devkit/build-angular": "^14.2.10",
81+
"@angular-eslint/builder": "14.4.0",
82+
"@angular-eslint/eslint-plugin": "14.4.0",
83+
"@angular-eslint/eslint-plugin-template": "14.4.0",
84+
"@angular-eslint/schematics": "14.4.0",
85+
"@angular-eslint/template-parser": "14.4.0",
86+
"@angular/cli": "^14.2.10",
87+
"@angular/compiler-cli": "^14.2.12",
88+
"@angular/language-service": "14.2.12",
8989
"@compodoc/compodoc": "1.0.1",
9090
"@fortawesome/fontawesome-free": "^5.2.0",
9191
"@types/d3-color": "1.0.5",
9292
"@types/jasmine": "~3.3.0",
9393
"@types/jasminewd2": "2.0.3",
9494
"@types/leaflet": "1.2.3",
9595
"@types/node": "^12.12.70",
96-
"@typescript-eslint/eslint-plugin": "5.27.1",
97-
"@typescript-eslint/parser": "5.27.1",
96+
"@typescript-eslint/eslint-plugin": "^5.36.2",
97+
"@typescript-eslint/parser": "^5.36.2",
9898
"codelyzer": "^6.0.2",
9999
"conventional-changelog-cli": "1.3.4",
100-
"eslint": "^8.17.0",
100+
"eslint": "^8.23.0",
101101
"husky": "0.13.3",
102102
"jasmine-core": "~3.6.0",
103103
"jasmine-spec-reporter": "~5.0.0",

‎src/app/@theme/components/footer/footer.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import '../../styles/themes';
2-
@import '~@nebular/theme/styles/global/breakpoints';
3-
@import '~bootstrap/scss/mixins/breakpoints';
2+
@import '@nebular/theme/styles/global/breakpoints';
3+
@import 'bootstrap/scss/mixins/breakpoints';
44

55
@include nb-install-component() {
66
width: 100%;

‎src/app/@theme/components/header/header.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import '~bootstrap/scss/mixins/breakpoints';
2-
@import '~@nebular/theme/styles/global/breakpoints';
1+
@import 'bootstrap/scss/mixins/breakpoints';
2+
@import '@nebular/theme/styles/global/breakpoints';
33
@import '../../styles/themes';
44

55
@include nb-install-component() {

‎src/app/@theme/layouts/one-column/one-column.layout.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import '../../styles/themes';
2-
@import '~bootstrap/scss/mixins/breakpoints';
3-
@import '~@nebular/theme/styles/global/breakpoints';
2+
@import 'bootstrap/scss/mixins/breakpoints';
3+
@import '@nebular/theme/styles/global/breakpoints';
44

55
@include nb-install-component() {
66
.menu-sidebar ::ng-deep .scrollable {

‎src/app/@theme/layouts/three-columns/three-columns.layout.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import '../../styles/themes';
2-
@import '~bootstrap/scss/mixins/breakpoints';
3-
@import '~@nebular/theme/styles/global/breakpoints';
2+
@import 'bootstrap/scss/mixins/breakpoints';
3+
@import '@nebular/theme/styles/global/breakpoints';
44

55
@include nb-install-component() {
66
.menu-sidebar ::ng-deep .scrollable {

‎src/app/@theme/layouts/two-columns/two-columns.layout.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import '../../styles/themes';
2-
@import '~bootstrap/scss/mixins/breakpoints';
3-
@import '~@nebular/theme/styles/global/breakpoints';
2+
@import 'bootstrap/scss/mixins/breakpoints';
3+
@import '@nebular/theme/styles/global/breakpoints';
44

55
@include nb-install-component() {
66
.menu-sidebar ::ng-deep .scrollable {

‎src/app/@theme/styles/styles.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
@import 'themes';
55

66
// framework component themes (styles tied to theme variables)
7-
@import '~@nebular/theme/styles/globals';
8-
@import '~@nebular/auth/styles/globals';
7+
@import '@nebular/theme/styles/globals';
8+
@import '@nebular/auth/styles/globals';
99

10-
@import '~bootstrap/scss/functions';
11-
@import '~bootstrap/scss/variables';
12-
@import '~bootstrap/scss/mixins';
13-
@import '~bootstrap/scss/grid';
10+
@import 'bootstrap/scss/functions';
11+
@import 'bootstrap/scss/variables';
12+
@import 'bootstrap/scss/mixins';
13+
@import 'bootstrap/scss/grid';
1414

1515
// loading progress bar theme
1616
@import './pace.theme';

‎src/app/@theme/styles/themes.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @nebular theming framework
2-
@import '~@nebular/theme/styles/theming';
2+
@import '@nebular/theme/styles/theming';
33
// @nebular out of the box themes
4-
@import '~@nebular/theme/styles/themes';
4+
@import '@nebular/theme/styles/themes';
55

66
$nb-themes: nb-register-theme((
77
layout-padding-top: 2.25rem,

0 commit comments

Comments
 (0)