Skip to content

Commit

Permalink
chore(ng): update igniteui-angular@18.1.0; dv@18.0.0; remove force
Browse files Browse the repository at this point in the history
  • Loading branch information
Lipata committed Jul 4, 2024
1 parent 1b2ac23 commit 26b567c
Show file tree
Hide file tree
Showing 26 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion packages/cli/lib/commands/upgrade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ command = {
if (success && !argv.skipInstall) {
Util.log("Installing npm packages.");
try {
Util.execSync("npm install --force --quiet");
Util.execSync("npm install --quiet");
Util.log("npm packages installed.");
} catch (error) {
Util.error(`Error installing npm packages.`);
Expand Down
4 changes: 2 additions & 2 deletions packages/core/packages/PackageManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
command = `${managerCommand} install --force --quiet`;
command = `${managerCommand} install --quiet`;
break;
}
await this.flushQueue(false);
Expand Down Expand Up @@ -277,7 +277,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
return `${managerCommand} install ${packageName} --force --quiet --save`;
return `${managerCommand} install ${packageName} --quiet --save`;
}
}

Expand Down
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.2.0", "igniteui-angular-gauges@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-gauges@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-gauges@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-gauges@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0", "igniteui-angular-maps@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.0", "igniteui-angular-maps@~18.0.0"];
}
}
module.exports = new IgxGeographicMapTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@angular/platform-browser-dynamic": "~18.0.0",
"@angular/router": "~18.0.0",
"hammerjs": "^2.0.8",
"igniteui-angular": "~18.0.0",
"igniteui-angular": "~18.1.0",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@
},
"private": true,
"dependencies": {
"@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/animations": "~18.0.0",
"@angular/common": "~18.0.0",
"@angular/compiler": "~18.0.0",
"@angular/core": "~18.0.0",
"@angular/forms": "~18.0.0",
"@angular/platform-browser": "~18.0.0",
"@angular/platform-browser-dynamic": "~18.0.0",
"@angular/router": "~18.0.0",
"angular-auth-oidc-client": "~15.0.4",
"hammerjs": "~2.0.8",
"igniteui-angular": "~17.2.0",
"igniteui-angular": "~18.1.0",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@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",
"@angular-devkit/build-angular": "~18.0.0",
"@angular-eslint/builder": "~18.0.0",
"@angular-eslint/eslint-plugin": "~18.0.0",
"@angular-eslint/eslint-plugin-template": "~18.0.0",
"@angular-eslint/schematics": "~18.0.0",
"@angular-eslint/template-parser": "~18.0.0",
"@angular/cli": "~18.0.0",
"@angular/compiler-cli": "~18.0.0",
"@angular/language-service": "~18.0.0",
"@types/facebook-js-sdk": "~3.3.6",
"@types/hammerjs": "~2.0.41",
"@types/jasmine": "~5.1.1",
Expand Down
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.2.0", "igniteui-angular-gauges@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-gauges@~18.0.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.2.0", "igniteui-angular-gauges@~17.2.0", IGNITEUI_ANGULAR_PACKAGE];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-gauges@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.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.2.0", "igniteui-angular-gauges@~17.2.0", IGNITEUI_ANGULAR_PACKAGE];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-gauges@~18.0.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.2.0", "igniteui-angular-charts@~17.2.0", "igniteui-angular-maps@~17.2.0"];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-charts@~18.0.0", "igniteui-angular-maps@~18.0.0"];
}
}
module.exports = new IgxGeographicMapTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@angular/platform-browser-dynamic": "~18.0.0",
"@angular/router": "~18.0.0",
"hammerjs": "~2.0.8",
"igniteui-angular": "~18.0.0",
"igniteui-angular": "~18.1.0",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@
},
"private": true,
"dependencies": {
"@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/animations": "~18.0.0",
"@angular/common": "~18.0.0",
"@angular/compiler": "~18.0.0",
"@angular/core": "~18.0.0",
"@angular/forms": "~18.0.0",
"@angular/platform-browser": "~18.0.0",
"@angular/platform-browser-dynamic": "~18.0.0",
"@angular/router": "~18.0.0",
"angular-auth-oidc-client": "~15.0.4",
"hammerjs": "~2.0.8",
"igniteui-angular": "~17.2.0",
"igniteui-angular": "~18.0.0",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@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",
"@angular-devkit/build-angular": "~18.0.0",
"@angular-eslint/builder": "~18.0.0",
"@angular-eslint/eslint-plugin": "~18.0.0",
"@angular-eslint/eslint-plugin-template": "~18.0.0",
"@angular-eslint/schematics": "~18.0.0",
"@angular-eslint/template-parser": "~18.0.0",
"@angular/cli": "~18.0.0",
"@angular/compiler-cli": "~18.0.0",
"@angular/language-service": "~18.0.0",
"@types/facebook-js-sdk": "~3.3.6",
"@types/hammerjs": "~2.0.41",
"@types/jasmine": "~5.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class IgxRadialGaugeTemplate extends IgniteUIForAngularTemplate {
this.projectType = "igx-ts";
this.name = "Radial Gauge";
this.description = "IgxRadialGauge with different animations";
this.packages = ["igniteui-angular-core@~17.2.0", "igniteui-angular-gauges@~17.2.0", IGNITEUI_ANGULAR_PACKAGE];
this.packages = ["igniteui-angular-core@~18.0.0", "igniteui-angular-gauges@~18.0.0", IGNITEUI_ANGULAR_PACKAGE];
}
}
module.exports = new IgxRadialGaugeTemplate();
18 changes: 9 additions & 9 deletions spec/unit/packageManager-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ describe("Unit - Package Manager", () => {
await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true);
expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@"~20.1"`, true);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install @infragistics/ignite-ui-full@"~20.1" --force --quiet --save`,
`npm install @infragistics/ignite-ui-full@"~20.1" --quiet --save`,
jasmine.any(Object)
);
expect(TestPackageManager.removePackage).toHaveBeenCalledWith("ignite-ui", true);
Expand All @@ -232,15 +232,15 @@ describe("Unit - Package Manager", () => {
await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true);
expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@"^17.1"`, true);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install @infragistics/ignite-ui-full@"^17.1" --force --quiet --save`,
`npm install @infragistics/ignite-ui-full@"^17.1" --quiet --save`,
jasmine.any(Object)
);

