dev-approuter 0.2.14 → 0.2.16

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.2.16](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.2.15...dev-approuter@0.2.16) (2024-03-30)
+
+
+### Bug Fixes
+
+* cleanup of dependencies and improved approuter logic ([#984](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/984)) ([65ffaed](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/65ffaedb7968015e008e2eb6aa66ff1e0a03a73a))
+
+
+
+
+
+## [0.2.15](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.2.14...dev-approuter@0.2.15) (2024-03-04)
+
+**Note:** Version bump only for package dev-approuter
+
+
+
+
+
 ## [0.2.14](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.2.13...dev-approuter@0.2.14) (2024-02-18)
 
 **Note:** Version bump only for package dev-approuter

package/lib/devApprouter.js

@@ -47,6 +47,8 @@ class DevApprouter {
 
 		const config = parseConfig();
 		const cwd = process.cwd();
+		const arPort = process.env.PORT || 5000;
+		const cdsPort = process.env.CDS_PORT || 4004;
 
 		// lookup the CDS server root
 		let cdsServerConfig;
@@ -100,7 +102,7 @@ class DevApprouter {
 				middlewareMountPath = "/_" + mountPath;
 
 				// add destination for newly configured route
-				addDestination(moduleId, process.env.PORT, middlewareMountPath);
+				addDestination(moduleId, arPort, middlewareMountPath);
 			} else {
 				middlewareMountPath = mountPath;
 			}
@@ -115,7 +117,6 @@ class DevApprouter {
 		// start CDS server on different port
 		if (cdsServerConfig) {
 			const { modulePath, moduleId } = cdsServerConfig;
-			const port = process.env.CDS_PORT || 4004;
 
 			// start CDS server on different port (requires to override the
 			// origin listen function to intercept call from CDS server and
@@ -124,8 +125,8 @@ class DevApprouter {
 			const app = express();
 			app._listen = app.listen;
 			app.listen = function (port, callback) {
-				return this._listen(process.env.CDS_PORT || 4004, function () {
-					console.log(`CDS server started at: http://localhost:${process.env.CDS_PORT || 4004}`);
+				return this._listen(cdsPort, function () {
+					console.log(`CDS server started at: http://localhost:${cdsPort}`);
 					callback?.apply(callback, arguments);
 				});
 			};
@@ -150,13 +151,13 @@ class DevApprouter {
 			}
 
 			// add destination for newly configured route
-			addDestination(moduleId, port);
+			addDestination(moduleId, cdsPort);
 		}
 
 		// create and start the SAP Approuter
 		// https://help.sap.com/docs/btp/sap-business-technology-platform/extension-api-of-application-router
 		approuter().start({
-			port: process.env.PORT || 5000,
+			port: arPort,
 			xsappConfig: applyDependencyConfig(config),
 			extensions: [
 				{
@@ -166,7 +167,7 @@ class DevApprouter {
 				},
 			].concat(extensions),
 		});
-		console.log(`Approuter started at: http://localhost:${process.env.PORT || 5000}`);
+		console.log(`Approuter started at: http://localhost:${arPort}`);
 	}
 }
 

package/lib/helpers.js

@@ -63,12 +63,7 @@ const addDestination = (moduleId, port, mountPath) => {
 		destinations = JSON.parse(process.env.destinations);
 	}
 
-	let url;
-	if (mountPath) {
-		url = `http://localhost:${process.env.PORT || 5000}${mountPath}`;
-	} else {
-		url = `http://localhost:${port}`;
-	}
+	let url = `http://localhost${port ? `:${port}` : ""}${mountPath || ""}`;
 
 	// only add new destination if it's not already provided
 	const destinationAlreadyExists = destinations.some((destination) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-approuter",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "A dev time wrapper for the SAP Application Router that can serve UI5 and CDS modules added as dependencies.",
   "author": "Nico Schoenteich <nicolai.schoenteich@sap.com> (https://github.com/nicoschoenteich)",
   "license": "Apache-2.0",
@@ -13,9 +13,9 @@
   "dependencies": {
     "@sap/approuter": ">=15.0.0",
     "@sap/xsenv": "4.2.0",
-    "cds-plugin-ui5": "^0.8.1",
+    "cds-plugin-ui5": "^0.8.3",
     "express": "^4.18.2",
     "ui5-middleware-cap": "^3.2.9"
   },
-  "gitHead": "c982231d4c48e09b2694a1124f032bb62267cd7c"
+  "gitHead": "cfbdc7583d6664e40c6ac5a765f662d34f93221b"
 }