@fundamental-ngx/core 0.35.4-rc.6 → 0.35.4-rc.7

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@fundamental-ngx/core",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "schematics": "./schematics/collection.json",
+  "ng-update": {
+    "migrations": "./schematics/migrations.json"
+  },
   "description": "Fundamental Library for Angular - core",
   "license": "Apache-2.0",
   "homepage": "https://sap.github.io/fundamental-ngx/home",
@@ -19,28 +22,20 @@
     "@angular/animations": "^13.0.0",
     "@angular/router": "^13.0.0",
     "@angular/cdk": "^13.0.0",
-    "rxjs": "7.5.4"
+    "rxjs": "7.5.4",
+    "fundamental-styles": "0.24.4",
+    "@sap-theming/theming-base-content": "11.1.40"
   },
   "dependencies": {
-    "@sap-theming/theming-base-content": "11.1.40",
     "focus-trap": "6.7.3",
-    "fundamental-styles": "0.24.4",
     "fast-deep-equal": "3.1.3",
     "lodash-es": "4.17.21",
     "tslib": "^2.0.0",
     "compare-versions": "4.1.3"
   },
-  "module": "fesm2015/fundamental-ngx-core.mjs",
-  "es2020": "fesm2020/fundamental-ngx-core.mjs",
-  "esm2020": "esm2020/fundamental-ngx-core.mjs",
-  "fesm2020": "fesm2020/fundamental-ngx-core.mjs",
-  "fesm2015": "fesm2015/fundamental-ngx-core.mjs",
-  "typings": "fundamental-ngx-core.d.ts",
   "exports": {
-    "./package.json": {
-      "default": "./package.json"
-    },
     ".": {
+      "sass": "./assets/fundamental-ngx-core.scss",
       "types": "./fundamental-ngx-core.d.ts",
       "esm2020": "./esm2020/fundamental-ngx-core.mjs",
       "es2020": "./fesm2020/fundamental-ngx-core.mjs",
@@ -48,6 +43,18 @@
       "node": "./fesm2015/fundamental-ngx-core.mjs",
       "default": "./fesm2020/fundamental-ngx-core.mjs"
     },
+    "./assets/fundamental-ngx-core-fonts.scss": {
+      "sass": "./assets/fundamental-ngx-core-fonts.scss"
+    },
+    "./assets/fonts/sap_fiori_3_fonts.css": {
+      "style": "./assets/fonts/sap_fiori_3_fonts.css"
+    },
+    "./assets/fonts/sap_horizon_fonts.css": {
+      "style": "./assets/fonts/sap_horizon_fonts.css"
+    },
+    "./package.json": {
+      "default": "./package.json"
+    },
     "./action-bar": {
       "types": "./action-bar/fundamental-ngx-core-action-bar.d.ts",
       "esm2020": "./esm2020/action-bar/fundamental-ngx-core-action-bar.mjs",
@@ -801,5 +808,11 @@
       "default": "./fesm2020/fundamental-ngx-core-wizard.mjs"
     }
   },
+  "module": "fesm2015/fundamental-ngx-core.mjs",
+  "es2020": "fesm2020/fundamental-ngx-core.mjs",
+  "esm2020": "esm2020/fundamental-ngx-core.mjs",
+  "fesm2020": "fesm2020/fundamental-ngx-core.mjs",
+  "fesm2015": "fesm2015/fundamental-ngx-core.mjs",
+  "typings": "fundamental-ngx-core.d.ts",
   "sideEffects": false
 }

package/pagination/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/pagination",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/panel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/panel",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/popover/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/popover",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/product-switch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/product-switch",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/progress-indicator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/progress-indicator",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "~12.0.5",
     "@angular/core": "~12.0.5"

package/quick-view/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/quick-view",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/radio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/radio",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/rating-indicator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/rating-indicator",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/resizable-card-layout/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core/resizable-card-layout",
-  "version": "0.35.4-rc.6",
+  "version": "0.35.4-rc.7",
   "peerDependencies": {
     "@angular/common": "^13.0.0",
     "@angular/core": "^13.0.0"

package/schematics/collection.json

@@ -5,15 +5,6 @@
             "description": "Adds @fundamental-ngx/core to the project.",
             "factory": "./ng-add/index#ngAdd",
             "schema": "./ng-add/schema.json"
-        },
-        "add-animations": {
-            "description": "Adds animations module imports using @angular/cdk tools.",
-            "factory": "./add-animations/index#addAnimations"
-        },
-        "migrate-theme-fonts": {
-            "description": "Updates @fundamental-ngx/core to the latest version changes.",
-            "factory": "./migrations/migrate-theme-fonts/index#ngUpdate",
-            "schema": "./migrations/migrate-theme-fonts/schema.json"
         }
     }
 }

