dev-approuter 0.1.2 → 0.1.4

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.4](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.1.3...dev-approuter@0.1.4) (2023-09-02)
+
+**Note:** Version bump only for package dev-approuter
+
+
+
+
+
+## [0.1.3](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.1.2...dev-approuter@0.1.3) (2023-08-29)
+
+**Note:** Version bump only for package dev-approuter
+
+
+
+
+
 ## [0.1.2](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.1.1...dev-approuter@0.1.2) (2023-08-25)
 
 

package/README.md

@@ -134,7 +134,7 @@ Look at the following example `xs-dev.json` that defines different `authenticati
 }
 ```
 
-Behind the scenes, the `dev-approuter` will resolve these "dependency routes" by adding the `source`, `target`, and `destination` properties to them. Be aware that exactly these properties might get overwritten by the `dev-approuter` in case you use them together with `dependency`.
+Behind the scenes, the `dev-approuter` will resolve these "dependency routes" by adding the `source`, `target`, and `destination` properties to them. Be aware that exactly these properties get overwritten by the `dev-approuter` in case you use them together with `dependency`. The only exception are SAP CAP dependencies, for which only the `destination` property gets overwritten by the `dev-approuter`.
 
 ## Using the `dev-approuter` and SAP Application Router simultaneously
 

package/lib/devApprouter.js

@@ -109,8 +109,17 @@ class DevApprouter {
 				console.log(`CAP server started at: http://localhost:${process.env.CAP_PORT || 4004}`);
 			});
 
-			config.routes.unshift(configureCAPRoute(moduleId, servicesPaths, config.dependencyRoutes[moduleId]));
-			config.dependencyRoutes[moduleId] = configureCAPRoute(moduleId, servicesPaths, config.dependencyRoutes[moduleId]);
+			// create route if CAP module is not referenced in xs-dev.json/xs-app.json
+			if (!config.dependencyRoutes[moduleId]) {
+				const route = {
+					dependency: moduleId,
+					authenticationType: "none",
+				};
+				config.routes.unshift(Object.assign({}, route));
+				config.dependencyRoutes[moduleId] = configureCAPRoute(moduleId, servicesPaths, route);
+			} else {
+				config.dependencyRoutes[moduleId] = configureCAPRoute(moduleId, servicesPaths, config.dependencyRoutes[moduleId]);
+			}
 
 			// add destination for newly configured route
 			addDestination(moduleId, process.env.CAP_PORT || 4004);

package/lib/helpers.js

@@ -25,7 +25,8 @@ const parseConfig = () => {
 			if (config.dependencyRoutes[`${route.dependency}`]) {
 				throw new Error(`Duplicate dependency "${route.dependency}" found in file ${path.join(process.cwd(), configFile)}.`);
 			} else {
-				config.dependencyRoutes[`${route.dependency}`] = route;
+				config.dependencyRoutes[`${route.dependency}`] = {};
+				Object.assign(config.dependencyRoutes[`${route.dependency}`], route);
 			}
 		}
 	});
@@ -40,7 +41,8 @@ const parseConfig = () => {
 const applyDependencyConfig = (config) => {
 	config.routes?.forEach((route) => {
 		if (route.dependency) {
-			route = config.dependencyRoutes[route.dependency];
+			Object.assign(route, config.dependencyRoutes[route.dependency]);
+			delete route.dependency;
 		}
 	});
 	delete config.dependencyRoutes;
@@ -95,15 +97,13 @@ const addDestination = (moduleId, port, mountPath) => {
  * @returns {Object} the configured route.
  */
 const configureCAPRoute = (moduleId, servicesPaths, route) => {
-	if (!route) {
-		route = {};
-		route.authenticationType = "none";
+	if (!route.source) {
+		route.source = servicesPaths
+			.map((path) => {
+				return `${path}(.*)`;
+			})
+			.join("|");
 	}
-	route.source = servicesPaths
-		.map((path) => {
-			return `${path}(.*)`;
-		})
-		.join("|");
 	route.destination = moduleId;
 	delete route.dependency;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-approuter",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "A dev time wrapper for the SAP Application Router that can serve UI5 and CAP modules added as dependencies.",
   "author": "Nico Schoenteich <nicolai.schoenteich@sap.com> (https://github.com/nicoschoenteich)",
   "license": "Apache-2.0",
@@ -12,10 +12,10 @@
   "dependencies": {
     "@sap/approuter": ">=14.3.0",
     "@sap/xsenv": "4.0.0",
-    "cds-plugin-ui5": "^0.4.0",
+    "cds-plugin-ui5": "^0.5.0",
     "express": "^4.18.2",
     "path": "^0.12.7",
     "ui5-middleware-cap": "^3.1.0"
   },
-  "gitHead": "3e8e6d7625a544cb6d1a329cc66a8d796e1c969f"
+  "gitHead": "9db24d0cd23d691749cd1419f24ec7f6cf7c1f5b"
 }