@robylon/react-native-sdk 2.0.19-staging.8 → 2.0.20

package/scripts/create-branch.js

@@ -147,6 +147,22 @@ const getRepoUrl = () => {
     .replace("git@github.com:", "https://github.com/");
 };
 
+// Add this new function near the top with other helper functions
+const updatePackageVersion = async (version, branchName) => {
+  try {
+    // Update version without creating git tag
+    execSync(`npm version ${version} --no-git-tag-version`);
+    execSync(`git add package.json package-lock.json`);
+    execSync(`git commit -m "chore: update version to ${version}"`);
+
+    // Push changes
+    console.log("\n📡 Pushing version update to remote...");
+    execSync(`git push origin ${branchName}`);
+  } catch (error) {
+    throw new Error(`Failed to update version: ${error.message}`);
+  }
+};
+
 const createBranch = async () => {
   try {
     // Set environment variable to allow branch creation
@@ -259,10 +275,25 @@ const createBranch = async () => {
           );
 
           // Checkout the release branch
-          execSync(`git fetch origin ${selectedRelease}`);
-          execSync(
-            `git checkout -b ${selectedRelease.split("origin/")[1]} ${selectedRelease}`
-          );
+          const releaseBranchName = selectedRelease.split("origin/")[1];
+
+          // Check if branch exists locally
+          const localBranches = execSync("git branch").toString();
+          const branchExists = localBranches.includes(releaseBranchName);
+
+          if (branchExists) {
+            // If branch exists locally, just check it out
+            execSync(`git checkout ${releaseBranchName}`);
+            // Update to latest from remote
+            execSync(`git fetch origin ${releaseBranchName}`);
+            execSync(`git reset --hard origin/${releaseBranchName}`);
+          } else {
+            // If branch doesn't exist locally, create and track it
+            execSync(`git fetch origin ${releaseBranchName}`);
+            execSync(
+              `git checkout -b ${releaseBranchName} origin/${releaseBranchName}`
+            );
+          }
 
           // Merge selected features
           const selectedFeatures =
@@ -277,7 +308,7 @@ const createBranch = async () => {
             console.log(`\nMerging ${branch}...`);
             try {
               execSync(
-                `git merge ${branch} --no-ff -m "Merge ${branch} into ${branchName}"`
+                `git merge ${branch} --no-ff -m "Merge ${branch} into ${releaseBranchName}"`
               );
             } catch (error) {
               console.log(`\n⚠️  Merge conflict detected with ${branch}!`);
@@ -293,7 +324,7 @@ const createBranch = async () => {
             console.log("\n🚨 MERGE CONFLICTS DETECTED 🚨");
             console.log("=====================================");
             conflictedBranches.forEach((branch) => {
-              const prUrl = `${repoUrl}/compare/${branchName}...${branch}?expand=1`;
+              const prUrl = `${repoUrl}/compare/${releaseBranchName}...${branch}?expand=1`;
               console.log(`\n❌ ${branch}`);
               console.log(`🔗 Create PR: ${prUrl}`);
             });
@@ -389,22 +420,8 @@ const createBranch = async () => {
 
       execSync(`git checkout -b ${branchName}`);
 
-      // Update version and commit
-      execSync(`npm version ${releaseVersion} --no-git-tag-version`);
-      execSync(`git add package.json package-lock.json`);
-      execSync(`git commit -m "chore: update version to ${releaseVersion}"`);
-
-      // Set up tracking and push to remote
-      try {
-        console.log("\n📡 Pushing to remote...");
-        execSync(
-          `git push -u origin ${branchName}${branchExists ? " --force" : ""}`
-        );
-      } catch (error) {
-        throw new Error(
-          `Failed to push to remote. Please check your permissions and try again.\nError: ${error.message}`
-        );
-      }
+      // Update version only during initial branch creation
+      await updatePackageVersion(releaseVersion, branchName);
 
       // Get all feature branches for next version
       const featureBranches = execSync("git branch -r")

package/scripts/validate-publish.js

@@ -1,71 +1,48 @@
 const { execSync } = require("child_process");
 
-const validatePublish = (type) => {
+const validatePublish = () => {
   try {
     // Get current branch
     const currentBranch = execSync("git rev-parse --abbrev-ref HEAD")
       .toString()
       .trim();
+    console.log("Validating branch:", currentBranch);
 
-    // Get version from package.json
-    const { version } = require("../package.json");
-    const baseVersion = version.split("-")[0];
+    if (!currentBranch.startsWith("release/v")) {
+      throw new Error("Publishing is only allowed from release branches");
+    }
 
-    switch (type) {
-      case "production":
-        if (!currentBranch.startsWith("release/v")) {
-          throw new Error(
-            "Production publishing is only allowed from release branches.\n" +
-              "Current branch: " +
-              currentBranch +
-              "\n" +
-              "Expected format: release/v{version}"
-          );
-        }
+    // Get version from branch name
+    const branchVersion = currentBranch.split("/v")[1];
 
-        // Verify release branch version matches package version
-        const releaseBranchVersion = currentBranch.split("/v")[1];
-        if (releaseBranchVersion !== baseVersion) {
-          throw new Error(
-            "Release branch version does not match package.json version.\n" +
-              `Branch version: ${releaseBranchVersion}\n` +
-              `Package version: ${baseVersion}\n` +
-              "Please update package.json version to match the release branch"
-          );
-        }
-        break;
+    // Get version from package.json
+    const packageVersion = require("../package.json").version;
+    console.log("Current version:", packageVersion);
 
-      case "hotfix":
-        if (!currentBranch.startsWith("hotfix/v")) {
-          throw new Error(
-            "Hotfix publishing is only allowed from hotfix branches.\n" +
-              "Current branch: " +
-              currentBranch +
-              "\n" +
-              "Expected format: hotfix/v{version}-patch.{number}"
-          );
-        }
-        break;
+    // Get latest published version
+    const latestVersion = execSync("npm view @robylon/react-native-sdk version")
+      .toString()
+      .trim();
+    console.log("Latest published version:", latestVersion);
+
+    // Ensure branch version matches package.json version
+    if (branchVersion !== packageVersion) {
+      throw new Error(
+        `Release branch version (${branchVersion}) must match package.json version (${packageVersion})`
+      );
+    }
 
-      case "staging":
-        if (!currentBranch.startsWith("feature/v")) {
-          throw new Error(
-            "Staging publishing is only allowed from feature branches.\n" +
-              "Current branch: " +
-              currentBranch +
-              "\n" +
-              "Expected format: feature/v{version}/{feature-name}"
-          );
-        }
-        break;
+    // Validate version is greater than latest published
+    const semver = require("semver");
+    if (!semver.gt(packageVersion, latestVersion)) {
+      throw new Error(
+        `New version (${packageVersion}) must be greater than latest published version (${latestVersion})`
+      );
     }
   } catch (error) {
-    console.error("\n❌ Publish validation failed:");
-    console.error(error.message);
+    console.error("Error:", error.message);
     process.exit(1);
   }
 };
 
-// Get publish type from command line argument
-const publishType = process.argv[2];
-validatePublish(publishType);
+validatePublish();

package/src/ChatbotWebview.tsx

@@ -1,44 +0,0 @@
-// File: src/ChatbotWebview.tsx
-import React, { useEffect, useState } from "react";
-import { View } from "react-native";
-import { WebView } from "react-native-webview";
-import { BASE_CHATBOT_URL } from "./constants";
-import LoadingIndicator from "./LoadingIndicator";
-
-interface ChatbotWebviewProps {
-  chatbotId: string;
-  additionalParams?: Record<string, string>;
-}
-
-const constructUrl = (
-  chatbotId: string,
-  additionalParams: Record<string, string> = {}
-): string => {
-  const params = new URLSearchParams({ id: chatbotId, ...additionalParams });
-  return `${BASE_CHATBOT_URL}?${params.toString()}`;
-};
-
-export const ChatbotWebview: React.FC<ChatbotWebviewProps> = ({
-  chatbotId,
-  additionalParams,
-}) => {
-  const [url, setUrl] = useState<string>("");
-
-  useEffect(() => {
-    setUrl(constructUrl(chatbotId, additionalParams));
-  }, [chatbotId, additionalParams]);
-
-  return (
-    <View style={{ flex: 1 }}>
-      {url ? (
-        <WebView
-          source={{ uri: url }}
-          startInLoadingState={true}
-          renderLoading={() => <LoadingIndicator />}
-        />
-      ) : (
-        <LoadingIndicator />
-      )}
-    </View>
-  );
-};