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

package/src/update110700/index_spec.js

@@ -0,0 +1,108 @@
+"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 schematics_1 = require("@angular-devkit/schematics");
+const testing_1 = require("@angular-devkit/schematics/testing");
+const path = require("path");
+const rxjs_1 = require("rxjs");
+const dependencies_1 = require("../utility/dependencies");
+const test_1 = require("../utility/test");
+const util_1 = require("../utility/util");
+const index_1 = require("./index");
+const collectionPath = path.join(__dirname, '../collection.json');
+describe('update110700', () => {
+    let appTree;
+    let runner;
+    let context;
+    const testOptions = {};
+    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
+        appTree = yield runner.runExternalSchematicAsync('@schematics/angular', 'workspace', test_1.workspaceOptions).toPromise();
+        appTree = yield runner
+            .runExternalSchematicAsync('@schematics/angular', 'application', test_1.appOptions, appTree)
+            .toPromise();
+        util_1.UtilConfig.defaultWaitMS = 0;
+        const collection = runner.engine.createCollection(collectionPath);
+        const schematic = runner.engine.createSchematic('update-11.7.0', collection);
+        context = runner.engine.createContext(schematic);
+        testOptions.project = test_1.appOptions.name;
+        testOptions.path = test_1.workspaceOptions.newProjectRoot + '/' + test_1.appOptions.name;
+        testOptions.verbose = true;
+    }));
+    describe('[Rule] update110700', () => {
+        it('Sollte die Abhängigkeiten mit ESLint 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",
+                    "@angular-eslint/builder": "4.0.0",
+                    "@angular-eslint/eslint-plugin": "4.0.0",
+                    "@angular-eslint/eslint-plugin-template": "4.0.0",
+                    "@angular-eslint/schematics": "4.0.0",
+                    "@angular-eslint/template-parser": "4.0.0",
+              }
+            }
+        `);
+            schematics_1.callRule(index_1.update110700(testOptions), rxjs_1.of(appTree), context).subscribe(() => {
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@ihk-gfi/lux-components').version).toEqual('11.7.0');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@ihk-gfi/lux-components-theme').version).toEqual('11.9.0');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-devkit/build-angular').version).toEqual('0.1102.17');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular/cli').version).toEqual('11.2.17');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-eslint/builder').version).toEqual('4.3.1');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin').version).toEqual('4.3.1');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin-template').version).toEqual('4.3.1');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-eslint/schematics').version).toEqual('4.3.1');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-eslint/template-parser').version).toEqual('4.3.1');
+                done();
+            }, (reason) => expect(reason).toBeUndefined());
+        });
+        it('Sollte die Abhängigkeiten ohne ESLint 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",
+              }
+            }
+        `);
+            schematics_1.callRule(index_1.update110700(testOptions), rxjs_1.of(appTree), context).subscribe(() => {
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@ihk-gfi/lux-components').version).toEqual('11.7.0');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@ihk-gfi/lux-components-theme').version).toEqual('11.9.0');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-devkit/build-angular').version).toEqual('0.1102.17');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular/cli').version).toEqual('11.2.17');
+                expect(dependencies_1.hasPackageJsonDependency(appTree, '@angular-eslint/builder')).toBeUndefined();
+                expect(dependencies_1.hasPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin')).toBeUndefined();
+                expect(dependencies_1.hasPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin-template')).toBeUndefined();
+                expect(dependencies_1.hasPackageJsonDependency(appTree, '@angular-eslint/schematics')).toBeUndefined();
+                expect(dependencies_1.hasPackageJsonDependency(appTree, '@angular-eslint/template-parser')).toBeUndefined();
+                done();
+            }, (reason) => expect(reason).toBeUndefined());
+        });
+    });
+});
+//# sourceMappingURL=index_spec.js.map

package/src/update110700/index_spec.js.map

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

package/src/update110700/index_spec.ts

