Skip to content

Commit 3c2d2bd

Browse files
authored
V15 (#26)
* jspython version jump * angular update step 1 * Upgraded to Angular v15 * version update
1 parent a4513f7 commit 3c2d2bd

File tree

10 files changed

+59
-209
lines changed

10 files changed

+59
-209
lines changed

angular.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,5 +298,8 @@
298298
}
299299
}
300300
},
301-
"defaultProject": "ngx-dynamic-components"
301+
"defaultProject": "ngx-dynamic-components",
302+
"cli": {
303+
"analytics": false
304+
}
302305
}

package.json

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ngx-dynamic-components",
3-
"version": "13.1.10",
3+
"version": "15.0.2",
44
"description": "NGX Dynamic Components is a configuration based dynamic components library for Angular. That allows you to rapidly create dynamic forms or any other mobile-friendly web layouts.",
55
"author": "FalconSoft Ltd",
66
"repository": {
@@ -28,54 +28,53 @@
2828
"fix": "ng serve --configuration=fix"
2929
},
3030
"dependencies": {
31-
"@angular/animations": "^13.2.6",
32-
"@angular/cdk": "^13.2.6",
33-
"@angular/common": "^13.2.6",
34-
"@angular/compiler": "^13.2.6",
35-
"@angular/core": "^13.2.6",
36-
"@angular/flex-layout": "^13.0.0-beta.38",
37-
"@angular/forms": "^13.2.6",
38-
"@angular/material": "^13.2.6",
39-
"@angular/platform-browser": "^13.2.6",
40-
"@angular/platform-browser-dynamic": "^13.2.6",
41-
"@angular/router": "^13.2.6",
42-
"@ng-select/ng-select": "^8.1.1",
31+
"@angular/animations": "^15.0.3",
32+
"@angular/cdk": "^15.0.2",
33+
"@angular/common": "^15.0.3",
34+
"@angular/compiler": "^15.0.3",
35+
"@angular/core": "^15.0.3",
36+
"@angular/flex-layout": "^14.0.0-beta.41",
37+
"@angular/forms": "^15.0.3",
38+
"@angular/material": "^15.0.2",
39+
"@angular/platform-browser": "^15.0.3",
40+
"@angular/platform-browser-dynamic": "^15.0.3",
41+
"@angular/router": "^15.0.3",
42+
"@ng-select/ng-select": "^10.0.1",
4343
"ace-builds": "^1.4.12",
4444
"angular-resizable-element": "^4.0.0",
4545
"angular-split": "^13.2.0",
4646
"bootstrap": "^5.1.3",
4747
"core-js": "^3.19.3",
48-
"fast-xml-parser": "^4.0.6",
4948
"font-awesome": "^4.7.0",
5049
"isomorphic-xml2js": "0.1.3",
5150
"json-formatter-js": "^2.3.3",
52-
"jspython-interpreter": "^2.1.7",
53-
"ngx-bootstrap": "^8.0.0",
54-
"ngx-markdown": "^13.1.0",
55-
"rxjs": "^7.4.0",
56-
"tslib": "^2.3.1",
57-
"zone.js": "~0.11.4"
51+
"jspython-interpreter": "^2.1.12",
52+
"ngx-bootstrap": "^10.0.0",
53+
"ngx-markdown": "^15.0.0",
54+
"rxjs": "^7.6.0",
55+
"tslib": "^2.4.1",
56+
"zone.js": "~0.12.0"
5857
},
5958
"devDependencies": {
60-
"@angular-devkit/build-angular": "~13.2.6",
61-
"@angular-eslint/builder": "^13.1.0",
62-
"@angular-eslint/eslint-plugin": "^13.1.0",
63-
"@angular-eslint/eslint-plugin-template": "^13.1.0",
64-
"@angular-eslint/schematics": "13.1.0",
65-
"@angular-eslint/template-parser": "^13.1.0",
66-
"@angular/cli": "^13.2.6",
67-
"@angular/compiler-cli": "^13.2.6",
68-
"@angular/language-service": "^13.2.6",
59+
"@angular-devkit/build-angular": "~15.0.3",
60+
"@angular-eslint/builder": "^15.1.0",
61+
"@angular-eslint/eslint-plugin": "^15.1.0",
62+
"@angular-eslint/eslint-plugin-template": "^15.1.0",
63+
"@angular-eslint/schematics": "15.1.0",
64+
"@angular-eslint/template-parser": "^15.1.0",
65+
"@angular/cli": "^15.0.3",
66+
"@angular/compiler-cli": "^15.0.3",
67+
"@angular/language-service": "^15.0.3",
6968
"@types/eslint": "^8.2.1",
7069
"@types/estree": "^0.0.50",
7170
"@types/jasmine": "~3.7.7",
7271
"@types/jasminewd2": "^2.0.9",
7372
"@types/node": "^12.19.11",
74-
"@typescript-eslint/eslint-plugin": "5.6.0",
75-
"@typescript-eslint/parser": "5.6.0",
73+
"@typescript-eslint/eslint-plugin": "^5.36.2",
74+
"@typescript-eslint/parser": "^5.36.2",
7675
"angular-cli-ghpages": "^1.0.0",
7776
"codelyzer": "^6.0.0",
78-
"eslint": "^8.4.1",
77+
"eslint": "^8.23.0",
7978
"eslint-plugin-import": "2.25.3",
8079
"eslint-plugin-jsdoc": "37.2.0",
8180
"eslint-plugin-prefer-arrow": "1.2.3",
@@ -87,10 +86,10 @@
8786
"karma-coverage-istanbul-reporter": "^3.0.3",
8887
"karma-jasmine": "~4.0.1",
8988
"karma-jasmine-html-reporter": "^1.6.0",
90-
"ng-packagr": "^13.0.3",
89+
"ng-packagr": "^15.0.3",
9190
"protractor": "~7.0.0",
9291
"ts-node": "~7.0.0",
9392
"tslint": "~6.1.3",
94-
"typescript": "~4.4.4"
93+
"typescript": "~4.8.4"
9594
}
9695
}

