Skip to content

Commit 385daf5

Browse files
paulbertdogiMutugiii
authored
all: bump angular to 15 (fixes #9123) (#9006)
Co-authored-by: dogi <[email protected]> Co-authored-by: mutugiii <[email protected]>
1 parent 787b4c1 commit 385daf5

File tree

99 files changed

+231
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+231
-206
lines changed

angular.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"src/styles/calendar.scss",
5555
"src/styles/roboto.scss",
5656
"src/simplemde.scss",
57-
"src/app/_export.module.scss",
5857
"node_modules/@fortawesome/fontawesome-free/css/all.css"
5958
],
6059
"scripts": [],
@@ -290,6 +289,12 @@
290289
},
291290
"@schematics/angular:directive": {
292291
"prefix": "app"
292+
},
293+
"@angular-eslint/schematics:application": {
294+
"setParserOptionsProject": true
295+
},
296+
"@angular-eslint/schematics:library": {
297+
"setParserOptionsProject": true
293298
}
294299
},
295300
"cli": {

docker/planet/pre-builder-Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM treehouses/node:3.14
1+
FROM treehouses/node:3.16
22

33
WORKDIR /ng-app
44

@@ -9,4 +9,4 @@ RUN apk add --update \
99
build-base \
1010
jq
1111

12-
RUN npm i --silent
12+
RUN npm i --silent

package.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "planet",
33
"license": "AGPL-3.0",
4-
"version": "0.20.30",
4+
"version": "0.20.31",
55
"myplanet": {
66
"latest": "v0.32.3",
77
"min": "v0.31.3"
@@ -26,21 +26,21 @@
2626
},
2727
"private": true,
2828
"dependencies": {
29-
"@angular/animations": "14.3.0",
30-
"@angular/cdk": "^14.2.7",
31-
"@angular/common": "14.3.0",
32-
"@angular/compiler": "14.3.0",
33-
"@angular/core": "14.3.0",
34-
"@angular/forms": "14.3.0",
35-
"@angular/localize": "^14.3.0",
36-
"@angular/material": "^14.2.7",
37-
"@angular/platform-browser": "14.3.0",
38-
"@angular/platform-browser-dynamic": "14.3.0",
39-
"@angular/platform-server": "14.3.0",
40-
"@angular/router": "14.3.0",
41-
"@angular/service-worker": "14.3.0",
42-
"@covalent/markdown": "^5.1.0",
43-
"@covalent/text-editor": "^5.1.0",
29+
"@angular/animations": "15.2.10",
30+
"@angular/cdk": "^15.2.9",
31+
"@angular/common": "15.2.10",
32+
"@angular/compiler": "15.2.10",
33+
"@angular/core": "15.2.10",
34+
"@angular/forms": "15.2.10",
35+
"@angular/localize": "^15.2.10",
36+
"@angular/material": "^15.2.9",
37+
"@angular/platform-browser": "15.2.10",
38+
"@angular/platform-browser-dynamic": "15.2.10",
39+
"@angular/platform-server": "15.2.10",
40+
"@angular/router": "15.2.10",
41+
"@angular/service-worker": "15.2.10",
42+
"@covalent/markdown": "^6.5.0",
43+
"@covalent/text-editor": "^6.5.0",
4444
"@fullcalendar/angular": "^6.1.10",
4545
"@fullcalendar/core": "^6.1.10",
4646
"@fullcalendar/daygrid": "^6.1.10",
@@ -49,7 +49,7 @@
4949
"export-to-csv": "^0.2.1",
5050
"html-to-pdfmake": "^1.2.0",
5151
"jszip": "^3.2.2",
52-
"marked": "^15.0.12",
52+
"marked": "4.2.5",
5353
"material-design-icons": "^3.0.1",
5454
"material-icons": "^0.3.1",
5555
"mime": "4.0.0",
@@ -64,25 +64,25 @@
6464
"zone.js": "~0.11.4"
6565
},
6666
"devDependencies": {
67-
"@angular-devkit/build-angular": "^14.2.13",
68-
"@angular-eslint/builder": "14.4.0",
69-
"@angular-eslint/eslint-plugin": "14.4.0",
70-
"@angular-eslint/eslint-plugin-template": "14.4.0",
71-
"@angular-eslint/schematics": "14.4.0",
72-
"@angular-eslint/template-parser": "14.4.0",
73-
"@angular/cli": "^14.2.13",
74-
"@angular/compiler-cli": "14.3.0",
75-
"@angular/language-service": "14.3.0",
67+
"@angular-devkit/build-angular": "^15.2.11",
68+
"@angular-eslint/builder": "15.2.1",
69+
"@angular-eslint/eslint-plugin": "15.2.1",
70+
"@angular-eslint/eslint-plugin-template": "15.2.1",
71+
"@angular-eslint/schematics": "15.2.1",
72+
"@angular-eslint/template-parser": "15.2.1",
73+
"@angular/cli": "^15.2.11",
74+
"@angular/compiler-cli": "15.2.10",
75+
"@angular/language-service": "15.2.10",
7676
"@fortawesome/fontawesome-free": "^5.13.0",
7777
"@types/jasmine": "~3.6.0",
7878
"@types/jasminewd2": "~2.0.8",
7979
"@types/ms": "0.7.34",
8080
"@types/node": "^12.11.1",
8181
"@types/pouchdb": "^6.4.0",
8282
"@types/pouchdb-find": "^6.3.4",
83-
"@typescript-eslint/eslint-plugin": "^5.36.2",
84-
"@typescript-eslint/parser": "^5.36.2",
85-
"eslint": "^8.23.0",
83+
"@typescript-eslint/eslint-plugin": "^5.43.0",
84+
"@typescript-eslint/parser": "^5.43.0",
85+
"eslint": "^8.28.0",
8686
"eslint-plugin-import": "^2.29.1",
8787
"eslint-plugin-jsdoc": "^46.10.1",
8888
"eslint-plugin-prefer-arrow": "^1.2.3",
@@ -99,6 +99,6 @@
9999
"request-promise": "^4.2.5",
100100
"sass-lint": "^1.13.1",
101101
"ts-node": "~8.5.4",
102-
"typescript": "~4.6.4"
102+
"typescript": "~4.9.5"
103103
}
104104
}