mockDeps.dependencies["ignite-ui"] = ">=0.1.0 <0.2.0";
await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true);
expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@">=0.1.0 <0.2.0"`, true);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install @infragistics/ignite-ui-full@">=0.1.0 <0.2.0" --force --quiet --save`,
`npm install @infragistics/ignite-ui-full@">=0.1.0 <0.2.0" --quiet --save`,
jasmine.any(Object)
);
done();
Expand All @@ -263,7 +263,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`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
expect(ProjectConfig.setConfig).toHaveBeenCalledWith({ packagesInstalled: true });
done();
Expand All @@ -280,7 +280,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(2);
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
expect(ProjectConfig.setConfig).toHaveBeenCalledWith({ packagesInstalled: true });
done();
Expand All @@ -301,7 +301,7 @@ describe("Unit - Package Manager", () => {
await PackageManager.installPackages(true);
expect(Util.log).toHaveBeenCalledTimes(1);
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
expect(process.exit).toHaveBeenCalled();
expect(ProjectConfig.setConfig).toHaveBeenCalledTimes(0);
Expand Down Expand Up @@ -345,7 +345,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledWith(`Error installing package example-package with npm`);
expect(Util.log).toHaveBeenCalledWith(`Error`);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install example-package --force --quiet --save`, { stdio: "pipe", encoding: "utf8" });
`npm install example-package --quiet --save`, { stdio: "pipe", encoding: "utf8" });
done();
});
it("Should run addPackage properly without error code", async done => {
Expand All @@ -355,7 +355,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(1);
expect(Util.log).toHaveBeenCalledWith(`Package example-package installed successfully`);
expect(Util.execSync).toHaveBeenCalledWith(
`npm install example-package --force --quiet --save`, { stdio: "pipe", encoding: "utf8" });
`npm install example-package --quiet --save`, { stdio: "pipe", encoding: "utf8" });
done();
});

Expand All @@ -380,7 +380,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(0);
expect(cp.exec).toHaveBeenCalledTimes(1);
expect(cp.exec).toHaveBeenCalledWith(
`npm install test-pack --force --quiet --no-save`, {}, jasmine.any(Function));
`npm install test-pack --quiet --no-save`, {}, jasmine.any(Function));
done();
});

Expand Down
2 changes: 1 addition & 1 deletion spec/unit/upgrade-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe("Unit - Upgrade command", () => {
upgradeIgniteUIPackagesSpy.and.returnValue(Promise.resolve(true));
await upgradeCmd.execute({ skipInstall: false });
expect(mockProject.upgradeIgniteUIPackages).toHaveBeenCalledTimes(3);
expect(Util.execSync).toHaveBeenCalledWith("npm install --force --quiet");
expect(Util.execSync).toHaveBeenCalledWith("npm install --quiet");

done();
});
Expand Down

0 comments on commit 26b567c

Please sign in to comment.