@@ -0,0 +1,122 @@
+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, hasPackageJsonDependency, updateDependency } from '../utility/dependencies';
+import { appOptions, workspaceOptions } from '../utility/test';
+import { UtilConfig } from '../utility/util';
+import { update110700 } from './index';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+
+describe('update110700', () => {
+  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.7.0', collection);
+    context = runner.engine.createContext(schematic);
+
+    testOptions.project = appOptions.name;
+    testOptions.path = workspaceOptions.newProjectRoot + '/' + appOptions.name;
+    testOptions.verbose = true;
+  });
+
+  describe('[Rule] update110700', () => {
+    it('Sollte die Abhängigkeiten mit ESLint 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",
+                    "@angular-eslint/builder": "4.0.0",
+                    "@angular-eslint/eslint-plugin": "4.0.0",
+                    "@angular-eslint/eslint-plugin-template": "4.0.0",
+                    "@angular-eslint/schematics": "4.0.0",
+                    "@angular-eslint/template-parser": "4.0.0",
+              }
+            }
+        `
+      );
+
+      callRule(update110700(testOptions), observableOf(appTree), context).subscribe(
+        () => {
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components').version).toEqual('11.7.0');
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components-theme').version).toEqual('11.9.0');
+          expect(getPackageJsonDependency(appTree, '@angular-devkit/build-angular').version).toEqual('0.1102.17');
+          expect(getPackageJsonDependency(appTree, '@angular/cli').version).toEqual('11.2.17');
+          expect(getPackageJsonDependency(appTree, '@angular-eslint/builder').version).toEqual('4.3.1');
+          expect(getPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin').version).toEqual('4.3.1');
+          expect(getPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin-template').version).toEqual('4.3.1');
+          expect(getPackageJsonDependency(appTree, '@angular-eslint/schematics').version).toEqual('4.3.1');
+          expect(getPackageJsonDependency(appTree, '@angular-eslint/template-parser').version).toEqual('4.3.1');
+
+          done();
+        },
+        (reason) => expect(reason).toBeUndefined()
+      );
+    });
+
+    it('Sollte die Abhängigkeiten ohne ESLint 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",
+              }
+            }
+        `
+      );
+
+      callRule(update110700(testOptions), observableOf(appTree), context).subscribe(
+        () => {
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components').version).toEqual('11.7.0');
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components-theme').version).toEqual('11.9.0');
+          expect(getPackageJsonDependency(appTree, '@angular-devkit/build-angular').version).toEqual('0.1102.17');
+          expect(getPackageJsonDependency(appTree, '@angular/cli').version).toEqual('11.2.17');
+          expect(hasPackageJsonDependency(appTree, '@angular-eslint/builder')).toBeUndefined();
+          expect(hasPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin')).toBeUndefined();
+          expect(hasPackageJsonDependency(appTree, '@angular-eslint/eslint-plugin-template')).toBeUndefined();
+          expect(hasPackageJsonDependency(appTree, '@angular-eslint/schematics')).toBeUndefined();
+          expect(hasPackageJsonDependency(appTree, '@angular-eslint/template-parser')).toBeUndefined();
+
+          done();
+        },
+        (reason) => expect(reason).toBeUndefined()
+      );
+    });
+  });
+});

package/src/update110700/schema.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "luxUpdate110700Schema",
+  "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/update110800/index.d.ts

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

package/src/update110800/index.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.update110800 = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const chalk = require("chalk");
+const dependencies_1 = require("../utility/dependencies");
+const util_1 = require("../utility/util");
+function update110800(options) {
+    return (tree, context) => {
+        return schematics_1.chain([
+            util_1.messageInfoRule(`Die LUX-Components werden auf die Version 11.8.0 aktualisiert...`),
+            util_1.messageInfoRule(`Die Datei "package.json" wird angepasst...`),
+            updateDependencies(),
+            util_1.messageSuccessRule(`Die Datei "package.json" wurde angepasst.`),
+            util_1.messageSuccessRule(`Die LUX-Components wurden auf die Version 11.8.0 aktualisiert.`),
+            util_1.finish(`${chalk.yellowBright('Fertig!')}`)
+        ]);
+    };
+    function updateDependencies() {
+        return (tree, _context) => {
+            dependencies_1.updateDependency(tree, '@ihk-gfi/lux-components', '11.8.0');
+            dependencies_1.updateDependency(tree, '@ihk-gfi/lux-components-theme', '11.10.0');
+            dependencies_1.updateDependency(tree, 'marked', '4.0.10');
+            dependencies_1.updateDependency(tree, '@types/marked', '4.0.1');
+            dependencies_1.updateDependencyDev(tree, '@angular-devkit/build-angular', '0.1102.18');
+            dependencies_1.updateDependencyDev(tree, '@compodoc/compodoc', '1.1.18');
+            return tree;
+        };
+    }
+}
+exports.update110800 = update110800;
+//# sourceMappingURL=index.js.map

