Skip to content

Commit ba75802

Browse files
AlexandraBuzilasdirix
AlexandraBuzila
authored and
sdirix
committed
Update to Angular v12
1 parent be5c82c commit ba75802

File tree

16 files changed

+3690
-1469
lines changed

16 files changed

+3690
-1469
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"tslint-loader": "^3.5.4",
3939
"tslint-react": "^4.1.0",
4040
"typedoc": "^0.19.2",
41-
"typescript": "3.8.3",
41+
"typescript": "4.2.3",
4242
"webpack": "^4.41.2",
4343
"webpack-merge": "^4.2.2"
4444
}

‎packages/angular-material/package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454
]
5555
},
5656
"peerDependencies": {
57-
"@angular/animations": "^9.0.0 || ^10.0.0 || ^11.0.0",
58-
"@angular/cdk": "^9.0.0 || ^10.0.0 || ^11.0.0",
59-
"@angular/common": "^9.0.0 || ^10.0.0 || ^11.0.0",
60-
"@angular/core": "^9.0.0 || ^10.0.0 || ^11.0.0",
61-
"@angular/flex-layout": "^9.0.0-beta || ^10.0.0-beta || ^11.0.0-beta",
62-
"@angular/forms": "^9.0.0 || ^10.0.0 || ^11.0.0",
63-
"@angular/material": "^9.0.0 || ^10.0.0 || ^11.0.0",
64-
"@angular/platform-browser": "^9.0.0 || ^10.0.0 || ^11.0.0",
65-
"@angular/router": "^9.0.0 || ^10.0.0 || ^11.0.0",
57+
"@angular/animations": "^12.0.0",
58+
"@angular/cdk": "^12.0.0",
59+
"@angular/common": "^12.0.0",
60+
"@angular/core": "^12.0.0",
61+
"@angular/flex-layout": "^12.0.0-beta",
62+
"@angular/forms": "^12.0.0",
63+
"@angular/material": "^12.0.0",
64+
"@angular/platform-browser": "^12.0.0",
65+
"@angular/router": "^12.0.0",
6666
"@jsonforms/angular": "^3.0.0-alpha.0",
6767
"@jsonforms/core": "^3.0.0-alpha.0",
6868
"core-js": "^2.5.3",
@@ -73,18 +73,18 @@
7373
"hammerjs": "2.0.8"
7474
},
7575
"devDependencies": {
76-
"@angular/animations": "^9.0.0",
77-
"@angular/cdk": "^9.0.0",
78-
"@angular/common": "^9.0.0",
79-
"@angular/compiler": "^9.0.0",
80-
"@angular/compiler-cli": "^9.0.0",
81-
"@angular/core": "^9.0.0",
82-
"@angular/flex-layout": "^9.0.0-beta.29",
83-
"@angular/forms": "^9.0.0",
84-
"@angular/material": "^9.0.0",
85-
"@angular/platform-browser": "^9.0.0",
86-
"@angular/platform-browser-dynamic": "^9.0.0",
87-
"@angular/router": "^9.0.0",
76+
"@angular/animations": "^12.0.0",
77+
"@angular/cdk": "^12.0.0",
78+
"@angular/common": "^12.0.0",
79+
"@angular/compiler": "^12.0.0",
80+
"@angular/compiler-cli": "^12.0.0",
81+
"@angular/core": "^12.0.0",
82+
"@angular/flex-layout": "^12.0.0-beta",
83+
"@angular/forms": "^12.0.0",
84+
"@angular/material": "^12.0.0",
85+
"@angular/platform-browser": "^12.0.0",
86+
"@angular/platform-browser-dynamic": "^12.0.0",
87+
"@angular/router": "^12.0.0",
8888
"@jsonforms/angular": "^3.0.0-alpha.1",
8989
"@jsonforms/angular-test": "^3.0.0-alpha.1",
9090
"@jsonforms/core": "^3.0.0-alpha.1",

‎packages/angular-material/src/layouts/layout.renderer.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2323
THE SOFTWARE.
2424
*/
25-
import { OnDestroy, OnInit, ChangeDetectorRef } from '@angular/core';
25+
import { OnDestroy, OnInit, ChangeDetectorRef, Component } from '@angular/core';
2626
import {
2727
JsonFormsAngularService,
2828
JsonFormsBaseRenderer
@@ -36,6 +36,9 @@ import {
3636
} from '@jsonforms/core';
3737
import { Subscription } from 'rxjs';
3838

39+
@Component({
40+
template: ''
41+
})
3942
export class LayoutRenderer<T extends Layout> extends JsonFormsBaseRenderer<T>
4043
implements OnInit, OnDestroy {
4144
hidden: boolean;

‎packages/angular-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"karma-jasmine": "^2.0.1",
1717
"karma-sourcemap-loader": "^0.3.7",
1818
"karma-webpack": "^3.0.5",
19-
"typescript": "3.8.3"
19+
"typescript": "4.2.3"
2020
},
2121
"scripts": {
2222
"build": "tsc",

‎packages/angular/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@
6161
]
6262
},
6363
"peerDependencies": {
64-
"@angular/core": "^9.0.0 || ^10.0.0 || ^11.0.0",
65-
"@angular/forms": "^9.0.0 || ^10.0.0 || ^11.0.0",
64+
"@angular/core": "^12.0.0",
65+
"@angular/forms": "^12.0.0",
6666
"@jsonforms/core": "^3.0.0-alpha.0",
6767
"rxjs": "^6.4.0"
6868
},
6969
"devDependencies": {
70-
"@angular/compiler": "^9.0.0",
71-
"@angular/compiler-cli": "^9.0.0",
72-
"@angular/core": "^9.0.0",
73-
"@angular/forms": "^9.0.0",
70+
"@angular/compiler": "^12.0.0",
71+
"@angular/compiler-cli": "^12.0.0",
72+
"@angular/core": "^12.0.0",
73+
"@angular/forms": "^12.0.0",
7474
"@jsonforms/core": "^3.0.0-alpha.1",
7575
"ava": "~2.4.0",
7676
"copy-webpack-plugin": "^5.0.5",

‎packages/angular/src/abstract-control.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
OwnPropsOfControl,
3232
StatePropsOfControl
3333
} from '@jsonforms/core';
34-
import { Input, OnDestroy, OnInit } from '@angular/core';
34+
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
3535
import {
3636
AbstractControl,
3737
FormControl,
@@ -43,7 +43,9 @@ import { Subscription } from 'rxjs';
4343
import { JsonFormsBaseRenderer } from './base.renderer';
4444
import { JsonFormsAngularService } from './jsonforms.service';
4545
import merge from 'lodash/merge';
46-
46+
@Component({
47+
template: ''
48+
})
4749
export abstract class JsonFormsAbstractControl<
4850
Props extends StatePropsOfControl
4951
> extends JsonFormsBaseRenderer<ControlElement> implements OnInit, OnDestroy {

‎packages/angular/src/base.renderer.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2323
THE SOFTWARE.
2424
*/
25-
import { Input } from '@angular/core';
25+
import { Directive, Input } from '@angular/core';
2626
import {
2727
JsonSchema,
2828
OwnPropsOfRenderer,
2929
UISchemaElement
3030
} from '@jsonforms/core';
3131

32+
@Directive()
3233
export class JsonFormsBaseRenderer<T extends UISchemaElement> {
3334
@Input() uischema: T;
3435
@Input() schema: JsonSchema;

‎packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"ts-node": "^8.5.3",
8181
"tslint": "^5.20.1",
8282
"typedoc": "^0.19.2",
83-
"typescript": "3.8.3",
83+
"typescript": "4.2.3",
8484
"webpack": "^4.41.2",
8585
"webpack-cli": "^3.2.1"
8686
}

‎packages/examples/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"rimraf": "^3.0.2",
5050
"tslint": "^5.20.1",
5151
"typedoc": "^0.19.2",
52-
"typescript": "3.8.3"
52+
"typescript": "4.2.3",
53+
"tslib": "^2.2.0"
5354
}
5455
}

0 commit comments

Comments
 (0)