Merge remote-tracking branch 'origin/main' into wizard-container-queries

Author: MapTo0

.editorconfig

@@ -8,6 +8,7 @@ charset = utf-8
 [*.{css,html,java,js,json,less,txt,ts}]
 trim_trailing_whitespace = true
 end_of_line = lf
+indent_style = tab
 tab_width = 4
 
 [pom.xml]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -28,7 +28,7 @@ body:
     id: example
     attributes:
       label: Isolated Example
-      description: Please provide a link to an isolated example if possible by forking [this codesandbox](https://codesandbox.io/s/71r1x5o51q?fontsize=14&module=%2Findex.html).
+      description: Please provide a link to an isolated example if possible by forking [this stackblitz](https://stackblitz.com/edit/js-vsrpnb?file=index.js,index.html).
     validations:
       required: false
   - type: textarea

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,8 @@
 
 
 ### PR checklist
+- [ ] Check the [Development Hints](https://sap.github.io/ui5-webcomponents/docs/contributing/DoD/)
+
 - [ ] Follow the [Commit message Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/docs/6-contributing/02-conventions-and-guidelines.md#commit-message-style)
 
 For example: `fix(ui5-*): correct/fix sth` or `feat(ui5-*): add/introduce sth`. If you don't want the change to be part of the release changelog - use `chore`, `refactor` or `docs`.

.github/actions/commentOnFixedIssues.mjs

@@ -0,0 +1,70 @@
+import { promises as fs } from 'node:fs';
+import { success as issueCommenter } from '@semantic-release/github';
+
+const getReleaseCommits = (releaseBody) => {
+	const commits = new Set();
+
+	const shaRegex = /commit\/(?<sha>\w{40})/g;
+	for (const match of releaseBody.matchAll(shaRegex)) {
+		if (match.groups?.sha) {
+			commits.add({ hash: match.groups.sha });
+		}
+	}
+
+	// Converting Set back to an array to get unique commits as array
+	return Array.from(commits);
+};
+
+const getOctokitShim = (github) => {
+	return new Proxy(class {}, {
+		construct(target, argArray, newTarget) {
+			return github;
+		}
+	});
+}
+
+/**
+ * Publishes comments to issues that are fixed and released.
+ * @param options {object}
+ * @param options.github {import("@octokit/rest/dist-types/index.d.ts").Octokit}
+ * @param options.context
+ */
+export default async function run({ github, context }) {
+	const lerna = await fs.readFile(new URL('../../lerna.json', import.meta.url), 'utf8');
+	const { version } = JSON.parse(lerna);
+
+	const { owner, repo } = context.repo;
+	const releaseInfo = await github.request('GET /repos/{owner}/{repo}/releases/tags/{tag}', {
+		owner,
+		repo,
+		tag: `v${version}`
+	});
+	const release = releaseInfo.data;
+	release.url = release.html_url;
+	
+
+	const commits = await getReleaseCommits(release.body);
+	
+	
+	try {
+		const semanticReleaseContext = {
+			options: { 
+				repositoryUrl: `https://github.com/${owner}/${repo}` 
+			},
+			commits,
+			nextRelease: { version: `v${version}` },
+			releases: [release],
+			logger: console,
+			env: process.env
+		};
+		const Octokit = getOctokitShim(github);
+
+		console.log('Commits:', commits.toString());
+		console.log('semanticReleaseContext:', semanticReleaseContext);
+
+		await issueCommenter({}, semanticReleaseContext, { Octokit });
+
+	} catch (error) {
+		console.error('Error in posting comment:', error);
+	}
+}

.github/actions/createIssueComments.cjs

@@ -0,0 +1,113 @@
+import { promises as fs } from 'node:fs';
+
+const extractChangelogSections = (releaseBody) => {
+	const fixes = [];
+	const features = [];
+	const fixesMatch = releaseBody.match(/## Bug Fixes([\s\S]*?)(?=##|$)/);
+	const featuresMatch = releaseBody.match(/## Features([\s\S]*?)(?=##|$)/);
+
+	if (fixesMatch) {
+		// Split lines, trim whitespace, and remove any leading bullet point (like "*" or "-")
+		const fixEntries = fixesMatch[1].trim().split('\n').map(line => line.replace(/^[*-]\s*/, '').trim());
+		fixes.push(...fixEntries);
+	}
+	if (featuresMatch) {
+		const featureEntries = featuresMatch[1].trim().split('\n').map(line => line.replace(/^[*-]\s*/, '').trim());
+		features.push(...featureEntries);
+	}
+
+	return { fixes, features };
+};
+
+const mergeReleaseChangelogs = (minorRelease, rcReleases) => {
+	// Extract the existing changes from the minor release body
+	const { fixes: minorFixes, features: minorFeatures } = extractChangelogSections(minorRelease.body);
+	const fixes = [...minorFixes];
+	const features = [...minorFeatures];
+
+	// Add changes from each RC release
+	rcReleases.forEach((release) => {
+		const { fixes: rcFixes, features: rcFeatures } = extractChangelogSections(release.body);
+		fixes.push(...rcFixes);
+		features.push(...rcFeatures);
+	})
+
+	// Sort fixes and features alphabetically
+	const sortedFixes = fixes.sort((a, b) => {
+		const contentA = a.match(/\*\*(.*?)\*\*/)?.[1] || '';
+		const contentB = b.match(/\*\*(.*?)\*\*/)?.[1] || '';
+		return contentA.localeCompare(contentB);
+	});
+
+	const sortedFeatures = features.sort((a, b) => {
+		const contentA = a.match(/\*\*(.*?)\*\*/)?.[1] || '';
+		const contentB = b.match(/\*\*(.*?)\*\*/)?.[1] || '';
+		return contentA.localeCompare(contentB);
+	});
+
+	return { fixes: sortedFixes, features: sortedFeatures };
+}
+
+const updateRelease = async (releaseContext) => {
+	const releaseId = releaseContext.minorRelease.id;
+	const releaseHeaderMatch = releaseContext.minorRelease.body.match(/^#\s\[.*?\]\(.*?\)\s\([\d-]+\)/);
+	const releaseHeader = releaseHeaderMatch ? `${releaseHeaderMatch[0]}\n\n` : '';
+	const formattedFixes = releaseContext.fixes.length ? `### Fixes\n- ${releaseContext.fixes.join('\n- ')}` : '';
+	const formattedFeatures = releaseContext.features.length ? `### Features\n- ${releaseContext.features.join('\n- ')}` : '';
+	const body = `${releaseHeader}${formattedFeatures}\n\n${formattedFixes}`.trim();
+
+	try {
+		await releaseContext.github.request('PATCH /repos/{owner}/{repo}/releases/{releaseId}', {
+			owner: releaseContext.owner,
+			repo: releaseContext.repo,
+			body,
+			releaseId,
+		});
+
+		console.log(`Release ${releaseContext.version} updated successfully:`, releaseContext);
+	} catch (error) {
+		console.error(`Error updating release ${releaseContext.version}:`, error );
+	}
+};
+
+/**
+ * Publishes comments to issues that are fixed and released.
+ * @param options {object}
+ * @param options.github {import("@octokit/rest/dist-types/index.d.ts").Octokit}
+ * @param options.context
+ */
+export default async function run({ github, context }) {
+	const lerna = await fs.readFile(new URL('../../lerna.json', import.meta.url), 'utf8');
+	const { version } = JSON.parse(lerna);
+
+	if (!version.startsWith("2")) {
+		console.warn('Skip: the task is relevant for version 2');
+		return;
+	}
+
+	try {
+		const { owner, repo } = context.repo;
+		const allReleases = (await github.request('GET /repos/{owner}/{repo}/releases', { owner, repo })).data;
+		const rcReleases = allReleases.filter((release) => release.tag_name.includes(`v${version}-rc`));
+		const minorRelease = allReleases.find((release) => release.tag_name === `v${version}`);
+
+		// Merge RC changelogs
+		const { fixes, features } = await mergeReleaseChangelogs(minorRelease, rcReleases);
+
+		const minorReleaseContext = {
+			github,
+			version,
+			owner,
+			repo,
+			minorRelease,
+			fixes,
+			features
+		}
+		
+		// Update the minor release with aggregated changelog
+		await updateRelease(minorReleaseContext);
+
+	} catch (error) {
+		console.error('Error:', error);
+	}
+}

.github/actions/mergeReleaseChangelog.mjs

@@ -0,0 +1,76 @@
+const fs = require("fs").promises;
+const child_process = require("child_process");
+const commandLineArgs = require('command-line-args');
+const execSync = child_process.execSync;
+const gitRev = execSync("git rev-parse HEAD").toString();
+
+const PACKAGES = {};
+const NPM_ORG = "@ui5/webcomponents";
+
+const options = commandLineArgs([
+	{ name: 'version', alias: 'v', type: String },
+	{ name: 'tag', alias: 't', type: String },
+	{ name: 'otp', alias: 'p', type: String },
+]);
+
+const DEFAULT_TAG = "experimental";
+const TAG = options.tag || DEFAULT_TAG;
+const NEW_VERSION = options.version;
+const OTP = options.otp;
+
+const run = async () => {
+	const { globby } = await import("globby");
+	let FILES = await globby(["packages/*/package.json", "!packages/playground/package.json", "!packages/website/package.json"]);
+
+	// Step 1: process package.json files
+	const pkgs = await Promise.all(FILES.map(processPackageJSON));
+
+	// Step 2: update package.json files
+	await Promise.all(pkgs.map(updatePackageJSON));
+
+	// Step 3: publish each package to npm
+	pkgs.forEach(publishPackage);
+};
+
+const processPackageJSON = async file => {
+	const folder = file.split("package.json")[0];
+	const fileRead = await fs.readFile(file);
+	const fileContent = JSON.parse(fileRead.toString());
+	const name = fileContent.name;
+
+	const version = NEW_VERSION || `0.0.0-${gitRev.slice(0,9,)}`;
+
+	PACKAGES[name] = { name, file, fileContent, version, folder };
+	return PACKAGES[name];
+};
+
+const updatePackageJSON = async pkg => {
+	const file = pkg.file;
+	const fileContent = pkg.fileContent;
+	const dependencies = fileContent.dependencies;
+	const devDependencies = fileContent.devDependencies;
+
+	fileContent.version = pkg.version;
+	dependencies && getDependencies(dependencies).forEach(dep => {
+		fileContent.dependencies[dep] = PACKAGES[dep].version;
+	});
+	devDependencies && getDependencies(devDependencies).forEach(dep => {
+		fileContent.devDependencies[dep] = PACKAGES[dep].version;
+	});
+
+	return fs.writeFile(file, JSON.stringify(fileContent, null, "  "));
+};
+
+const getDependencies = (dependencies) => {
+	return Object.keys(dependencies).filter(dep => dep.startsWith(NPM_ORG));
+};
+
+const publishPackage = pkg => {
+	console.info(`Publish ${pkg.name}: ${pkg.version} ...`); // eslint-disable-line
+	const OTP_PARAM = OTP ? `--otp=${OTP}` : ``;
+	execSync(`yarn publish ${pkg.folder} --tag=${TAG} --new-version=${pkg.version} ${OTP_PARAM}`);
+};
+
+run().catch(error => {
+	console.error("Release of @experimental version failed", error); // eslint-disable-line
+});