package/src/update110800/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,+BAA+B;AAC/B,0DAA0G;AAC1G,0CAA8E;AAE9E,SAAgB,YAAY,CAAC,OAAY;IACvC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,OAAO,kBAAK,CAAC;YACX,sBAAe,CAAC,kEAAkE,CAAC;YAEnF,sBAAe,CAAC,4CAA4C,CAAC;YAC7D,kBAAkB,EAAE;YACpB,yBAAkB,CAAC,2CAA2C,CAAC;YAE/D,yBAAkB,CAAC,gEAAgE,CAAC;YACpF,aAAM,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;SAC3C,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,SAAS,kBAAkB;QACzB,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;YAChD,+BAAgB,CAAC,IAAI,EAAE,yBAAyB,EAAE,QAAQ,CAAC,CAAC;YAC5D,+BAAgB,CAAC,IAAI,EAAE,+BAA+B,EAAE,SAAS,CAAC,CAAC;YACnE,+BAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC3C,+BAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;YAEjD,kCAAmB,CAAC,IAAI,EAAE,+BAA+B,EAAE,WAAW,CAAC,CAAC;YACxE,kCAAmB,CAAC,IAAI,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;YAE1D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AA3BD,oCA2BC"}

package/src/update110800/index.ts

@@ -0,0 +1,33 @@
+import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import * as chalk from 'chalk';
+import { hasPackageJsonDependency, updateDependency, updateDependencyDev } from '../utility/dependencies';
+import { finish, messageInfoRule, messageSuccessRule } from '../utility/util';
+
+export function update110800(options: any): Rule {
+  return (tree: Tree, context: SchematicContext) => {
+    return chain([
+      messageInfoRule(`Die LUX-Components werden auf die Version 11.8.0 aktualisiert...`),
+
+      messageInfoRule(`Die Datei "package.json" wird angepasst...`),
+      updateDependencies(),
+      messageSuccessRule(`Die Datei "package.json" wurde angepasst.`),
+
+      messageSuccessRule(`Die LUX-Components wurden auf die Version 11.8.0 aktualisiert.`),
+      finish(`${chalk.yellowBright('Fertig!')}`)
+    ]);
+  };
+
+  function updateDependencies() {
+    return (tree: Tree, _context: SchematicContext) => {
+      updateDependency(tree, '@ihk-gfi/lux-components', '11.8.0');
+      updateDependency(tree, '@ihk-gfi/lux-components-theme', '11.10.0');
+      updateDependency(tree, 'marked', '4.0.10');
+      updateDependency(tree, '@types/marked', '4.0.1');
+
+      updateDependencyDev(tree, '@angular-devkit/build-angular', '0.1102.18');
+      updateDependencyDev(tree, '@compodoc/compodoc', '1.1.18');
+
+      return tree;
+    };
+  }
+}

package/src/update110800/index_spec.d.ts

@@ -0,0 +1 @@
+export {};

package/src/update110800/index_spec.js