projects/bootstrap/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngx-dynamic-components/bootstrap",
3-
"version": "13.1.10",
3+
"version": "15.0.2",
44
"private": false,
55
"description": "@ngx-dynamic-components/bootstrap is Angular 7+ library what contains a bootstrap interfaces to build a configuration driven web pages and workflows.",
66
"author": "FalconSoft Ltd <[email protected]>",
@@ -19,11 +19,11 @@
1919
"form library"
2020
],
2121
"peerDependencies": {
22-
"@angular/animations": "^13.0.3",
23-
"@angular/common": "^13.0.3",
24-
"@angular/core": "^13.0.3",
25-
"@ngx-dynamic-components/core": ">=13.1.10",
22+
"@angular/animations": "^15.0.3",
23+
"@angular/common": "^15.0.3",
24+
"@angular/core": "^15.0.3",
25+
"@ngx-dynamic-components/core": ">=15.0.1",
2626
"bootstrap-scss": "^4.6.0",
27-
"ngx-bootstrap": "^8.0.0"
27+
"ngx-bootstrap": "^10.0.0"
2828
}
2929
}

projects/core/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngx-dynamic-components/core",
3-
"version": "13.1.10",
3+
"version": "15.0.2",
44
"private": false,
55
"description": "@ngx-dynamic-components/core is Angular 7+ library what contains a core interfaces to build a configuration driven web pages and workflows.",
66
"author": "FalconSoft Ltd <[email protected]>",
@@ -21,8 +21,7 @@
2121

2222
"peerDependencies": {
2323
"isomorphic-xml2js": "0.1.3",
24-
"@angular/cdk": "^13.0.3",
25-
"@angular/common": "^13.0.3",
26-
"@angular/core": "^13.0.0"
24+
"@angular/common": "^15.0.3",
25+
"@angular/core": "^15.0.3"
2726
}
2827
}

