update for linnker test and podspec

markdevocht · markdevocht · commit fbc20d892bd0 · 2025-11-26T09:39:49.000+02:00
diff --git a/ReactNativeNavigation.podspec b/ReactNativeNavigation.podspec
@@ -1,44 +1,8 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
-# Detect if this is a Swift project by checking common iOS project locations
-# Avoid recursive directory scanning which can be slow in CI with large node_modules
-start_dir = File.expand_path('../../', __dir__)
-swift_delegate_path = nil
-
-# Check specific, known locations where AppDelegate.swift typically exists
-# This avoids slow recursive directory traversal
-['ios', 'example/ios', 'playground/ios', 'app/ios', 'demo/ios'].each do |ios_dir|
-  ios_path = File.join(start_dir, ios_dir)
-  next unless Dir.exist?(ios_path)
-  
-  # Check direct subdirectories (common project structures)
-  # Most projects have: ios/ProjectName/AppDelegate.swift
-  Dir.entries(ios_path).each do |entry|
-    next if entry.start_with?('.') || entry == 'Pods' || entry == 'build' || entry == 'DerivedData'
-    entry_path = File.join(ios_path, entry)
-    next unless Dir.exist?(entry_path)
-    
-    app_delegate_path = File.join(entry_path, 'AppDelegate.swift')
-    if File.exist?(app_delegate_path)
-      swift_delegate_path = app_delegate_path
-      break
-    end
-  end
-  break if swift_delegate_path
-end
-
-swift_project = swift_delegate_path && File.exist?(swift_delegate_path)
-
-if swift_project
-  puts "ReactNativeNavigation: Swift AppDelegate detected - enabling Swift-compatible configuration"
-else
-  puts "ReactNativeNavigation: Objective-C AppDelegate detected - using standard configuration"
-end
-
 Pod::Spec.new do |s|
   s.name         = "ReactNativeNavigation"
   s.prepare_command = 'node autolink/postlink/__helpers__/generate_version_header.js'
@@ -58,13 +22,10 @@ Pod::Spec.new do |s|
     s.source_files        = 'ios/**/*.{h,m,mm,cpp}'
     s.exclude_files       = "ios/ReactNativeNavigationTests/**/*.*", "ios/OCMock/**/*.*"
     
-    # Only expose headers for Swift projects
-    if swift_project
-      s.public_header_files = [
-          'ios/RNNAppDelegate.h',
-          'ios/ReactNativeVersionExtracted.h'
-        ]
-    end
+    s.public_header_files = [
+      'ios/RNNAppDelegate.h',
+      'ios/ReactNativeVersionExtracted.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'
@@ -76,11 +37,8 @@ Pod::Spec.new do |s|
       "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
   }
 
-  # Only add DEFINES_MODULE for Swift projects
-  if swift_project
-    xcconfig_settings["DEFINES_MODULE"] = "YES"
-  end
-
+  xcconfig_settings["DEFINES_MODULE"] = "YES"
+  
   s.pod_target_xcconfig = xcconfig_settings
 
   if fabric_enabled
