@ihk-gfi/lux-components-update 11.5.0 → 11.9.0

package/src/update110900/index_spec.ts

@@ -0,0 +1,341 @@
+import { callRule, SchematicContext } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import * as path from 'path';
+import { of as observableOf } from 'rxjs';
+import { getPackageJsonDependency } from '../utility/dependencies';
+import { appOptions, workspaceOptions } from '../utility/test';
+import { UtilConfig } from '../utility/util';
+import { addIconsToIndexHtml, update110900 } from './index';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+
+describe('update110900', () => {
+  let appTree: UnitTestTree;
+  let runner: SchematicTestRunner;
+  let context: SchematicContext;
+
+  const testOptions: any = {};
+
+  beforeEach(async () => {
+    runner = new SchematicTestRunner('schematics', collectionPath);
+
+    appTree = await runner.runExternalSchematicAsync('@schematics/angular', 'workspace', workspaceOptions).toPromise();
+    appTree = await runner
+      .runExternalSchematicAsync('@schematics/angular', 'application', appOptions, appTree)
+      .toPromise();
+
+    UtilConfig.defaultWaitMS = 0;
+
+    const collection = runner.engine.createCollection(collectionPath);
+    const schematic = runner.engine.createSchematic('update-11.9.0', collection);
+    context = runner.engine.createContext(schematic);
+
+    testOptions.project = appOptions.name;
+    testOptions.path = workspaceOptions.newProjectRoot + '/' + appOptions.name;
+    testOptions.verbose = true;
+  });
+
+  describe('[Rule] update110900', () => {
+    it('Sollte die Abhängigkeiten aktualisieren', (done) => {
+      appTree.overwrite(
+        '/package.json',
+        `
+            {
+              "name": "Lorem ipsum",
+              "version": "0.0.32",
+              "scripts": {
+                "build": "tsc -p tsconfig.json",
+                "test": "npm run build && jasmine src/**/*_spec.js"
+              },
+              "dependencies": {
+                "@ihk-gfi/lux-components": "11.0.0",
+              },
+              "devDependencies": {
+                    "@angular-devkit/build-angular": "0.1102.14"
+              }
+            }
+        `
+      );
+
+      appTree.overwrite(
+        '/angular.json',
+        `{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "bar": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "i18n": {
+        "sourceLocale": {
+          "code": "de",
+          "baseHref": "/"
+        },
+        "locales": {
+          "en": "src/locale/messages.en.xlf"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "ngx-build-plus:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "polyfills": "src/polyfills.ts",
+            "assets": [
+              "src/assets",
+              {
+                "glob": "*(*min.css|*min.css.map)",
+                "input": "./node_modules/@ihk-gfi/lux-components-theme/prebuilt-themes",
+                "output": "./assets/themes"
+              }
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": [
+              {
+                "bundleName": "polyfill-webcomp",
+                "input": "node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-sd-ce-pf.js"
+              },
+              {
+                "bundleName": "polyfill-webcomp-es5",
+                "input": "node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"
+              }
+            ],
+            "allowedCommonJsDependencies": [
+              "hammerjs",
+              "ng2-pdf-viewer"
+            ],
+            "localize": [
+              "de"
+            ],
+            "i18nMissingTranslation": "error",
+            "extraWebpackConfig": "webpack.config.js"
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
+            },
+            "es5": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
+              "tsConfig": "src/tsconfig.app.ie.json"
+            },
+            "en": {
+              "localize": [
+                "en"
+              ],
+              "aot": true,
+              "outputPath": "dist/en",
+              "i18nMissingTranslation": "error"
+            }
+          }
+        },
+        "serve": {
+          "builder": "ngx-build-plus:dev-server",
+          "options": {
+            "browserTarget": "bar:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "bar:build:production"
+            },
+            "es5": {
+              "browserTarget": "bar:build:es5"
+            },
+            "en": {
+              "browserTarget": "bar:build:en"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "bar:build"
+          }
+        },
+        "test": {
+          "builder": "ngx-build-plus:karma",
+          "options": {
+            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "scripts": [],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "assets": [
+              "src/assets",
+              {
+                "glob": "**/*",
+                "input": "./node_modules/pdfjs-dist/cmaps/",
+                "output": "./assets/cmaps"
+              },
+              {
+                "glob": "*.css",
+                "input": "./node_modules/@ihk-gfi/lux-components-theme/prebuilt-themes",
+                "output": "./assets/themes"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
+          }
+        }
+      }
+    },
+    "bar-e2e": {
+      "root": "e2e",
+      "sourceRoot": "e2e",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "bar:serve"
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "bar",
+  "cli": {
+    "defaultCollection": "@angular-eslint/schematics"
+  },
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "bp",
+      "style": "scss"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "bp"
+    }
+  }
+}
+        `
+      );
+
+      callRule(update110900(testOptions), observableOf(appTree), context).subscribe(
+        (success) => {
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components').version).toEqual('11.9.0');
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components-theme').version).toEqual('11.11.0');
+
+          const angularJson = success.read('/angular.json')?.toString();
+          expect(angularJson).toContain(
+            `{
+                "glob": "all.css",
+                "input": "./node_modules/@fortawesome/fontawesome-free/css",
+                "output": "./assets/icons/fontawesome/css"
+              },`
+          );
+
+          expect(angularJson).toContain(
+            `{
+                "glob": "*(*.eot|*.ttf|*.woff|*.woff2)",
+                "input": "./node_modules/@fortawesome/fontawesome-free/webfonts",
+                "output": "./assets/icons/fontawesome/webfonts"
+              },`
+          );
+
+          expect(angularJson).toContain(
+            `{
+                "glob": "material-design-icons.css",
+                "input": "./node_modules/material-design-icons-iconfont/dist",
+                "output": "./assets/icons/material-icons"
+              },`
+          );
+
+          expect(angularJson).toContain(
+            `{
+                "glob": "*(*.eot|*.ttf|*.woff|*.woff2)",
+                "input": "./node_modules/material-design-icons-iconfont/dist/fonts",
+                "output": "./assets/icons/material-icons/fonts"
+              },`
+          );
+
+          done();
+        },
+        (reason) => expect(reason).toBeUndefined()
+      );
+    });
+  });
+
+  describe('[Rule] addIconsToIndexHtml', () => {
+    it('Sollte die Datei "index.html" angepasst haben', (done) => {
+      appTree.create(
+        'src/index.html',
+        `
+<!doctype html>
+<html lang="de">
+<head>
+  <meta charset="utf-8">
+  <title>LUX Blueprint</title>
+  <base href="/">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body style="margin: 0">
+<noscript>
+  <div id="no-js" class="lux-no-js">
+    <p><b>Achtung, Javascript ist deaktiviert.</b></p>
+    <p>Bitte aktivieren Sie Javascript in Ihrem Browser, damit die Applikation funktionsf&auml;hig ist.</p>
+  </div>
+</noscript>
+  <app-root></app-root>
+</body>
+</html>
+        `
+      );
+
+
+      callRule(addIconsToIndexHtml(testOptions), observableOf(appTree), context).subscribe(
+        (success) => {
+          const content = success.read('src/index.html')?.toString();
+
+          expect(content).toContain('<link rel="icon" type="image/x-icon" href="favicon.ico">');
+          expect(content).toContain('<link rel="stylesheet" href="assets/icons/material-icons/material-design-icons.css">');
+          expect(content).toContain('<link rel="stylesheet" href="assets/icons/fontawesome/css/all.css">');
+
+          done();
+        },
+        (reason) => expect(reason).toBeUndefined()
+      );
+    });
+  });
+});

