From 9472bea6003ae43739dc36dc86f05c901fa908b1 Mon Sep 17 00:00:00 2001 From: lipata Date: Thu, 3 Oct 2024 15:36:40 +0300 Subject: [PATCH 1/2] chore: update wc, react and dock-manager --- .../igr-ts/bullet-graph/default/index.ts | 2 +- .../igr-ts/category-chart/default/index.ts | 2 +- .../igr-ts/doughnut-chart/default/index.ts | 2 +- .../igr-ts/financial-chart/default/index.ts | 2 +- .../react/igr-ts/grid/basic/index.ts | 4 ++-- .../igr-ts/linear-gauge/default/index.ts | 2 +- .../react/igr-ts/pie-chart/default/index.ts | 2 +- .../igr-ts/radial-gauge/default/index.ts | 2 +- .../igc-ts/dock-manager/default/index.ts | 2 +- .../igc-ts/projects/_base/files/package.json | 6 ++--- .../_base_with_home/files/package.json | 22 +++++++++---------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/cli/templates/react/igr-ts/bullet-graph/default/index.ts b/packages/cli/templates/react/igr-ts/bullet-graph/default/index.ts index 2aaea3218..050c55967 100644 --- a/packages/cli/templates/react/igr-ts/bullet-graph/default/index.ts +++ b/packages/cli/templates/react/igr-ts/bullet-graph/default/index.ts @@ -10,7 +10,7 @@ class IgrTsBulletGraphTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-ts"; this.name = "Bullet Graph"; this.description = `allows for a linear and concise view of measures compared against a scale.`; - this.packages = ["igniteui-react-gauges@~18.6.0"]; + this.packages = ["igniteui-react-gauges@~18.7.0"]; } } module.exports = new IgrTsBulletGraphTemplate(); diff --git a/packages/cli/templates/react/igr-ts/category-chart/default/index.ts b/packages/cli/templates/react/igr-ts/category-chart/default/index.ts index 2c25cd729..7a90f12a8 100644 --- a/packages/cli/templates/react/igr-ts/category-chart/default/index.ts +++ b/packages/cli/templates/react/igr-ts/category-chart/default/index.ts @@ -11,7 +11,7 @@ class IgrTsCategoryChartTemplate extends IgniteUIForReactTemplate { this.name = "Category Chart"; this.description = `makes visualizing category data easy. Simplifies the complexities of the data visualization domain into manageable API`; - this.packages = ["igniteui-react-charts@~18.6.0"]; + this.packages = ["igniteui-react-charts@~18.7.0"]; } } module.exports = new IgrTsCategoryChartTemplate(); diff --git a/packages/cli/templates/react/igr-ts/doughnut-chart/default/index.ts b/packages/cli/templates/react/igr-ts/doughnut-chart/default/index.ts index 0fa276483..b081552fe 100644 --- a/packages/cli/templates/react/igr-ts/doughnut-chart/default/index.ts +++ b/packages/cli/templates/react/igr-ts/doughnut-chart/default/index.ts @@ -10,7 +10,7 @@ class IgrTsDoughnutChartTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-ts"; this.name = "Doughnut Chart"; this.description = `proportionally illustrate the occurrences of variables.`; - this.packages = ["igniteui-react-charts@~18.6.0"]; + this.packages = ["igniteui-react-charts@~18.7.0"]; } } module.exports = new IgrTsDoughnutChartTemplate(); diff --git a/packages/cli/templates/react/igr-ts/financial-chart/default/index.ts b/packages/cli/templates/react/igr-ts/financial-chart/default/index.ts index 36a71f086..b33c80fd0 100644 --- a/packages/cli/templates/react/igr-ts/financial-chart/default/index.ts +++ b/packages/cli/templates/react/igr-ts/financial-chart/default/index.ts @@ -12,7 +12,7 @@ class IgrTsFinancialChartTemplate extends IgniteUIForReactTemplate { this.name = "Financial Chart"; this.description = `charting component that makes it easy to visualize financial data by using a simple and intuitive API.`; - this.packages = ["igniteui-react-charts@~18.6.0"]; + this.packages = ["igniteui-react-charts@~18.7.0"]; } } module.exports = new IgrTsFinancialChartTemplate(); diff --git a/packages/cli/templates/react/igr-ts/grid/basic/index.ts b/packages/cli/templates/react/igr-ts/grid/basic/index.ts index dd15f07e6..0b468a1d0 100644 --- a/packages/cli/templates/react/igr-ts/grid/basic/index.ts +++ b/packages/cli/templates/react/igr-ts/grid/basic/index.ts @@ -14,8 +14,8 @@ class GridTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-ts"; this.components = ["Grid"]; this.controlGroup = "Data Grids"; - this.packages = ["igniteui-react-grids@~18.6.0", "igniteui-react-inputs@~18.6.0", - "igniteui-react-layouts@~18.6.0", "igniteui-react@~18.6.0"]; + this.packages = ["igniteui-react-grids@~18.7.0", "igniteui-react-inputs@~18.7.0", + "igniteui-react-layouts@~18.7.0", "igniteui-react@~18.7.0"]; this.hasExtraConfiguration = false; } diff --git a/packages/cli/templates/react/igr-ts/linear-gauge/default/index.ts b/packages/cli/templates/react/igr-ts/linear-gauge/default/index.ts index a988f615a..4b534b079 100644 --- a/packages/cli/templates/react/igr-ts/linear-gauge/default/index.ts +++ b/packages/cli/templates/react/igr-ts/linear-gauge/default/index.ts @@ -10,7 +10,7 @@ class IgrTsLinearGaugeTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-ts"; this.name = "Linear Gauge"; this.description = `value compared against a scale and one or more ranges.`; - this.packages = ["igniteui-react-gauges@~18.6.0"]; + this.packages = ["igniteui-react-gauges@~18.7.0"]; } } module.exports = new IgrTsLinearGaugeTemplate(); diff --git a/packages/cli/templates/react/igr-ts/pie-chart/default/index.ts b/packages/cli/templates/react/igr-ts/pie-chart/default/index.ts index 7e827c975..4c218cefe 100644 --- a/packages/cli/templates/react/igr-ts/pie-chart/default/index.ts +++ b/packages/cli/templates/react/igr-ts/pie-chart/default/index.ts @@ -10,7 +10,7 @@ class IgrTsPieChartTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-ts"; this.name = "Pie Chart"; this.description = `easily illustate the proportions of data entries`; - this.packages = ["igniteui-react-charts@~18.6.0"]; + this.packages = ["igniteui-react-charts@~18.7.0"]; } } module.exports = new IgrTsPieChartTemplate(); diff --git a/packages/cli/templates/react/igr-ts/radial-gauge/default/index.ts b/packages/cli/templates/react/igr-ts/radial-gauge/default/index.ts index bd47c9f7d..c216fa1c1 100644 --- a/packages/cli/templates/react/igr-ts/radial-gauge/default/index.ts +++ b/packages/cli/templates/react/igr-ts/radial-gauge/default/index.ts @@ -12,7 +12,7 @@ class IgrTsRadialGaugeTemplate extends IgniteUIForReactTemplate { this.description = `provides a number of visual elements, like a needle, tick marks, ranges and labels, in order to create a predefined shape and scale.`; // TODO: read version from igniteui-react-core in package.json - this.packages = ["igniteui-react-gauges@~18.6.0"]; + this.packages = ["igniteui-react-gauges@~18.7.0"]; } } module.exports = new IgrTsRadialGaugeTemplate(); diff --git a/packages/cli/templates/webcomponents/igc-ts/dock-manager/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/dock-manager/default/index.ts index 47761e247..f942ed265 100644 --- a/packages/cli/templates/webcomponents/igc-ts/dock-manager/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/dock-manager/default/index.ts @@ -10,7 +10,7 @@ class IgcDockManagerTemplate extends IgniteUIForWebComponentsTemplate { this.projectType = "igc-ts"; this.name = "Dock Manager"; this.description = "Dock Manager with most functionalities and docking options"; - this.packages = ["igniteui-dockmanager@~1.12.4"]; + this.packages = ["igniteui-dockmanager@~1.14.4"]; } } module.exports = new IgcDockManagerTemplate(); diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json index faa65612d..76d594a63 100644 --- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json +++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json @@ -21,9 +21,9 @@ }, "dependencies": { "@vaadin/router": "^1.7.4", - "lit": "^3.1.2", - "typescript": "^5.3.3", - "igniteui-webcomponents": "~4.11.0" + "lit": "^3.2.0", + "typescript": "^5.6.2", + "igniteui-webcomponents": "~5.0.0" }, "devDependencies": { "@babel/preset-env": "^7.20.2", diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base_with_home/files/package.json b/packages/cli/templates/webcomponents/igc-ts/projects/_base_with_home/files/package.json index 170f37bba..0a6f3d325 100644 --- a/packages/cli/templates/webcomponents/igc-ts/projects/_base_with_home/files/package.json +++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base_with_home/files/package.json @@ -22,16 +22,16 @@ "dependencies": { "@vaadin/router": "^1.7.4", "@igniteui/material-icons-extended": "^3.0.2", - "igniteui-dockmanager": "~1.14.3", - "igniteui-webcomponents": "~4.11.0", - "igniteui-webcomponents-charts": "~4.8.0", - "igniteui-webcomponents-core": "~4.8.0", - "igniteui-webcomponents-gauges": "~4.8.0", - "igniteui-webcomponents-grids": "~4.8.0", - "igniteui-webcomponents-inputs": "~4.8.0", - "igniteui-webcomponents-layouts": "~4.8.0", - "lit": "^3.1.2", - "typescript": "^5.3.3" + "igniteui-dockmanager": "~1.14.4", + "igniteui-webcomponents": "~5.0.0", + "igniteui-webcomponents-charts": "~5.0.0", + "igniteui-webcomponents-core": "~5.0.0", + "igniteui-webcomponents-gauges": "~5.0.0", + "igniteui-webcomponents-grids": "~5.0.0", + "igniteui-webcomponents-inputs": "~5.0.0", + "igniteui-webcomponents-layouts": "~5.0.0", + "lit": "^3.2.0", + "typescript": "^5.6.2" }, "devDependencies": { "@babel/preset-env": "^7.20.2", @@ -50,7 +50,7 @@ "deepmerge": "^4.2.2", "eslint": "^8.57.0", "eslint-plugin-lit": "^1.8.2", - "igniteui-cli": "^13.1.5", + "igniteui-cli": "^14.0.0", "rimraf": "^5.0.5", "rollup": "^2.79.0", "rollup-plugin-copy-assets": "^2.0.3", From 95083684d5b7da20627c42d71801c0ab90390c88 Mon Sep 17 00:00:00 2001 From: lipata Date: Thu, 10 Oct 2024 14:54:26 +0300 Subject: [PATCH 2/2] fix: use native form instead of removed igc-form --- .../files/src/app/__path__/__filePrefix__.ts | 6 ++---- .../src/app/__path__/__filePrefix__.test.ts | 2 +- .../files/src/app/__path__/__filePrefix__.ts | 16 ++++++---------- .../webcomponents/igc-ts/form/default/index.ts | 2 +- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/packages/cli/templates/webcomponents/igc-ts/custom-templates/subscription-form/files/src/app/__path__/__filePrefix__.ts b/packages/cli/templates/webcomponents/igc-ts/custom-templates/subscription-form/files/src/app/__path__/__filePrefix__.ts index 914ad88fb..073549b01 100644 --- a/packages/cli/templates/webcomponents/igc-ts/custom-templates/subscription-form/files/src/app/__path__/__filePrefix__.ts +++ b/packages/cli/templates/webcomponents/igc-ts/custom-templates/subscription-form/files/src/app/__path__/__filePrefix__.ts @@ -2,14 +2,12 @@ import { html, css, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { defineComponents, - IgcFormComponent, IgcInputComponent, IgcCheckboxComponent, IgcButtonComponent, } from 'igniteui-webcomponents'; defineComponents( - IgcFormComponent, IgcInputComponent, IgcCheckboxComponent, IgcButtonComponent, @@ -49,7 +47,7 @@ export default class $(ClassName) extends LitElement { render() { return html`
- +
Subscribe
@@ -59,7 +57,7 @@ export default class $(ClassName) extends LitElement { Reset Submit
- + `; } diff --git a/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.test.ts b/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.test.ts index 0b0148e04..6b706a029 100644 --- a/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.test.ts +++ b/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.test.ts @@ -1,7 +1,7 @@ import { expect } from '@open-wc/testing'; import $(ClassName) from './$(path).js'; -describe('IgcFormComponent', () => { +describe('Form', () => { it(' is an instance of $(ClassName)', async () => { const element = document.createElement('app-$(path)'); expect(element).to.be.instanceOf($(ClassName)); diff --git a/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.ts b/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.ts index f506f427d..846a07d8e 100644 --- a/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.ts +++ b/packages/cli/templates/webcomponents/igc-ts/form/default/files/src/app/__path__/__filePrefix__.ts @@ -2,12 +2,10 @@ import { html, css, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { defineComponents, - IgcFormComponent, IgcRadioGroupComponent, } from 'igniteui-webcomponents'; defineComponents( - IgcFormComponent, IgcRadioGroupComponent, ); @@ -23,19 +21,17 @@ export default class $(ClassName) extends LitElement { render() { return html` - - - - - +
+ +
- - + + Male Female
- +
`; } } diff --git a/packages/cli/templates/webcomponents/igc-ts/form/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/form/default/index.ts index 92b9a7d21..97a14a854 100644 --- a/packages/cli/templates/webcomponents/igc-ts/form/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/form/default/index.ts @@ -9,7 +9,7 @@ class IgcFormTemplate extends IgniteUIForWebComponentsTemplate { this.id = "form"; this.projectType = "igc-ts"; this.name = "Form"; - this.description = "basic IgcForm"; + this.description = "basic Form"; } } module.exports = new IgcFormTemplate();