dev-approuter 0.1.22 → 0.2.1

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.1](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.2.0...dev-approuter@0.2.1) (2023-10-04)
+
+
+### Bug Fixes
+
+* **dev-approuter:** consider the UI5 middleware config ([#872](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/872)) ([e724aee](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/e724aeeee9bbb66d3ee2070474f63f7f4ea57299))
+
+
+
+
+
+# [0.2.0](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.1.22...dev-approuter@0.2.0) (2023-10-03)
+
+
+### Features
+
+* **ui5-middleware-cap:** wrap @sap/cds/bin/serve command ([#869](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/869)) ([541e6e6](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/541e6e6d8f877e4bf4e472bc576e7e33224f0e03))
+
+
+
+
+
 ## [0.1.22](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/dev-approuter@0.1.21...dev-approuter@0.1.22) (2023-10-02)
 
 **Note:** Version bump only for package dev-approuter

package/lib/devApprouter.js

@@ -58,9 +58,19 @@ class DevApprouter {
 		}
 
 		// find all UI5 modules from the CDS server root and dependencies from the approuter
-		const ui5Modules = [...(await findUI5Modules({ cwd, skipLocalApps: true }))];
+		const ui5Modules = [];
+		let ui5ModulesConfig = {};
+		const approuterUI5Modules = await findUI5Modules({ cwd, skipLocalApps: true });
+		ui5Modules.push(...(approuterUI5Modules || []));
+		const { config: approuterUI5ModulesConfig } = approuterUI5Modules;
+		ui5ModulesConfig = Object.assign(ui5ModulesConfig, approuterUI5ModulesConfig);
+		//const ui5Modules = [...(await findUI5Modules({ cwd, skipLocalApps: true }))];
 		if (cdsServerConfig) {
-			ui5Modules.push(...(await findUI5Modules({ cwd: cdsServerConfig.modulePath, skipDeps: true })));
+			const cdsUI5Modules = await findUI5Modules({ cwd: cdsServerConfig.modulePath, skipLocalApps: true });
+			ui5Modules.push(...(cdsUI5Modules || []));
+			const { config: cdsUI5ModulesConfig } = cdsUI5Modules;
+			ui5ModulesConfig = Object.assign(ui5ModulesConfig, cdsUI5ModulesConfig);
+			//ui5Modules.push(...(await findUI5Modules({ cwd: cdsServerConfig.modulePath, skipDeps: true })));
 		}
 
 		// collect UI5 middlewares
@@ -75,6 +85,7 @@ class DevApprouter {
 			await applyUI5Middleware(router, {
 				cwd,
 				basePath: modulePath,
+				...(ui5ModulesConfig[moduleId] || {}),
 			});
 
 			// mounting the router for the UI5 application to the CDS server
@@ -104,12 +115,26 @@ 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
+			// start CDS server on different port (requires to override the
+			// origin listen function to intercept call from CDS server and
+			// ensure to use the port as defined by environment variable or
+			// the default port for the CDS server!)
 			const app = express();
-			const { servicesPaths } = await applyCDSMiddleware(app, { root: modulePath, cwd });
-			app.listen(process.env.CDS_PORT || 4004, () => {
-				console.log(`CDS server started at: http://localhost:${process.env.CDS_PORT || 4004}`);
+			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}`);
+					callback?.apply(callback, arguments);
+				});
+			};
+
+			// apply the CDS server middlewares and keep the welcome page
+			const { servicesPaths } = await applyCDSMiddleware(app, {
+				root: modulePath,
+				options: config.dependencyRoutes[moduleId]?.options,
+				headless: false,
 			});
 
 			// create route if CDS module is not referenced in xs-dev.json/xs-app.json
@@ -125,7 +150,7 @@ class DevApprouter {
 			}
 
 			// add destination for newly configured route
-			addDestination(moduleId, process.env.CDS_PORT || 4004);
+			addDestination(moduleId, port);
 		}
 
 		// create and start the SAP Approuter

package/lib/helpers.js

@@ -43,6 +43,7 @@ const applyDependencyConfig = (config) => {
 		if (route.dependency) {
 			Object.assign(route, config.dependencyRoutes[route.dependency]);
 			delete route.dependency;
+			delete route.options;
 		}
 	});
 	delete config.dependencyRoutes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-approuter",
-  "version": "0.1.22",
+  "version": "0.2.1",
   "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",
@@ -14,7 +14,7 @@
     "@sap/xsenv": "4.0.0",
     "cds-plugin-ui5": "^0.6.13",
     "express": "^4.18.2",
-    "ui5-middleware-cap": "^3.1.5"
+    "ui5-middleware-cap": "^3.2.1"
   },
-  "gitHead": "0469566e63fdad3800a1a3a92c781f807328dac8"
+  "gitHead": "4c60ccc427b97468dbc6aee0d4c909d42c49e926"
 }