diff --git a/autolink/postlink/__snapshots__/appDelegateLinker77.test.js.snap b/autolink/postlink/__snapshots__/appDelegateLinker77.test.js.snap
@@ -0,0 +1,70 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`appDelegateLinker should work for RN 0.77 & 0.78 with Objective-C 1`] = `
+"#import "AppDelegate.h"
+#import <ReactNativeNavigation/ReactNativeNavigation.h>
+
+#import <React/RCTBundleURLProvider.h>
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+#if DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+/// This method controls whether the \`concurrentRoot\`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: \`true\` if the \`concurrentRoot\` feature is enabled. Otherwise, it returns \`false\`.
+- (BOOL)concurrentRootEnabled
+{
+  return true;
+}
+
+@end "
+`;
+
+exports[`appDelegateLinker should work for RN 0.77 & 0.78 with Swift 1`] = `
+"import UIKit
+import React
+import ReactNativeNavigation
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: RNNAppDelegate {
+  override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    self.moduleName = "app"
+    self.dependencyProvider = RCTAppDependencyProvider()
+
+    // You can add your custom initial props in the dictionary below.
+    // They will be passed down to the ViewController used by React Native.
+    self.initialProps = [:]
+
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+} "
+`;
diff --git a/autolink/postlink/__snapshots__/appDelegateLinker79.test.js.snap b/autolink/postlink/__snapshots__/appDelegateLinker79.test.js.snap
@@ -0,0 +1,39 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`appDelegateLinker should work with Swift bridgeless RN 0.79 1`] = `
+"import UIKit
+import React
+import ReactNativeNavigation
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: RNNAppDelegate {
+
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    self.reactNativeDelegate = ReactNativeDelegate()
+    super.application(application, didFinishLaunchingWithOptions: launchOptions)
+
+    
+
+    return true
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+}"
+`;
+
diff --git a/autolink/postlink/appDelegateLinker.test.js b/autolink/postlink/appDelegateLinker.test.js
diff --git a/autolink/postlink/appDelegateLinker77.test.js b/autolink/postlink/appDelegateLinker77.test.js
@@ -0,0 +1,51 @@
+import fs from 'node:fs';
+import * as mockHelpers from './__helpers__/fixtures';
+
+jest.mock('./log');
+
+const { getReactNativeVersion } = require('./__helpers__/reactNativeVersion');
+const rnVersion = getReactNativeVersion();
+const shouldSkip = rnVersion && rnVersion.minor >= 79;
+
+// Conditionally skip entire test suite based on RN version
+(shouldSkip ? describe.skip : describe)('appDelegateLinker', () => {
+    it('should work for RN 0.77 & 0.78 with Objective-C', () => {
+        jest.mock('./path', () => {
+            const appDelegatePath = mockHelpers.prepareFixtureDuplicate77({
+                userFixtureFileName: 'AppDelegate.mm.template',
+                patchedFixtureFileName: 'rnn-tests_AppDelegate.mm',
+            });
+            return {
+                appDelegate: appDelegatePath,
+            };
+        });
+
+        const AppDelegateLinker = require('./appDelegateLinker');
+        const linker = new AppDelegateLinker();
+
+        linker.link();
+        const appDelegateContent = fs.readFileSync(linker.appDelegatePath, 'utf8');
+        expect(appDelegateContent).toMatchSnapshot();
+    });
+
+    it('should work for RN 0.77 & 0.78 with Swift', () => {
+        jest.mock('./path', () => {
+            const tmpAppDelegatePath = mockHelpers.prepareFixtureDuplicate77({
+                userFixtureFileName: 'AppDelegate.swift.template',
+                patchedFixtureFileName: 'rnn-tests_AppDelegate.swift',
+            });
+
+            return {
+                appDelegate: tmpAppDelegatePath,
+            };
+        });
+
+        const AppDelegateLinker = require('./appDelegateLinker');
+        const linker = new AppDelegateLinker();
+        linker.link();
+
+        const appDelegateContent = fs.readFileSync(linker.appDelegatePath, 'utf8');
+        expect(appDelegateContent).toMatchSnapshot();
+    });
+});
+
diff --git a/autolink/postlink/appDelegateLinker79.test.js b/autolink/postlink/appDelegateLinker79.test.js
@@ -0,0 +1,32 @@
+import fs from 'node:fs';
+import * as mockHelpers from './__helpers__/fixtures';
+
+jest.mock('./log');
+
+const { getReactNativeVersion } = require('./__helpers__/reactNativeVersion');
+const rnVersion = getReactNativeVersion();
+const shouldSkip = !rnVersion || rnVersion.minor < 79;
+
+// Conditionally skip entire test suite based on RN version
+(shouldSkip ? describe.skip : describe)('appDelegateLinker', () => {
+    it('should work with Swift bridgeless RN 0.79', () => {
+        jest.mock('./path', () => {
+            const tmpAppDelegatePath = mockHelpers.prepareFixtureDuplicate79({
+                userFixtureFileName: 'AppDelegate.swift.template',
+                patchedFixtureFileName: 'rnn-tests_AppDelegate79.swift',
+            });
+
+            return {
+                appDelegate: tmpAppDelegatePath,
+            };
+        });
+
+        const AppDelegateLinker = require('./appDelegateLinker');
+        const linker = new AppDelegateLinker();
+        linker.link();
+
+        const appDelegateContent = fs.readFileSync(linker.appDelegatePath, 'utf8');
+        expect(appDelegateContent).toMatchSnapshot();
+    });
+});
+
diff --git a/ios/ReactNativeNavigation.xcodeproj/project.pbxproj b/ios/ReactNativeNavigation.xcodeproj/project.pbxproj
@@ -238,8 +238,9 @@
 		507ACB1223F44D1E00829911 /* RNNComponentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 507ACB1023F44D1E00829911 /* RNNComponentView.mm */; };
 		507ACB1523F44E5200829911 /* RNNComponentRootView.h in Headers */ = {isa = PBXBuildFile; fileRef = 507ACB1323F44E5200829911 /* RNNComponentRootView.h */; };
 		507ACB1623F44E5200829911 /* RNNComponentRootView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 507ACB1423F44E5200829911 /* RNNComponentRootView.mm */; };
