Skip to content

Commit

Permalink
Merge branch 'master' into gedinakova/react-add-styles-css
Browse files Browse the repository at this point in the history
  • Loading branch information
gedinakova authored Feb 16, 2024
2 parents 8fe7b5e + d754a0e commit 424ad65
Show file tree
Hide file tree
Showing 28 changed files with 115 additions and 115 deletions.
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igniteui-cli",
"version": "13.1.5",
"version": "13.1.6-beta.2",
"description": "CLI tool for creating Ignite UI projects",
"keywords": [
"CLI",
Expand Down Expand Up @@ -78,8 +78,8 @@
"all": true
},
"dependencies": {
"@igniteui/angular-templates": "~17.1.1315",
"@igniteui/cli-core": "~13.1.5",
"@igniteui/angular-templates": "~17.1.1316-beta.2",
"@igniteui/cli-core": "~13.1.6-beta.2",
"chalk": "^2.3.2",
"fs-extra": "^3.0.1",
"glob": "^7.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@angular/animations": "~17.2.0",
"@angular/common": "~17.2.0",
"@angular/compiler": "~17.2.0",
"@angular/core": "~17.2.0",
"@angular/forms": "~17.2.0",
"@angular/platform-browser": "~17.2.0",
"@angular/platform-browser-dynamic": "~17.2.0",
"@angular/router": "~17.2.0",
"jquery": ">=1.9.1",
"jquery-ui": ">=1.10.5",
"igniteui-angular-wrappers": "~17.0.0",
Expand All @@ -27,9 +27,9 @@
"zone.js": "~0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular-devkit/build-angular": "~17.2.0",
"@angular/cli": "~17.2.0",
"@angular/compiler-cli": "~17.2.0",
"@types/jasmine": "~5.1.0",
"@types/node": "^18.16.0",
"igniteui-cli": "^$(cliVersion)",
Expand All @@ -39,6 +39,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.2.2"
"typescript": "~5.3.2"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/cli-core",
"version": "13.1.5",
"version": "13.1.6-beta.2",
"description": "Base types and functionality for Ignite UI CLI",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/igx-templates/constants.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~17.0.0";
export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~17.1.0-beta.0";
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IgxBulletGraphTemplate extends IgniteUIForAngularTemplate {
import: ["IgxBulletGraphModule"],
from: "igniteui-angular-gauges"
}];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-gauges@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-gauges@~17.2.0"];
}
}
module.exports = new IgxBulletGraphTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IgxCategoryChartTemplate extends IgniteUIForAngularTemplate {
{ import: "IgxCategoryChartModule", from: "igniteui-angular-charts" },
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxCategoryChartTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class IgxGridAwesomeTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxGridAwesomeTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class IgxGridCRMTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxGridCRMTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class IgxFinTechGridTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxFinTechGridTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class IgxFinancialChartTemplate extends IgniteUIForAngularTemplate {
this.dependencies = [
{ import: "IgxFinancialChartModule", from: "igniteui-angular-charts" }
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxFinancialChartTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class IgxLinearGaugeTemplate extends IgniteUIForAngularTemplate {
from: "igniteui-angular-gauges"
}
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-gauges@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-gauges@~17.2.0"];
}
}
module.exports = new IgxLinearGaugeTemplate();
2 changes: 1 addition & 1 deletion packages/igx-templates/igx-ts-legacy/map/default/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class IgxGeographicMapTemplate extends IgniteUIForAngularTemplate {
from: "igniteui-angular-charts"
}
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0", "igniteui-angular-maps@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0", "igniteui-angular-maps@~17.2.0"];
}
}
module.exports = new IgxGeographicMapTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"hammerjs": "~2.0.8",
"igniteui-angular": "~17.0.0",
"@angular/animations": "~17.2.0",
"@angular/common": "~17.2.0",
"@angular/compiler": "~17.2.0",
"@angular/core": "~17.2.0",
"@angular/forms": "~17.2.0",
"@angular/platform-browser": "~17.2.0",
"@angular/platform-browser-dynamic": "~17.2.0",
"@angular/router": "~17.2.0",
"hammerjs": "^2.0.8",
"igniteui-angular": "~17.1.0-beta.2",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~17.0.0",
"@angular-eslint/builder": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/schematics": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular-devkit/build-angular": "~17.2.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.2.0",
"@angular/compiler-cli": "~17.2.0",
"@types/jasmine": "~5.1.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
Expand All @@ -46,6 +46,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.2.2"
"typescript": "~5.3.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@angular/animations": "~17.2.0",
"@angular/common": "~17.2.0",
"@angular/compiler": "~17.2.0",
"@angular/core": "~17.2.0",
"@angular/forms": "~17.2.0",
"@angular/platform-browser": "~17.2.0",
"@angular/platform-browser-dynamic": "~17.2.0",
"@angular/router": "~17.2.0",
"angular-auth-oidc-client": "~15.0.4",
"hammerjs": "~2.0.8",
"igniteui-angular": "~17.0.0",
"igniteui-angular": "~17.1.0-beta.2",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~17.0.0",
"@angular-eslint/builder": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/schematics": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular/language-service": "~17.0.0",
"@angular-devkit/build-angular": "~17.2.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.2.0",
"@angular/compiler-cli": "~17.2.0",
"@angular/language-service": "~17.2.0",
"@types/facebook-js-sdk": "~3.3.6",
"@types/hammerjs": "~2.0.41",
"@types/jasmine": "~5.1.1",
Expand All @@ -51,6 +51,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.2.2"
"typescript": "~5.3.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class IgxRadialGaugeTemplate extends IgniteUIForAngularTemplate {
from: "igniteui-angular-gauges"
}
];
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-gauges@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-gauges@~17.2.0"];
}
}
module.exports = new IgxRadialGaugeTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class IgxBulletGraphTemplate extends IgniteUIForAngularTemplate {
this.projectType = "igx-ts";
this.name = "Bullet Graph";
this.description = "IgxBulletGraph with different animations.";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-gauges@~17.0.0", IGNITEUI_ANGULAR_PACKAGE];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-gauges@~17.2.0", IGNITEUI_ANGULAR_PACKAGE];
}
}
module.exports = new IgxBulletGraphTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class IgxCategoryChartTemplate extends IgniteUIForAngularTemplate {
this.projectType = "igx-ts";
this.name = "Category Chart";
this.description = "basic category chart with chart type selector.";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxCategoryChartTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class IgxGridAwesomeTemplate extends IgniteUIForAngularTemplate {
this.listInCustomTemplates = true;
this.name = "Awesome Grid";
this.description = "Awesome IgxGrid";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxGridAwesomeTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class IgxGridCRMTemplate extends IgniteUIForAngularTemplate {
this.listInCustomTemplates = true;
this.name = "CRM Grid";
this.description = "CRM IgxGrid";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxGridCRMTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class IgxFinTechGridTemplate extends IgniteUIForAngularTemplate {
this.listInCustomTemplates = true;
this.name = "FinTech Grid";
this.description = "Grid with simulated high-frequency data feed";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxFinTechGridTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class IgxFinancialChartTemplate extends IgniteUIForAngularTemplate {
this.id = "financial-chart";
this.projectType = "igx-ts";
this.name = "Financial Chart";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0"];
}
}
module.exports = new IgxFinancialChartTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class IgxLinearGaugeTemplate extends IgniteUIForAngularTemplate {
this.projectType = "igx-ts";
this.name = "Linear Gauge";
this.description = "IgxLinearGauge with different animations.";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-gauges@~17.0.0", IGNITEUI_ANGULAR_PACKAGE];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-gauges@~17.2.0", IGNITEUI_ANGULAR_PACKAGE];
}
}
module.exports = new IgxLinearGaugeTemplate();
2 changes: 1 addition & 1 deletion packages/igx-templates/igx-ts/map/default/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class IgxGeographicMapTemplate extends IgniteUIForAngularTemplate {
this.projectType = "igx-ts";
this.name = "Geographic Map";
this.description = "Basic IgxGeographicMap.";
this.packages = ["igniteui-angular-core@~17.0.0", "igniteui-angular-charts@~17.0.0", "igniteui-angular-maps@~17.0.0"];
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-charts@~17.2.0", "igniteui-angular-maps@~17.2.0"];
}
}
module.exports = new IgxGeographicMapTemplate();
36 changes: 18 additions & 18 deletions packages/igx-templates/igx-ts/projects/_base/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@angular/animations": "~17.2.0",
"@angular/common": "~17.2.0",
"@angular/compiler": "~17.2.0",
"@angular/core": "~17.2.0",
"@angular/forms": "~17.2.0",
"@angular/platform-browser": "~17.2.0",
"@angular/platform-browser-dynamic": "~17.2.0",
"@angular/router": "~17.2.0",
"hammerjs": "~2.0.8",
"igniteui-angular": "~17.0.0",
"igniteui-angular": "~17.1.0-beta.2",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~17.0.0",
"@angular-eslint/builder": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/schematics": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular-devkit/build-angular": "~17.2.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.2.0",
"@angular/compiler-cli": "~17.2.0",
"@types/jasmine": "~5.1.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
Expand All @@ -45,6 +45,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.2.2"
"typescript": "~5.3.2"
}
}
Loading

0 comments on commit 424ad65

Please sign in to comment.