cds-plugin-ui5 0.2.0 → 0.2.2

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.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)
+
+
+### Bug Fixes
+
+* **cds-plugin-ui5:** also include root app dir HTML files ([#789](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/789)) ([d6cdfb6](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/d6cdfb615b2bfffd44559689a68659a80eb57680))
+
+
+
+
+
+## [0.2.1](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.2.0...cds-plugin-ui5@0.2.1) (2023-08-01)
+
+
+### Bug Fixes
+
+* **cds-plugin-ui5:** delay server start until bootstrap is completed ([#783](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/783)) ([88380ba](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/88380ba91ff9d4539a746edf7dc36f3bd4228137))
+
+
+
+
+
 # [0.2.0](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.1.7...cds-plugin-ui5@0.2.0) (2023-07-31)
 
 

package/cds-plugin.js

@@ -10,6 +10,23 @@ const applyUI5Middleware = require("./lib/applyUI5Middleware");
 // to disable the ui5-middleware-cap if used in apps
 process.env["cds-plugin-ui5"] = true;
 
+// promise to await the bootstrap and lock the
+// served event to delay the startup a bit
+let bootstrapped;
+const bootstrapCompleted = new Promise((r) => {
+	bootstrapped = r;
+});
+
+// hook into the "served" event to delay the startup of the
+// CDS server until the bootstrap is completed and the UI5
+// middlewares for the UI5 applications are properly available
+cds.on("served", async function served(/* cdsServices */) {
+	log.debug("served");
+	await bootstrapCompleted;
+});
+
+// hook into the "bootstrap" event to startup the UI5 middlewares
+// for the available UI5 applications in the CDS server and its deps
 cds.on("bootstrap", async function bootstrap(app) {
 	log.debug("bootstrap");
 
@@ -115,6 +132,8 @@ cds.on("bootstrap", async function bootstrap(app) {
 			log.error(`Failed to inject application pages to CAP overview page! You need to manually open the application pages!`);
 		}
 	}
+	// bootstrap completed, unlock the "served" event
+	bootstrapped();
 });
 
 // return callback for plugin activation

package/lib/findUI5Modules.js

@@ -26,6 +26,8 @@ module.exports = async function findUI5Modules({ cwd, skipLocalApps, skipDeps })
 	if (!skipLocalApps) {
 		const appDir = path.join(cwd, "app");
 		if (fs.existsSync(appDir)) {
+			// lookup all dirs inside the root app directory for
+			// being either a local app or a UI5 application
 			fs.readdirSync(appDir, { withFileTypes: true })
 				.filter((f) => f.isDirectory())
 				.forEach((d) => localApps.add(d.name));
@@ -36,12 +38,22 @@ module.exports = async function findUI5Modules({ cwd, skipLocalApps, skipDeps })
 					appDirs.push(d);
 				}
 			});
-		}
 
-		// look for a single app if no apps were found in the app directories
-		if (appDirs.length === 0) {
-			if (fs.existsSync(path.join(appDir, "ui5.yaml"))) {
-				appDirs.push(appDir);
+			// also include all root app directory HTML files if no ui5.yaml is present
+			if (!fs.existsSync(path.join(appDir, "ui5.yaml"))) {
+				fs.readdirSync(appDir, { withFileTypes: true })
+					.filter((f) => {
+						return f.isFile();
+					})
+					.forEach((f) => {
+						localApps.add(f.name);
+					});
+			} else {
+				// if a ui5.yaml is present in the root app directory consider this
+				// as a UI5 application to be included into the mounting
+				if (appDirs.length === 0) {
+					appDirs.push(appDir);
+				}
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cds-plugin-ui5",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A CAP server cds-plugin to inject the middlewares of all related UI5 tooling based projects.",
   "author": "Peter Muessig",
   "license": "Apache-2.0",
@@ -24,5 +24,5 @@
     "@sap/cds": ">=6.8.2",
     "express": ">=4.18.2"
   },
-  "gitHead": "c6e94b130e72603fc05d70bcaf982bd681b72604"
+  "gitHead": "5c08d4699b0f4c0d55bb800f323905ffde4624c0"
 }