Merge branch 'escape-html-in-comments' into jsdoc-to-markdow

# Conflicts:
#	internal/documentation/scripts/downloadPackages.sh

Author: werwolf2303

.release-please-manifest.json

@@ -1,8 +1,8 @@
 {
-	"packages/logger": "5.0.0-alpha.0",
-	"packages/fs": "5.0.0-alpha.0",
-	"packages/builder": "5.0.0-alpha.0",
-	"packages/server": "5.0.0-alpha.0",
-	"packages/project": "5.0.0-alpha.0",
-	"packages/cli": "5.0.0-alpha.0"
+	"packages/logger": "5.0.0-alpha.2",
+	"packages/fs": "5.0.0-alpha.2",
+	"packages/builder": "5.0.0-alpha.2",
+	"packages/server": "5.0.0-alpha.2",
+	"packages/project": "5.0.0-alpha.2",
+	"packages/cli": "5.0.0-alpha.2"
 }

README.md

@@ -26,6 +26,7 @@ Note that previous versions (up to v4) are maintained in [dedicated repositories
 - [API Reference](https://ui5.github.io/cli/stable/api/)
 - [CLI Documentation](https://ui5.github.io/cli/stable/pages/CLI/)
 - [Project Configuration](https://ui5.github.io/cli/stable/pages/Configuration/)
+- 🎬 [UI5con@SAP 2025 Talk](https://www.youtube.com/live/0D0_M4RDiZY?si=tuOjd8s6S_FUvAaF&t=4948)
 - 🎬 [UI5con@SAP 2020 Talk](https://www.youtube.com/watch?v=8IHoVJLKN34)
 - 🎬 [UI5con@SAP 2018 Talk](https://www.youtube.com/watch?v=iQ07oe26y_k)
 - [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md)

internal/documentation/scripts/downloadPackages.sh

@@ -3,10 +3,14 @@ set -euo pipefail
 
 # Constants
 readonly UI5_CLI_PACKAGES_VERSION="next"
-readonly UI5_CLI_PACKAGES=($(find ../../packages/*/package.json -exec jq -r '.name' {} \;))
+UI5_CLI_PACKAGES=()
+while IFS= read -r pkg; do
+	UI5_CLI_PACKAGES+=("$pkg")
+done < <(find ../../packages/*/package.json -exec jq -r '.name' {} \;)
 
 # Directories
-readonly SCRIPT_DIR="$(dirname -- "$0")"
+SCRIPT_DIR="$(dirname -- "$0")"
+readonly SCRIPT_DIR
 readonly DOC_ROOT="${SCRIPT_DIR}/.."
 readonly TMP_PACKAGES_DIR="./tmp/packages"
 
@@ -31,8 +35,9 @@ download_packages() {
 	for package in "${UI5_CLI_PACKAGES[@]}"; do
 		echo "Downloading and extracting $package..."
 		npm pack "$package@$UI5_CLI_PACKAGES_VERSION" --workspaces false --quiet --pack-destination "$TMP_PACKAGES_DIR"
-		local package_file_name="$(extract_package_file_name "$package")"
-		rm -rf "$TMP_PACKAGES_DIR/${package}"
+		local package_file_name
+		package_file_name="$(extract_package_file_name "$package")"
+		rm -rf "$TMP_PACKAGES_DIR/${package:?}"
 		mkdir -p "$TMP_PACKAGES_DIR/${package}"
 		tar -xzf "$TMP_PACKAGES_DIR/${package_file_name}"-*.tgz --strip-components=1 -C "$TMP_PACKAGES_DIR/${package}"
 		rm "$TMP_PACKAGES_DIR/${package_file_name}"-*.tgz

internal/shrinkwrap-extractor/lib/convertPackageLockToShrinkwrap.js

@@ -48,7 +48,8 @@ export default async function convertPackageLockToShrinkwrap(workspaceRootDir, t
 		path: workspaceRootDir,
 	});
 	const tree = await arb.loadVirtual();
-	const cliNode = Array.from(tree.tops).find((node) => node.packageName === targetPackageName);
+	const tops = Array.from(tree.tops.values());
+	const cliNode = tops.find((node) => node.packageName === targetPackageName);
 	if (!cliNode) {
 		throw new Error(`Target package "${targetPackageName}" not found in workspace`);
 	}
@@ -70,7 +71,10 @@ export default async function convertPackageLockToShrinkwrap(workspaceRootDir, t
 			if (extractedPackages[packageLoc]) {
 				throw new Error(`Duplicate root package entry for "${targetPackageName}"`);
 			}
-		} else if (!pkg.resolved) {
+		} else {
+			packageLoc = normalizePackageLocation(packageLoc, node, targetPackageName, tree.packageName);
+		}
+		if (packageLoc !== "" && !pkg.resolved) {
 			// For all but the root package, ensure that "resolved" and "integrity" fields are present
 			// These are always missing for locally linked packages, but sometimes also for others (e.g. if installed
 			// from local cache)
@@ -100,6 +104,31 @@ export default async function convertPackageLockToShrinkwrap(workspaceRootDir, t
 	return shrinkwrap;
 }
 
+/**
+ * Normalize package locations from workspace-specific paths to standard npm paths.
+ * Examples (assuming @ui5/cli is the targetPackageName):
+ * 	- packages/cli/node_modules/foo -> node_modules/foo
+ * 	- packages/fs/node_modules/bar -> node_modules/@ui5/fs/node_modules/bar
+ *
+ * @param {string} location - Package location from arborist
+ * @param {object} node - Package node from arborist
+ * @param {string} targetPackageName - Target package name for shrinkwrap file
+ * @param {string} rootPackageName - Root / workspace package name
+ * @returns {string} - Normalized location for npm-shrinkwrap.json
+ */
+function normalizePackageLocation(location, node, targetPackageName, rootPackageName) {
+	const topPackageName = node.top.packageName;
+	if (topPackageName === targetPackageName) {
+		// Remove location for packages within target package (e.g. @ui5/cli)
+		return location.substring(node.top.location.length + 1);
+	} else if (topPackageName !== rootPackageName) {
+		// Add package within node_modules of actual package name (e.g. @ui5/fs)
+		return `node_modules/${topPackageName}/${location.substring(node.top.location.length + 1)}`;
+	}
+	// If it's already within the root workspace package, keep as-is
+	return location;
+}
+
 function collectDependencies(node, relevantPackageLocations) {
 	if (relevantPackageLocations.has(node.location)) {
 		// Already processed