dev-approuter 0.3.1 → 0.3.3

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.3](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.3.2...dev-approuter@0.3.3) (2024-11-05)
+
+**Note:** Version bump only for package dev-approuter
+
+
+
+
+
+## [0.3.2](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.3.1...dev-approuter@0.3.2) (2024-11-01)
+
+
+### Bug Fixes
+
+* update dependencies ([#1114](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/1114)) ([d7672f2](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/d7672f2cd10f8a5de1da3070050ab98810e0fcf8))
+
+
+
+
+
 ## [0.3.1](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.3.0...dev-approuter@0.3.1) (2024-10-10)
 
 **Note:** Version bump only for package dev-approuter

package/lib/devApprouter.js

@@ -2,10 +2,11 @@ const approuter = require("@sap/approuter");
 const express = require("express");
 const xsenv = require("@sap/xsenv");
 
+const LOG = require("@sap/cds").log("dev-approuter") || console;
+
 const findUI5Modules = require("cds-plugin-ui5/lib/findUI5Modules");
 const createPatchedRouter = require("cds-plugin-ui5/lib/createPatchedRouter");
 const applyUI5Middleware = require("cds-plugin-ui5/lib/applyUI5Middleware");
-
 const findCDSModules = require("ui5-middleware-cap/lib/findCDSModules");
 const applyCDSMiddleware = require("ui5-middleware-cap/lib/applyCDSMiddleware");
 
@@ -91,7 +92,7 @@ class DevApprouter {
 			});
 
 			// mounting the router for the UI5 application to the CDS server
-			console.log(`Mounting ${mountPath} to UI5 app ${modulePath}`);
+			LOG.info(`Mounting ${mountPath} to UI5 app ${modulePath}`);
 
 			let middlewareMountPath;
 			// define middlewareMountPath as `/_${mountPath}` if ui5 module is referenced as "dependency" in xs-dev.json or xs-app.json
@@ -126,7 +127,7 @@ class DevApprouter {
 			app._listen = app.listen;
 			app.listen = function (port, callback) {
 				return this._listen(cdsPort, function () {
-					console.log(`CDS server started at: http://localhost:${cdsPort}`);
+					LOG.info(`CDS server started at: http://localhost:${cdsPort}`);
 					callback?.apply(callback, arguments);
 				});
 			};
@@ -144,7 +145,9 @@ class DevApprouter {
 					dependency: moduleId,
 					authenticationType: "none",
 				};
-				config.routes.unshift(Object.assign({}, route));
+				// respect already declared routes in xs-dev.json
+				// so inserting these auto-generated ones after
+				config.routes.push(Object.assign({}, route));
 				config.dependencyRoutes[moduleId] = configureCDSRoute(moduleId, servicesPaths, route);
 			} else {
 				config.dependencyRoutes[moduleId] = configureCDSRoute(moduleId, servicesPaths, config.dependencyRoutes[moduleId]);
@@ -167,7 +170,7 @@ class DevApprouter {
 				},
 			].concat(extensions),
 		});
-		console.log(`Approuter started at: http://localhost:${arPort}`);
+		LOG.info(`Approuter started at: http://localhost:${arPort}`);
 	}
 }
 

package/lib/helpers.js

@@ -1,6 +1,8 @@
 const path = require("path");
 const fs = require("fs");
 
+const LOG = require("@sap/cds").log("dev-approuter") || console;
+
 /**
  * Parses the approuter configuration from an `xs-dev.json` file.
  * If that file doesn't exist, it looks for an `xs-app.json` file.
@@ -16,6 +18,7 @@ const parseConfig = () => {
 		if (fs.existsSync(path.join(process.cwd(), file))) {
 			config = JSON.parse(fs.readFileSync(path.join(process.cwd(), file), { encoding: "utf8" }));
 			configFile = file;
+			LOG.info(`Using configuration from ${path.join(process.cwd(), configFile)}`);
 			break;
 		}
 	}
@@ -47,6 +50,7 @@ const applyDependencyConfig = (config) => {
 		}
 	});
 	delete config.dependencyRoutes;
+	LOG.info("running these routes:", config.routes);
 	return config;
 };
 
@@ -83,6 +87,7 @@ const addDestination = (moduleId, port, mountPath) => {
 		});
 		process.env.destinations = JSON.stringify(destinations);
 	}
+	LOG.info("running these destinations:", JSON.parse(process.env.destinations));
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-approuter",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "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",
@@ -11,11 +11,19 @@
     "directory": "packages/dev-approuter"
   },
   "dependencies": {
-    "@sap/approuter": ">=16.7.1",
-    "@sap/xsenv": "5.2.0",
+    "@sap/approuter": ">=17.0.0",
+    "@sap/xsenv": "5.4.0",
     "cds-plugin-ui5": "^0.11.1",
-    "express": "^4.19.2",
+    "express": "^4.21.1",
     "ui5-middleware-cap": "^3.3.0"
   },
-  "gitHead": "49c0415f143ba94b88f522362f027e84021933d2"
+  "peerDependencies": {
+    "@sap/cds": "*"
+  },
+  "peerDependenciesMeta": {
+    "@sap/cds": {
+      "optional": true
+    }
+  },
+  "gitHead": "2605fafb84023ea02332b3b80befcb47e747ab84"
 }