package/src/update110900/schema.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "luxupdate110900Schema",
+  "title": "Aktualisiert das LUX-Componentsprojekt",
+  "type": "object",
+  "description": "Aktualisiert das LUX-Componentsprojekt",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "Der Projektname",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "verbose": {
+      "type": "boolean",
+      "description": "Generiert mehr Logausgaben",
+      "default": false
+    }
+  },
+  "required": [],
+  "additionalProperties": false
+}

package/src/utility/dependencies.d.ts

@@ -10,6 +10,12 @@ export interface NodeDependency {
     name: string;
     version: string;
 }
+/**
+ * Liefert die Dependency zurück, wenn es sie gibt, undefined sonst.
+ * @param tree
+ * @param name
+ */
+export declare function hasPackageJsonDependency(tree: Tree, name: string): NodeDependency | undefined;
 /**
  * Versucht eine Dependency aus der package.json auslesen und gibt diese zurück.
  * @param tree

package/src/utility/dependencies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deletePackageJsonDependency = exports.updatePackageJsonDependency = exports.updateDependencyDev = exports.updateDependency = exports.getPackageJsonDependency = exports.NodeDependencyType = void 0;
+exports.deletePackageJsonDependency = exports.updatePackageJsonDependency = exports.updateDependencyDev = exports.updateDependency = exports.getPackageJsonDependency = exports.hasPackageJsonDependency = exports.NodeDependencyType = void 0;
 const chalk = require("chalk");
 const jsonc_parser_1 = require("jsonc-parser");
 const files_1 = require("./files");
@@ -13,6 +13,27 @@ var NodeDependencyType;
     NodeDependencyType["Peer"] = "peerDependencies";
     NodeDependencyType["Optional"] = "optionalDependencies";
 })(NodeDependencyType = exports.NodeDependencyType || (exports.NodeDependencyType = {}));
+/**
+ * Liefert die Dependency zurück, wenn es sie gibt, undefined sonst.
+ * @param tree
+ * @param name
+ */
+function hasPackageJsonDependency(tree, name) {
+    const packageJsonNode = json_1.readJson(tree, '/package.json');
+    let dependency = undefined;
+    [NodeDependencyType.Default, NodeDependencyType.Dev, NodeDependencyType.Optional, NodeDependencyType.Peer].forEach((depType) => {
+        let node = jsonc_parser_1.findNodeAtLocation(packageJsonNode, [depType.toString(), name]);
+        if (node) {
+            dependency = {
+                type: depType,
+                name: name,
+                version: node.value
+            };
+        }
+    });
+    return dependency;
+}
+exports.hasPackageJsonDependency = hasPackageJsonDependency;
 /**
  * Versucht eine Dependency aus der package.json auslesen und gibt diese zurück.
  * @param tree

package/src/utility/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["dependencies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["dependencies.ts"],"names":[],"mappings":"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"}

package/src/utility/dependencies.ts

@@ -18,6 +18,32 @@ export interface NodeDependency {
   version: string;
 }
 
+/**
+ * Liefert die Dependency zurück, wenn es sie gibt, undefined sonst.
+ * @param tree
+ * @param name
+ */
+export function hasPackageJsonDependency(tree: Tree, name: string): NodeDependency | undefined {
+  const packageJsonNode = readJson(tree, '/package.json');
+  let dependency: NodeDependency | undefined = undefined;
+
+  [NodeDependencyType.Default, NodeDependencyType.Dev, NodeDependencyType.Optional, NodeDependencyType.Peer].forEach(
+    (depType) => {
+
+      let node = findNodeAtLocation(packageJsonNode, [depType.toString(), name]);
+      if (node) {
+        dependency = {
+          type   : depType,
+          name   : name,
+          version: node.value
+        };
+      }
+    }
+  );
+
+  return dependency;
+}
+
 /**
  * Versucht eine Dependency aus der package.json auslesen und gibt diese zurück.
  * @param tree