Skip to content

fix(upgrade-packages): preserve file changes across package updates #1868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdinev merged 3 commits into from
Nov 4, 2026
Merged

fix(upgrade-packages): preserve file changes across package updates #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c10999f
fix(upgrade-packages): preserve file changes across package updates
georgianastasov Oct 30, 2026
0f751d0
Merge branch 'master' into ganastasov/upgrade-packages-file-save
kdinev Nov 4, 2026
2a0d9a8
Merge branch 'master' into ganastasov/upgrade-packages-file-save
georgianastasov Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/core/update/Update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ function updateFileImports(
...createExpressions(RegularExpressionType.STYLE, packageDef.trial)
]
const newContent = updateFileContent(fileContent, regExpressions, packageDef.licensed);
fileChange = fileContent !== newContent;
fileChange = fileChange || fileContent !== newContent;
fileContent = newContent;
}
}
Expand All @@ -223,7 +223,7 @@ function updateFileImports(
if (fileContent.includes(packageDef.trial)) {
const newContent = updateFileContent(fileContent,
createExpressions(RegularExpressionType.STYLE, packageDef.trial), packageDef.licensed);
fileChange = fileContent !== newContent;
fileChange = fileChange || fileContent !== newContent;
fileContent = newContent;
}
}
Expand Down Expand Up @@ -321,7 +321,7 @@ function updateHTMLImports(htmlFiles: string[], packageDefs: PackageDefinition[]
if (fileContent.includes(packageDef.trial)) {
const newContent = updateFileContent(fileContent,
createExpressions(RegularExpressionType.STYLE, packageDef.trial), packageDef.licensed);
fileChange = fileContent !== newContent;
fileChange = fileChange || fileContent !== newContent;
fileContent = newContent;
}
}
Expand Down
32 changes: 29 additions & 3 deletions spec/unit/update-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,21 @@ import { dockManagerLoader } from '@infragistics/igniteui-dockmanager/loader';

