Skip to content

Commit fe1c665

Browse files
authored
fix(migrations): do not migrate for libs & migrate for SSR #12508 (#12521)
1 parent b32d9fd commit fe1c665

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

projects/igniteui-angular/migrations/update-15_0_4/index.spec.ts

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as path from 'path';
22

33
import { EmptyTree } from '@angular-devkit/schematics';
44
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
5+
import { ProjectType } from '../../schematics/utils/util';
56

67
const version = '15.0.4';
78

@@ -24,18 +25,44 @@ describe(`Update to ${version}`, () => {
2425
},
2526
version: 1
2627
};
28+
const configJsonLib = {
29+
defaultProject: 'testProj',
30+
projects: {
31+
testProj: {
32+
root: '/',
33+
sourceRoot: '/testSrc',
34+
prefix: 'lib',
35+
projectType: ProjectType.Library,
36+
architect: {
37+
build: {
38+
options: {
39+
}
40+
}
41+
}
42+
}
43+
},
44+
version: 1
45+
};
2746

2847
beforeEach(() => {
2948
appTree = new UnitTestTree(new EmptyTree());
30-
appTree.create('/angular.json', JSON.stringify(configJson));
3149
});
3250

3351
const migrationName = 'migration-27';
3452

3553
it(`should add igniteui-theming to pacakage json and configure it`, async () => {
54+
appTree.create('/angular.json', JSON.stringify(configJson));
3655
const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
3756
.toPromise();
3857

3958
expect(JSON.parse(JSON.stringify(tree.readContent('angular.json')))).toContain("stylePreprocessorOptions");
4059
});
60+
61+
it(`should not add igniteui-theming to library pacakage json and configure it`, async () => {
62+
appTree.create('/angular.json', JSON.stringify(configJsonLib));
63+
const tree = await schematicRunner.runSchematicAsync(migrationName, {}, appTree)
64+
.toPromise();
65+
66+
expect(JSON.parse(JSON.stringify(tree.readContent('angular.json')))).not.toContain("stylePreprocessorOptions");
67+
});
4168
});

projects/igniteui-angular/schematics/utils/dependency-handler.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { workspaces } from '@angular-devkit/core';
22
import { SchematicContext, Rule, Tree } from '@angular-devkit/schematics';
33
import { Options } from '../interfaces/options';
4-
import { createHost } from './util';
4+
import { createHost, ProjectType } from './util';
55

66
export enum PackageTarget {
77
DEV = 'devDependencies',
@@ -158,8 +158,10 @@ const addHammerToConfig =
158158
};
159159

160160
export const includeStylePreprocessorOptions = async (workspaceHost: workspaces.WorkspaceHost, workspace: workspaces.WorkspaceDefinition, context: SchematicContext, tree: Tree): Promise<void> => {
161-
await Promise.all(Array.from(workspace.projects.values()).map(async (project) => {
161+
await Promise.all(Array.from(workspace.projects.values()).map(async (project: workspaces.ProjectDefinition) => {
162+
if (project.extensions['projectType'] === ProjectType.Library) return;
162163
await addStylePreprocessorOptions(project, tree, "build", context);
164+
await addStylePreprocessorOptions(project, tree, "server", context);
163165
await addStylePreprocessorOptions(project, tree, "test", context);
164166
}));
165167

0 commit comments

Comments
 (0)