@@ -0,0 +1,70 @@
+"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 schematics_1 = require("@angular-devkit/schematics");
+const testing_1 = require("@angular-devkit/schematics/testing");
+const path = require("path");
+const rxjs_1 = require("rxjs");
+const dependencies_1 = require("../utility/dependencies");
+const test_1 = require("../utility/test");
+const util_1 = require("../utility/util");
+const index_1 = require("./index");
+const collectionPath = path.join(__dirname, '../collection.json');
+describe('update110800', () => {
+    let appTree;
+    let runner;
+    let context;
+    const testOptions = {};
+    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
+        appTree = yield runner.runExternalSchematicAsync('@schematics/angular', 'workspace', test_1.workspaceOptions).toPromise();
+        appTree = yield runner
+            .runExternalSchematicAsync('@schematics/angular', 'application', test_1.appOptions, appTree)
+            .toPromise();
+        util_1.UtilConfig.defaultWaitMS = 0;
+        const collection = runner.engine.createCollection(collectionPath);
+        const schematic = runner.engine.createSchematic('update-11.8.0', collection);
+        context = runner.engine.createContext(schematic);
+        testOptions.project = test_1.appOptions.name;
+        testOptions.path = test_1.workspaceOptions.newProjectRoot + '/' + test_1.appOptions.name;
+        testOptions.verbose = true;
+    }));
+    describe('[Rule] update110800', () => {
+        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"
+              }
+            }
+        `);
+            schematics_1.callRule(index_1.update110800(testOptions), rxjs_1.of(appTree), context).subscribe(() => {
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@ihk-gfi/lux-components').version).toEqual('11.8.0');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@ihk-gfi/lux-components-theme').version).toEqual('11.10.0');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@angular-devkit/build-angular').version).toEqual('0.1102.18');
+                expect(dependencies_1.getPackageJsonDependency(appTree, 'marked').version).toEqual('4.0.10');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@types/marked').version).toEqual('4.0.1');
+                expect(dependencies_1.getPackageJsonDependency(appTree, '@compodoc/compodoc').version).toEqual('1.1.18');
+                done();
+            }, (reason) => expect(reason).toBeUndefined());
+        });
+    });
+});
+//# sourceMappingURL=index_spec.js.map

package/src/update110800/index_spec.js.map

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

package/src/update110800/index_spec.ts

@@ -0,0 +1,75 @@
+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 { update110800 } from './index';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+
+describe('update110800', () => {
+  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.8.0', collection);
+    context = runner.engine.createContext(schematic);
+
+    testOptions.project = appOptions.name;
+    testOptions.path = workspaceOptions.newProjectRoot + '/' + appOptions.name;
+    testOptions.verbose = true;
+  });
+
+  describe('[Rule] update110800', () => {
+    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"
+              }
+            }
+        `
+      );
+
+      callRule(update110800(testOptions), observableOf(appTree), context).subscribe(
+        () => {
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components').version).toEqual('11.8.0');
+          expect(getPackageJsonDependency(appTree, '@ihk-gfi/lux-components-theme').version).toEqual('11.10.0');
+          expect(getPackageJsonDependency(appTree, '@angular-devkit/build-angular').version).toEqual('0.1102.18');
+          expect(getPackageJsonDependency(appTree, 'marked').version).toEqual('4.0.10');
+          expect(getPackageJsonDependency(appTree, '@types/marked').version).toEqual('4.0.1');
+          expect(getPackageJsonDependency(appTree, '@compodoc/compodoc').version).toEqual('1.1.18');
+
+          done();
+        },
+        (reason) => expect(reason).toBeUndefined()
+      );
+    });
+  });
+});

package/src/update110800/schema.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "luxUpdate110800Schema",
+  "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/update110900/index.d.ts

@@ -0,0 +1,4 @@
+import { Rule } from '@angular-devkit/schematics';
+export declare function update110900(options: any): Rule;
+export declare function addIconsToIndexHtml(options: any): Rule;
+export declare function addIconAssets(options: any, value: any): Rule;

