Skip to content

Commit 830d1b8

Browse files
CopilotHristo313damyanpetev
authored
refactor(upgrade-packages): always keep igniteui-react; upgrade igniteui-react-dockmanager instead (#1638)
Co-authored-by: Hristo313 <57346540+Hristo313@users.noreply.github.com> Co-authored-by: Damyan Petev <damyanpetev@users.noreply.github.com>
1 parent 7c2dd0e commit 830d1b8

File tree

4 files changed

+29
-15
lines changed

4 files changed

+29
-15
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ A comprehensive modernization of all Angular templates to align with Angular v21
8989
* **CLI error handling:** added `.fail()` handler to yargs to gracefully handle command validation errors (e.g., missing required subcommands) instead of showing raw stack traces ([#1614](https://github.com/IgniteUI/igniteui-cli/pull/1614))
9090
* **Unknown command detection:** running `ig <unknown>` now prints an error message and available commands instead of silently falling through to the step-by-step interactive mode ([#1614](https://github.com/IgniteUI/igniteui-cli/pull/1614))
9191
* **Unhandled promise rejection:** added `.catch()` in the CLI entry point to catch and display unexpected errors cleanly ([#1614](https://github.com/IgniteUI/igniteui-cli/pull/1614))
92+
* **upgrade-packages:** aligned with React 19.4.0+ licensing migration, now upgrading `igniteui-react-dockmanager` and no longer upgrading `igniteui-react` ([#1641](https://github.com/IgniteUI/igniteui-cli/pull/1641))
9293

9394
---
9495

packages/core/update/package-resolve.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ export const FEED_DOCK_MANAGER = "@infragistics/igniteui-dockmanager";
1616

1717
// react
1818
export const NPM_REACT = "igniteui-react";
19-
export const FEED_REACT = "@infragistics/igniteui-react";
19+
export const NPM_REACT_DOCK_MANAGER = "igniteui-react-dockmanager";
20+
export const FEED_REACT_DOCK_MANAGER = "@infragistics/igniteui-react-dockmanager";
2021
export const NPM_REACT_CORE = "igniteui-react-core";
2122
export const FEED_REACT_CORE = "@infragistics/igniteui-react-core";
2223
export const NPM_REACT_CHARTS = "igniteui-react-charts";
@@ -76,7 +77,7 @@ export const UPGRADEABLE_PACKAGES = {
7677
[NPM_DOCK_MANAGER]: FEED_DOCK_MANAGER,
7778

7879
// react
79-
[NPM_REACT]: FEED_REACT,
80+
[NPM_REACT_DOCK_MANAGER]: FEED_REACT_DOCK_MANAGER,
8081
[NPM_REACT_CORE]: FEED_REACT_CORE,
8182
[NPM_REACT_CHARTS]: FEED_REACT_CHARTS,
8283
[NPM_REACT_GAUGES]: FEED_REACT_GAUGES,

spec/unit/packageResolve-spec.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { IFileSystem } from "../../packages/core/types";
22
import { App } from "../../packages/core/util";
33
import {
44
FEED_DOCK_MANAGER, FEED_ANGULAR, getUpgradeablePackages,
5-
NPM_DOCK_MANAGER, NPM_ANGULAR, resolvePackage, PackageDefinition
5+
NPM_DOCK_MANAGER, NPM_ANGULAR, resolvePackage, PackageDefinition,
6+
FEED_REACT_DOCK_MANAGER, NPM_REACT_DOCK_MANAGER
67
} from "../../packages/core/update/package-resolve";
78

89
class MockFileSystem implements IFileSystem {
@@ -114,6 +115,15 @@ describe("Igx templates - package resolve", () => {
114115
expected.push({ trial: NPM_DOCK_MANAGER, licensed: FEED_DOCK_MANAGER });
115116
mockRead.and.returnValue(JSON.stringify(mockObj));
116117
expect(getUpgradeablePackages()).toEqual(expected);
118+
mockObj.dependencies = {
119+
"igniteui-angular": "^9.0.1",
120+
"igniteui-dockmanager": "0.1.0",
121+
"igniteui-react-dockmanager": "0.1.0",
122+
"kek": "1.0.1"
123+
};
124+
expected.push({ trial: NPM_REACT_DOCK_MANAGER, licensed: FEED_REACT_DOCK_MANAGER });
125+
mockRead.and.returnValue(JSON.stringify(mockObj));
126+
expect(getUpgradeablePackages()).toEqual(expected);
117127
});
118128
});
119129
});

spec/unit/update-spec.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,8 @@ title = 'igniteui-angular example';
483483

484484
it("Should fail if no packages.json is found", async () => {
485485
const upgradeable: pkgResolve.PackageDefinition = {
486-
trial: pkgResolve.NPM_REACT,
487-
licensed: pkgResolve.FEED_REACT
486+
trial: pkgResolve.NPM_REACT_DOCK_MANAGER,
487+
licensed: pkgResolve.FEED_REACT_DOCK_MANAGER
488488
};
489489
spyOn(pkgResolve, "getUpgradeablePackages").and.returnValue([upgradeable]);
490490
(fsSpy.directoryExists as jasmine.Spy).and.returnValue(false);
@@ -499,8 +499,8 @@ title = 'igniteui-angular example';
499499
someName: "testValue"
500500
};
501501
const upgradeable: pkgResolve.PackageDefinition = {
502-
trial: pkgResolve.NPM_REACT,
503-
licensed: pkgResolve.FEED_REACT
502+
trial: pkgResolve.NPM_REACT_DOCK_MANAGER,
503+
licensed: pkgResolve.FEED_REACT_DOCK_MANAGER
504504
};
505505
spyOn(pkgResolve, "getUpgradeablePackages").and.returnValue([upgradeable]);
506506
(fsSpy.directoryExists as jasmine.Spy).and.returnValue(false);
@@ -509,13 +509,14 @@ title = 'igniteui-angular example';
509509
expect(await updateWorkspace("")).toEqual(false);
510510
});
511511

512-
it("Should update package.json file, removing non-scoped igniteui-react packages", async () => {
512+
it("Should update package.json file, removing non-scoped igniteui-react-* packages", async () => {
513513
const mockPackageJSON = {
514514
dependencies: {
515515
"@alphabetically-sorted-scope/package": "^0.0.0",
516516
"alphabetically-second-package": "^0.0.0",
517517
"igniteui-react": "^18.5.1",
518-
"igniteui-dockmanager": "^1.0.0",
518+
"igniteui-react-grids": "^18.5.1",
519+
"igniteui-react-dockmanager": "^1.0.0",
519520
"some-package": "^0.0.0"
520521
}
521522
};
@@ -539,9 +540,10 @@ title = 'igniteui-angular example';
539540
expect(fsSpy.writeFile).toHaveBeenCalledWith("package.json", Util.formatPackageJson({
540541
dependencies: {
541542
"@alphabetically-sorted-scope/package": "^0.0.0",
542-
"@infragistics/igniteui-react": "^18.5.1",
543-
"@infragistics/igniteui-dockmanager": "^1.0.0",
543+
"@infragistics/igniteui-react-dockmanager": "^1.0.0",
544+
"@infragistics/igniteui-react-grids": "^18.5.1",
544545
"alphabetically-second-package": "^0.0.0",
546+
"igniteui-react": "^18.5.1",
545547
"some-package": "^0.0.0"
546548
}
547549
}));
@@ -567,8 +569,8 @@ title = 'igniteui-angular example';
567569
`{
568570
"dependencies": {
569571
"@infragistics/igniteui-dockmanager": "^1.0.0",
570-
"@infragistics/igniteui-react": "^18.5.1",
571572
"@infragistics/igniteui-react-grids": "^18.5.1",
573+
"igniteui-react": "^18.5.1",
572574
"some-package": "^0.0.0"
573575
}
574576
}
@@ -738,8 +740,8 @@ export default function Home() {
738740
"name": "root-project",
739741
"dependencies": {
740742
"@infragistics/igniteui-dockmanager": "^1.0.0",
741-
"@infragistics/igniteui-react": "^18.5.1",
742743
"@infragistics/igniteui-react-grids": "^18.5.1",
744+
"igniteui-react": "^18.5.1",
743745
"some-package": "^0.0.0"
744746
},
745747
"workspaces": [
@@ -766,8 +768,8 @@ export default function Home() {
766768
"name": "charts-project",
767769
"dependencies": {
768770
"@infragistics/igniteui-dockmanager": "^1.0.0",
769-
"@infragistics/igniteui-react": "^18.5.1",
770771
"@infragistics/igniteui-react-grids": "^18.5.1",
772+
"igniteui-react": "^18.5.1",
771773
"some-package": "^0.0.0"
772774
}
773775
}
@@ -791,8 +793,8 @@ export default function Home() {
791793
"name": "charts-project",
792794
"dependencies": {
793795
"@infragistics/igniteui-dockmanager": "^1.0.0",
794-
"@infragistics/igniteui-react": "^18.5.1",
795796
"@infragistics/igniteui-react-grids": "^18.5.1",
797+
"igniteui-react": "^18.5.1",
796798
"some-package": "^0.0.0"
797799
}
798800
}

0 commit comments

Comments
 (0)