ci: fix logic for sub folders

Author: fadi-george

scripts/patch-repo.sh

@@ -20,18 +20,56 @@ if [ ! -f "$TAR_FILE" ]; then
   exit 1
 fi
 
+if [ ! -r "$TAR_FILE" ]; then
+  echo "Error: Tar file $TAR_FILE is not readable"
+  exit 1
+fi
+
 if [ ! -d "$TARGET_DIR" ]; then
   echo "Error: Target directory $TARGET_DIR does not exist"
   exit 1
 fi
 
-# Extract tar archive
-tar zxvvf "$TAR_FILE" -C "$(dirname "$TARGET_DIR")"
+# Verify tar file is valid before proceeding
+if ! tar -tzf "$TAR_FILE" >/dev/null 2>&1; then
+  echo "Error: Tar file $TAR_FILE is corrupted or invalid"
+  exit 1
+fi
+
+# Determine how many leading components to strip from the tarball
+# We count the number of directory separators in the first entry
+# e.g., "vue/v2/" -> 2 slashes -> strip 2, "react/" -> 1 slash -> strip 1
+# Use a temporary file to avoid broken pipe errors when piping tar output
+TEMP_LIST=$(mktemp)
+trap "rm -f $TEMP_LIST" EXIT
+if ! tar -tf "$TAR_FILE" > "$TEMP_LIST" 2>/dev/null; then
+  echo "Error: Could not read tar file $TAR_FILE"
+  exit 1
+fi
+FIRST_ENTRY=$(head -n 1 "$TEMP_LIST")
+if [ -z "$FIRST_ENTRY" ]; then
+  echo "Error: Tar file $TAR_FILE appears to be empty"
+  exit 1
+fi
+STRIP_COMPONENTS=$(echo "$FIRST_ENTRY" | tr -cd '/' | wc -c)
+rm -f "$TEMP_LIST"
+trap - EXIT
+
+# Clean up target directory except for .git and node_modules to ensure a clean sync
+# This allows 'git add -A' to detect deletions
+find "$TARGET_DIR" -mindepth 1 -maxdepth 1 ! -name ".git" ! -name "node_modules" -exec rm -rf {} +
+
+# Extract tar archive directly into the target directory, stripping the prefix
+# Use explicit error handling to catch any extraction failures
+if ! tar zxf "$TAR_FILE" -C "$TARGET_DIR" --strip-components="${STRIP_COMPONENTS// /}"; then
+  echo "Error: Failed to extract tar file $TAR_FILE to $TARGET_DIR"
+  exit 1
+fi
 
 # Add all changes and commit
 cd "$TARGET_DIR"
 git add -A
-if git commit -m "chore: sync with web-shim-codegen v$VERSION"; then
+if git commit -m "build: sync with web-shim-codegen v$VERSION"; then
   echo "$REPO_NAME repository has been updated"
 else
   echo "$REPO_NAME repository has NOT been updated, no changes to commit"

src/static/.releaserc.json

@@ -69,6 +69,11 @@
               "section": "Documentation",
               "hidden": false
             },
+            {
+              "type": "build",
+              "section": "Build System",
+              "hidden": false
+            },
             {
               "type": "deps",
               "section": "Dependency Updates",

src/static/react/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-onesignal",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "React OneSignal Module: Make it easy to integrate OneSignal with your React App!",
   "contributors": [
     {