@callstack/react-native-brownfield 3.2.1 → 3.4.0

package/src/expo-config-plugin/android/withBrownfieldAndroid.ts

@@ -4,7 +4,10 @@ import {
   type ConfigPlugin,
 } from '@expo/config-plugins';
 
-import { modifyRootBuildGradle, modifySettingsGradle } from './gradleHelpers';
+import {
+  modifyRootBuildGradle,
+  modifySettingsGradle,
+} from './utils/gradleHelpers';
 import { withAndroidModuleFiles } from './withAndroidModuleFiles';
 import type { ResolvedBrownfieldPluginConfigWithAndroid } from '../types';
 

package/src/expo-config-plugin/expoUtils.ts

@@ -0,0 +1,12 @@
+import type { ExpoConfig } from '@expo/config-types';
+
+export function getExpoInfo(config: ExpoConfig) {
+  const expoMajor = config.sdkVersion
+    ? parseInt(config.sdkVersion.split('.')[0], 10)
+    : -1;
+  const isExpoPre55 = expoMajor < 55;
+  return {
+    expoMajor,
+    isExpoPre55,
+  };
+}

package/src/expo-config-plugin/ios/podfileHelpers.ts

@@ -6,6 +6,10 @@ const BROWNFIELD_POD_HOOK_MARKER_START =
   '# >>> react-native-brownfield expo phase ordering >>>';
 const BROWNFIELD_POD_HOOK_MARKER_END =
   '# <<< react-native-brownfield expo phase ordering <<<';
+const BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_START =
+  '# >>> react-native-brownfield Expo SDK 55+ swift defines >>>';
+const BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_END =
+  '# <<< react-native-brownfield Expo SDK 55+ swift defines <<<';
 const BROWNFIELD_POST_INTEGRATE_REQUIRE = `require File.join(File.dirname(\`node --print "require.resolve('@callstack/react-native-brownfield/package.json')"\`), "scripts/react_native_brownfield_post_integrate")`;
 const REACT_NATIVE_PODS_REQUIRE_REGEX =
   /^require File\.join\(File\.dirname\(`node --print "require\.resolve\('react-native\/package\.json'\)"`\), "scripts\/react_native_pods"\)\s*$/m;
@@ -49,16 +53,52 @@ ${BROWNFIELD_POD_HOOK_MARKER_END}
   return modifiedPodfile;
 }
 
