diff --git a/.gitignore b/.gitignore index c182f06ef..0a1faf325 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ packages/core/config/Config.schema.json # Misc npm-debug.log* yarn-error.log* +package-lock.json # Mac OSX Finder files. **/.DS_Store diff --git a/packages/cli/bin/execute.js b/packages/cli/bin/execute.js old mode 100644 new mode 100755 diff --git a/packages/cli/templates/angular/ig-ts/projects/empty/files/package.json b/packages/cli/templates/angular/ig-ts/projects/empty/files/package.json index f89f71b2d..892c3f761 100644 --- a/packages/cli/templates/angular/ig-ts/projects/empty/files/package.json +++ b/packages/cli/templates/angular/ig-ts/projects/empty/files/package.json @@ -20,7 +20,7 @@ "@angular/router": "~20.0.0", "jquery": ">=1.9.1", "jquery-ui": ">=1.10.5", - "igniteui-angular-wrappers": "~17.0.0", + "igniteui-angular-wrappers": "~20.0.0", "ignite-ui": "~22.2", "rxjs": "~7.8.0", "tslib": "^2.3.0", diff --git a/packages/cli/templates/react/es6/projects/empty/files/package.json b/packages/cli/templates/react/es6/projects/empty/files/package.json index 0de3dd16f..4ab795834 100644 --- a/packages/cli/templates/react/es6/projects/empty/files/package.json +++ b/packages/cli/templates/react/es6/projects/empty/files/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "ignite-ui": "21.1.13", - "igniteui-react": "^1.3.2", + "igniteui-react": "~19.2.0", "jquery": "^3.6.0", "jquery-ui": "^1.12.1", "react": "^17.0.2", diff --git a/packages/cli/templates/react/igr-es6/bullet-graph/default/index.ts b/packages/cli/templates/react/igr-es6/bullet-graph/default/index.ts index b98dca030..d694f9802 100644 --- a/packages/cli/templates/react/igr-es6/bullet-graph/default/index.ts +++ b/packages/cli/templates/react/igr-es6/bullet-graph/default/index.ts @@ -10,7 +10,7 @@ class IgrBulletGraphTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-es6"; this.name = "Bullet Graph"; this.description = `allows for a linear and concise view of measures compared against a scale.`; - this.packages = ["igniteui-react-gauges@~16.15.0"]; // TODO: read version from igniteui-react-core in package.json + this.packages = ["igniteui-react-gauges@~19.0.0"]; // TODO: read version from igniteui-react-core in package.json } } module.exports = new IgrBulletGraphTemplate(); diff --git a/packages/cli/templates/react/igr-es6/category-chart/default/index.ts b/packages/cli/templates/react/igr-es6/category-chart/default/index.ts index 8378a3371..d9ca11b7b 100644 --- a/packages/cli/templates/react/igr-es6/category-chart/default/index.ts +++ b/packages/cli/templates/react/igr-es6/category-chart/default/index.ts @@ -11,7 +11,7 @@ class IgrCategoryChartTemplate 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@~16.15.0"]; // TODO: read version from igniteui-react-core in package.json + this.packages = ["igniteui-react-charts@~19.0.0"]; // TODO: read version from igniteui-react-core in package.json } } module.exports = new IgrCategoryChartTemplate(); diff --git a/packages/cli/templates/react/igr-es6/doughnut-chart/default/index.ts b/packages/cli/templates/react/igr-es6/doughnut-chart/default/index.ts index 86139cded..eecf79a94 100644 --- a/packages/cli/templates/react/igr-es6/doughnut-chart/default/index.ts +++ b/packages/cli/templates/react/igr-es6/doughnut-chart/default/index.ts @@ -10,7 +10,7 @@ class IgrDoughnutChartTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-es6"; this.name = "Doughnut Chart"; this.description = `proportionally illustrate the occurrences of variables.`; - this.packages = ["igniteui-react-charts@~16.15.0"]; // TODO: read version from igniteui-react-core in package.json + this.packages = ["igniteui-react-charts@~19.0.0"]; // TODO: read version from igniteui-react-core in package.json } } module.exports = new IgrDoughnutChartTemplate(); diff --git a/packages/cli/templates/react/igr-es6/financial-chart/default/index.ts b/packages/cli/templates/react/igr-es6/financial-chart/default/index.ts index ebd77ebb2..43beaf1a1 100644 --- a/packages/cli/templates/react/igr-es6/financial-chart/default/index.ts +++ b/packages/cli/templates/react/igr-es6/financial-chart/default/index.ts @@ -12,7 +12,7 @@ class IgrFinancialChartTemplate 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@~16.15.0"]; // TODO: read version from igniteui-react-core in package.json + this.packages = ["igniteui-react-charts@~19.0.0"]; // TODO: read version from igniteui-react-core in package.json } } module.exports = new IgrFinancialChartTemplate(); diff --git a/packages/cli/templates/react/igr-es6/grid/basic/index.ts b/packages/cli/templates/react/igr-es6/grid/basic/index.ts index 979119959..a71f5a9a1 100644 --- a/packages/cli/templates/react/igr-es6/grid/basic/index.ts +++ b/packages/cli/templates/react/igr-es6/grid/basic/index.ts @@ -15,8 +15,8 @@ class GridTemplate extends IgniteUIForReactTemplate { this.components = ["Grid"]; this.controlGroup = "Data Grids"; // TODO: read version from igniteui-react-core in package.json - this.packages = ["igniteui-react-grids@~16.15.0", "igniteui-react-inputs@~16.15.0", - "igniteui-react-layouts@~16.15.0"]; + this.packages = ["igniteui-react-grids@~19.0.0", "igniteui-react-inputs@~19.0.0", + "igniteui-react-layouts@~19.0.0"]; this.hasExtraConfiguration = false; } diff --git a/packages/cli/templates/react/igr-es6/linear-gauge/default/index.ts b/packages/cli/templates/react/igr-es6/linear-gauge/default/index.ts index 200cd9a69..964ce3f64 100644 --- a/packages/cli/templates/react/igr-es6/linear-gauge/default/index.ts +++ b/packages/cli/templates/react/igr-es6/linear-gauge/default/index.ts @@ -10,7 +10,7 @@ class IgrLinearGaugeTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-es6"; this.name = "Linear Gauge"; this.description = `value compared against a scale and one or more ranges.`; - this.packages = ["igniteui-react-gauges@~16.15.0"]; // TODO: read version from igniteui-react-core in package.json + this.packages = ["igniteui-react-gauges@~19.0.0"]; // TODO: read version from igniteui-react-core in package.json } } module.exports = new IgrLinearGaugeTemplate(); diff --git a/packages/cli/templates/react/igr-es6/pie-chart/default/index.ts b/packages/cli/templates/react/igr-es6/pie-chart/default/index.ts index 5f279cc8b..9fa94d31f 100644 --- a/packages/cli/templates/react/igr-es6/pie-chart/default/index.ts +++ b/packages/cli/templates/react/igr-es6/pie-chart/default/index.ts @@ -10,7 +10,7 @@ class IgrPieChartTemplate extends IgniteUIForReactTemplate { this.projectType = "igr-es6"; this.name = "Pie Chart"; this.description = `easily illustate the proportions of data entries`; - this.packages = ["igniteui-react-charts@~16.15.0"]; // TODO: read version from igniteui-react-core in package.json + this.packages = ["igniteui-react-charts@~19.0.0"]; // TODO: read version from igniteui-react-core in package.json } } module.exports = new IgrPieChartTemplate(); diff --git a/packages/cli/templates/react/igr-es6/projects/_base/files/package.json b/packages/cli/templates/react/igr-es6/projects/_base/files/package.json index 07a773494..570c35177 100644 --- a/packages/cli/templates/react/igr-es6/projects/_base/files/package.json +++ b/packages/cli/templates/react/igr-es6/projects/_base/files/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "igniteui-react-core": "~16.15.0", + "igniteui-react-core": "~19.0.0", "react": "^16.8.2", "react-app-polyfill": "^0.2.0", "react-dom": "^16.8.2", diff --git a/packages/cli/templates/react/igr-es6/radial-gauge/default/index.ts b/packages/cli/templates/react/igr-es6/radial-gauge/default/index.ts index 287fb7d35..ad87842ad 100644 --- a/packages/cli/templates/react/igr-es6/radial-gauge/default/index.ts +++ b/packages/cli/templates/react/igr-es6/radial-gauge/default/index.ts @@ -11,7 +11,7 @@ class IgrRadialGaugeTemplate extends IgniteUIForReactTemplate { this.name = "Radial Gauge"; 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.`; - this.packages = ["igniteui-react-gauges@~16.15.0"]; // TODO: read version from igniteui-react-core in package.json + this.packages = ["igniteui-react-gauges@~19.0.0"]; // TODO: read version from igniteui-react-core in package.json } } module.exports = new IgrRadialGaugeTemplate(); 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 21b845829..0d9907cc6 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@~19.0.2", "igniteui-react-inputs@~19.0.0", - "igniteui-react-layouts@~19.0.0", "igniteui-react@~19.0.3"]; + this.packages = ["igniteui-react-grids@~19.0.0", "igniteui-react-inputs@~19.0.0", + "igniteui-react-layouts@~19.0.0", "igniteui-react@~19.2.0"]; this.hasExtraConfiguration = false; } diff --git a/packages/cli/templates/webcomponents/igc-ts/financial-chart/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/financial-chart/default/index.ts index aee4a94da..c0fa7b5cc 100644 --- a/packages/cli/templates/webcomponents/igc-ts/financial-chart/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/financial-chart/default/index.ts @@ -11,8 +11,8 @@ class IgcFinancialChartTemplate extends IgniteUIForWebComponentsTemplate { this.name = "Financial Chart"; this.description = "IgcFinancialChart"; this.packages = [ - "igniteui-webcomponents-core@~5.4.0", - "igniteui-webcomponents-charts@~5.4.0" + "igniteui-webcomponents-core@~6.0.0", + "igniteui-webcomponents-charts@~6.0.0" ]; } } diff --git a/packages/cli/templates/webcomponents/igc-ts/grid/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/grid/default/index.ts index 57a97a147..399cc8a97 100644 --- a/packages/cli/templates/webcomponents/igc-ts/grid/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/grid/default/index.ts @@ -11,10 +11,10 @@ class IgcGridTemplate extends IgniteUIForWebComponentsTemplate { this.name = "Grid"; this.description = "IgcGrid with local data"; this.packages = [ - "igniteui-webcomponents-core@~5.4.0", - "igniteui-webcomponents-grids@~5.4.0", - "igniteui-webcomponents-inputs@~5.4.0", - "igniteui-webcomponents-layouts@~5.4.0" + "igniteui-webcomponents-core@~6.0.0", + "igniteui-webcomponents-grids@~6.0.0", + "igniteui-webcomponents-inputs@~6.0.0", + "igniteui-webcomponents-layouts@~6.0.0" ]; } } diff --git a/packages/cli/templates/webcomponents/igc-ts/linear-gauge/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/linear-gauge/default/index.ts index 5488ec86c..c22b76cd3 100644 --- a/packages/cli/templates/webcomponents/igc-ts/linear-gauge/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/linear-gauge/default/index.ts @@ -11,8 +11,8 @@ class IgcLinearGaugeTemplate extends IgniteUIForWebComponentsTemplate { this.name = "Linear Gauge"; this.description = "IgcLinearGauge"; this.packages = [ - "igniteui-webcomponents-core@~5.4.0", - "igniteui-webcomponents-gauges@~5.4.0" + "igniteui-webcomponents-core@~6.0.0", + "igniteui-webcomponents-gauges@~6.0.0" ]; } } diff --git a/packages/cli/templates/webcomponents/igc-ts/linear-progress/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/linear-progress/default/index.ts index 32aa407f4..ce615a1da 100644 --- a/packages/cli/templates/webcomponents/igc-ts/linear-progress/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/linear-progress/default/index.ts @@ -11,8 +11,8 @@ class IgcLinearProgressComponent extends IgniteUIForWebComponentsTemplate { this.name = "Linear Progress"; this.description = "Basic Linear Progress"; this.packages = [ - "igniteui-webcomponents-core@~5.4.0", - "igniteui-webcomponents-charts@~5.4.0" + "igniteui-webcomponents-core@~6.0.0", + "igniteui-webcomponents-charts@~6.0.0" ]; } } diff --git a/packages/cli/templates/webcomponents/igc-ts/pie-chart/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/pie-chart/default/index.ts index 25e744ab8..045ad2abe 100644 --- a/packages/cli/templates/webcomponents/igc-ts/pie-chart/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/pie-chart/default/index.ts @@ -11,8 +11,8 @@ class IgcPieChartTemplate extends IgniteUIForWebComponentsTemplate { this.name = "Pie Chart"; this.description = "IgcPieChart with local data"; this.packages = [ - "igniteui-webcomponents-core@~5.4.0", - "igniteui-webcomponents-charts@~5.4.0" + "igniteui-webcomponents-core@~6.0.0", + "igniteui-webcomponents-charts@~6.0.0" ]; } } 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 36c2cb9df..6e4726bfe 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 @@ -23,7 +23,7 @@ "@vaadin/router": "^2.0.0", "lit": "^3.3.0", "typescript": "~5.8.3", - "igniteui-webcomponents": "~6.1.0" + "igniteui-webcomponents": "~6.2.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 8a88d1384..3728b0e81 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 @@ -23,13 +23,13 @@ "@vaadin/router": "^1.7.4", "@igniteui/material-icons-extended": "^3.0.2", "igniteui-dockmanager": "~1.14.4", - "igniteui-webcomponents": "~5.4.0", - "igniteui-webcomponents-charts": "~5.4.0", - "igniteui-webcomponents-core": "~5.4.0", - "igniteui-webcomponents-gauges": "~5.4.0", - "igniteui-webcomponents-grids": "~5.4.0", - "igniteui-webcomponents-inputs": "~5.4.0", - "igniteui-webcomponents-layouts": "~5.4.0", + "igniteui-webcomponents": "~6.2.0", + "igniteui-webcomponents-charts": "~6.0.0", + "igniteui-webcomponents-core": "~6.0.0", + "igniteui-webcomponents-gauges": "~6.0.0", + "igniteui-webcomponents-grids": "~6.0.0", + "igniteui-webcomponents-inputs": "~6.0.0", + "igniteui-webcomponents-layouts": "~6.0.0", "lit": "^3.2.1", "typescript": "~5.7.2" }, diff --git a/packages/cli/templates/webcomponents/igc-ts/radial-gauge/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/radial-gauge/default/index.ts index 6a25f7c78..7f2a81fb5 100644 --- a/packages/cli/templates/webcomponents/igc-ts/radial-gauge/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/radial-gauge/default/index.ts @@ -11,8 +11,8 @@ class IgcradialGaugeTemplate extends IgniteUIForWebComponentsTemplate { this.name = "Radial Gauge"; this.description = "IgcRadialGauge"; this.packages = [ - "igniteui-webcomponents-core@~5.4.0", - "igniteui-webcomponents-gauges@~5.4.0" + "igniteui-webcomponents-core@~6.0.0", + "igniteui-webcomponents-gauges@~6.0.0" ]; } } diff --git a/packages/cli/templates/webcomponents/igc-ts/tree/default/index.ts b/packages/cli/templates/webcomponents/igc-ts/tree/default/index.ts index da0e99f2a..236a50ea0 100644 --- a/packages/cli/templates/webcomponents/igc-ts/tree/default/index.ts +++ b/packages/cli/templates/webcomponents/igc-ts/tree/default/index.ts @@ -11,10 +11,10 @@ class IgcTreeTemplate extends IgniteUIForWebComponentsTemplate { this.name = "Tree"; this.description = "basic IgcTree"; this.packages = [ - "igniteui-webcomponents-core@~5.4.0", - "igniteui-webcomponents-grids@~5.4.0", - "igniteui-webcomponents-inputs@~5.4.0", - "igniteui-webcomponents-layouts@~5.4.0" + "igniteui-webcomponents-core@~6.0.0", + "igniteui-webcomponents-grids@~6.0.0", + "igniteui-webcomponents-inputs@~6.0.0", + "igniteui-webcomponents-layouts@~6.0.0" ]; } } diff --git a/packages/core/packages/PackageManager.ts b/packages/core/packages/PackageManager.ts index 22329cc8e..955d555d7 100644 --- a/packages/core/packages/PackageManager.ts +++ b/packages/core/packages/PackageManager.ts @@ -95,8 +95,7 @@ export class PackageManager { case "npm": /* passes through */ default: - // TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available - command = `${managerCommand} install --quiet --legacy-peer-deps`; + command = `${managerCommand} install --quiet`; break; } await this.flushQueue(false); @@ -166,8 +165,7 @@ export class PackageManager { } public static async queuePackage(packageName: string, verbose = false) { - // TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available - const command = this.getInstallCommand(this.getManager(), packageName).replace("--save", "--no-save").concat(" --legacy-peer-deps"); + const command = this.getInstallCommand(this.getManager(), packageName).replace("--save", "--no-save"); const [packName, version] = packageName.split(/@(?=[^\/]+$)/); const packageJSON = this.getPackageJSON(); if (!packageJSON.dependencies) { diff --git a/spec/unit/packageManager-spec.ts b/spec/unit/packageManager-spec.ts index 3e8fd9877..dde69811b 100644 --- a/spec/unit/packageManager-spec.ts +++ b/spec/unit/packageManager-spec.ts @@ -296,8 +296,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`); expect(Util.log).toHaveBeenCalledWith(`Error installing npm packages.`); expect(Util.log).toHaveBeenCalledWith(`Example`); - // TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available - expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`, + expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`, { stdio: ["inherit"], killSignal: "SIGINT" }); mockProjectConfig.packagesInstalled = true; expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig); @@ -313,8 +312,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledTimes(2); expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`); expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`); - // TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available - expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`, + expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`, { stdio: ["inherit"], killSignal: "SIGINT" }); mockProjectConfig.packagesInstalled = true; expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig); @@ -333,8 +331,7 @@ describe("Unit - Package Manager", () => { await PackageManager.installPackages(true); expect(Util.log).toHaveBeenCalledTimes(1); expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`); - // TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available - expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`, + expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`, { stdio: ["inherit"], killSignal: "SIGINT" }); expect(process.exit).toHaveBeenCalled(); expect(ProjectConfig.setConfig).toHaveBeenCalledTimes(0); @@ -420,7 +417,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledTimes(0); expect(child_process.exec).toHaveBeenCalledTimes(1); expect(child_process.exec).toHaveBeenCalledWith( - `npm install test-pack --quiet --no-save --legacy-peer-deps`, {}, jasmine.any(Function)); + `npm install test-pack --quiet --no-save`, {}, jasmine.any(Function)); }); it("queuePackage should ignore existing package installs", async () => {