Various improvements (#1859)

Author: r0b1n

automation/scripts/package.json

@@ -14,7 +14,7 @@
         "lint": "echo 'Lint disabled for now, please update package scripts'",
         "lint:enableme": "eslint . --ext .mjs",
         "root-script:commitlint": "commitlint",
-        "root-script:format-staged": "pretty-quick --staged --config \"./.prettierrc.cjs\" --pattern \"**/{src,script,typings,test,**}/**/*.{cjs,mjs,js,jsx,ts,tsx,scss,html,xml,md,json}\""
+        "root-script:format-staged": "pretty-quick --staged --config \"./.prettierrc.cjs\" --pattern \"**/{src,script,typings,test,**}/**/*.{cjs,mjs,js,jsx,ts,tsx,scss,xml,md,json}\""
     },
     "dependencies": {
         "@commitlint/cli": "^19.8.1",

automation/utils/src/changelog.ts

@@ -1,6 +1,6 @@
 import { gh } from "./github";
 import { PublishedInfo } from "./package-info";
-import { exec, pushd, popd } from "./shell";
+import { exec, popd, pushd } from "./shell";
 
 export async function updateChangelogsAndCreatePR(
     info: PublishedInfo,
@@ -10,6 +10,30 @@ export async function updateChangelogsAndCreatePR(
     const releaseBranchName = `${releaseTag}-update-changelog`;
     const appName = info.marketplace.appName;
 
+    // Check if branch already exists on remote
+    try {
+        const { stdout: remoteOutput } = await exec(`git ls-remote --heads ${remoteName} ${releaseBranchName}`, {
+            stdio: "pipe"
+        });
+        if (remoteOutput.trim()) {
+            // Branch exists on remote, get its commit hash and rename it
+            const remoteCommitHash = remoteOutput.split("\t")[0].substring(0, 7); // Get short hash from remote output
+            const renamedBranchName = `${releaseBranchName}-${remoteCommitHash}`;
+
+            console.log(
+                `Branch '${releaseBranchName}' already exists on remote. Renaming it to '${renamedBranchName}'...`
+            );
+
+            // Create new branch on remote with the renamed name pointing to the same commit
+            await exec(`git push ${remoteName} ${remoteName}/${releaseBranchName}:refs/heads/${renamedBranchName}`);
+            // Delete the old branch on remote
+            await exec(`git push ${remoteName} --delete ${releaseBranchName}`);
+        }
+    } catch (error) {
+        // Branch doesn't exist on remote, continue with original name
+        console.log(`Using branch name '${releaseBranchName}'`);
+    }
+
     console.log(`Creating branch '${releaseBranchName}'...`);
     await exec(`git checkout -b ${releaseBranchName}`);
 

automation/utils/src/monorepo.ts

@@ -1,6 +1,6 @@
 import { prompt } from "enquirer";
 import { oraPromise } from "./cli-utils";
-import { exec, find, mkdir, cp } from "./shell";
+import { cp, exec, find, mkdir } from "./shell";
 
 type DependencyName = string;
 

automation/utils/src/steps.ts

@@ -12,7 +12,7 @@ import { copyMpkFiles, getMpkPaths } from "./monorepo";
 import { createModuleMpkInDocker } from "./mpk";
 import { ModuleInfo, PackageInfo, WidgetInfo } from "./package-info";
 import { addFilesToPackageXml, PackageType } from "./package-xml";
-import { chmod, cp, ensureFileExists, exec, mkdir, popd, pushd, rm, unzip, zip } from "./shell";
+import { chmod, cp, ensureFileExists, exec, find, mkdir, popd, pushd, rm, unzip, zip } from "./shell";
 import chalk from "chalk";
 
 type Step<Info, Config> = (params: { info: Info; config: Config }) => Promise<void>;
@@ -196,6 +196,57 @@ export async function addWidgetsToMpk({ config }: ModuleStepParams): Promise<voi
     rm("-rf", target);
 }
 
+export async function addREADMEOSSToMpk({ config, info }: ModuleStepParams): Promise<void> {
+    logStep("Add READMEOSS to mpk");
+
+    // Check that READMEOSS file exists in package root and find it by name pattern
+    const packageRoot = config.paths.package;
+    const widgetName = info.mxpackage.name;
+    const version = info.version.format();
+
+    // We'll search for files matching the name and version, ignoring timestamp
+    const readmeossPattern = `*${widgetName}__${version}__READMEOSS_*.html`;
+
+    console.info(`Looking for READMEOSS file matching pattern: ${readmeossPattern}`);
+
+    // Find files matching the pattern in package root
+    const matchingFiles = find(packageRoot).filter(file => {
+        const fileName = parse(file).base;
+        // Check if filename contains the widget name, version, and READMEOSS
+        return fileName.includes(`${widgetName}__${version}__READMEOSS_`) && fileName.endsWith(".html");
+    });
+
+    if (matchingFiles.length === 0) {
+        console.warn(
+            `⚠️  READMEOSS file not found for ${widgetName} version ${version}. Expected pattern: ${readmeossPattern}`
+        );
+        console.warn(`   Skipping READMEOSS addition to mpk.`);
+        return;
+    }
+
+    const readmeossFile = matchingFiles[0];
+    console.info(`Found READMEOSS file: ${parse(readmeossFile).base}`);
+
+    const mpk = config.output.files.modulePackage;
+    const widgets = await getMpkPaths(config.dependencies);
+    const mpkEntry = parse(mpk);
+    const target = join(mpkEntry.dir, "tmp");
+
+    rm("-rf", target);
+
+    console.info("Unzip module mpk");
+    await unzip(mpk, target);
+    chmod("-R", "a+rw", target);
+
+    console.info(`Add READMEOSS file to ${mpkEntry.base}`);
+    // Copy the READMEOSS file to the target directory
+    cp(readmeossFile, target);
+
+    console.info("Create module zip archive");
+    await zip(target, mpk);
+    rm("-rf", target);
+}
+
 export async function moveModuleToDist({ info, config }: ModuleStepParams): Promise<void> {
     logStep("Move module to dist");
 

automation/utils/src/verify-widget-manifest.ts

@@ -1,5 +1,5 @@
 import { ClientModulePackageFile, readPackageXml } from "./package-xml";
-import { WidgetPackageSchema, WidgetPackage } from "./package-info";
+import { WidgetPackage, WidgetPackageSchema } from "./package-info";
 
 type ParsedManifests = [WidgetPackage, ClientModulePackageFile];
 

package.json

@@ -27,9 +27,9 @@
     },
     "engines": {
         "node": ">=22",
-        "pnpm": "10.12.4"
+        "pnpm": "10.15.0"
     },
-    "packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184",
+    "packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b",
     "pnpm": {
         "peerDependencyRules": {
             "allowedVersions": {

packages/customWidgets/calendar-custom-web/src/components/Button.ts

@@ -1,4 +1,4 @@
-import { ReactNode, createElement, FunctionComponent } from "react";
+import { createElement, FunctionComponent, ReactNode } from "react";
 import classNames from "classnames";
 
 export interface ButtonProps {

packages/customWidgets/calendar-custom-web/src/components/Calendar.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, Component, ReactChild, createElement, ReactNode } from "react";
+import { Component, createElement, CSSProperties, ReactChild, ReactNode } from "react";
 
 import { Alert } from "./Alert";
 import { Container, Style } from "../utils/namespaces";

packages/customWidgets/calendar-custom-web/src/components/CalendarLoader.ts

@@ -1,4 +1,4 @@
-import { ReactElement, createElement, FunctionComponent } from "react";
+import { createElement, FunctionComponent, ReactElement } from "react";
 import "../ui/CalendarLoader.scss";
 
 export const CalendarLoader: FunctionComponent = () =>

packages/customWidgets/calendar-custom-web/src/components/SizeContainer.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, createElement, FunctionComponent, PropsWithChildren } from "react";
+import { createElement, CSSProperties, FunctionComponent, PropsWithChildren } from "react";
 import classNames from "classnames";
 
 export type HeightUnitType = "percentageOfWidth" | "percentageOfParent" | "pixels";