Merge branch 'main' into update-xcode-policy

Author: kevintse328

.circleci/config.yml

@@ -63,35 +63,44 @@ jobs:
           keys:
             - ui-bundle-v1-{{ checksum "ui/package-lock.json" }}-{{ checksum "ui/gulpfile.js" }}
             - ui-bundle-v1-{{ checksum "ui/package-lock.json" }}
-            - ui-bundle-v1-
       - run:
           name: Check if UI rebuild needed
           command: |
             set -e
             echo "[INFO] Checking if UI rebuild is necessary..."
 
-            # Check if UI bundle exists from cache
-            if [ -f "ui-bundle.zip" ]; then
-              echo "[INFO] UI bundle found in cache"
-
-              # Determine base branch for comparison
-              if [ "${CIRCLE_BRANCH}" = "main" ]; then
-                BASE_REF="HEAD~1"
-                echo "[INFO] On main branch, comparing against HEAD~1"
-              else
-                BASE_REF="origin/main"
-                echo "[INFO] On feature branch, comparing against origin/main"
-              fi
+            # Determine base branch for comparison
+            if [ "${CIRCLE_BRANCH}" = "main" ]; then
+              BASE_REF="HEAD~1"
+              echo "[INFO] On main branch, comparing against HEAD~1"
+            else
+              BASE_REF="origin/main"
+              echo "[INFO] On feature branch, comparing against origin/main"
+            fi
+
+            # Check for dependency file changes (forces full UI rebuild)
+            DEPENDENCY_FILES="package.json package-lock.json ui/package.json ui/package-lock.json"
+            DEPENDENCY_CHANGED=false
 
-              # Check if ui/ directory has changes
-              if git diff --quiet $BASE_REF HEAD -- ui/; then
-                echo "[INFO] No UI changes detected, skipping UI rebuild"
-                echo "export SKIP_UI_BUILD=true" >> $BASH_ENV
-              else
-                echo "[INFO] UI changes detected, will rebuild UI bundle"
+            for file in $DEPENDENCY_FILES; do
+              if ! git diff --quiet $BASE_REF HEAD -- "$file" 2>/dev/null; then
+                echo "[INFO] Dependency file changed: $file"
+                DEPENDENCY_CHANGED=true
               fi
-            else
+            done
+
+            if [ "$DEPENDENCY_CHANGED" = true ]; then
+              echo "[INFO] Dependency changes detected, forcing UI rebuild"
+              echo "export SKIP_UI_BUILD=false" >> $BASH_ENV
+            elif [ ! -f "ui-bundle.zip" ]; then
               echo "[INFO] No cached UI bundle found, will build UI"
+              echo "export SKIP_UI_BUILD=false" >> $BASH_ENV
+            elif git diff --quiet $BASE_REF HEAD -- ui/; then
+              echo "[INFO] No UI changes detected, skipping UI rebuild"
+              echo "export SKIP_UI_BUILD=true" >> $BASH_ENV
+            else
+              echo "[INFO] UI changes detected, will rebuild UI bundle"
+              echo "export SKIP_UI_BUILD=false" >> $BASH_ENV
             fi
       - run:
           name: Build UI bundle (conditional)