feat(iOS): RN-77 Swift support

Author: markdevocht

ReactNativeNavigation.podspec

@@ -21,13 +21,17 @@ Pod::Spec.new do |s|
     s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
     s.source_files        = 'lib/ios/**/*.{h,m,mm,cpp}'
     s.exclude_files       = "lib/ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
+    s.public_header_files = [
+          'lib/ios/RNNAppDelegate.h'
+        ]
   end
 
   folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'
   s.pod_target_xcconfig = {
       'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
       "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
       "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+      "DEFINES_MODULE" => "YES"
   }
 
   if fabric_enabled

autolink/postlink/appDelegateLinker.js

@@ -21,34 +21,46 @@ class AppDelegateLinker {
 
     logn('Linking AppDelegate...');
 
-    var appDelegateContents = fs.readFileSync(this.appDelegatePath, 'utf8');
+    // New flow for Swift
+    if (nodePath.extname(this.appDelegatePath) === '.swift') {
+      debugn('Entering Swift flow ...');
+      var appDelegateContents = fs.readFileSync(this.appDelegatePath, 'utf8');
+      appDelegateContents = this._extendRNNAppDelegateSwift(appDelegateContents);
+      fs.writeFileSync(this.appDelegatePath, appDelegateContents);
+      this.removeUnneededImportsSuccess = true
+      this.removeApplicationLaunchContentSuccess = true
+
+    } else { // Old flow for Objective-C
+      debugn('Entering Objective-C flow ...');
+      var appDelegateContents = fs.readFileSync(this.appDelegatePath, 'utf8');
+
+      if (this.appDelegateHeaderPath) {
+        var appDelegateHeaderContents = fs.readFileSync(this.appDelegateHeaderPath, 'utf8');
+        appDelegateHeaderContents = this._extendRNNAppDelegate(appDelegateHeaderContents);
+        fs.writeFileSync(this.appDelegateHeaderPath, appDelegateHeaderContents);
+      }
 
-    if (this.appDelegateHeaderPath) {
-      var appDelegateHeaderContents = fs.readFileSync(this.appDelegateHeaderPath, 'utf8');
-      appDelegateHeaderContents = this._extendRNNAppDelegate(appDelegateHeaderContents);
-      fs.writeFileSync(this.appDelegateHeaderPath, appDelegateHeaderContents);
-    }
+      try {
+        appDelegateContents = this._removeUnneededImports(appDelegateContents);
+        this.removeUnneededImportsSuccess = true;
+      } catch (e) {
+        errorn('   ' + e.message);
+      }
 
-    try {
-      appDelegateContents = this._removeUnneededImports(appDelegateContents);
-      this.removeUnneededImportsSuccess = true;
-    } catch (e) {
-      errorn('   ' + e.message);
-    }
+      appDelegateContents = this._importNavigation(appDelegateContents);
 
-    appDelegateContents = this._importNavigation(appDelegateContents);
+      appDelegateContents = this._bootstrapNavigation(appDelegateContents);
 
-    appDelegateContents = this._bootstrapNavigation(appDelegateContents);
+      try {
+        appDelegateContents = this._removeApplicationLaunchContent(appDelegateContents);
+        this.removeApplicationLaunchContentSuccess = true;
+      } catch (e) {
+        errorn('   ' + e.message);
+      }
 
-    try {
-      appDelegateContents = this._removeApplicationLaunchContent(appDelegateContents);
-      this.removeApplicationLaunchContentSuccess = true;
-    } catch (e) {
-      errorn('   ' + e.message);
+      fs.writeFileSync(this.appDelegatePath, appDelegateContents);
     }
 
-    fs.writeFileSync(this.appDelegatePath, appDelegateContents);
-
     if (this.removeUnneededImportsSuccess && this.removeApplicationLaunchContentSuccess) {
       infon('AppDelegate linked successfully!\n');
     } else {
@@ -178,6 +190,19 @@ class AppDelegateLinker {
   _doesImportNavigation(content) {
     return /#import\s+\<ReactNativeNavigation\/ReactNativeNavigation.h>/.test(content);
   }
+
+  // SWIFT implementation
+  _extendRNNAppDelegateSwift(content) {
+    return content
+      .replace(
+        /import React_RCTAppDelegate/,
+        'import ReactNativeNavigation'
+      )
+      .replace(
+        /class AppDelegate: RCTAppDelegate/,
+        'class AppDelegate: RNNAppDelegate'
+      )
+  }
 }
 
 module.exports = AppDelegateLinker;

autolink/postlink/path.js

@@ -2,6 +2,7 @@ var glob = require('glob');
 var ignoreFolders = {
   ignore: ['node_modules/**', '**/build/**', '**/Build/**', '**/DerivedData/**', '**/*-tvOS*/**'],
 };
+var { warnn, infon, debugn } = require('./log');
 
 exports.mainActivityJava = glob.sync('**/MainActivity.java', ignoreFolders)[0];
 exports.mainActivityKotlin = glob.sync('**/MainActivity.kt', ignoreFolders)[0];
@@ -10,10 +11,28 @@ exports.mainApplicationJava = mainApplicationJava;
 exports.rootGradle = mainApplicationJava.replace(/android\/app\/.*\.java/, 'android/build.gradle');
 
 var reactNativeVersion = require('../../../react-native/package.json').version;
+
+infon('Locating the AppDelegate.mm file ...');
 exports.appDelegate = glob.sync(
-  reactNativeVersion < '0.68.0' ? '**/AppDelegate.m' : '**/AppDelegate.mm',
+  '**/AppDelegate.mm',
   ignoreFolders
 )[0];
-exports.appDelegateHeader = glob.sync('**/AppDelegate.h', ignoreFolders)[0];
+
+if (exports.appDelegate === undefined) {
+  warnn('AppDelegate.mm file not found, looking for AppDelegate.swift ...');
+  exports.appDelegate = glob.sync(
+    '**/AppDelegate.swift',
+    ignoreFolders
+  )[0];
+
+  if (exports.appDelegate !== undefined) {
+    debugn('Found AppDelegate.swift');
+  }
+
+} else {
+  debugn('Found AppDelegate.mm');
+  exports.appDelegateHeader = glob.sync('**/AppDelegate.h', ignoreFolders)[0];
+}
+
 exports.podFile = glob.sync('**/Podfile', ignoreFolders)[0];
 exports.plist = glob.sync('**/info.plist', ignoreFolders)[0];