diff --git a/packages/core/update/Update.ts b/packages/core/update/Update.ts index 8d2788699..56251c81e 100644 --- a/packages/core/update/Update.ts +++ b/packages/core/update/Update.ts @@ -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; } } @@ -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; } } @@ -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; } } diff --git a/spec/unit/update-spec.ts b/spec/unit/update-spec.ts index ded330421..36fb2f103 100644 --- a/spec/unit/update-spec.ts +++ b/spec/unit/update-spec.ts @@ -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: @@ -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) { @@ -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" } } @@ -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" } @@ -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'; @@ -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'; @@ -665,6 +683,7 @@ export default function Home() {
@@ -686,6 +705,7 @@ export default function Home() { @@ -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" } @@ -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" } @@ -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'; @@ -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'; @@ -1255,6 +1279,7 @@ export default class App extends LitElement {