nx-react-native-cli 2.6.12 → 2.7.1

package/templates/shared/apps/mobile/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,28 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+      android:name=".MainApplication"
+      android:label="@string/app_name"
+      android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher"
+      android:allowBackup="false"
+      tools:replace="android:allowBackup"
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true"
+      android:networkSecurityConfig="@xml/network_security_config">
+      <activity
+        android:name=".MainActivity"
+        android:label="@string/app_name"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+        android:launchMode="singleTask"
+        android:windowSoftInputMode="adjustResize"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+      </activity>
+    </application>
+</manifest>

package/templates/shared/apps/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

package/templates/shared/apps/mobile/android/app/src/main/res/styles.xml

@@ -0,0 +1,14 @@
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
+        <item name="colorAccent">#1185e6</item>
+        <item name="colorPrimary">#1185e6</item>
+    </style>
+
+    <style name="BootTheme" parent="Theme.BootSplash">
+        <item name="bootSplashBackground">@color/bootsplash_background</item>
+        <item name="bootSplashLogo">@drawable/bootsplash_logo</item>
+        <item name="postBootSplashTheme">@style/AppTheme</item>
+    </style>
+</resources>

package/templates/shared/apps/mobile/deploy.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+# Interactive deployment - picks platform, lane, and environment
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+FASTLANE_DIR="$SCRIPT_DIR/fastlane"
+
+source "$SCRIPT_DIR/picker.sh"
+
+# --- Platform selection ---
+PLATFORMS=("ios" "android")
+pick "Select a platform:" "${PLATFORMS[@]}" --key "deploy-platform"
+SELECTED_PLATFORM="${PLATFORMS[$PICKED_INDEX]}"
+
+# --- Lane selection (dynamically parsed from Fastfile) ---
+LANES=$(python3 -c "
+import re
+with open('$FASTLANE_DIR/Fastfile') as f:
+    content = f.read()
+
+# Find the platform block for the selected platform
+pattern = r'platform\s+:$SELECTED_PLATFORM\s+do(.*?)^end'
+match = re.search(pattern, content, re.DOTALL | re.MULTILINE)
+if match:
+    block = match.group(1)
+    # Find all lane declarations
+    lanes = re.findall(r'lane\s+:(\w+)\s+do', block)
+    for lane in lanes:
+        print(lane)
+")
+
+if [ -z "$LANES" ]; then
+  echo "No lanes found for platform: $SELECTED_PLATFORM"
+  exit 1
+fi
+
+LANE_ARRAY=()
+while IFS= read -r line; do
+  [ -z "$line" ] && continue
+  LANE_ARRAY+=("$line")
+done <<< "$LANES"
+
+pick "Select a lane:" "${LANE_ARRAY[@]}" --key "deploy-lane-$SELECTED_PLATFORM"
+SELECTED_LANE="${LANE_ARRAY[$PICKED_INDEX]}"
+
+# --- Environment selection (dynamically from .env.* files) ---
+ENV_ARRAY=()
+for env_file in "$FASTLANE_DIR"/.env.*; do
+  [ -f "$env_file" ] || continue
+  env_name=$(basename "$env_file" | sed 's/^\.env\.//')
+  # Skip template
+  if [ "$env_name" = "template" ]; then
+    continue
+  fi
+  ENV_ARRAY+=("$env_name")
+done
+
+if [ ${#ENV_ARRAY[@]} -eq 0 ]; then
+  echo ""
+  echo "No environment files found. Create at least one of:"
+  echo "  fastlane/.env.development"
+  echo "  fastlane/.env.staging"
+  echo "  fastlane/.env.production"
+  exit 1
+fi
+
+pick "Select an environment:" "${ENV_ARRAY[@]}" --key "deploy-env"
+SELECTED_ENV="${ENV_ARRAY[$PICKED_INDEX]}"
+
+# --- Safeguard: check for local URLs in .env ---
+APP_ENV="$SCRIPT_DIR/.env"
+if [ -f "$APP_ENV" ]; then
+  if grep -qiE 'localhost|192\.168\.' "$APP_ENV"; then
+    echo ""
+    echo "Deployment aborted: apps/mobile/.env contains a local URL (localhost or 192.168.*)."
+    echo "Update your .env to point to the correct remote server before deploying."
+    exit 1
+  fi
+fi
+
+# --- Confirmation ---
+echo ""
+echo "Deploy summary:"
+echo "  Platform:    $SELECTED_PLATFORM"
+echo "  Lane:        $SELECTED_LANE"
+if [ -n "$SELECTED_ENV" ]; then
+  echo "  Environment: $SELECTED_ENV"
+fi
+echo ""
+
+CONFIRM_ARRAY=("Yes" "No")
+pick "Proceed with deployment?" "${CONFIRM_ARRAY[@]}"
+if [ "$PICKED_INDEX" -ne 0 ]; then
+  echo "Deployment cancelled."
+  exit 0
+fi
+
+# --- Run fastlane ---
+echo ""
+FASTLANE_CMD="bundle exec fastlane $SELECTED_PLATFORM $SELECTED_LANE"
+if [ -n "$SELECTED_ENV" ]; then
+  FASTLANE_CMD="$FASTLANE_CMD --env $SELECTED_ENV"
+fi
+
+echo "Running: $FASTLANE_CMD"
+echo ""
+
+cd "$SCRIPT_DIR" && $FASTLANE_CMD

package/templates/shared/apps/mobile/package.json

@@ -1,82 +1,5 @@
 {
   "name": "mobile",
   "version": "0.0.1",
-  "private": true,
-  "scripts": {
-    "android:connect": "adb reverse tcp:8081 tcp:8081",
-    "start": "npx nx start mobile --skip-nx-cache",
-    "run-ios": "./ios-only.sh npx nx run-ios mobile --skip-nx-cache --scheme=Dev --simulator='iPhone 16'",
-    "run-android": "npx nx run-android mobile --skip-nx-cache",
-    "ensure-symlink": "npx nx ensure-symlink mobile",
-    "sync-deps": "npx nx sync-deps mobile",
-    "pod-install": "./ios-only.sh npx nx pod-install mobile",
-    "export-node-binary": "./export-node-binary.sh",
-    "bundle:pod-install": "./ios-only.sh 'cd ios && bundle install && bundle exec pod install --repo-update && npm run export-node-binary'",
-    "pre-build": "npm run ensure-symlink && npm run sync-deps && npm run pod-install",
-  "list:ios-configurations": "./ios-only.sh 'cd ios && xcodebuild -list'",
-    "list:ios-devices": "./ios-only.sh xcrun xctrace list devices",
-    "xcode": "./ios-only.sh xed -b ios",
-    "touch-xcode": "./ios-only.sh 'cd ios && touch .xcode.env'",
-    "check-env:mobile": "cd ../.. && npm run check-env:mobile",
-    "setup-fastlane": "rbenv local && bundle install && bundle update",
-    "deploy-android:dev": "bundle exec fastlane android dev --env development",
-    "deploy-ios:dev": "./ios-only.sh 'bundle exec fastlane ios dev --env development'",
-    "ios-certificates": "./ios-only.sh 'npm run setup-fastlane && bundle exec fastlane ios certificates --env development'"
-  },
-  "dependencies": {
-    "@gorhom/bottom-sheet": "*",
-    "@hookform/resolvers": "*",
-    "@react-native-community/datetimepicker": "*",
-    "@react-native-community/hooks": "*",
-    "@react-native/metro-config": "*",
-    "@react-navigation/core": "*",
-    "@react-navigation/material-top-tabs": "*",
-    "@react-navigation/native-stack": "*",
-    "@react-navigation/native": "*",
-    "@react-navigation/routers": "*",
-    "@react-navigation/stack": "*",
-    "@shopify/react-native-skia": "*",
-    "@tanstack/query-async-storage-persister": "*",
-    "@tanstack/query-core": "*",
-    "@tanstack/query-sync-storage-persister": "*",
-    "@tanstack/react-query-persist-client": "*",
-    "@tanstack/react-query": "*",
-    "@testing-library/jest-native": "*",
-    "@testing-library/react-native": "*",
-    "axios": "*",
-    "babel-plugin-module-resolver": "*",
-    "dayjs": "*",
-    "jotai-optics": "*",
-    "jotai": "*",
-    "lodash": "*",
-    "metro-config": "*",
-    "react-hook-form": "*",
-    "react-native-dotenv": "*",
-    "react-native-gesture-handler": "*",
-    "react-native-get-random-values": "*",
-    "react-native-haptic-feedback": "*",
-    "react-native-keyboard-controller": "*",
-    "react-native-mmkv": "*",
-    "react-native-modal-datetime-picker": "*",
-    "react-native-modal": "*",
-    "react-native-nitro-modules": "*",
-    "react-native-pager-view": "*",
-    "react-native-reanimated": "*",
-    "react-native-safe-area-context": "*",
-    "react-native-screens": "*",
-    "react-native-simple-toast": "*",
-    "react-native-svg-transformer": "*",
-    "react-native-svg": "*",
-    "react-native-turbo-image": "*",
-    "react-native-url-polyfill": "*",
-    "react-native-worklets": "*",
-    "react-native": "*",
-    "react": "*",
-    "tailwindcss": "*",
-    "twrnc": "*",
-    "uuid": "*",
-    "zod-validation-error": "*",
-    "zod": "*",
-    "zustand": "*"
-  }
+  "private": true
 }

package/templates/shared/apps/mobile/picker.sh

@@ -0,0 +1,151 @@
+#!/bin/bash
+# Arrow key menu picker with scrolling and recent selection memory
+# Usage: source picker.sh
+#   pick "Title" options_array                    # no memory
+#   pick "Title" options_array --key "cache-key"  # remembers last pick
+
+PICKER_CACHE_DIR="${HOME}/.cache/nxrn-picker"
+
+pick() {
+  local title="$1"
+  shift
+
+  # Parse options and --key flag
+  local raw_options=()
+  local cache_key=""
+  while [ $# -gt 0 ]; do
+    if [ "$1" = "--key" ]; then
+      cache_key="$2"
+      shift 2
+    else
+      raw_options+=("$1")
+      shift
+    fi
+  done
+
+  local options=("${raw_options[@]}")
+  local count=${#options[@]}
+  local selected=0
+
+  # If cache key provided, sort last-used to top
+  local reordered_indices=()
+  if [ -n "$cache_key" ] && [ -f "$PICKER_CACHE_DIR/$cache_key" ]; then
+    local last_pick
+    last_pick=$(cat "$PICKER_CACHE_DIR/$cache_key")
+
+    # Find the last-used item and move it to front
+    local found_idx=-1
+    for i in "${!options[@]}"; do
+      if [ "${options[$i]}" = "$last_pick" ]; then
+        found_idx=$i
+        break
+      fi
+    done
+
+    if [ $found_idx -ge 0 ]; then
+      local new_options=("${options[$found_idx]}")
+      reordered_indices=($found_idx)
+      for i in "${!options[@]}"; do
+        if [ "$i" -ne $found_idx ]; then
+          new_options+=("${options[$i]}")
+          reordered_indices+=($i)
+        fi
+      done
+      options=("${new_options[@]}")
+    fi
+  fi
+
+  # If no reorder happened, build identity mapping
+  if [ ${#reordered_indices[@]} -eq 0 ]; then
+    for i in "${!options[@]}"; do
+      reordered_indices+=($i)
+    done
+  fi
+
+  # Max visible rows
+  local term_height=$(tput lines)
+  local max_visible=$((term_height - 4))
+  if [ $max_visible -gt $count ]; then
+    max_visible=$count
+  fi
+  if [ $max_visible -lt 3 ]; then
+    max_visible=3
+  fi
+
+  local scroll_offset=0
+
+  tput civis
+  trap 'tput cnorm' RETURN
+
+  draw_menu() {
+    for ((i = 0; i < max_visible; i++)); do
+      local idx=$((scroll_offset + i))
+      tput el
+      if [ "$idx" -eq $selected ]; then
+        echo -e "  \033[7m> ${options[$idx]}\033[0m"
+      else
+        echo "    ${options[$idx]}"
+      fi
+    done
+    tput el
+    if [ $count -gt $max_visible ]; then
+      echo -e "  \033[2m[$((selected + 1))/$count]\033[0m"
+    else
+      echo ""
+    fi
+  }
+
+  echo ""
+  echo "$title"
+  draw_menu
+
+  local visible_lines=$((max_visible + 1))
+
+  while true; do
+    IFS= read -rsn1 key
+
+    if [[ "$key" == $'\x1b' ]]; then
+      read -rsn2 rest
+      key+="$rest"
+    fi
+
+    case "$key" in
+      $'\x1b[A' | k)
+        ((selected--))
+        if [ $selected -lt 0 ]; then
+          selected=$((count - 1))
+          scroll_offset=$((count - max_visible))
+          if [ $scroll_offset -lt 0 ]; then scroll_offset=0; fi
+        elif [ $selected -lt $scroll_offset ]; then
+          scroll_offset=$selected
+        fi
+        ;;
+      $'\x1b[B' | j)
+        ((selected++))
+        if [ $selected -ge $count ]; then
+          selected=0
+          scroll_offset=0
+        elif [ $selected -ge $((scroll_offset + max_visible)) ]; then
+          scroll_offset=$((selected - max_visible + 1))
+        fi
+        ;;
+      '')
+        break
+        ;;
+    esac
+
+    tput cuu $visible_lines
+    draw_menu
+  done
+
+  tput cnorm
+
+  # Save selection to cache
+  if [ -n "$cache_key" ]; then
+    mkdir -p "$PICKER_CACHE_DIR"
+    echo "${options[$selected]}" > "$PICKER_CACHE_DIR/$cache_key"
+  fi
+
+  # Map back to original index
+  PICKED_INDEX=${reordered_indices[$selected]}
+}

package/templates/shared/apps/mobile/pod-install.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# Smart pod install - only runs when dependencies have changed
+# Compares checksum of Podfile + root package.json deps against cached value
+
+if [[ "$OSTYPE" != "darwin"* ]]; then
+  echo "Skipping pod install on non-macOS platform"
+  exit 0
+fi
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+IOS_DIR="$SCRIPT_DIR/ios"
+ROOT_DIR="$SCRIPT_DIR/../.."
+CHECKSUM_FILE="$IOS_DIR/.pods-checksum"
+
+# Generate checksum from files that affect pods
+CURRENT_CHECKSUM=$(cat \
+  "$IOS_DIR/Podfile" \
+  "$ROOT_DIR/package.json" \
+  "$ROOT_DIR/yarn.lock" \
+  2>/dev/null | shasum -a 256 | awk '{print $1}')
+
+# Compare with cached checksum
+if [ -f "$CHECKSUM_FILE" ]; then
+  CACHED_CHECKSUM=$(cat "$CHECKSUM_FILE")
+  if [ "$CURRENT_CHECKSUM" = "$CACHED_CHECKSUM" ]; then
+    echo "Pods up to date, skipping install."
+    exit 0
+  fi
+fi
+
+echo "Dependencies changed, running pod install..."
+cd "$IOS_DIR" && bundle install && bundle exec pod install
+
+if [ $? -eq 0 ]; then
+  echo "$CURRENT_CHECKSUM" > "$CHECKSUM_FILE"
+  cd "$SCRIPT_DIR" && ./export-node-binary.sh
+else
+  echo "Pod install failed"
+  exit 1
+fi

package/templates/shared/apps/mobile/react-native.config.js

@@ -1,4 +1,19 @@
+const rootPkg = require('../../package.json');
+
+// Dynamically read all dependencies from the root package.json
+// so autolinking discovers native modules without duplicating deps here.
+const allDeps = Object.keys({
+  ...rootPkg.dependencies,
+  ...rootPkg.devDependencies,
+});
+
+const dependencies = {};
+for (const dep of allDeps) {
+  dependencies[dep] = {};
+}
+
 module.exports = {
+  dependencies,
   project: {
     ios: {},
     android: {},

package/templates/shared/apps/mobile/run-android.sh

@@ -0,0 +1,131 @@
+#!/bin/bash
+# Interactive Android launcher - picks variant and device
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+ANDROID_DIR="$SCRIPT_DIR/android"
+
+source "$SCRIPT_DIR/picker.sh"
+
+# --- Variant selection via gradle install tasks ---
+echo ""
+echo "Fetching build variants..."
+
+INSTALL_TASKS=$(cd "$ANDROID_DIR" && ./gradlew app:tasks --group=install --quiet 2>/dev/null | grep "^install" | grep -vi "AndroidTest\|Optimized" | awk '{print $1}')
+
+if [ -z "$INSTALL_TASKS" ]; then
+  echo "Could not read build variants from Gradle"
+  exit 1
+fi
+
+TASK_ARRAY=()
+DISPLAY_ARRAY=()
+while IFS= read -r line; do
+  [ -z "$line" ] && continue
+  TASK_ARRAY+=("$line")
+  DISPLAY_ARRAY+=("${line#install}")
+done <<< "$INSTALL_TASKS"
+
+pick "Select a build variant:" "${DISPLAY_ARRAY[@]}" --key "android-variant"
+SELECTED_TASK="${TASK_ARRAY[$PICKED_INDEX]}"
+SELECTED_VARIANT="${SELECTED_TASK#install}"
+
+# Mode is the full variant name with first letter lowercased (e.g. devDebug, productionRelease)
+MODE="$(tr '[:upper:]' '[:lower:]' <<< "${SELECTED_VARIANT:0:1}")${SELECTED_VARIANT:1}"
+
+# Infer appIdSuffix from flavor (lowercase first char of variant minus build type)
+FLAVOR=$(echo "$SELECTED_VARIANT" | sed -E 's/(Debug|Release)$//' | tr '[:upper:]' '[:lower:]')
+APP_ID_SUFFIX=""
+if [ "$FLAVOR" != "production" ] && [ -n "$FLAVOR" ]; then
+  APP_ID_SUFFIX="$FLAVOR"
+fi
+
+# --- Device selection (booted devices + shutdown AVDs) ---
+DEVICE_ARRAY=()
+DEVICE_IDS=()
+DEVICE_TYPES=() # "booted" or "avd"
+
+# Collect running devices/emulators
+RUNNING_AVDS=()
+DEVICES=$(adb devices -l 2>/dev/null | tail -n +2 | grep -v '^$')
+if [ -n "$DEVICES" ]; then
+  while IFS= read -r line; do
+    [ -z "$line" ] && continue
+    SERIAL=$(echo "$line" | awk '{print $1}')
+    MODEL=$(echo "$line" | grep -o 'model:[^ ]*' | cut -d: -f2)
+
+    if echo "$SERIAL" | grep -q "emulator"; then
+      # Get AVD name for this running emulator
+      AVD_NAME=$(adb -s "$SERIAL" emu avd name 2>/dev/null | head -1 | tr -d '\r')
+      RUNNING_AVDS+=("$AVD_NAME")
+      LABEL="[Booted] $SERIAL${AVD_NAME:+ ($AVD_NAME)}"
+    else
+      LABEL="[Device] $SERIAL${MODEL:+ ($MODEL)}"
+    fi
+
+    DEVICE_ARRAY+=("$LABEL")
+    DEVICE_IDS+=("$SERIAL")
+    DEVICE_TYPES+=("booted")
+  done <<< "$DEVICES"
+fi
+
+# Collect shutdown AVDs
+ALL_AVDS=$(emulator -list-avds 2>/dev/null)
+if [ -n "$ALL_AVDS" ]; then
+  while IFS= read -r avd; do
+    [ -z "$avd" ] && continue
+    # Skip if already running
+    ALREADY_RUNNING=false
+    for running in "${RUNNING_AVDS[@]}"; do
+      if [ "$avd" = "$running" ]; then
+        ALREADY_RUNNING=true
+        break
+      fi
+    done
+    if [ "$ALREADY_RUNNING" = false ]; then
+      DEVICE_ARRAY+=("[Shutdown] $avd")
+      DEVICE_IDS+=("$avd")
+      DEVICE_TYPES+=("avd")
+    fi
+  done <<< "$ALL_AVDS"
+fi
+
+if [ ${#DEVICE_ARRAY[@]} -eq 0 ]; then
+  echo ""
+  echo "No Android devices or AVDs found."
+  exit 1
+fi
+
+pick "Select a device:" "${DEVICE_ARRAY[@]}" --key "android-device"
+SELECTED_INDEX=$PICKED_INDEX
+SELECTED_DEVICE="${DEVICE_IDS[$SELECTED_INDEX]}"
+
+# Boot AVD if shutdown
+if [ "${DEVICE_TYPES[$SELECTED_INDEX]}" = "avd" ]; then
+  echo ""
+  echo "Booting AVD: $SELECTED_DEVICE..."
+  # Launch in a new session so it's fully detached from this script
+  perl -e 'use POSIX "setsid"; setsid(); exec("emulator", "-avd", $ARGV[0], "-no-snapshot-load")' "$SELECTED_DEVICE" </dev/null &>/dev/null &
+
+  # Wait for device to come online
+  echo "Waiting for device to boot..."
+  adb wait-for-device
+  # Wait for boot animation to finish
+  while [ "$(adb shell getprop sys.boot_completed 2>/dev/null | tr -d '\r')" != "1" ]; do
+    sleep 1
+  done
+  echo "Device booted."
+
+  # Get the serial of the newly booted emulator
+  SELECTED_DEVICE=$(adb devices | grep "emulator" | tail -1 | awk '{print $1}')
+fi
+
+echo ""
+echo "Running: task=$SELECTED_TASK mode=$MODE device=$SELECTED_DEVICE"
+echo ""
+
+RN_ARGS="--tasks=$SELECTED_TASK --mode=$MODE --device=$SELECTED_DEVICE"
+if [ -n "$APP_ID_SUFFIX" ]; then
+  RN_ARGS="$RN_ARGS --appIdSuffix=$APP_ID_SUFFIX"
+fi
+
+cd "$SCRIPT_DIR" && npx react-native run-android $RN_ARGS