fix(core,platform): revert "schematics, deps, migrations, assets & styles (#8465)"

This reverts commit 1dc00d1.

Author: platon-rov

libs/core/schematics/add-animations/index.ts

@@ -0,0 +1,50 @@
+import { SchematicContext, Tree } from '@angular-devkit/schematics';
+import { addModuleImportToModule, findModuleFromOptions } from '@angular/cdk/schematics';
+import { hasModuleImport } from '../utils/ng-module-utils';
+
+const browserAnimationsModuleName = 'BrowserAnimationsModule';
+const noopAnimationsModuleName = 'NoopAnimationsModule';
+
+// Configures animations modules
+export function addAnimations(options: any): any {
+    return async (tree: Tree, context: SchematicContext) => {
+        const modulePath = await findModuleFromOptions(tree, options);
+
+        if (options.animations) {
+            if (hasModuleImport(tree, modulePath, noopAnimationsModuleName)) {
+                context.logger.warn(
+                    `Could not set up "${browserAnimationsModuleName} because "${noopAnimationsModuleName}" is already imported. Please manually set up browser animations.`
+                );
+
+                return tree;
+            }
+
+            if (hasModuleImport(tree, modulePath, browserAnimationsModuleName)) {
+                context.logger.info(
+                    `✅️ Import of ${browserAnimationsModuleName} already present in root module. Skipping.`
+                );
+
+                return tree;
+            }
+
+            addModuleImportToModule(
+                tree,
+                modulePath,
+                browserAnimationsModuleName,
+                '@angular/platform-browser/animations'
+            );
+
+            context.logger.info(`✅️ Added ${browserAnimationsModuleName} to root module.`);
+
+            return tree;
+        }
+
+        if (!hasModuleImport(tree, modulePath, browserAnimationsModuleName)) {
+            addModuleImportToModule(tree, modulePath, noopAnimationsModuleName, '@angular/platform-browser/animations');
+
+            context.logger.info(`✅️ Added ${noopAnimationsModuleName} to root module.`);
+        }
+
+        return tree;
+    };
+}

libs/core/schematics/collection.json

@@ -5,6 +5,15 @@
             "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"
         }
     }
 }

libs/core/schematics/migrations.json

