Merge branch 'main' into shared-xml-id-validation

Author: Jimmy-Joseph19

examples/fe-fpm-cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sap-ux/fe-fpm-cli
 
+## 0.1.137
+
+### Patch Changes
+
+- @sap-ux/fe-fpm-writer@0.43.23
+
 ## 0.1.136
 
 ### Patch Changes

examples/fe-fpm-cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/fe-fpm-cli",
-    "version": "0.1.136",
+    "version": "0.1.137",
     "description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
     "license": "Apache-2.0",
     "private": true,

examples/simple-generator/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @sap-ux/generator-simple-fe
 
+## 1.1.246
+
+### Patch Changes
+
+- @sap-ux/fiori-elements-writer@2.8.129
+- @sap-ux/fiori-freestyle-writer@2.5.97
+
 ## 1.1.245
 
 ### Patch Changes

examples/simple-generator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/generator-simple-fe",
-    "version": "1.1.245",
+    "version": "1.1.246",
     "description": "Simple example of a yeoman generator for Fiori elements.",
     "license": "Apache-2.0",
     "private": true,

packages/annotation-generator/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @sap-ux/annotation-generator
 
+## 0.4.51
+
+### Patch Changes
+
+- Updated dependencies [52f6549]
+    - @sap-ux/fiori-annotation-api@0.9.44
+
 ## 0.4.50
 
 ### Patch Changes

packages/annotation-generator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/annotation-generator",
-    "version": "0.4.50",
+    "version": "0.4.51",
     "description": "Library that provides API for generation of annotations by SAP Fiori App Generator",
     "publisher": "SAPSE",
     "repository": {

packages/eslint-plugin-fiori-tools/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @sap-ux/eslint-plugin-fiori-tools
 
+## 9.13.0
+
+### Minor Changes
+
+- 52f6549: Add .cds annotations support to enable linting of CAP apps with the eslint-plugin-fiori-tools.
+
+### Patch Changes
+
+- Updated dependencies [52f6549]
+    - @sap-ux/fiori-annotation-api@0.9.44
+
 ## 9.12.3
 
 ### Patch Changes

packages/eslint-plugin-fiori-tools/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/eslint-plugin-fiori-tools",
-    "version": "9.12.3",
+    "version": "9.13.0",
     "description": "Custom linting plugin for Fiori tools apps",
     "repository": {
         "type": "git",

packages/eslint-plugin-fiori-tools/src/index.ts

@@ -8,7 +8,7 @@ import { rules } from './rules';
 import { FioriLanguage } from './language/fiori-language';
 import { createSyncFn } from 'synckit';
 import type { getPathMappings } from '@sap-ux/project-access';
-import { uniformUrl } from './project-context/utils';
+import { uniformUrl } from '@sap-ux/fiori-annotation-api';
 export { DiagnosticCache } from './language/diagnostic-cache';
 
 // Use CommonJS require for modules with resolution issues

packages/eslint-plugin-fiori-tools/src/language/annotations/source-code.ts

@@ -77,7 +77,7 @@ export class FioriAnnotationSourceCode extends TextSourceCodeBase {
                 const child = node[key];
 
                 if (!child) {
-                    return;
+                    continue;
                 }
                 if (Array.isArray(child)) {
                     for (const grandchild of child) {