From 90ea562752897e56540b1cf0b33709f21b59ffc1 Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Wed, 17 Jan 2024 17:14:04 +0300 Subject: [PATCH] include: bootstrap-icons to style-map update: angular.json > styles section --- modules/openiddict/app/angular/angular.json | 6 +++++- npm/ng-packs/apps/dev-app/project.json | 6 +++++- .../schematics/src/commands/change-theme/index.ts | 1 + .../schematics/src/commands/change-theme/style-map.ts | 10 ++++++++++ templates/app-nolayers/angular/angular.json | 6 +++++- templates/app/angular/angular.json | 6 +++++- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/modules/openiddict/app/angular/angular.json b/modules/openiddict/app/angular/angular.json index 34103ef0a8..3fea4d174b 100644 --- a/modules/openiddict/app/angular/angular.json +++ b/modules/openiddict/app/angular/angular.json @@ -105,7 +105,11 @@ "inject": false, "bundleName": "abp-bundle.rtl" }, - "node_modules/bootstrap-icons/font/bootstrap-icons.css", + { + "input": "node_modules/bootstrap-icons/font/bootstrap-icons.css", + "inject": true, + "bundleName": "bootstrap-icons" + }, "src/styles.scss" ], "scripts": [] diff --git a/npm/ng-packs/apps/dev-app/project.json b/npm/ng-packs/apps/dev-app/project.json index 72759f38ad..10c72d7127 100644 --- a/npm/ng-packs/apps/dev-app/project.json +++ b/npm/ng-packs/apps/dev-app/project.json @@ -108,7 +108,11 @@ "inject": false, "bundleName": "ng-zorro-antd-tree" }, - "node_modules/bootstrap-icons/font/bootstrap-icons.css", + { + "input": "node_modules/bootstrap-icons/font/bootstrap-icons.css", + "inject": true, + "bundleName": "bootstrap-icons" + }, "apps/dev-app/src/styles.scss" ], "scripts": [] diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts index f524f705fa..f922288f31 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts @@ -24,6 +24,7 @@ export default function (_options: ChangeThemeOptions): Rule { return async () => { const targetThemeName = _options.name; const selectedProject = _options.targetProject; + if (!targetThemeName) { throw new SchematicsException('The theme name does not selected'); } diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts index a0db18aaf2..0b9f724e57 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts @@ -191,6 +191,11 @@ styleMap.set(ThemeOptionsEnum.LeptonX, [ inject: false, bundleName: 'abp-bundle.rtl', }, + { + input: 'node_modules/bootstrap-icons/font/bootstrap-icons.css', + inject: true, + bundleName: 'bootstrap-icons', + }, ]); styleMap.set(ThemeOptionsEnum.LeptonXLite, [ { @@ -243,6 +248,11 @@ styleMap.set(ThemeOptionsEnum.LeptonXLite, [ inject: false, bundleName: 'abp-bundle.rtl', }, + { + input: 'node_modules/bootstrap-icons/font/bootstrap-icons.css', + inject: true, + bundleName: 'bootstrap-icons', + }, ]); // the code written by Github co-pilot. thank go-pilot. You are the best sidekick. export const allStyles = Array.from(styleMap.values()).reduce((acc, val) => [...acc, ...val], []); diff --git a/templates/app-nolayers/angular/angular.json b/templates/app-nolayers/angular/angular.json index 16e8870f7d..7a6c2413d3 100644 --- a/templates/app-nolayers/angular/angular.json +++ b/templates/app-nolayers/angular/angular.json @@ -105,7 +105,11 @@ "inject": false, "bundleName": "abp-bundle.rtl" }, - "node_modules/bootstrap-icons/font/bootstrap-icons.css", + { + "input": "node_modules/bootstrap-icons/font/bootstrap-icons.css", + "inject": true, + "bundleName": "bootstrap-icons" + }, "src/styles.scss" ], "scripts": [] diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index 16e8870f7d..7a6c2413d3 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -105,7 +105,11 @@ "inject": false, "bundleName": "abp-bundle.rtl" }, - "node_modules/bootstrap-icons/font/bootstrap-icons.css", + { + "input": "node_modules/bootstrap-icons/font/bootstrap-icons.css", + "inject": true, + "bundleName": "bootstrap-icons" + }, "src/styles.scss" ], "scripts": []