@@ -0,0 +1,125 @@
+import { Rule, SchematicContext, Tree, chain, SchematicsException } from '@angular-devkit/schematics';
+import { WorkspaceSchema } from '@schematics/angular/utility/workspace-models';
+import { findStylesheetFiles } from '../../utils/file-utils';
+
+import { sapFioriFonts, sapHorizonFonts } from './styles';
+import { Schema } from './schema';
+
+export function ngUpdate(options: any): Rule {
+    return chain([addStylePathToConfig(options), createThemingStyleFiles(options)]);
+}
+
+interface AngularStyleObject {
+    input: string;
+    inject: boolean;
+    bundleName: string;
+}
+
+const FONT_FACE_REGEX = /(@font-face)[\w\s]?{[\s\S\W\w]+?(?=\s}\s)?\s?}/gi;
+
+const themeFontFiles = ['sap_fiori_3_fonts', 'sap_horizon_fonts'];
+
+function createThemingStyleFiles(options: Schema): Rule {
+    return (tree: Tree, context: SchematicContext) => {
+        const angularConfigPath = '/angular.json';
+        const workspaceConfig = tree.read(angularConfigPath);
+
+        if (!workspaceConfig) {
+            throw new SchematicsException(
+                `❌ Unable to find angular.json. Please manually configure your styles array.`
+            );
+        }
+
+        const workspaceJson: WorkspaceSchema = JSON.parse(workspaceConfig.toString());
+
+        const sourceRoot = workspaceJson.projects[options.project].sourceRoot;
+
+        if (!tree.exists(`${sourceRoot}/theming/sap_fiori_3_fonts.css`)) {
+            tree.create(`${sourceRoot}/theming/sap_fiori_3_fonts.css`, sapFioriFonts);
+            context.logger.info(`✅️ Created sap_fiori_3_fonts.css file.`);
+        }
+        if (!tree.exists(`${sourceRoot}/theming/sap_horizon_fonts.css`)) {
+            tree.create(`${sourceRoot}/theming/sap_horizon_fonts.css`, sapHorizonFonts);
+            context.logger.info(`✅️ Created sap_horizon_fonts.css file.`);
+        }
+
+        if (options.autofixFontStyles) {
+            const styleSheets = findStylesheetFiles(tree).filter(
+                (s) => !s.endsWith('sap_horizon_fonts.css') && !s.endsWith('sap_fiori_3_fonts.css')
+            );
+            context.logger.info(styleSheets.join());
+
+            if (styleSheets.length > 0) {
+                styleSheets.forEach((styleSheet) => {
+                    let contents = tree.read(styleSheet).toString();
+
+                    if (FONT_FACE_REGEX.test(contents)) {
+                        const matches = contents.match(FONT_FACE_REGEX).filter((m) => m.includes('/SAP-icons.woff'));
+
+                        if (matches.length === 0) {
+                            return;
+                        }
+
+                        matches.forEach((match) => {
+                            contents = contents.replace(match, '');
+                        });
+
+                        tree.overwrite(styleSheet, contents);
+                        context.logger.info(`✅️ Successfully migrated ${styleSheet}.`);
+                    }
+                });
+            }
+        }
+
+        context.logger.info(
+            `⚠️ Notice: If you have imported SAP-Icon icon font styles from @sap-theming, please remove it since now it controlled by fundamental-ngx`
+        );
+
+        return tree;
+    };
+}
+
+// Adds the icon style path to the angular.json.
+function addStylePathToConfig(options: any): Rule {
+    return (tree: Tree, context: SchematicContext) => {
+        const angularConfigPath = '/angular.json';
+        const workspaceConfig = tree.read(angularConfigPath);
+
+        if (!workspaceConfig) {
+            throw new SchematicsException(
+                `❌ Unable to find angular.json. Please manually configure your styles array.`
+            );
+        }
+
+        const workspaceJson: WorkspaceSchema = JSON.parse(workspaceConfig.toString());
+
+        const sourceRoot = workspaceJson.projects[options.project].sourceRoot;
+
+        try {
+            let stylesArray = (workspaceJson!.projects[options.project]!.architect!.build!.options as any)[
+                'styles'
+            ] as (string | AngularStyleObject)[];
+
+            themeFontFiles.forEach((fontStyle) => {
+                if (!stylesArray.find((style) => typeof style === 'object' && style.bundleName === `${fontStyle}`)) {
+                    stylesArray.push({
+                        input: `${sourceRoot}/theming/${fontStyle}.css`,
+                        inject: false,
+                        bundleName: fontStyle
+                    });
+                    context.logger.info(`✅️ Added ${fontStyle} font style to angular.json`);
+                }
+            });
+
+            (workspaceJson!.projects[options.project]!.architect!.build!.options as any)['styles'] = stylesArray;
+        } catch (e) {
+            throw new SchematicsException(
+                `❌ Unable to find angular.json project styles. Please manually configure your styles array.`
+            );
+        }
+
+        tree.overwrite(angularConfigPath, JSON.stringify(workspaceJson, null, 2));
+
+        return tree;
+    };
+}

libs/core/schematics/migrations/migrate-theme-fonts/index.ts

@@ -0,0 +1,21 @@
+{
+    "$schema": "http://json-schema.org/schema",
+    "$id": "fundamental-ngx-ng-add",
+    "title": "Fundamental Library for Angular ng-add schematic",
+    "type": "object",
+    "properties": {
+        "project": {
+            "type": "string",
+            "description": "The name of the project.",
+            "$default": {
+                "$source": "projectName"
+            }
+        },
+        "autofixFontStyles": {
+            "type": "boolean",
+            "default": true,
+            "description": "Whether to try to automatically fix icon font imports",
+            "x-prompt": "Try to automatically fix icon font imports?"
+        }
+    }
+}

libs/core/schematics/migrations/migrate-theme-fonts/schema.json

@@ -0,0 +1,4 @@
+export interface Schema {
+    project: string;
+    autofixFontStyles: boolean;
+}

libs/core/schematics/migrations/migrate-theme-fonts/schema.ts

@@ -0,0 +1,17 @@
+export const sapFioriFonts = `
+@font-face {
+    font-family: 'SAP-icons';
+    src: url('~@sap-theming/theming-base-content/content/Base/baseLib/baseTheme/fonts/SAP-icons.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+`;
+
+export const sapHorizonFonts = `
+@font-face {
+    font-family: 'SAP-icons';
+    src: url('~@sap-theming/theming-base-content/content/Base/baseLib/sap_horizon/fonts/SAP-icons.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+`;