cds-plugin-ui5 0.9.4 → 0.9.6

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.9.6](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.9.5...cds-plugin-ui5@0.9.6) (2024-07-22)
+
+
+### Bug Fixes
+
+* **cds-plugin-ui5:** correctly determine the @sap/cds-dk version ([#1047](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/1047)) ([5c7f982](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/5c7f982715c6ed2e11859420a4867d192117e9aa))
+
+
+
+
+
+## [0.9.5](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.9.4...cds-plugin-ui5@0.9.5) (2024-07-22)
+
+
+### Bug Fixes
+
+* **cds-plugin-ui5:** report versions of the plugin and @sap/cds-dk, @sap/cds ([#1045](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/1045)) ([8db7560](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/8db7560da65d2d042a5e71887b885c8d102714db))
+
+
+
+
+
 ## [0.9.4](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.9.3...cds-plugin-ui5@0.9.4) (2024-07-19)
 
 

package/cds-plugin.js

@@ -48,8 +48,11 @@ if (!skip) {
 	// to disable the ui5-middleware-cap if used in apps
 	process.env["cds-plugin-ui5"] = true;
 
+	const { dirname, join, resolve } = require("path");
+	const { readFileSync, existsSync, realpathSync } = require("fs");
 	const { execSync } = require("child_process");
-	const { readFileSync } = require("fs");
+
+	const { version: cdsPluginUI5Version } = require(`${__dirname}/package.json`);
 
 	// function to resolve a module with the given paths without throwing an error
 	const resolveModule = function resolveModule(moduleName, paths) {
@@ -60,23 +63,54 @@ if (!skip) {
 		}
 	};
 
+	// helper to find the package.json in the current dir or upwards
+	const findPackageJson = function findPackageJson(dir) {
+		let currentDir = dir;
+		while (currentDir !== resolve(currentDir, "..")) {
+			const packageJsonPath = join(currentDir, "package.json");
+			if (existsSync(packageJsonPath)) {
+				return packageJsonPath;
+			}
+			currentDir = resolve(currentDir, "..");
+		}
+		return undefined;
+	};
+
 	// find out the CDS-DK version to control the behavior of the plugin
 	const getCDSDKVersion = function getCDSDKVersion() {
-		const moduleName = "@sap/cds-dk";
-		const globalModulesPath = execSync("npm root -g").toString().trim();
-		let resolvedPath = resolveModule(`${moduleName}/package.json`);
-		if (!resolvedPath) {
-			resolvedPath = resolveModule(`${moduleName}/package.json`, [globalModulesPath]);
-		}
-		if (resolvedPath) {
-			const packageJson = JSON.parse(readFileSync(resolvedPath, { encoding: "utf-8" }));
+		const cdsDkPath = realpathSync(process.argv[1]);
+		const cdsDkDir = dirname(cdsDkPath);
+		const packageJsonPath = findPackageJson(cdsDkDir);
+		if (packageJsonPath) {
+			const packageJson = JSON.parse(readFileSync(packageJsonPath, { encoding: "utf-8" }));
 			return packageJson.version;
+		} else {
+			const moduleName = "@sap/cds-dk";
+			let resolvedPath = resolveModule(`${moduleName}/package.json`);
+			if (!resolvedPath) {
+				const globalModulesPath = execSync("npm root -g").toString().trim();
+				resolvedPath = resolveModule(`${moduleName}/package.json`, [globalModulesPath]);
+			}
+			if (resolvedPath) {
+				const packageJson = JSON.parse(readFileSync(resolvedPath, { encoding: "utf-8" }));
+				return packageJson.version;
+			}
 		}
+		return undefined;
 	};
 
 	// get the CDS-DK version to control the behavior of the plugin
 	const cdsdkVersion = getCDSDKVersion();
 
+	// logging the version of the cds-plugin-ui5
+	log.info(`Running cds-plugin-ui5@${cdsPluginUI5Version} (@sap/cds-dk@${cdsdkVersion}, @sap/cds@${cds.version})`);
+	if (global.__cds_loaded_from?.size > 1) {
+		log.warn("  !! Multiple versions of @sap/cds loaded !!");
+		global.__cds_loaded_from.forEach((cdsPath) => {
+			log.warn(`    => ${cdsPath}`);
+		});
+	}
+
 	// promise to await the bootstrap and lock the
 	// served event to delay the startup a bit
 	let bootstrapped;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cds-plugin-ui5",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "A CDS server plugin to inject the middlewares of all related UI5 tooling based projects.",
   "author": "Peter Muessig",
   "license": "Apache-2.0",
@@ -12,19 +12,19 @@
   },
   "dependencies": {
     "@ui5/fs": "^3.0.5",
-    "@ui5/project": "^3.9.1",
-    "@ui5/server": "^3.2.0",
+    "@ui5/project": "^3.9.2",
+    "@ui5/server": "^3.2.1",
     "js-yaml": "^4.1.0",
     "node-html-parser": "^6.1.13",
-    "semver": "^7.6.2"
+    "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@sap/cds": "^6.8.4",
-    "express": "^4.19.2"
+    "@sap/cds": "*",
+    "express": "*"
   },
   "peerDependencies": {
     "@sap/cds": ">=6.8.2",
     "express": ">=4.18.2"
   },
-  "gitHead": "4a689e18ba048dfcb02b9adbd98b82769db22f53"
+  "gitHead": "d17d6b66530a90711be777b9864fe2bf4f27f239"
 }