cds-plugin-ui5 0.9.5 → 0.9.7

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.7](https://github.com/ui5-community/ui5-ecosystem-showcase/compare/cds-plugin-ui5@0.9.6...cds-plugin-ui5@0.9.7) (2024-07-23)
+
+
+### Bug Fixes
+
+* **cds-plugin-ui5:** fix error when resolving symlinks for CDS-DK root ([#1048](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/1048)) ([3b05ada](https://github.com/ui5-community/ui5-ecosystem-showcase/commit/3b05ada1fe2bfac2ecc962af700646030d8c39d8)), closes [#1033](https://github.com/ui5-community/ui5-ecosystem-showcase/issues/1033)
+
+
+
+
+
+## [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)
 
 

package/cds-plugin.js

@@ -48,8 +48,9 @@ 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`);
 
@@ -62,18 +63,45 @@ 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";
-		let resolvedPath = resolveModule(`${moduleName}/package.json`);
-		if (!resolvedPath) {
-			const globalModulesPath = execSync("npm root -g").toString().trim();
-			resolvedPath = resolveModule(`${moduleName}/package.json`, [globalModulesPath]);
+		let cdsDkPath = process.argv[1];
+		try {
+			cdsDkPath = realpathSync(cdsDkPath);
+		} catch (err) {
+			// ignore
 		}
-		if (resolvedPath) {
-			const packageJson = JSON.parse(readFileSync(resolvedPath, { encoding: "utf-8" }));
+		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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cds-plugin-ui5",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "A CDS server plugin to inject the middlewares of all related UI5 tooling based projects.",
   "author": "Peter Muessig",
   "license": "Apache-2.0",
@@ -26,5 +26,5 @@
     "@sap/cds": ">=6.8.2",
     "express": ">=4.18.2"
   },
-  "gitHead": "0a4076873a7fbd2fc675b5f9c2ec2efa3cd0518a"
+  "gitHead": "03e64dc67ace03c5f8857f92bbd3c8aebedd6d35"
 }