cds-plugin-ui5 0.7.4 → 0.8.0

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.8.0](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.7.5...cds-plugin-ui5@0.8.0) (2024-01-25)
+
+
+### Features
+
+* **ui5-middleware-ui5:** support nested scenarios in CDS servers ([#938](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/938)) ([5d61f18](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/5d61f18f04a624e8f61ec7fa1e8f32e81c43f6b0))
+
+
+
+
+
+## [0.7.5](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.7.4...cds-plugin-ui5@0.7.5) (2024-01-17)
+
+
+### Bug Fixes
+
+* **cds-plugin-ui5:** support app folders being served from cds.env.folders.app ([#934](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/934)) ([#935](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/935)) ([9cff34d](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/9cff34d1b39ff2d22b6a8caaf3971306de737fe5))
+
+
+
+
+
 ## [0.7.4](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.7.3...cds-plugin-ui5@0.7.4) (2023-12-10)
 
 **Note:** Version bump only for package cds-plugin-ui5

package/README.md

@@ -2,7 +2,7 @@
 
 > :wave: This is a **community project** and there is no official support for this package! Feel free to use it, open issues, contribute, and help answering questions.
 
-The `cds-plugin-ui5` is a CDS server `cds-plugin` which enables the integration of UI5 tooling based (UI5 freestyle or Fiori elements) projects into the CDS server via the UI5 tooling express middlewares. The UI5 or Fiori elements projects just need to be located in the `app` folder of the CDS server or be dependency of the CDS server.
+The `cds-plugin-ui5` is a CDS server `cds-plugin` which enables the integration of UI5 tooling based (UI5 freestyle or Fiori elements) projects into the CDS server via the UI5 tooling express middlewares. The UI5 or Fiori elements projects just need to be located in the `app` folder of the CDS server, or via the `cds.env.folders.app` variable, or be a dependency of the CDS server.
 
 > :construction: **Note**
 > This cds-plugin is still work in progress and not final yet!

package/cds-plugin.js

@@ -69,7 +69,7 @@ if (!skip) {
 		log.debug("bootstrap");
 
 		const cwd = process.cwd();
-		const ui5Modules = await findUI5Modules({ cwd });
+		const ui5Modules = await findUI5Modules({ cwd, cds });
 		const { localApps, config } = ui5Modules;
 
 		const links = [];

package/lib/findUI5Modules.js

@@ -20,7 +20,7 @@ const log = require("./log");
  * @param {string} options.skipDeps skip dependencies
  * @returns {Array<UI5Module>} array of UI5 module
  */
-module.exports = async function findUI5Modules({ cwd, skipLocalApps, skipDeps }) {
+module.exports = async function findUI5Modules({ cwd, cds, skipLocalApps, skipDeps }) {
 	// extract the modules configuration from the package.json
 	const pkgJson = require(path.join(cwd, "package.json"));
 
@@ -52,9 +52,9 @@ module.exports = async function findUI5Modules({ cwd, skipLocalApps, skipDeps })
 	const localApps = new Set();
 	const appDirs = [];
 	if (!skipLocalApps) {
-		const appDir = path.join(cwd, "app");
+		const appDir = path.join(cwd, cds?.env?.folders?.app || "app");
 		if (fs.existsSync(appDir)) {
-			// is the UI5 app directly in teh app directory?
+			// is the UI5 app directly in the app directory?
 			if (!fs.existsSync(path.join(appDir, determineUI5Yaml(appDir)))) {
 				// lookup all dirs inside the root app directory for
 				// being either a local app or a UI5 application

package/lib/rewriteHTML.js

@@ -61,15 +61,22 @@ module.exports = async function rewriteHTML(req, res, rewriteCondition, rewriteC
 		// store the last chunk in the content buffer
 		contentBuffer.push(content instanceof Buffer ? content.toString(encoding) : content);
 
-		// create the html content and parse it
+		// create the html content
 		let htmlContent = contentBuffer.join("");
-		const doc = HTMLParser.parse(htmlContent);
 
-		// now run the callback
-		rewriteContent(doc);
+		// ensure that the request is rewritten only once and not also by the cds-plugin-ui5
+		// therefore we add a marker to the request so that the middlewares can identify this
+		if (!req["ui5-rewriteHTML"]) {
+			// parse the html content
+			const doc = HTMLParser.parse(htmlContent);
 
-		// update the html content
-		htmlContent = doc.toString();
+			// now run the callback
+			rewriteContent(doc);
+
+			// update the html content
+			htmlContent = doc.toString();
+		}
+		req["ui5-rewriteHTML"] = true;
 
 		// the rest is on express
 		end.call(res, htmlContent, encoding);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cds-plugin-ui5",
-  "version": "0.7.4",
+  "version": "0.8.0",
   "description": "A CDS server plugin to inject the middlewares of all related UI5 tooling based projects.",
   "author": "Peter Muessig",
   "license": "Apache-2.0",
@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@ui5/fs": "^3.0.5",
-    "@ui5/project": "^3.8.0",
-    "@ui5/server": "^3.1.4",
+    "@ui5/project": "^3.9.0",
+    "@ui5/server": "^3.1.5",
     "js-yaml": "^4.1.0",
-    "node-html-parser": "^6.1.11"
+    "node-html-parser": "^6.1.12"
   },
   "devDependencies": {
     "@sap/cds": "^6.8.4",
@@ -25,5 +25,5 @@
     "@sap/cds": ">=6.8.2",
     "express": ">=4.18.2"
   },
-  "gitHead": "035b27d4b261799f585b8d2d86308e2025398866"
+  "gitHead": "674eb4798d4f5a23efadf81f303f705cac3caa82"
 }