+function ensureExpoDefinesForSDK55AndAbove(podfile: string): string {
+  if (podfile.includes(BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_START)) {
+    return podfile;
+  }
+
+  const hook = `
+    ${BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_START}
+    installer.pods_project.targets.each do |target|
+      if target.name == 'ReactBrownfield'
+        puts "[Brownfield] Adding definition of EXPO_SDK_GTE_55 to target: #{target.name}"
+
+        target.build_configurations.each do |config|
+          conditions = config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] || '$(inherited)'
+          conditions = conditions.to_s
+          config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = "#{conditions} EXPO_SDK_GTE_55"
+        end
+      end
+    end
+    ${BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_END}
+`;
+
+  const postInstallMatch = podfile.match(
+    /(post_install\s+do\s+\|installer\|\s*\n)((?:(?!^\s*end\s*$)[\s\S])*)(^\s*end\s*$)/m
+  );
+
+  if (postInstallMatch) {
+    const [whole, start, content, end] = postInstallMatch;
+    const updated = `${start}${content.trimEnd()}\n${hook}\n${end}`;
+    return podfile.replace(whole, updated);
+  }
+
+  // if there is no post_install, append one
+  return `${podfile.trimEnd()}\n\npost_install do |installer|\n${hook}\nend\n`;
+}
+
 /**
  * Modifies the Podfile to include the Brownfield framework target
  * @param podfile The original Podfile content
  * @param frameworkName The name of the framework target to add
+ * @param expoMajor The major version of the Expo SDK
  * @returns The modified Podfile content
  */
 export function modifyPodfile(
   podfile: string,
   frameworkName: string,
-  isExpoPre55: boolean
+  expoMajor: number
 ): string {
   // check if the framework target is already included
   if (podfile.includes(`target '${frameworkName}'`)) {
@@ -99,8 +139,11 @@ export function modifyPodfile(
 
   Logger.logDebug(`Added framework target "${frameworkName}" to Podfile`);
 
-  if (isExpoPre55) {
+  if (expoMajor < 55) {
     modifiedPodfile = ensureExpoPhaseOrderingHook(modifiedPodfile);
+  } else {
+    // Expo SDK >= 55
+    modifiedPodfile = ensureExpoDefinesForSDK55AndAbove(modifiedPodfile);
   }
 
   return modifiedPodfile;

package/src/expo-config-plugin/ios/withBrownfieldIos.ts

@@ -14,6 +14,7 @@ import { modifyPodfile } from './podfileHelpers';
 import { withIosFrameworkFiles } from './withIosFrameworkFiles';
 import type { ResolvedBrownfieldPluginConfigWithIos } from '../types';
 import { Logger } from '../logging';
+import { getExpoInfo } from '../expoUtils';
 
 /**
  * iOS Config Plugin for integration with @callstack/react-native-brownfield.
@@ -28,10 +29,8 @@ import { Logger } from '../logging';
 export const withBrownfieldIos: ConfigPlugin<
   ResolvedBrownfieldPluginConfigWithIos
 > = (config, props) => {
-  const expoMajor = config.sdkVersion
-    ? parseInt(config.sdkVersion.split('.')[0], 10)
-    : -1;
-  const isExpoPre55 = expoMajor < 55;
+  const { isExpoPre55, expoMajor } = getExpoInfo(config);
+
   // Step 1: modify the Xcode project to add framework target &
   config = withXcodeProject(config, (xcodeConfig) => {
     const { modResults: project, modRequest } = xcodeConfig;
@@ -81,7 +80,7 @@ export const withBrownfieldIos: ConfigPlugin<
     podfileConfig.modResults.contents = modifyPodfile(
       podfileConfig.modResults.contents,
       frameworkName,
-      isExpoPre55
+      expoMajor
     );
 
     return podfileConfig;

package/src/expo-config-plugin/template/android/ReactNativeHostManager.post55.kt

@@ -0,0 +1,32 @@
+package {{PACKAGE_NAME}}
+
+import android.app.Application
+import android.content.res.Configuration
+import com.callstack.reactnativebrownfield.OnJSBundleLoaded
+import com.callstack.reactnativebrownfield.ReactNativeBrownfield
+import com.facebook.react.PackageList
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
+import expo.modules.ApplicationLifecycleDispatcher
+import expo.modules.ExpoReactHostFactory
+
+object ReactNativeHostManager {
+    fun initialize(application: Application, onJSBundleLoaded: OnJSBundleLoaded? = null) {
+        loadReactNative(application)
+
+        ApplicationLifecycleDispatcher.onApplicationCreate(application)
+
+        val reactHost: ReactHost by lazy {
+            ExpoReactHostFactory.getDefaultReactHost(
+                context = application.applicationContext,
+                packageList = PackageList(application).packages,
+            )
+        }
+
+        ReactNativeBrownfield.initialize(application, reactHost, onJSBundleLoaded)
+    }
+
+    fun onConfigurationChanged(application: Application, newConfig: Configuration) {
+        ApplicationLifecycleDispatcher.onConfigurationChanged(application, newConfig)
+    }
+}

package/src/expo-config-plugin/template/android/build.gradle.kts

@@ -83,7 +83,7 @@ android {
 
 dependencies {
     api("com.facebook.react:react-android:{{RN_VERSION}}")
-    api("com.facebook.react:hermes-android:{{RN_VERSION}}")
+    api("{{HERMES_ARTIFACT}}")
 
     api("io.coil-kt.coil3:coil-compose:3.2.0")
     api("io.coil-kt.coil3:coil-network-okhttp:3.2.0")

package/lib/commonjs/expo-config-plugin/android/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["BROWNFIELD_PLUGIN_VERSION","exports","brownfieldGradlePluginDependency"],"sourceRoot":"../../../../src","sources":["expo-config-plugin/android/constants.ts"],"mappings":"2IAAO,GAAM,CAAAA,yBAAyB,CAAAC,OAAA,CAAAD,yBAAA,CAAG,OAAO,CACzC,GAAM,CAAAE,gCAAgC,CAAAD,OAAA,CAAAC,gCAAA,CAAG,2DAA2DF,yBAAyB,IAAI","ignoreList":[]}

package/lib/commonjs/expo-config-plugin/android/gradleHelpers.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports,"__esModule",{value:true});exports.modifyRootBuildGradle=modifyRootBuildGradle;exports.modifySettingsGradle=modifySettingsGradle;var _constants=require("./constants");var _logging=require("../logging");function modifyRootBuildGradle(contents){if(contents.includes('brownfield-gradle-plugin')){_logging.Logger.logDebug('Brownfield Gradle plugin already in root build.gradle, skipping');return contents;}_logging.Logger.logDebug(`Modifying root build.gradle to add the Gradle Brownfield plugin`);var buildscriptDepsRegex=/(buildscript\s*\{[\s\S]*?dependencies\s*\{[\s\S]*?)(})/m;var match=contents.match(buildscriptDepsRegex);if(!match){throw new Error('Could not locate buildscript block in root build.gradle');}var insertion=`\t${_constants.brownfieldGradlePluginDependency}\n\t`;var modifiedContents=contents.replace(buildscriptDepsRegex,`$1${insertion}$2`);_logging.Logger.logDebug('Added Brownfield Gradle plugin to root build.gradle');return modifiedContents;}function modifySettingsGradle(contents,moduleName){var includeStatement=`include ':${moduleName}'`;if(contents.includes(includeStatement)){_logging.Logger.logDebug(`Module "${moduleName}" already in settings.gradle, skipping`);return contents;}_logging.Logger.logDebug(`Modifying settings.gradle to include module "${moduleName}"`);var modifiedContents=contents+`\n${includeStatement}\n`;_logging.Logger.logDebug(`Added module "${moduleName}" to settings.gradle`);return modifiedContents;}
-//# sourceMappingURL=gradleHelpers.js.map

package/lib/commonjs/expo-config-plugin/android/gradleHelpers.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_constants","require","_logging","modifyRootBuildGradle","contents","includes","Logger","logDebug","buildscriptDepsRegex","match","Error","insertion","brownfieldGradlePluginDependency","modifiedContents","replace","modifySettingsGradle","moduleName","includeStatement"],"sourceRoot":"../../../../src","sources":["expo-config-plugin/android/gradleHelpers.ts"],"mappings":"+JAAA,IAAAA,UAAA,CAAAC,OAAA,gBACA,IAAAC,QAAA,CAAAD,OAAA,eAOO,QAAS,CAAAE,qBAAqBA,CAACC,QAAgB,CAAU,CAE9D,GAAIA,QAAQ,CAACC,QAAQ,CAAC,0BAA0B,CAAC,CAAE,CACjDC,eAAM,CAACC,QAAQ,CACb,iEACF,CAAC,CACD,MAAO,CAAAH,QAAQ,CACjB,CAEAE,eAAM,CAACC,QAAQ,CACb,iEACF,CAAC,CAGD,GAAM,CAAAC,oBAAoB,CACxB,yDAAyD,CAC3D,GAAM,CAAAC,KAAK,CAAGL,QAAQ,CAACK,KAAK,CAACD,oBAAoB,CAAC,CAElD,GAAI,CAACC,KAAK,CAAE,CACV,KAAM,IAAI,CAAAC,KAAK,CAAC,yDAAyD,CAAC,CAC5E,CAGA,GAAM,CAAAC,SAAS,CAAG,KAAKC,2CAAgC,MAAM,CAC7D,GAAM,CAAAC,gBAAgB,CAAGT,QAAQ,CAACU,OAAO,CACvCN,oBAAoB,CACpB,KAAKG,SAAS,IAChB,CAAC,CAEDL,eAAM,CAACC,QAAQ,CAAC,qDAAqD,CAAC,CACtE,MAAO,CAAAM,gBAAgB,CACzB,CAQO,QAAS,CAAAE,oBAAoBA,CAClCX,QAAgB,CAChBY,UAAkB,CACV,CACR,GAAM,CAAAC,gBAAgB,CAAG,aAAaD,UAAU,GAAG,CAGnD,GAAIZ,QAAQ,CAACC,QAAQ,CAACY,gBAAgB,CAAC,CAAE,CACvCX,eAAM,CAACC,QAAQ,CACb,WAAWS,UAAU,wCACvB,CAAC,CACD,MAAO,CAAAZ,QAAQ,CACjB,CAEAE,eAAM,CAACC,QAAQ,CACb,gDAAgDS,UAAU,GAC5D,CAAC,CAGD,GAAM,CAAAH,gBAAgB,CAAGT,QAAQ,CAAG,KAAKa,gBAAgB,IAAI,CAE7DX,eAAM,CAACC,QAAQ,CAAC,iBAAiBS,UAAU,sBAAsB,CAAC,CAElE,MAAO,CAAAH,gBAAgB,CACzB","ignoreList":[]}

package/lib/module/expo-config-plugin/android/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["BROWNFIELD_PLUGIN_VERSION","exports","brownfieldGradlePluginDependency"],"sourceRoot":"../../../../src","sources":["expo-config-plugin/android/constants.ts"],"mappings":"2IAAO,GAAM,CAAAA,yBAAyB,CAAAC,OAAA,CAAAD,yBAAA,CAAG,OAAO,CACzC,GAAM,CAAAE,gCAAgC,CAAAD,OAAA,CAAAC,gCAAA,CAAG,2DAA2DF,yBAAyB,IAAI","ignoreList":[]}

package/lib/module/expo-config-plugin/android/gradleHelpers.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports,"__esModule",{value:true});exports.modifyRootBuildGradle=modifyRootBuildGradle;exports.modifySettingsGradle=modifySettingsGradle;var _constants=require("./constants");var _logging=require("../logging");function modifyRootBuildGradle(contents){if(contents.includes('brownfield-gradle-plugin')){_logging.Logger.logDebug('Brownfield Gradle plugin already in root build.gradle, skipping');return contents;}_logging.Logger.logDebug(`Modifying root build.gradle to add the Gradle Brownfield plugin`);var buildscriptDepsRegex=/(buildscript\s*\{[\s\S]*?dependencies\s*\{[\s\S]*?)(})/m;var match=contents.match(buildscriptDepsRegex);if(!match){throw new Error('Could not locate buildscript block in root build.gradle');}var insertion=`\t${_constants.brownfieldGradlePluginDependency}\n\t`;var modifiedContents=contents.replace(buildscriptDepsRegex,`$1${insertion}$2`);_logging.Logger.logDebug('Added Brownfield Gradle plugin to root build.gradle');return modifiedContents;}function modifySettingsGradle(contents,moduleName){var includeStatement=`include ':${moduleName}'`;if(contents.includes(includeStatement)){_logging.Logger.logDebug(`Module "${moduleName}" already in settings.gradle, skipping`);return contents;}_logging.Logger.logDebug(`Modifying settings.gradle to include module "${moduleName}"`);var modifiedContents=contents+`\n${includeStatement}\n`;_logging.Logger.logDebug(`Added module "${moduleName}" to settings.gradle`);return modifiedContents;}
-//# sourceMappingURL=gradleHelpers.js.map

package/lib/module/expo-config-plugin/android/gradleHelpers.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_constants","require","_logging","modifyRootBuildGradle","contents","includes","Logger","logDebug","buildscriptDepsRegex","match","Error","insertion","brownfieldGradlePluginDependency","modifiedContents","replace","modifySettingsGradle","moduleName","includeStatement"],"sourceRoot":"../../../../src","sources":["expo-config-plugin/android/gradleHelpers.ts"],"mappings":"+JAAA,IAAAA,UAAA,CAAAC,OAAA,gBACA,IAAAC,QAAA,CAAAD,OAAA,eAOO,QAAS,CAAAE,qBAAqBA,CAACC,QAAgB,CAAU,CAE9D,GAAIA,QAAQ,CAACC,QAAQ,CAAC,0BAA0B,CAAC,CAAE,CACjDC,eAAM,CAACC,QAAQ,CACb,iEACF,CAAC,CACD,MAAO,CAAAH,QAAQ,CACjB,CAEAE,eAAM,CAACC,QAAQ,CACb,iEACF,CAAC,CAGD,GAAM,CAAAC,oBAAoB,CACxB,yDAAyD,CAC3D,GAAM,CAAAC,KAAK,CAAGL,QAAQ,CAACK,KAAK,CAACD,oBAAoB,CAAC,CAElD,GAAI,CAACC,KAAK,CAAE,CACV,KAAM,IAAI,CAAAC,KAAK,CAAC,yDAAyD,CAAC,CAC5E,CAGA,GAAM,CAAAC,SAAS,CAAG,KAAKC,2CAAgC,MAAM,CAC7D,GAAM,CAAAC,gBAAgB,CAAGT,QAAQ,CAACU,OAAO,CACvCN,oBAAoB,CACpB,KAAKG,SAAS,IAChB,CAAC,CAEDL,eAAM,CAACC,QAAQ,CAAC,qDAAqD,CAAC,CACtE,MAAO,CAAAM,gBAAgB,CACzB,CAQO,QAAS,CAAAE,oBAAoBA,CAClCX,QAAgB,CAChBY,UAAkB,CACV,CACR,GAAM,CAAAC,gBAAgB,CAAG,aAAaD,UAAU,GAAG,CAGnD,GAAIZ,QAAQ,CAACC,QAAQ,CAACY,gBAAgB,CAAC,CAAE,CACvCX,eAAM,CAACC,QAAQ,CACb,WAAWS,UAAU,wCACvB,CAAC,CACD,MAAO,CAAAZ,QAAQ,CACjB,CAEAE,eAAM,CAACC,QAAQ,CACb,gDAAgDS,UAAU,GAC5D,CAAC,CAGD,GAAM,CAAAH,gBAAgB,CAAGT,QAAQ,CAAG,KAAKa,gBAAgB,IAAI,CAE7DX,eAAM,CAACC,QAAQ,CAAC,iBAAiBS,UAAU,sBAAsB,CAAC,CAElE,MAAO,CAAAH,gBAAgB,CACzB","ignoreList":[]}

package/lib/typescript/commonjs/src/expo-config-plugin/android/constants.d.ts

@@ -1,3 +0,0 @@
-export declare const BROWNFIELD_PLUGIN_VERSION = "1.0.1";
-export declare const brownfieldGradlePluginDependency = "classpath(\"com.callstack.react:brownfield-gradle-plugin:1.0.1\")";
-//# sourceMappingURL=constants.d.ts.map

package/lib/typescript/commonjs/src/expo-config-plugin/android/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,UAAU,CAAC;AACjD,eAAO,MAAM,gCAAgC,sEAA2F,CAAC"}

package/lib/typescript/commonjs/src/expo-config-plugin/android/gradleHelpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gradleHelpers.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/gradleHelpers.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+B9D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,MAAM,CAqBR"}

package/lib/typescript/module/src/expo-config-plugin/android/constants.d.ts

@@ -1,3 +0,0 @@
-export declare const BROWNFIELD_PLUGIN_VERSION = "1.0.1";
-export declare const brownfieldGradlePluginDependency = "classpath(\"com.callstack.react:brownfield-gradle-plugin:1.0.1\")";
-//# sourceMappingURL=constants.d.ts.map

package/lib/typescript/module/src/expo-config-plugin/android/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,UAAU,CAAC;AACjD,eAAO,MAAM,gCAAgC,sEAA2F,CAAC"}

package/lib/typescript/module/src/expo-config-plugin/android/gradleHelpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gradleHelpers.d.ts","sourceRoot":"","sources":["../../../../../../src/expo-config-plugin/android/gradleHelpers.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+B9D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,MAAM,CAqBR"}