Merge branch 'main' into feat/cli

Author: artus9033

.github/actions/setup/action.yml

@@ -5,13 +5,13 @@ runs:
   using: composite
   steps:
     - name: Setup Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@65d868f8d4d85d7d4abb7de0875cde3fcc8798f5 # v6
       with:
         node-version: 'lts/*'
         cache: 'yarn'
 
     - name: Restore turbo cache
-      uses: actions/cache@v5
+      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
       with:
         path: |
           .turbo

.github/workflows/ci.yml

@@ -6,16 +6,17 @@ on:
   pull_request:
     branches: [main]
 
-env:
-  USE_CCACHE: 1
+concurrency:
+  group: pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
 
 jobs:
   build-lint:
     name: Build & static code analysis
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -40,16 +41,19 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@6f229686ee4375cc4a86b2514c89bac4930e82c4 # v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@5d7b2146334bacf88728daaa70414a99f5164e0f # v5
         with:
           distribution: 'zulu'
           java-version: '17'
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@65d868f8d4d85d7d4abb7de0875cde3fcc8798f5 # v6
         with:
           node-version: 'lts/*'
           cache: 'yarn'
@@ -61,7 +65,7 @@ jobs:
         run: yarn build
 
       - name: Restore android build cache
-        uses: actions/cache@v5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
         with:
           path: |
             apps/TesterIntegrated/kotlin/build
@@ -71,8 +75,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-tester-android-build-
 
-      - name: Restore Gradle cache
-        uses: actions/cache@v5
+      - name: Resture Gradle cache
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
         with:
           path: |
             ~/.gradle/caches
@@ -117,24 +121,21 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
       - name: Use appropriate Xcode version
         uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
           xcode-version: '16'
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@65d868f8d4d85d7d4abb7de0875cde3fcc8798f5 # v6
         with:
           node-version: 'lts/*'
           cache: 'yarn'
 
-      - name: Restore ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@5dd816ae0186f20dfa905997a64104db9a8221c7 # v1.280.0
         with:
           ruby-version: '3.2'
           bundler-cache: true
@@ -146,28 +147,19 @@ jobs:
         run: yarn build
 
       - name: Restore Pods cache