-		507DBBDB2A31DE8400F1FC74 /* RNNAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 507DBBD92A31DE8400F1FC74 /* RNNAppDelegate.h */; };
+		507DBBDB2A31DE8400F1FC74 /* RNNAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 507DBBD92A31DE8400F1FC74 /* RNNAppDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		507DBBDC2A31DE8400F1FC74 /* RNNAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 507DBBDA2A31DE8400F1FC74 /* RNNAppDelegate.mm */; };
+		507DBBDD2A31DE8400F1FC75 /* ReactNativeVersionExtracted.h in Headers */ = {isa = PBXBuildFile; fileRef = 507DBBDE2A31DE8400F1FC76 /* ReactNativeVersionExtracted.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		507E7D57201DDD3000444E6C /* RNNSharedElementAnimationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 507E7D55201DDD3000444E6C /* RNNSharedElementAnimationOptions.h */; };
 		507E7D58201DDD3000444E6C /* RNNSharedElementAnimationOptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 507E7D56201DDD3000444E6C /* RNNSharedElementAnimationOptions.mm */; };
 		507F43C51FF4F17C00D9425B /* RNNTopTabsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */; };
@@ -735,6 +736,7 @@
 		507ACB1423F44E5200829911 /* RNNComponentRootView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNComponentRootView.mm; sourceTree = "<group>"; };
 		507DBBD92A31DE8400F1FC74 /* RNNAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNAppDelegate.h; sourceTree = "<group>"; };
 		507DBBDA2A31DE8400F1FC74 /* RNNAppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNNAppDelegate.mm; sourceTree = "<group>"; };
+		507DBBDE2A31DE8400F1FC76 /* ReactNativeVersionExtracted.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactNativeVersionExtracted.h; sourceTree = "<group>"; };
 		507E7D55201DDD3000444E6C /* RNNSharedElementAnimationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSharedElementAnimationOptions.h; sourceTree = "<group>"; };
 		507E7D56201DDD3000444E6C /* RNNSharedElementAnimationOptions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSharedElementAnimationOptions.mm; sourceTree = "<group>"; };
 		507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsViewController.h; sourceTree = "<group>"; };
@@ -1588,6 +1590,7 @@
 				7BA500741E2544B9001B9E1B /* ReactNativeNavigation.mm */,
 				507DBBD92A31DE8400F1FC74 /* RNNAppDelegate.h */,
 				507DBBDA2A31DE8400F1FC74 /* RNNAppDelegate.mm */,
+				507DBBDE2A31DE8400F1FC76 /* ReactNativeVersionExtracted.h */,
 				5030B62023D5B4CA008F1642 /* Color+Interpolation.h */,
 				5030B61F23D5B4CA008F1642 /* Color+Interpolation.mm */,
 				5030B62623D5B54D008F1642 /* LNInterpolable.h */,
@@ -1857,6 +1860,7 @@
 				5050465421F8F4490035497A /* RNNReactComponentRegistry.h in Headers */,
 				506BF65C2600AE4200A22755 /* CenterTransition.h in Headers */,
 				507DBBDB2A31DE8400F1FC74 /* RNNAppDelegate.h in Headers */,
+				507DBBDD2A31DE8400F1FC75 /* ReactNativeVersionExtracted.h in Headers */,
 				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
 				50E38DD723A7A2BE009817F6 /* AnimatedViewFactory.h in Headers */,
 				E8E5182E1F83A48B000467AC /* RNNTransitionStateHolder.h in Headers */,
diff --git a/playground/ios/playground/AppDelegate.mm b/playground/ios/playground/AppDelegate.mm
diff --git a/scripts/changeReactNativeVersion.js b/scripts/changeReactNativeVersion.js