projects/core/src/lib/components/base-html-element.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ export class BaseHTMLElement<T = HTMLProperties> extends BaseDynamicComponent<T>
1414
element: HTMLElement;
1515
private parentNode: Node;
1616

17-
constructor(public containerRef?: ViewContainerRef, public injector?: Injector) {
18-
super(injector);
19-
}
20-
2117
async ngOnDestroy(): Promise<void> {
2218
this.emitEvent((this.properties as BaseProperties).onDestroy);
2319
if (this.element) {

projects/core/src/lib/ui-components/text/text.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export class TextProperties extends BindingProperties {
4646
description: 'Text style text data.',
4747
example: 'h2',
4848
})
49+
// eslint-disable-next-line @typescript-eslint/naming-convention
4950
'text-style'?: string;
5051
}
5152

projects/tools/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngx-dynamic-components/tools",
3-
"version": "13.1.10",
3+
"version": "15.0.2",
44
"private": false,
55
"description": "@ngx-dynamic-components/tools is Angular 7+ library what contains a core interfaces to build a configuration driven web pages.",
66
"author": "FalconSoft Ltd <[email protected]>",
@@ -19,12 +19,12 @@
1919
"form library"
2020
],
2121
"peerDependencies": {
22-
"@angular/common": "^13.0.3",
23-
"@angular/core": "^13.0.3",
24-
"@angular/flex-layout": "^13.0.0-beta.36",
25-
"@angular/material": "^13.0.3",
26-
"@ngx-dynamic-components/bootstrap": ">=13.1.10",
27-
"@ngx-dynamic-components/core": ">=13.1.10",
22+
"@angular/common": "^15.0.3",
23+
"@angular/core": "^15.0.3",
24+
"@angular/flex-layout": "^14.0.0-beta.41",
25+
"@angular/material": "^15.0.2",
26+
"@ngx-dynamic-components/bootstrap": ">=15.0.1",
27+
"@ngx-dynamic-components/core": ">=15.0.1",
2828
"ace-builds": "^1.4.12",
2929
"angular-split": "^13.2.0"
3030
}

projects/tools/src/lib/components/preview-editor/preview-editor.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'src/_vars.scss';
1+
@import '../../../../../../src/_vars.scss';
22

33
$color: rgba(0, 0, 0, .5);
44

projects/tools/src/lib/components/preview-editor/preview-editor.component.spec.ts

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

projects/tools/src/lib/components/preview-editor/preview-editor.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
getComponentById,
1414
BaseDynamicComponent,
1515
CoreService,
16+
AttributesMap,
1617
} from '@ngx-dynamic-components/core';
1718
import type {
1819
NGXDynamicComponent,
@@ -48,7 +49,7 @@ export class PreviewEditorComponent implements OnInit, AfterViewInit {
4849

4950
dataModel: any;
5051
dataModelCopy: any;
51-
uiModel: UIModel | string;
52+
uiModel: string;
5253

5354
uiModelEditor: Ace.Editor;
5455
uiModelJSONEditor: Ace.Editor;
@@ -101,7 +102,7 @@ export class PreviewEditorComponent implements OnInit, AfterViewInit {
101102
this.interpreter.addFunction('alert', (msg: string): void => alert(msg));
102103

103104
this.interpreter.assignGlobalContext({});
104-
this.uiModel = this.initUiModel;
105+
this.uiModel = this.initUiModel as string;
105106
console.log('this.initDataModel', this.initDataModel);
106107
this.dataModel = this.initDataModel;
107108
}
@@ -192,7 +193,7 @@ export class PreviewEditorComponent implements OnInit, AfterViewInit {
192193
this.uiModelJSONEditor.resize();
193194
}
194195

195-
private refreshPreview(uiModel: UIModel | string, dataModel: any): void {
196+
private refreshPreview(uiModel: string, dataModel: any): void {
196197
this.uiModel = uiModel;
197198
this.dataModelCopy = JSON.parse(JSON.stringify(dataModel));
198199
}

0 commit comments

Comments
 (0)