-        uses: actions/cache@v5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
         with:
           path: |
             apps/TesterIntegrated/swift/Pods
           key: ${{ runner.os }}-tester-ios-pods-${{ hashFiles('apps/TesterIntegrated/swift/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-tester-ios-pods-
 
-      - name: Install pods (TesterIntegrated)
+      - name: Install pods
         run: |
           cd apps/TesterIntegrated/swift
           pod install
 
-      - name: Restore iOS build cache
-        uses: actions/cache@v5
-        with:
-          path: |
-            apps/TesterIntegrated/swift/build
-          key: ${{ runner.os }}-tester-ios-build-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-tester-ios-build-
-
       # == IntegratedTester ==
 
       - name: Build integrated iOS tester app

.github/workflows/deploy-docs.yml

@@ -21,14 +21,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
         with:
           fetch-depth: 0 # Not needed if lastUpdated is not enabled
       - name: Setup
         uses: ./.github/actions/setup
 
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@d5606572c479bee637007364c6b4800ac4fc8573 # v5
 
       - name: Install dependencies
         working-directory: docs
@@ -40,7 +40,7 @@ jobs:
           yarn run build
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
         with:
           path: docs/doc_build
 
@@ -55,4 +55,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@854d7aa1b99e4509c4d1b53d69b7ba4eaf39215a # v4.0.5

.github/workflows/gradle-plugin-lint.yml

@@ -13,19 +13,19 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@6f229686ee4375cc4a86b2514c89bac4930e82c4 # v5
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@5d7b2146334bacf88728daaa70414a99f5164e0f # v5
         with:
           distribution: temurin
           java-version: 17
 
       - name: Restore Gradle cache
-        uses: actions/cache@v5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
         with:
           path: |
             ~/.gradle/caches

apps/README.md

@@ -5,4 +5,4 @@ This directory contains demo projects showcasing the usage of the `react-native-
 - `RNApp` - the React Native application that is packaged to AAR and XCFramework archives and integrated into native projects
 - `AndroidApp` - the native Android application that integrates the RNApp AAR package (a "consumer" of the RNApp library)
 - `iOSApp` - the native iOS application that integrates the RNApp XCFramework package (a "consumer" of the RNApp library)
-- TesterIntegrated` - a native tester application that integrates the native projects with and React Native project inside a single application, consuming the brownfield module directly, without packaging to an artifact; this is mostly useful for internal development purposes and is not as meaningful for end users of React Native Brownfield
+- `TesterIntegrated` - a native tester application that integrates the native projects with and React Native project inside a single application, consuming the brownfield module directly, without packaging to an artifact; this is mostly useful for internal development purposes and is not as meaningful for end users of React Native Brownfield

apps/TesterIntegrated/App.tsx

@@ -1,11 +1,13 @@
-import React, { useEffect } from 'react';
-import { StyleSheet, Text, View, Button } from 'react-native';
+import { useEffect } from 'react';
+import { StyleSheet, Text, View, Button, TextInput } from 'react-native';
+import { useStore } from '@callstack/brownie';
 import {
   createNativeStackNavigator,
   type NativeStackScreenProps,
 } from '@react-navigation/native-stack';
 import ReactNativeBrownfield from '@callstack/react-native-brownfield';
 import { NavigationContainer } from '@react-navigation/native';
+import './BrownfieldStore.brownie';
 
 const getRandomValue = () => Math.round(Math.random() * 255);
 const getRandomTheme = () => {
@@ -22,10 +24,18 @@ const getRandomTheme = () => {
   };
 };
 
-type Props = NativeStackScreenProps<RootStackParamList, 'Home'>;
+type RootStackParamList = {
+  Home: { theme: { primary: string; secondary: string } };
+};
 
-function HomeScreen({ navigation, route }: Props) {
-  const colors = route.params?.theme || getRandomTheme();
+type HomeScreenProps = NativeStackScreenProps<RootStackParamList, 'Home'>;
+
+const theme = getRandomTheme();
+
+function HomeScreen({ navigation, route }: HomeScreenProps) {
+  const colors = route.params?.theme || theme;
+  const [counter, setState] = useStore('BrownfieldStore', (s) => s.counter);
+  const [user] = useStore('BrownfieldStore', (s) => s.user);
 
   useEffect(() => {
     const unsubscribe = navigation.addListener('focus', () => {
@@ -37,10 +47,29 @@ function HomeScreen({ navigation, route }: Props) {
 
   return (
     <View style={[styles.container, { backgroundColor: colors.primary }]}>
-      <Text style={[styles.text, { color: colors.secondary }]}>
+      <Text style={[styles.title, { color: colors.secondary }]}>
         React Native Screen
       </Text>
 
+      <Text style={[styles.text, { color: colors.secondary }]}>
+        Count: {counter}
+      </Text>
+
+      <TextInput
+        style={styles.input}
+        value={user.name}
+        onChangeText={(text) =>
+          setState((prev) => ({ user: { ...prev.user, name: text } }))
+        }
+        placeholder="User name"
+      />
+
+      <Button
+        onPress={() => setState((prev) => ({ counter: prev.counter + 1 }))}
+        color={colors.secondary}
+        title="Increment"
+      />
+
       <Button
         onPress={() => {
           navigation.push('Home', {
@@ -65,9 +94,6 @@ function HomeScreen({ navigation, route }: Props) {
     </View>
   );
 }
-type RootStackParamList = {
-  Home: { theme: { primary: string; secondary: string } };
-};
 
 const Stack = createNativeStackNavigator<RootStackParamList>();
 
@@ -87,9 +113,22 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
-  text: {
+  title: {
     fontSize: 30,
     fontWeight: 'bold',
     margin: 10,
   },
+  text: {
+    fontSize: 16,
+    margin: 5,
+  },
+  input: {
+    borderWidth: 1,
+    borderColor: '#ccc',
+    borderRadius: 8,
+    padding: 10,
+    width: 200,
+    marginVertical: 10,
+    backgroundColor: '#fff',
+  },
 });

apps/TesterIntegrated/BrownfieldStore.brownie.ts

@@ -0,0 +1,21 @@
+import type { BrownieStore } from '@callstack/brownie';
+
+interface BrownfieldStore extends BrownieStore {
+  counter: number;
+  user: {
+    name: string;
+  };
+}
+
+interface SettingsStore extends BrownieStore {
+  theme: 'light' | 'dark';
+  notificationsEnabled: boolean;
+  privacyMode: boolean;
+}
+
+declare module '@callstack/brownie' {
+  interface BrownieStores {
+    BrownfieldStore: BrownfieldStore;
+    SettingsStore: SettingsStore;
+  }
+}

apps/TesterIntegrated/kotlin/app/src/main/java/com/callstack/kotlinexample/Generated/BrownfieldStore.kt

@@ -0,0 +1,14 @@
+package com.callstack.kotlinexample
+
+data class BrownfieldStore (
+    val counter: Double,
+    val user: User
+) {
+    companion object {
+        const val STORE_NAME = "BrownfieldStore"
+    }
+}
+
+data class User (
+    val name: String
+)

apps/TesterIntegrated/kotlin/app/src/main/java/com/callstack/kotlinexample/Generated/SettingsStore.kt

@@ -0,0 +1,16 @@
+package com.callstack.kotlinexample
+
+data class SettingsStore (
+    val notificationsEnabled: Boolean,
+    val privacyMode: Boolean,
+    val theme: Theme
+) {
+    companion object {
+        const val STORE_NAME = "SettingsStore"
+    }
+}
+
+enum class Theme {
+    Dark,
+    Light
+}

apps/TesterIntegrated/metro.config.cjs

@@ -1,16 +1,11 @@
-const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
 const path = require('path');
+const { getDefaultConfig } = require('@react-native/metro-config'); // Import from `@expo/metro-config` if using Expo CLI
+const { withMetroConfig } = require('react-native-monorepo-config');
 
-const root = path.resolve(__dirname, '../..');
-
-/**
- * Metro configuration
- * https://reactnative.dev/docs/metro
- *
- * @type {import('@react-native/metro-config').MetroConfig}
- */
-const config = {
-  watchFolders: [root],
-};
-
-module.exports = mergeConfig(getDefaultConfig(__dirname), config);
+module.exports = withMetroConfig(
+  getDefaultConfig(__dirname), // Metro config to extend
+  {
+    root: path.resolve(__dirname, '../..'), // Path to the monorepo root
+    dirname: __dirname, // Path to the current directory
+  }
+);