Skip to content

Commit fe0ea3d

Browse files
CopilotLipata
andcommitted
fix: Remove --legacy-peer-deps flag to allow automatic peer dependency installation
Co-authored-by: Lipata <[email protected]>
1 parent fb429bb commit fe0ea3d

File tree

6 files changed

+13
-34
lines changed

6 files changed

+13
-34
lines changed

packages/cli/templates/react/igr-es6/grid/basic/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class GridTemplate extends IgniteUIForReactTemplate {
1616
this.controlGroup = "Data Grids";
1717
// TODO: read version from igniteui-react-core in package.json
1818
this.packages = ["igniteui-react-grids@~16.15.0", "igniteui-react-inputs@~16.15.0",
19-
"igniteui-react-layouts@~16.15.0", "igniteui-react-core@~16.15.0"];
19+
"igniteui-react-layouts@~16.15.0"];
2020

2121
this.hasExtraConfiguration = false;
2222
}

packages/cli/templates/react/igr-ts/grid/basic/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class GridTemplate extends IgniteUIForReactTemplate {
1515
this.components = ["Grid"];
1616
this.controlGroup = "Data Grids";
1717
this.packages = ["igniteui-react-grids@~19.0.2", "igniteui-react-inputs@~19.0.0",
18-
"igniteui-react-layouts@~19.0.0", "igniteui-react@~19.0.3", "igniteui-react-core@~19.0.0"];
18+
"igniteui-react-layouts@~19.0.0", "igniteui-react@~19.0.3"];
1919

2020
this.hasExtraConfiguration = false;
2121
}

packages/core/packages/PackageManager.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ export class PackageManager {
9595
case "npm":
9696
/* passes through */
9797
default:
98-
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
99-
command = `${managerCommand} install --quiet --legacy-peer-deps`;
98+
command = `${managerCommand} install --quiet`;
10099
break;
101100
}
102101
await this.flushQueue(false);
@@ -166,8 +165,7 @@ export class PackageManager {
166165
}
167166

168167
public static async queuePackage(packageName: string, verbose = false) {
169-
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
170-
const command = this.getInstallCommand(this.getManager(), packageName).replace("--save", "--no-save").concat(" --legacy-peer-deps");
168+
const command = this.getInstallCommand(this.getManager(), packageName).replace("--save", "--no-save");
171169
const [packName, version] = packageName.split(/@(?=[^\/]+$)/);
172170
const packageJSON = this.getPackageJSON();
173171
if (!packageJSON.dependencies) {

spec/templates/react-spec.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,4 @@ describe("React templates", () => {
2727
}
2828
}
2929
});
30-
31-
it("Grid templates should include igniteui-react-core dependency", async () => {
32-
const reactFramework: Framework = require(templatesLocation);
33-
34-
// Check all project libraries
35-
for (const projLibrary of reactFramework.projectLibraries) {
36-
// Find grid templates
37-
const gridTemplates = projLibrary.templates.filter(template =>
38-
template.id === "grid" && template.packages &&
39-
template.packages.some(pkg => pkg.includes("igniteui-react-grids"))
40-
);
41-
42-
// Verify each grid template includes igniteui-react-core
43-
for (const gridTemplate of gridTemplates) {
44-
const hasReactCore = gridTemplate.packages.some(pkg => pkg.includes("igniteui-react-core"));
45-
expect(hasReactCore).toBeTruthy(
46-
`Grid template ${gridTemplate.id} in project type ${gridTemplate.projectType} should include igniteui-react-core dependency`
47-
);
48-
}
49-
}
50-
});
5130
});

spec/unit/packageManager-spec.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,7 @@ describe("Unit - Package Manager", () => {
296296
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
297297
expect(Util.log).toHaveBeenCalledWith(`Error installing npm packages.`);
298298
expect(Util.log).toHaveBeenCalledWith(`Example`);
299-
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
300-
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`,
299+
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
301300
{ stdio: ["inherit"], killSignal: "SIGINT" });
302301
mockProjectConfig.packagesInstalled = true;
303302
expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig);
@@ -313,8 +312,7 @@ describe("Unit - Package Manager", () => {
313312
expect(Util.log).toHaveBeenCalledTimes(2);
314313
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
315314
expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`);
316-
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
317-
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`,
315+
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
318316
{ stdio: ["inherit"], killSignal: "SIGINT" });
319317
mockProjectConfig.packagesInstalled = true;
320318
expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig);
@@ -333,8 +331,7 @@ describe("Unit - Package Manager", () => {
333331
await PackageManager.installPackages(true);
334332
expect(Util.log).toHaveBeenCalledTimes(1);
335333
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
336-
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
337-
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`,
334+
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
338335
{ stdio: ["inherit"], killSignal: "SIGINT" });
339336
expect(process.exit).toHaveBeenCalled();
340337
expect(ProjectConfig.setConfig).toHaveBeenCalledTimes(0);
@@ -420,7 +417,7 @@ describe("Unit - Package Manager", () => {
420417
expect(Util.log).toHaveBeenCalledTimes(0);
421418
expect(child_process.exec).toHaveBeenCalledTimes(1);
422419
expect(child_process.exec).toHaveBeenCalledWith(
423-
`npm install test-pack --quiet --no-save --legacy-peer-deps`, {}, jasmine.any(Function));
420+
`npm install test-pack --quiet --no-save`, {}, jasmine.any(Function));
424421
});
425422

426423
it("queuePackage should ignore existing package installs", async () => {

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,11 @@
909909
resolved "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.3.2.tgz"
910910
integrity sha512-HhgHqOUT05H45zuQL+XPywQbRNFttd7Rkkr7dZnpCRdp4W8GDjfyKCoCS5qVyowAyNh9Vc7VEq9qmiLMlvf6Zg==
911911

912+
913+
version "20.3.2"
914+
resolved "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.3.2.tgz"
915+
integrity sha512-NrZ8L9of2GmYEM8GMJX6QRrLJlAwM+ds2rhdY1bxwpiyCNcD3IO/gzJlBs+kG4ly05F1u/X4k/FI5dXPpjUSgw==
916+
912917
"@octokit/auth-token@^3.0.0":
913918
version "3.0.4"
914919
resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz"

0 commit comments

Comments
 (0)