cds-plugin-ui5 0.2.2 → 0.3.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.3.0](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.2.3...cds-plugin-ui5@0.3.0) (2023-08-17)
+
+
+### Features
+
+* include moduleId in return value to increase reuseability of fu… ([#796](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/796)) ([ae69ed4](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/ae69ed44070f72b0460893904729b49cf4341ffe))
+
+
+
+
+
+## [0.2.3](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.2.2...cds-plugin-ui5@0.2.3) (2023-08-12)
+
+**Note:** Version bump only for package cds-plugin-ui5
+
+
+
+
+
 ## [0.2.2](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.2.1...cds-plugin-ui5@0.2.2) (2023-08-09)
 
 

package/lib/findUI5Modules.js

@@ -112,7 +112,21 @@ module.exports = async function findUI5Modules({ cwd, skipLocalApps, skipDeps })
 
 				// determine the module path based on the location of the ui5.yaml
 				const modulePath = path.dirname(ui5YamlPath);
-				apps.push({ modulePath, mountPath });
+
+				// manually get the module name as defined in package.json
+				// skipDeps is only true if we are looking for UI5 apps inside a CAP server project
+				// in all other cases the module name equals the appDir
+				let moduleName;
+				if (skipDeps) {
+					const packageJsonPath = require.resolve(path.join(appDir, "package.json"), {
+						paths: [cwd],
+					});
+					const packageJsonContent = fs.readFileSync(packageJsonPath, "utf-8");
+					moduleName = JSON.parse(packageJsonContent).name;
+				}
+				const moduleId = moduleName || appDir;
+
+				apps.push({ moduleId, modulePath, mountPath });
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cds-plugin-ui5",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "A CAP server cds-plugin to inject the middlewares of all related UI5 tooling based projects.",
   "author": "Peter Muessig",
   "license": "Apache-2.0",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@ui5/fs": "^3.0.4",
-    "@ui5/project": "^3.4.2",
+    "@ui5/project": "^3.5.0",
     "@ui5/server": "^3.1.3",
     "js-yaml": "^4.1.0",
     "node-html-parser": "^6.1.5"
@@ -24,5 +24,5 @@
     "@sap/cds": ">=6.8.2",
     "express": ">=4.18.2"
   },
-  "gitHead": "5c08d4699b0f4c0d55bb800f323905ffde4624c0"
+  "gitHead": "67e4ae6ca95c267dbc4472a916b84dd1c3f0ad0b"
 }