package/schematics/migrations/migration-0.36/index.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/schematics/migrations/migration-0.36/index.js

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@angular-devkit/core");
+const schematics_1 = require("@angular-devkit/schematics");
+const workspace_1 = require("@schematics/angular/utility/workspace");
+const file_utils_1 = require("../../utils/file-utils");
+function default_1() {
+    return (0, schematics_1.chain)([removeStylesFromConfig(), removeIconFonts(), removeFontStyles(), noticeAddSchematics()]);
+}
+exports.default = default_1;
+function removeStylesFromConfig() {
+    return (_, context) => __awaiter(this, void 0, void 0, function* () {
+        return (0, workspace_1.updateWorkspace)((workspace) => {
+            workspace.projects.forEach((project) => {
+                project.targets.forEach((target) => {
+                    var _a, _b;
+                    const styles = (_a = target.options) === null || _a === void 0 ? void 0 : _a.styles;
+                    if (!((_b = target.options) === null || _b === void 0 ? void 0 : _b.styles) || !styles || !(0, core_1.isJsonArray)(styles)) {
+                        return;
+                    }
+                    const stylesToRemove = [
+                        'node_modules/fundamental-styles/dist/icon.css',
+                        './node_modules/@sap-theming/theming-base-content/content/Base/baseLib/sap_fiori_3/css_variables.css',
+                        './node_modules/fundamental-styles/dist/theming/sap_fiori_3.css'
+                    ];
+                    stylesToRemove.forEach((styleToRemove) => {
+                        const indexInStylesArray = styles.findIndex((configStyle) => typeof configStyle === 'string' && configStyle === styleToRemove);
+                        if (indexInStylesArray > -1) {
+                            styles.splice(indexInStylesArray, 1);
+                            context.logger.info(`✅️ Removed '${styleToRemove}' style from angular.json`);
+                        }
+                    });
+                    target.options.styles = styles;
+                });
+            });
+        });
+    });
+}
+function removeIconFonts() {
+    return (tree, context) => (0, workspace_1.updateWorkspace)((workspace) => {
+        workspace.projects.forEach((project) => {
+            project.targets.forEach((target) => {
+                var _a, _b;
+                const styles = (_a = target.options) === null || _a === void 0 ? void 0 : _a.styles;
+                if (!((_b = target.options) === null || _b === void 0 ? void 0 : _b.styles) || !styles || !(0, core_1.isJsonArray)(styles)) {
+                    return;
+                }
+                const iconFonts = ['sap_fiori_3_fonts', 'sap_horizon_fonts'];
+                iconFonts.forEach((fontFile) => {
+                    // Remove file
+                    const fontFileWithPath = `${project.sourceRoot}/theming/${fontFile}.css`;
+                    if (tree.exists(fontFileWithPath)) {
+                        tree.delete(fontFileWithPath);
+                        context.logger.info(`✅️ Removed ${fontFile}.css file.`);
+                    }
+                    // Remove from config
+                    const indexInStylesArray = styles.findIndex((style) => (0, core_1.isJsonObject)(style) && (style === null || style === void 0 ? void 0 : style.bundleName) === `${fontFile}`);
+                    if (indexInStylesArray > -1) {
+                        styles.splice(indexInStylesArray, 1);
+                        context.logger.info(`✅️ Removed '${fontFile}' style from angular.json`);
+                    }
+                });
+                target.options.styles = styles;
+            });
+        });
+    });
+}
+function removeFontStyles() {
+    return (tree, context) => {
+        const styleSheets = (0, file_utils_1.findStylesheetFiles)(tree);
+        if (styleSheets.length > 0) {
+            const FONT_FACE_REGEX = /(@font-face)[\w\s]?{[s\S\W\w]+?(?=\s}\s)?\s?}[\n\s]*/gi;
+            styleSheets.forEach((styleSheet) => {
+                let buffer = tree.read(styleSheet);
+                if (!buffer) {
+                    return;
+                }
+                let contents = buffer.toString();
+                if (FONT_FACE_REGEX.test(contents)) {
+                    const matches = contents
+                        .match(FONT_FACE_REGEX)
+                        .filter((m) => { var _a; return (_a = m.match(/~@sap-theming.*\.woff/)) === null || _a === void 0 ? void 0 : _a.length; });
+                    if (matches.length === 0) {
+                        return;
+                    }
+                    matches.forEach((match) => {
+                        contents = contents.replace(match, '');
+                    });
+                    tree.overwrite(styleSheet, contents);
+                    context.logger.info(`✅️ Removed font styles from stylesheets.`);
+                }
+            });
+        }
+        context.logger.info(`⚠️ Notice: If you have imported font styles from @sap-theming, please remove it since now it controlled by fundamental-ngx`);
+        return tree;
+    };
+}
+function noticeAddSchematics() {
+    return (_, context) => {
+        context.logger.info(`ℹ️ Now you have run ng-add schematics once again to setup things in the right way.`);
+        // Unfortunately we cannot run it on our own because ng-update doesn't respect schema so there is no way to get options here and pass them further
+    };
+}
+//# sourceMappingURL=index.js.map

package/schematics/migrations/migration-0.36/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/core/schematics/migrations/migration-0.36/index.ts"],"names":[],"mappings":"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"}

package/schematics/migrations.json

@@ -0,0 +1,9 @@
+{
+    "schematics": {
+        "migration-0.36": {
+            "version": "0.36",
+            "description": "Removes icon font files, font styles, styles from config and notifies about necessity of running add schematics again.",
+            "factory": "./migrations/migration-0.36/index"
+        }
+    }
+}