package/src/update110900/index.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addIconAssets = exports.addIconsToIndexHtml = exports.update110900 = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const chalk = require("chalk");
+const jsonc_parser_1 = require("jsonc-parser");
+const dependencies_1 = require("../utility/dependencies");
+const json_1 = require("../utility/json");
+const logging_1 = require("../utility/logging");
+const util_1 = require("../utility/util");
+function update110900(options) {
+    return (tree, context) => {
+        const fontawesomeCss = {
+            glob: 'all.css',
+            input: './node_modules/@fortawesome/fontawesome-free/css',
+            output: './assets/icons/fontawesome/css'
+        };
+        const fontawesomeIcons = {
+            glob: '*(*.eot|*.ttf|*.woff|*.woff2)',
+            input: './node_modules/@fortawesome/fontawesome-free/webfonts',
+            output: './assets/icons/fontawesome/webfonts'
+        };
+        const materialCss = {
+            glob: 'material-design-icons.css',
+            input: './node_modules/material-design-icons-iconfont/dist',
+            output: './assets/icons/material-icons'
+        };
+        const materialIcons = {
+            glob: '*(*.eot|*.ttf|*.woff|*.woff2)',
+            input: './node_modules/material-design-icons-iconfont/dist/fonts',
+            output: './assets/icons/material-icons/fonts'
+        };
+        return schematics_1.chain([
+            util_1.messageInfoRule(`Die LUX-Components werden auf die Version 11.9.0 aktualisiert...`),
+            util_1.messageInfoRule(`Die Datei "package.json" wird angepasst...`),
+            updateDependencies(),
+            util_1.messageSuccessRule(`Die Datei "package.json" wurde angepasst.`),
+            util_1.messageInfoRule(`Die Datei "angular.json" wird angepasst...`),
+            addIconAssets(options, materialIcons),
+            addIconAssets(options, materialCss),
+            addIconAssets(options, fontawesomeIcons),
+            addIconAssets(options, fontawesomeCss),
+            util_1.messageSuccessRule(`Die Datei "angular.json" wurde angepasst.`),
+            util_1.messageInfoRule(`Die Datei "index.html" wird angepasst...`),
+            addIconsToIndexHtml(options),
+            util_1.messageSuccessRule(`Die Datei "index.html" wurde angepasst.`),
+            util_1.messageSuccessRule(`Die LUX-Components wurden auf die Version 11.9.0 aktualisiert.`),
+            util_1.finish(`${chalk.yellowBright('Fertig!')}`)
+        ]);
+    };
+    function updateDependencies() {
+        return (tree, _context) => {
+            dependencies_1.updateDependency(tree, '@ihk-gfi/lux-components', '11.9.0');
+            dependencies_1.updateDependency(tree, '@ihk-gfi/lux-components-theme', '11.11.0');
+            return tree;
+        };
+    }
+}
+exports.update110900 = update110900;
+function addIconsToIndexHtml(options) {
+    return schematics_1.chain([
+        (tree, context) => {
+            const newValue = '<link rel="stylesheet" href="assets/icons/fontawesome/css/all.css">\n' +
+                '<link rel="stylesheet" href="assets/icons/material-icons/material-design-icons.css">\n' +
+                '<link rel="icon"';
+            const errorMessage = 'Die folgenden Einträge konnten NICHT automatisiert eingetragen werden. Diese müssen jetzt manuell im <head>-Tag nachgetragen werden: ' +
+                '\n' +
+                newValue.replace('<link rel="icon"', '');
+            const filePath = 'src/index.html';
+            if (tree.read(filePath)) {
+                const content = tree.read(filePath).toString();
+                const modifiedContent = content.replace('<link rel="icon"', newValue);
+                if (modifiedContent !== content) {
+                    logging_1.logInfo('Folgender Einträge wurden ergänzt: ' + newValue);
+                    tree.overwrite(filePath, modifiedContent);
+                }
+                else {
+                    logging_1.logError(errorMessage);
+                }
+            }
+            else {
+                logging_1.logError(errorMessage);
+            }
+        }
+    ]);
+}
+exports.addIconsToIndexHtml = addIconsToIndexHtml;
+function addIconAssets(options, value) {
+    return (tree, context) => {
+        const filePath = '/angular.json';
+        let contentAsNode = json_1.readJson(tree, filePath);
+        const buildAssetsNode = jsonc_parser_1.findNodeAtLocation(contentAsNode, [
+            'projects',
+            options.project,
+            'architect',
+            'build',
+            'options',
+            'assets'
+        ]);
+        if (buildAssetsNode) {
+            const angularJson = json_1.readJsonAsString(tree, filePath);
+            const edits = jsonc_parser_1.modify(angularJson, ['projects', options.project, 'architect', 'build', 'options', 'assets', 0], value, { formattingOptions: json_1.jsonFormattingOptions, isArrayInsertion: true });
+            if (edits) {
+                tree.overwrite(filePath, jsonc_parser_1.applyEdits(angularJson, edits));
+                logging_1.logInfo('Folgender Eintrag wurden ergänzt: ' + JSON.stringify(value));
+            }
+        }
+    };
+}
+exports.addIconAssets = addIconAssets;
+//# sourceMappingURL=index.js.map

package/src/update110900/index.js.map

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