Skip to content

Commit 94ea474

Browse files
valadzhovvaladzhov
committed
Merge branch 'valadzhov/cli-chematics-update-19.0.0-1338' of https://github.com/IgniteUI/igniteui-cli into valadzhov/cli-chematics-update-19.0.0-1338
2 parents 2227b1e + 01188be commit 94ea474

File tree

5 files changed

+23
-86
lines changed

5 files changed

+23
-86
lines changed

‎packages/core/packages/PackageManager.ts‎

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

167168
public static async queuePackage(packageName: string, verbose = false) {
168-
const command = this.getInstallCommand(this.getManager(), packageName).replace("--save", "--no-save");
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");
169171
const [packName, version] = packageName.split(/@(?=[^\/]+$)/);
170172
const packageJSON = this.getPackageJSON();
171173
if (!packageJSON.dependencies) {

‎packages/igx-templates/constants.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~17.1.0-beta.0";
1+
export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~19.0.0-beta.0";

‎packages/igx-templates/igx-ts/projects/_base/files/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@angular/platform-browser": "~19.0.0",
2020
"@angular/platform-browser-dynamic": "~19.0.0",
2121
"@angular/router": "~19.0.0",
22-
"hammerjs": "~2.0.8",
22+
"hammerjs": "~2.0.8",
2323
"igniteui-angular": "~19.0.0-beta.0",
2424
"minireset.css": "~0.0.7",
2525
"rxjs": "~7.8.0",

‎spec/unit/packageManager-spec.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ 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-
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
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`,
300301
{ stdio: ["inherit"], killSignal: "SIGINT" });
301302
mockProjectConfig.packagesInstalled = true;
302303
expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig);
@@ -312,7 +313,8 @@ describe("Unit - Package Manager", () => {
312313
expect(Util.log).toHaveBeenCalledTimes(2);
313314
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
314315
expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`);
315-
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
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`,
316318
{ stdio: ["inherit"], killSignal: "SIGINT" });
317319
mockProjectConfig.packagesInstalled = true;
318320
expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig);
@@ -331,7 +333,8 @@ describe("Unit - Package Manager", () => {
331333
await PackageManager.installPackages(true);
332334
expect(Util.log).toHaveBeenCalledTimes(1);
333335
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
334-
expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`,
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`,
335338
{ stdio: ["inherit"], killSignal: "SIGINT" });
336339
expect(process.exit).toHaveBeenCalled();
337340
expect(ProjectConfig.setConfig).toHaveBeenCalledTimes(0);
@@ -417,7 +420,7 @@ describe("Unit - Package Manager", () => {
417420
expect(Util.log).toHaveBeenCalledTimes(0);
418421
expect(child_process.exec).toHaveBeenCalledTimes(1);
419422
expect(child_process.exec).toHaveBeenCalledWith(
420-
`npm install test-pack --quiet --no-save`, {}, jasmine.any(Function));
423+
`npm install test-pack --quiet --no-save --legacy-peer-deps`, {}, jasmine.any(Function));
421424
});
422425

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

‎yarn.lock‎

Lines changed: 10 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,7 @@
1010
"@jridgewell/gen-mapping" "^0.3.5"
1111
"@jridgewell/trace-mapping" "^0.3.24"
1212

13-
"@angular-devkit/[email protected]":
14-
version "14.0.7"
15-
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-14.0.7.tgz#1ff48d9623c56cfa9cdbbb60a0144adc2a26a4e7"
16-
integrity sha512-XBqK2OMVKkV1Ltkh4aBsoHoDJQlins5a6qa/ZMjW4reYx90qLERs8ZfeWlRUWhvn2/ohx4aPq77jwSR5avp/Cw==
17-
dependencies:
18-
ajv "8.11.0"
19-
ajv-formats "2.1.1"
20-
jsonc-parser "3.0.0"
21-
rxjs "6.6.7"
22-
source-map "0.7.3"
23-
24-
"@angular-devkit/[email protected]", "@angular-devkit/core@^19.0.0-rc.3":
13+
"@angular-devkit/[email protected]", "@angular-devkit/core@^19.0.0":
2514
version "19.0.0"
2615
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-19.0.0.tgz#15943480916618aec415ec1c056806dff2e473ef"
2716
integrity sha512-/EJQOKVFb9vsFbPR+57C7fJHFVr7le9Ru6aormIKw24xyZZHtt5X4rwdeN7l6Zkv8F0cJ2EoTSiQoY17090DLQ==
@@ -33,18 +22,7 @@
3322
rxjs "7.8.1"
3423
source-map "0.7.4"
3524

36-
"@angular-devkit/[email protected]":
37-
version "14.0.7"
38-
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-14.0.7.tgz#05f0e1c533bbecd72ad3af15782fa15b789bed32"
39-
integrity sha512-nJUJXCBQr7rmVn6IXFAXMCWAB1w6JQmFGuFVW0G3GH/A0e+A3ttzJc6qVLYluqaFoafw394cZu24YJo55E/+Zg==
40-
dependencies:
41-
"@angular-devkit/core" "14.0.7"
42-
jsonc-parser "3.0.0"
43-
magic-string "0.26.1"
44-
ora "5.4.1"
45-
rxjs "6.6.7"
46-
47-
"@angular-devkit/[email protected]", "@angular-devkit/schematics@^19.0.0-rc.3":
25+
"@angular-devkit/[email protected]", "@angular-devkit/schematics@^19.0.0":
4826
version "19.0.0"
4927
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-19.0.0.tgz#e1d3e216ef027394a9e4d3eeb8a63cc67d24bd85"
5028
integrity sha512-90pGZtpZgjDk1UgRBatfeqYP6qUZL9fLh+8zIpavOr2ey5bW2lADO7mS2Qrc7U1SmGqnxQXQQ7uIS+50gYm0tQ==
@@ -1022,14 +1000,14 @@
10221000
resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
10231001
integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
10241002

1025-
"@schematics/angular@~14.0.0":
1026-
version "14.0.7"
1027-
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-14.0.7.tgz#ca4a5eff0eb7998efab080cc324fbe44ebdd5f06"
1028-
integrity sha512-I0v1gNFpm9ReL/hUzwjjOa+hk0qvlXv/vjITAWnlUV5dba6FZxzwsrTGsGO6t5XMNsm6QtwpDYDRdy9uy/n/1g==
1003+
"@schematics/angular@~19.0.0":
1004+
version "19.0.0"
1005+
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-19.0.0.tgz#842a6112d16e87e76e22424419f71c047fc73560"
1006+
integrity sha512-2U8dlhURoQfS99ZF67RVeARFeJn4Z0Lg2dfYbGj+ooRH5YMtAZq8zAIRCfyC3OMiJEZM6BbGigCD6gNoAhP0RQ==
10291007
dependencies:
1030-
"@angular-devkit/core" "14.0.7"
1031-
"@angular-devkit/schematics" "14.0.7"
1032-
jsonc-parser "3.0.0"
1008+
"@angular-devkit/core" "19.0.0"
1009+
"@angular-devkit/schematics" "19.0.0"
1010+
jsonc-parser "3.3.1"
10331011

10341012
"@schematics/angular@~19.0.0-rc.3":
10351013
version "19.0.0"
@@ -1404,30 +1382,13 @@ aggregate-error@^3.0.0:
14041382
clean-stack "^2.0.0"
14051383
indent-string "^4.0.0"
14061384

1407-
[email protected]:
1408-
version "2.1.1"
1409-
resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
1410-
integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
1411-
dependencies:
1412-
ajv "^8.0.0"
1413-
14141385
[email protected]:
14151386
version "3.0.1"
14161387
resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578"
14171388
integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==
14181389
dependencies:
14191390
ajv "^8.0.0"
14201391

1421-
[email protected]:
1422-
version "8.11.0"
1423-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
1424-
integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
1425-
dependencies:
1426-
fast-deep-equal "^3.1.1"
1427-
json-schema-traverse "^1.0.0"
1428-
require-from-string "^2.0.2"
1429-
uri-js "^4.2.2"
1430-
14311392
[email protected], ajv@^8.0.0:
14321393
version "8.17.1"
14331394
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
@@ -4451,11 +4412,6 @@ json5@^2.2.2, json5@^2.2.3:
44514412
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
44524413
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
44534414

4454-
[email protected]:
4455-
version "3.0.0"
4456-
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
4457-
integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
4458-
44594415
[email protected]:
44604416
version "3.2.0"
44614417
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
@@ -4785,13 +4741,6 @@ lru-cache@^6.0.0:
47854741
dependencies:
47864742
yallist "^4.0.0"
47874743

4788-
[email protected]:
4789-
version "0.26.1"
4790-
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.1.tgz#ba9b651354fa9512474199acecf9c6dbe93f97fd"
4791-
integrity sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==
4792-
dependencies:
4793-
sourcemap-codec "^1.4.8"
4794-
47954744
[email protected]:
47964745
version "0.30.12"
47974746
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.12.tgz#9eb11c9d072b9bcb4940a5b2c2e1a217e4ee1a60"
@@ -6311,13 +6260,6 @@ [email protected]:
63116260
resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
63126261
integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
63136262

6314-
[email protected]:
6315-
version "6.6.7"
6316-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
6317-
integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
6318-
dependencies:
6319-
tslib "^1.9.0"
6320-
63216263
[email protected], rxjs@^7.5.5, rxjs@^7.8.1:
63226264
version "7.8.1"
63236265
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
@@ -6652,11 +6594,6 @@ source-map-support@^0.5.21:
66526594
buffer-from "^1.0.0"
66536595
source-map "^0.6.0"
66546596

6655-
[email protected]:
6656-
version "0.7.3"
6657-
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
6658-
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
6659-
66606597
[email protected]:
66616598
version "0.7.4"
66626599
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
@@ -6667,11 +6604,6 @@ source-map@^0.6.0, source-map@^0.6.1:
66676604
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
66686605
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
66696606

6670-
sourcemap-codec@^1.4.8:
6671-
version "1.4.8"
6672-
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
6673-
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
6674-
66756607
spawn-wrap@^2.0.0:
66766608
version "2.0.0"
66776609
resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-2.0.0.tgz#103685b8b8f9b79771318827aa78650a610d457e"
@@ -7068,7 +7000,7 @@ tsconfig-paths@^4.1.2:
70687000
minimist "^1.2.6"
70697001
strip-bom "^3.0.0"
70707002

7071-
tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
7003+
tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1:
70727004
version "1.14.1"
70737005
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
70747006
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

0 commit comments

Comments
 (0)