nx-react-native-cli 2.7.0 → 2.7.1

package/templates/shared/apps/mobile/scripts/setup-ios-dev-scheme.rb

@@ -157,6 +157,24 @@ def upsert_info_plist_display_name(app_target, ios_dir, project_name)
   updated
 end
 
+def upsert_info_plist_encryption_flag(app_target, ios_dir, project_name)
+  paths = resolve_info_plist_paths(app_target, ios_dir, project_name)
+  updated = []
+
+  paths.each do |path|
+    next unless File.exist?(path)
+
+    plist = Xcodeproj::Plist.read_from_path(path) || {}
+    next if plist['ITSAppUsesNonExemptEncryption'] == false
+
+    plist['ITSAppUsesNonExemptEncryption'] = false
+    Xcodeproj::Plist.write_to_path(plist, path)
+    updated << "Info.plist ITSAppUsesNonExemptEncryption=false at #{path}"
+  end
+
+  updated
+end
+
 def update_scheme_configuration(doc, action_name, build_configuration)
   action = REXML::XPath.first(doc, "//#{action_name}")
   raise "Missing #{action_name} in source scheme." unless action
@@ -301,6 +319,81 @@ def upsert_firebase_environment_script_phase(app_target)
   phase_status
 end
 
+def upsert_podfile_node_require_and_permissions(podfile_path)
+  return :missing unless File.exist?(podfile_path)
+
+  content = File.read(podfile_path)
+  updated = content.dup
+  changes = []
+
+  # Step 1: Replace old inline require with node_require function if needed
+  unless updated.include?('def node_require(script)')
+    old_require_pattern = /# Resolve react_native_pods\.rb with node to allow for hoisting\nrequire Pod::Executable\.execute_command\('node', \['-p',\n\s*'require\.resolve\(\n\s*"react-native\/scripts\/react_native_pods\.rb",\n\s*\{paths: \[process\.argv\[1\]\]\},\n\s*\)', __dir__\]\)\.strip/m
+
+    node_require_block = <<~RUBY.chomp
+      def node_require(script)
+        # Resolve script with node to allow for hoisting
+        require Pod::Executable.execute_command('node', ['-p',
+          "require.resolve(
+            '\#{script}',
+            {paths: [process.argv[1]]},
+          )", __dir__]).strip
+      end
+
+      # Use it to require both react-native's and this package's scripts:
+      node_require('react-native/scripts/react_native_pods.rb')
+      node_require('react-native-permissions/scripts/setup.rb')
+    RUBY
+
+    if updated.match?(old_require_pattern)
+      updated.sub!(old_require_pattern, node_require_block)
+      changes << 'node_require function (replaced inline require)'
+    end
+  end
+
+  # Step 2: Add setup_permissions after prepare_react_native_project! if not present
+  unless updated.include?('setup_permissions')
+    permissions_block = <<~RUBY
+
+      # Uncomment the permissions you need
+      setup_permissions([
+        # 'AppTrackingTransparency',
+        # 'Bluetooth',
+        # 'Calendars',
+        # 'CalendarsWriteOnly',
+        # 'Camera',
+        # 'Contacts',
+        # 'FaceID',
+        # 'LocationAccuracy',
+        # 'LocationAlways',
+        # 'LocationWhenInUse',
+        # 'MediaLibrary',
+        # 'Microphone',
+        # 'Motion',
+        'Notifications',
+        # 'PhotoLibrary',
+        # 'PhotoLibraryAddOnly',
+        # 'Reminders',
+        # 'Siri',
+        # 'SpeechRecognition',
+        # 'StoreKit',
+      ])
+    RUBY
+
+    if updated.include?('prepare_react_native_project!')
+      updated.sub!(/prepare_react_native_project!\s*\n/) do |match|
+        "#{match}#{permissions_block}"
+      end
+      changes << 'setup_permissions block'
+    end
+  end
+
+  return :unchanged if updated == content
+
+  File.write(podfile_path, updated)
+  changes
+end
+
 ios_dir = File.join(Dir.pwd, 'ios')
 project_path = Dir.glob(File.join(ios_dir, '*.xcodeproj')).first
 raise 'Could not find an .xcodeproj under ios/.' unless project_path
@@ -330,6 +423,7 @@ changes.concat(upsert_product_bundle_identifier(app_target, base_bundle_identifi
 base_product_name = extract_base_product_name(app_target)
 changes.concat(upsert_product_name(app_target, base_product_name))
 changes.concat(upsert_info_plist_display_name(app_target, ios_dir, project_name))
+changes.concat(upsert_info_plist_encryption_flag(app_target, ios_dir, project_name))
 firebase_phase_status = upsert_firebase_environment_script_phase(app_target)
 changes << "Firebase plist run script #{firebase_phase_status}" unless firebase_phase_status == 'existing'
 
@@ -359,9 +453,15 @@ formatter.write(scheme_doc.root, output)
 output << "\n"
 File.write(dev_scheme_path, output)
 
-podfile_status = upsert_podfile_project_mapping(File.join(ios_dir, 'Podfile'), project_name)
+podfile_path = File.join(ios_dir, 'Podfile')
+podfile_status = upsert_podfile_project_mapping(podfile_path, project_name)
 changes << 'Podfile project mapping' if podfile_status == :updated
 
+node_require_status = upsert_podfile_node_require_and_permissions(podfile_path)
+if node_require_status.is_a?(Array)
+  node_require_status.each { |change| changes << "Podfile #{change}" }
+end
+
 puts 'Configured iOS build configurations and Dev scheme.'
 if changes.empty?
   puts 'No new build configurations were created (already configured).'

package/templates/shared/apps/mobile/src/app/index.tsx

@@ -1,57 +1,21 @@
-import { createAsyncStoragePersister } from '@tanstack/query-async-storage-persister';
-import { QueryClient } from '@tanstack/react-query';
-import { AsyncStorage, PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
+import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
 import React from 'react';
 import { LogBox } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import 'react-native-get-random-values';
 import { KeyboardProvider } from 'react-native-keyboard-controller';
-import { createMMKV } from 'react-native-mmkv';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { useDeviceContext } from 'twrnc';
 
+import { persistOptions, queryClient } from './query-client';
+
 import { StorageManager } from '@/components';
-import CONFIG from '@/config';
 import ApplicationRoutes from '@/routes';
 import { tw } from '@/tailwind';
 import 'react-native-url-polyfill/auto';
 
 LogBox.ignoreLogs(['VirtualizedLists', 'onAnimatedValueUpdate']);
 
-const CACHE_TIME = 0;
-const STALE_TIME = 0;
-
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      staleTime: STALE_TIME,
-    },
-  },
-});
-
-const storage = createMMKV({
-  encryptionKey: CONFIG.STORAGE_KEY,
-  id: 'react-query-persist',
-});
-
-export const MmkvStorage: AsyncStorage = {
-  getItem: (name) => {
-    const value = storage.getString(name);
-
-    return value ?? null;
-  },
-  removeItem: (name) => {
-    storage.remove(name);
-  },
-  setItem: (name, value) => storage.set(name, value),
-};
-
-const persister = createAsyncStoragePersister({
-  storage: MmkvStorage as AsyncStorage,
-});
-
-const persistOptions = { maxAge: CACHE_TIME, persister };
-
 function Application() {
   useDeviceContext(tw, {
     initialColorScheme: 'light',

package/templates/shared/apps/mobile/src/app/query-client.ts

@@ -0,0 +1,40 @@
+import { createAsyncStoragePersister } from '@tanstack/query-async-storage-persister';
+import { QueryClient } from '@tanstack/react-query';
+import { AsyncStorage } from '@tanstack/react-query-persist-client';
+import { createMMKV } from 'react-native-mmkv';
+
+import CONFIG from '@/config';
+
+const CACHE_TIME = 0;
+const STALE_TIME = 0;
+
+export const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      staleTime: STALE_TIME,
+    },
+  },
+});
+
+const storage = createMMKV({
+  encryptionKey: CONFIG.STORAGE_KEY,
+  id: 'react-query-persist',
+});
+
+export const MmkvStorage: AsyncStorage = {
+  getItem: (name) => {
+    const value = storage.getString(name);
+
+    return value ?? null;
+  },
+  removeItem: (name) => {
+    storage.remove(name);
+  },
+  setItem: (name, value) => storage.set(name, value),
+};
+
+const persister = createAsyncStoragePersister({
+  storage: MmkvStorage as AsyncStorage,
+});
+
+export const persistOptions = { maxAge: CACHE_TIME, persister };