src/app/_export.module.scss

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/app/app-router.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const routes: Routes = [
2020
];
2121

2222
@NgModule({
23-
imports: [ RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' }) ],
23+
imports: [ RouterModule.forRoot(routes, {}) ],
2424
exports: [ RouterModule ]
2525
})
2626
export class AppRoutingModule {}

src/app/chat/chat-sidebar/chat-sidebar.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit, OnDestroy, HostListener } from '@angular/core';
22
import { FormBuilder, FormGroup, Validators, FormControl, AbstractControl } from '@angular/forms';
3-
import { MatDialog } from '@angular/material/dialog';
3+
import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
44
import { Subject } from 'rxjs';
55
import { takeUntil } from 'rxjs/operators';
66

src/app/community/community-link-dialog.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, ViewChild, Inject } from '@angular/core';
22
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
3-
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
3+
import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
44
import { MatStepper } from '@angular/material/stepper';
55
import { CustomValidators } from '../validators/custom-validators';
66
import { TeamsService } from '../teams/teams.service';

src/app/community/community-list-dialog.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Inject } from '@angular/core';
2-
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
2+
import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
33

44
@Component({
55
templateUrl: './community-list-dialog.component.html',

src/app/community/community.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit, OnDestroy, ViewEncapsulation, HostListener } from '@angular/core';
22
import { ActivatedRoute, ParamMap, Router } from '@angular/router';
3-
import { MatDialog } from '@angular/material/dialog';
3+
import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
44
import { UntypedFormBuilder } from '@angular/forms';
55
import { Subject, forkJoin, iif, of, throwError } from 'rxjs';
66
import { takeUntil, finalize, switchMap, map, catchError, tap, debounceTime, distinctUntilChanged } from 'rxjs/operators';

src/app/courses/add-courses/courses-step.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, Input, Output, EventEmitter, OnDestroy, ViewEncapsulation, ViewChild } from '@angular/core';
22
import { Router } from '@angular/router';
33
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
4-
import { MatDialog, MatDialogRef } from '@angular/material/dialog';
4+
import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
55
import { Subject } from 'rxjs';
66
import { takeUntil } from 'rxjs/operators';
77
import { CoursesService } from '../courses.service';

0 commit comments

Comments
 (0)