fix: Always copy 'app.json' (#138)

Author: tido64

.rubocop.yml

@@ -13,6 +13,9 @@ Lint/UnusedMethodArgument:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 

example/ios/Podfile.lock

@@ -353,7 +353,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   ReactTestApp-DevSupport: 1aee56d5c69fe4a4f4d5be0cbd3f22f5326d70fd
-  ReactTestApp-Resources: 6d92ddc0b2da071656efa3b828d8ad341b3cbb1d
+  ReactTestApp-Resources: 5950ae44720217c6778ff03fb1d906c8fb3ce483
   SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 

ios/ReactTestApp/Manifest.swift

@@ -19,7 +19,7 @@ struct Manifest: Codable {
     let components: [Component]
 
     static func fromFile() -> Manifest? {
-        guard let manifestURL = Bundle.main.url(forResource: "app", withExtension: "json", subdirectory: "assets"),
+        guard let manifestURL = Bundle.main.url(forResource: "app", withExtension: "json"),
               let data = try? Data(contentsOf: manifestURL, options: .uncached) else {
             return nil
         }

ios/test_app.rb

@@ -91,8 +91,8 @@ def resources_pod(project_root, target_platform)
   app_manifest = find_file('app.json', project_root)
   return if app_manifest.nil?
 
-  resources = resolve_resources(JSON.parse(File.read(app_manifest)), target_platform)
-  return if !resources.instance_of?(Array) || resources.empty?
+  manifest_resources = resolve_resources(JSON.parse(File.read(app_manifest)), target_platform)
+  resources = ['app.json'] + (manifest_resources.instance_of?(Array) ? manifest_resources : [])
 
   spec = {
     'name' => 'ReactTestApp-Resources',

test/test_test_app.rb

@@ -112,11 +112,12 @@ def test_react_native_pods
       assert_nil(resources_pod(Pathname.new('/'), target))
       assert_nil(resources_pod(Pathname.new('.'), target))
 
-      assert_nil(resources_pod(fixture_path('without_resources'), target))
-      assert_nil(resources_pod(fixture_path('without_resources', target.to_s), target))
+      assert_equal('.', resources_pod(fixture_path('without_resources'), target))
+      assert_equal('..', resources_pod(fixture_path('without_resources', target.to_s), target))
 
-      assert_nil(resources_pod(fixture_path('without_platform_resources'), target))
-      assert_nil(resources_pod(fixture_path('without_platform_resources', target.to_s), target))
+      assert_equal('.', resources_pod(fixture_path('without_platform_resources'), target))
+      assert_equal('..',
+                   resources_pod(fixture_path('without_platform_resources', target.to_s), target))
 
       assert_equal('.', resources_pod(fixture_path('with_resources'), target))
       assert_equal('..', resources_pod(fixture_path('with_resources', target.to_s), target))
@@ -129,25 +130,30 @@ def test_react_native_pods
 
   %i[ios macos].each do |target|
     define_method("test_#{target}_resources_pod_writes_podspec") do
-      resources = %w[dist/assets dist/main.jsbundle]
-      platform_resources = ["dist-#{target}/assets", "dist-#{target}/main.jsbundle"]
+      resources = %w[app.json dist/assets dist/main.jsbundle]
+      platform_resources = ['app.json', "dist-#{target}/assets", "dist-#{target}/main.jsbundle"]
 
       [
-        fixture_path('with_resources'),
-        fixture_path('with_resources', target.to_s),
         fixture_path('with_platform_resources'),
         fixture_path('with_platform_resources', target.to_s),
+        fixture_path('with_resources'),
+        fixture_path('with_resources', target.to_s),
+        fixture_path('without_platform_resources'),
+        fixture_path('without_platform_resources', target.to_s),
+        fixture_path('without_resources'),
+        fixture_path('without_resources', target.to_s),
       ].each do |project_root|
         podspec_path = resources_pod(project_root, target)
         manifest_path = app_manifest_path(project_root, podspec_path)
         manifest = JSON.parse(File.read(manifest_path))
 
-        if project_root.to_s.include?('with_platform_resources')
+        if project_root.to_s.include?('without')
+          assert_equal(['app.json'], manifest['resources'])
+        elsif project_root.to_s.include?('with_platform_resources')
           assert_equal(platform_resources, manifest['resources'].sort)
         else
           assert_equal(resources, manifest['resources'].sort)
         end
-
       ensure
         File.delete(manifest_path)
       end