Skip to content

Commit 06ad793

Browse files
committed
chore(schematics): adapt schematics to 15.0.0 updates
1 parent 7498e03 commit 06ad793

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"igniteui-theming": "^1.1.2"
8787
},
8888
"igxDevDependencies": {
89-
"@igniteui/angular-schematics": "~15.0.1100-beta.0"
89+
"@igniteui/angular-schematics": "~15.0.1100-rc.0"
9090
},
9191
"ng-update": {
9292
"migrations": "./migrations/migration-collection.json"

projects/igniteui-angular/schematics/ng-add/add-normalize.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const resetPackage = { 'minireset.css': '~0.0.4' };
1010
export const cssImport = 'node_modules/minireset.css/minireset.css';
1111
export const scssImport =
1212
`// CSS Reset, comment out if not required or using a different module\n`
13-
+ `@import '~minireset.css/minireset';\n`;
13+
+ `@import 'minireset.css/minireset';\n`;
1414

1515

1616
export const addResetCss = (workspace: workspaces.WorkspaceDefinition, host: Tree): boolean => {
@@ -28,7 +28,7 @@ export const addResetCss = (workspace: workspaces.WorkspaceDefinition, host: Tre
2828
case 'sass':
2929
case 'scss':
3030
let content = host.read(stylesFile).toString();
31-
if (content.indexOf(`~minireset.css/minireset`) === -1) {
31+
if (content.indexOf(`minireset.css/minireset`) === -1) {
3232
content = scssImport + content;
3333
host.overwrite(stylesFile, content);
3434
addPackage = resetPackage;

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,17 @@ const addHammerToConfig =
152152
context.logger.warn(`Could not find a matching scripts array property under ${config} options. ` +
153153
`It could require you to manually update it to 'scripts': [ ${hammerjsFilePath}] `);
154154
}
155+
156+
// if there are no elements in the architect[config]options.stylePreprocessorOptions.includePaths that contain node_modules
157+
const stylePrepropPath = 'node_modules';
158+
if (!projectOptions?.stylePreprocessorOptions?.includePaths?.some(el => el.includes(stylePrepropPath))) {
159+
if (projectOptions?.stylePreprocessorOptions?.includePaths) {
160+
projectOptions?.stylePreprocessorOptions?.includePaths.push(stylePrepropPath);
161+
return;
162+
}
163+
context.logger.warn(`Could not find a matching stylePreprocessorOptions includePaths array property under ${config} options. ` +
164+
`It could require you to manually update it to "stylePreprocessorOptions": { "includePaths": ["node_modules"] }`);
165+
}
155166
};
156167

157168
const includeDependencies = async (pkgJson: any, context: SchematicContext, tree: Tree): Promise<void> => {

0 commit comments

Comments
 (0)