@ihk-gfi/lux-components-update 15.0.0 → 15.0.2

package/README.md

@@ -5,7 +5,7 @@ Dieses Projekt enthält alle Updateskripte (umgesetzt mit Angular Schematics) f
 Updateskripte:
 
 - `update` (aktualisiert das Projekt auf die Version 15.0.0)
-- `update-14.x.x` (aktualisiert das Projekt auf die Version 15.x.x)
+- `update-15.x.x` (aktualisiert das Projekt auf die Version 15.x.x)
 - `add-lux-components` (fügt die LUX-Components zu einem Angular-Projekt hinzu)
 
 ## Voraussetzungen

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ihk-gfi/lux-components-update",
-  "version": "15.0.0",
+  "version": "15.0.2",
   "description": "Schematics für die Aktualisierung von LUX-Applikationen",
   "scripts": {
     "build": "npm run clean && tsc -p tsconfig.json",
@@ -30,10 +30,10 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "15.2.5",
-    "@angular-devkit/schematics": "15.2.5",
-    "@angular-devkit/schematics-cli": "15.2.5",
-    "@angular/cli": "15.2.5",
+    "@angular-devkit/core": "15.2.9",
+    "@angular-devkit/schematics": "15.2.9",
+    "@angular-devkit/schematics-cli": "15.2.9",
+    "@angular/cli": "15.2.9",
     "@types/jasmine": "4.3.1",
     "@types/node": "16.11.7",
     "@types/semver": "7.3.13",
@@ -44,7 +44,7 @@
     "jasmine": "4.6.0",
     "jsdom": "20.0.1",
     "jsonc-parser": "3.0.0",
-    "semver": "7.3.7",
+    "semver": "7.5.2",
     "typescript": "4.9.5"
   },
   "devDependencies": {

package/update-dependencies/index.js

@@ -37,6 +37,7 @@ function updateDependencies() {
         updateDep('ng2-pdf-viewer', '8.0.1', addOrUpdate),
         updateDep('pdfjs-dist', '2.13.216', addOrUpdate),
         updateDep('ngx-cookie-service', '15.0.0', addOrUpdate),
+        updateDep('ngx-build-plus', '15.0.0', addOrUpdate),
         updateDevDep('@ihk-gfi/lux-components-update', '15.0.0', addOrUpdate),
         updateDevDep('@angular-eslint/builder', '15.2.1', updateIfExists),
         updateDevDep('@angular-eslint/eslint-plugin', '15.2.1', updateIfExists),
@@ -45,7 +46,7 @@ function updateDependencies() {
         updateDevDep('@angular-eslint/template-parser', '15.2.1', updateIfExists),
         updateDevDep('@typescript-eslint/eslint-plugin', '5.62.0', updateIfExists),
         updateDevDep('@typescript-eslint/parser', '5.62.0', updateIfExists),
-        updateDevDep('eslint', '8.28.0', updateIfExists),
+        updateDevDep('eslint', '8.46.0', updateIfExists),
         updateDevDep('eslint-plugin-import', '2.26.0', updateIfExists),
         updateDevDep('eslint-plugin-jsdoc', '39.2.9', updateIfExists),
         updateDevDep('eslint-plugin-prefer-arrow', '1.2.3', updateIfExists),

package/updates/15.0.0/index.js

@@ -69,6 +69,7 @@ function removeMaAndFaIcons(options) {
 }
 exports.removeMaAndFaIcons = removeMaAndFaIcons;
 function updateProjectStructure(options) {
+    var _a, _b, _c, _d, _e, _f;
     return (0, schematics_1.chain)([
         (0, util_1.messageInfoRule)(`Projektstruktur wird angepasst...`),
         copyAppFiles(options),
@@ -77,6 +78,9 @@ function updateProjectStructure(options) {
         (0, json_1.updateJsonValue)('/angular.json', ['projects', options.project, 'architect', 'build', 'options', 'polyfills'], ['zone.js'], false),
         (0, json_1.updateJsonValue)('/angular.json', ['projects', options.project, 'architect', 'test', 'options', 'polyfills'], ['zone.js', 'zone.js/testing', 'src/test.ts'], false),
         (0, json_1.deleteJsonValue)('/angular.json', ['projects', options.project, 'architect', 'test', 'options', 'main']),
+        (0, util_1.applyRuleIfFileExists)((0, json_1.deleteJsonArray)(((_a = options.path) !== null && _a !== void 0 ? _a : '.') + '/src/tsconfig.app.json', ['files'], (node) => (0, json_1.findStringInArray)(node, 'polyfills.ts')), ((_b = options.path) !== null && _b !== void 0 ? _b : '.') + '/src/tsconfig.app.json'),
+        (0, util_1.applyRuleIfFileExists)((0, json_1.deleteJsonArray)(((_c = options.path) !== null && _c !== void 0 ? _c : '.') + '/src/tsconfig.spec.json', ['files'], (node) => (0, json_1.findStringInArray)(node, 'polyfills.ts')), ((_d = options.path) !== null && _d !== void 0 ? _d : '.') + '/src/tsconfig.spec.json'),
+        (0, util_1.applyRuleIfFileExists)((0, json_1.deleteJsonArray)(((_e = options.path) !== null && _e !== void 0 ? _e : '.') + '/src/tsconfig.spec.json', ['compilerOptions', 'types'], (node) => (0, json_1.findStringInArray)(node, 'node')), ((_f = options.path) !== null && _f !== void 0 ? _f : '.') + '/src/tsconfig.spec.json'),
         (0, util_1.messageSuccessRule)(`Projektstruktur wurde angepasst.`)
     ]);
 }

package/utility/json.d.ts

@@ -34,7 +34,7 @@ export declare function readJsonAsString(tree: Tree, filePath: string): string;
 export declare function appendScript(script: string, part: string, index?: number): string;
 export declare function updateJsonValue(filePath: string, jsonPath: string[], value: any, onlyUpdate?: boolean): Rule;
 export declare function deleteJsonValue(filePath: string, jsonPath: string[]): Rule;
-export declare function updateJsonArray(filePath: string, jsonPath: string[], value: any, onlyUpdate?: boolean, findFn?: (value: Node) => boolean): Rule;
+export declare function updateJsonArray(filePath: string, jsonPath: string[], value: any, onlyUpdate?: boolean, findFn?: (value: Node) => boolean, message?: string): Rule;
 export declare function deleteJsonArray(filePath: string, jsonPath: string[], findFn?: (value: Node) => boolean): Rule;
 /**
  * Diese Methode liefert den Index im Array des Objekts mit der übergebenen Property zurück.
@@ -58,6 +58,7 @@ export declare function deleteJsonArray(filePath: string, jsonPath: string[], fi
  */
 export declare function findObjectIndexInArray(arrayNode: Node, propertyName: string, propertyValue: string): number;
 export declare function findObjectPropertyInArray(node: Node, propertyName: string, propertyValue: string): boolean;
+export declare function findStringInArray(arrayNode: Node, value: string): boolean;
 /**
  * Diese Methode liefert den Index im Array des Werts zurück.
  *

package/utility/json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeJsonNode = exports.findStringIndexInArray = exports.findObjectPropertyInArray = exports.findObjectIndexInArray = exports.deleteJsonArray = exports.updateJsonArray = exports.deleteJsonValue = exports.updateJsonValue = exports.appendScript = exports.readJsonAsString = exports.readJson = exports.jsonFormattingOptions = void 0;
+exports.removeJsonNode = exports.findStringIndexInArray = exports.findStringInArray = exports.findObjectPropertyInArray = exports.findObjectIndexInArray = exports.deleteJsonArray = exports.updateJsonArray = exports.deleteJsonValue = exports.updateJsonValue = exports.appendScript = exports.readJsonAsString = exports.readJson = exports.jsonFormattingOptions = void 0;
 const jsonc_parser_1 = require("jsonc-parser");
 const logging_1 = require("./logging");
 exports.jsonFormattingOptions = {
@@ -93,7 +93,7 @@ function deleteJsonValue(filePath, jsonPath) {
     return updateJsonValue(filePath, jsonPath, void 0, true);
 }
 exports.deleteJsonValue = deleteJsonValue;
-function updateJsonArray(filePath, jsonPath, value, onlyUpdate = false, findFn) {
+function updateJsonArray(filePath, jsonPath, value, onlyUpdate = false, findFn, message) {
     return (tree, _context) => {
         // Gibt es bereits eine passende Stelle?
         let foundIndex = -1;
@@ -127,14 +127,19 @@ function updateJsonArray(filePath, jsonPath, value, onlyUpdate = false, findFn)
             });
             if (edits) {
                 tree.overwrite(filePath, (0, jsonc_parser_1.applyEdits)(jsonFile, edits));
-                (0, logging_1.logInfo)(`"${JSON.stringify(value)}" an der Stelle "${jsonPath.join('.')}" hinzugefügt.`);
+                if (message) {
+                    (0, logging_1.logInfo)(message);
+                }
+                else {
+                    (0, logging_1.logInfo)(`"${JSON.stringify(value)}" an der Stelle "${jsonPath.join('.')}" hinzugefügt.`);
+                }
             }
         }
     };
 }
 exports.updateJsonArray = updateJsonArray;
 function deleteJsonArray(filePath, jsonPath, findFn) {
-    return updateJsonArray(filePath, jsonPath, void 0, true, findFn);
+    return updateJsonArray(filePath, jsonPath, void 0, true, findFn, `${filePath}: Wert aus dem Array an der Stelle "${jsonPath.join('.')}" gelöscht.`);
 }
 exports.deleteJsonArray = deleteJsonArray;
 /**
@@ -208,6 +213,14 @@ function findObjectPropertyInArray(node, propertyName, propertyValue) {
     return found;
 }
 exports.findObjectPropertyInArray = findObjectPropertyInArray;
+function findStringInArray(arrayNode, value) {
+    let found = false;
+    if (arrayNode.type === 'string' && arrayNode.value === value) {
+        found = true;
+    }
+    return found;
+}
+exports.findStringInArray = findStringInArray;
 /**
  * Diese Methode liefert den Index im Array des Werts zurück.
  *

package/utility/util.d.ts

@@ -26,6 +26,7 @@ export declare const waitForTreeCallback: (_tree: Tree, callback: Function, wait
  */
 export declare const runInstallAndLogToDos: (context: SchematicContext, messages: string[], runNpmInstall: boolean) => void;
 export declare function updateI18nFile(tree: Tree, language: string, insertTransUnitId: string, translations: string): void;
+export declare function applyRuleIfFileExists(rule: Rule, path: string): Rule;
 export declare function applyRuleIf(minVersion: string, rule: Rule): Rule;
 export declare function messageDebugRule(message: any, options: any): Rule;
 export declare function messageInfoRule(message: any): Rule;

package/utility/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.finish = exports.messageSuccessRule = exports.messageInfoInternRule = exports.messageInfoRule = exports.messageDebugRule = exports.applyRuleIf = exports.updateI18nFile = exports.runInstallAndLogToDos = exports.waitForTreeCallback = exports.replaceAll = exports.replaceFirst = exports.escapeRegExp = exports.UtilConfig = void 0;
+exports.finish = exports.messageSuccessRule = exports.messageInfoInternRule = exports.messageInfoRule = exports.messageDebugRule = exports.applyRuleIf = exports.applyRuleIfFileExists = exports.updateI18nFile = exports.runInstallAndLogToDos = exports.waitForTreeCallback = exports.replaceAll = exports.replaceFirst = exports.escapeRegExp = exports.UtilConfig = void 0;
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -97,6 +97,17 @@ function updateI18nFile(tree, language, insertTransUnitId, translations) {
     }
 }
 exports.updateI18nFile = updateI18nFile;
+function applyRuleIfFileExists(rule, path) {
+    return (tree, _context) => {
+        if (tree.exists(path)) {
+            return rule;
+        }
+        else {
+            return tree;
+        }
+    };
+}
+exports.applyRuleIfFileExists = applyRuleIfFileExists;
 function applyRuleIf(minVersion, rule) {
     return (tree, _context) => {
         let version = (0, dependencies_1.getPackageJsonDependency)(tree, '@ihk-gfi/lux-components').version;