package/templates/shared/apps/mobile/src/components/atoms/KeyboardAwareScrollView/keyboard-aware-scroll-view.component.tsx

@@ -67,6 +67,7 @@ export function KeyboardAwareScrollView(props: Props) {
       refreshControl={refreshControl}
       scrollEventThrottle={16}
       ScrollViewComponent={ScrollViewComponent}
+      showsVerticalScrollIndicator={false}
       style={style}
       onScroll={onScroll}
       {...rest}

package/templates/shared/apps/mobile/src/components/molecules/ScreenContainer/screen-container.component.tsx

@@ -81,7 +81,7 @@ export function ScreenContainer(props: Props) {
           <KeyboardAwareScrollView
             containerStyle={defaultContainerStyle}
             refreshControl={refreshControl as ReactElement<RefreshControlProps>}
-            scrollViewRef={scrollViewRef}
+            scrollViewRef={scrollViewRef as React.RefObject<RNScrollView>}
             onScroll={onScroll}
           >
             {children}
@@ -104,7 +104,7 @@ export function ScreenContainer(props: Props) {
         <KeyboardAwareScrollView
           containerStyle={defaultContainerStyle}
           refreshControl={refreshControl as ReactElement<RefreshControlProps>}
-          scrollViewRef={scrollViewRef}
+          scrollViewRef={scrollViewRef as React.RefObject<RNScrollView>}
           onScroll={onScroll}
         >
           {children}

package/templates/shared/apps/mobile/src/routes/index.tsx

@@ -2,6 +2,7 @@ import { DefaultTheme, NavigationContainer, Theme } from '@react-navigation/nati
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import React, { useEffect } from 'react';
 import { StatusBar } from 'react-native';
+import BootSplash from 'react-native-bootsplash';
 
 import CONFIG from '@/config';
 import { Routes } from '@/routes';
@@ -50,7 +51,12 @@ export default function ApplicationRoutes() {
   );
 
   return (
-    <NavigationContainer theme={navigationTheme}>
+    <NavigationContainer
+      theme={navigationTheme}
+      onReady={() => {
+        BootSplash.hide();
+      }}
+    >
       <RootStack.Navigator initialRouteName={initialRouteName} screenOptions={screenOptions}>
         {screens}
       </RootStack.Navigator>