export class HomeComponent {
title = 'igniteui-angular example';
}`},
}`}, {
path: "src/app.component.ts",
content:
`// docked panes come from igniteui-dockmanager
import { IgxGridComponent } from 'igniteui-angular';`,
expected:
`// docked panes come from igniteui-dockmanager
import { IgxGridComponent } from '@infragistics/igniteui-angular';`}, {
path: "src/styles.scss",
content:
`@use 'igniteui-angular/theming' as *;
// igniteui-dockmanager themes are included separately`,
expected:
`@use '@infragistics/igniteui-angular/theming' as *;
// igniteui-dockmanager themes are included separately`},
{
path: ".github/workflows/node.js.yml",
content:
Expand Down Expand Up @@ -329,8 +343,8 @@ title = 'igniteui-angular example';
`}];
(fsSpy.glob as jasmine.Spy).and.returnValues // per workspace
([ "package.json" ], // root package.json
["src/home.component.ts", "src/app-module.ts"], // logic files
["src/home.component.scss"], [], [], // for each style extension
["src/home.component.ts", "src/app-module.ts", "src/app.component.ts"], // logic files
["src/home.component.scss", "src/styles.scss"], [], [], // for each style extension
[]); // inner package.json files
(fsSpy.readFile as jasmine.Spy).and.callFake((filePath: string) => {
if (filePath.indexOf("package.json") > -1) {
Expand Down Expand Up @@ -561,6 +575,7 @@ title = 'igniteui-angular example';
"igniteui-dockmanager": "^1.0.0",
"igniteui-react": "^18.5.1",
"igniteui-react-grids": "^18.5.1",
"igniteui-react-inputs": "^18.5.1",
"some-package": "^0.0.0"
}
}
Expand All @@ -570,6 +585,7 @@ title = 'igniteui-angular example';
"dependencies": {
"@infragistics/igniteui-dockmanager": "^1.0.0",
"@infragistics/igniteui-react-grids": "^18.5.1",
"@infragistics/igniteui-react-inputs": "^18.5.1",
"igniteui-react": "^18.5.1",
"some-package": "^0.0.0"
}
Expand All @@ -585,6 +601,7 @@ import 'igniteui-react-grids/grids';
import { IgrGrid, IgrColumn } from 'igniteui-react-grids';
import { IgcDockManager } from 'igniteui-dockmanager';
import 'igniteui-react-grids/grids/themes/light/bootstrap.css'
// form inputs come from igniteui-react-inputs

export default function Home() {
const title = 'igniteui-react example';
Expand All @@ -596,6 +613,7 @@ import '@infragistics/igniteui-react-grids/grids';
import { IgrGrid, IgrColumn } from '@infragistics/igniteui-react-grids';
import { IgcDockManager } from '@infragistics/igniteui-dockmanager';
import '@infragistics/igniteui-react-grids/grids/themes/light/bootstrap.css'
// form inputs come from igniteui-react-inputs

export default function Home() {
const title = 'igniteui-react example';
Expand Down Expand Up @@ -665,6 +683,7 @@ export default function Home() {
<link rel="stylesheet" href="./styles.css" />
<link rel="stylesheet"
href="node_modules/igniteui-react-grids/grids/themes/light/bootstrap.css"
<!-- form inputs come from igniteui-react-inputs -->
</head>
<body>
<div id="root"></div>
Expand All @@ -686,6 +705,7 @@ export default function Home() {
<link rel="stylesheet" href="./styles.css" />
<link rel="stylesheet"
href="node_modules/@infragistics/igniteui-react-grids/grids/themes/light/bootstrap.css"
<!-- form inputs come from igniteui-react-inputs -->
</head>
<body>
<div id="root"></div>
Expand Down Expand Up @@ -1141,6 +1161,7 @@ export const GridComponent = () => {
"igniteui-webcomponents": "^4.7.0",
"igniteui-webcomponents-core": "^4.7.0",
"igniteui-webcomponents-grids": "^4.7.0",
"igniteui-webcomponents-spreadsheet": "^4.7.0",
"igniteui-dockmanager": "^1.0.0",
"some-package": "^0.0.0"
}
Expand All @@ -1152,6 +1173,7 @@ export const GridComponent = () => {
"@infragistics/igniteui-dockmanager": "^1.0.0",
"@infragistics/igniteui-webcomponents-core": "^4.7.0",
"@infragistics/igniteui-webcomponents-grids": "^4.7.0",
"@infragistics/igniteui-webcomponents-spreadsheet": "^4.7.0",
"igniteui-webcomponents": "^4.7.0",
"some-package": "^0.0.0"
}
Expand All @@ -1165,6 +1187,7 @@ export const GridComponent = () => {
import { IgcDockManager } from 'igniteui-dockmanager';
import { defineComponents, IgcLinearProgressComponent } from 'igniteui-webcomponents';
import { ModuleManager } from 'igniteui-webcomponents-core';
// the spreadsheet is configured in igniteui-webcomponents-spreadsheet

export default class App extends LitElement {
const title = 'igniteui-webcomponents example';
Expand All @@ -1174,6 +1197,7 @@ export default class App extends LitElement {
import { IgcDockManager } from '@infragistics/igniteui-dockmanager';
import { defineComponents, IgcLinearProgressComponent } from 'igniteui-webcomponents';
import { ModuleManager } from '@infragistics/igniteui-webcomponents-core';
// the spreadsheet is configured in igniteui-webcomponents-spreadsheet

export default class App extends LitElement {
const title = 'igniteui-webcomponents example';
Expand Down Expand Up @@ -1255,6 +1279,7 @@ export default class App extends LitElement {
<base href="/">
<title>Ignite UI for Web Components</title>
<link rel="stylesheet" href="./node_modules/igniteui-webcomponents-grids/grids/themes/light/bootstrap.css">
<!-- the spreadsheet is configured in igniteui-webcomponents-spreadsheet -->
<link rel="stylesheet" href="./styles.css">
</head>
<body class="ig-scrollbar">
Expand All @@ -1272,6 +1297,7 @@ export default class App extends LitElement {
<base href="/">
<title>Ignite UI for Web Components</title>
<link rel="stylesheet" href="./node_modules/@infragistics/igniteui-webcomponents-grids/grids/themes/light/bootstrap.css">
<!-- the spreadsheet is configured in igniteui-webcomponents-spreadsheet -->
<link rel="stylesheet" href="./styles.css">
</head>
<body class="ig-scrollbar">
Expand Down
Loading