Derive artifacts resolver package name from --hybrid flag

Author: mateuuszzzzz

.github/workflows/buildIOS.yml

@@ -120,7 +120,7 @@ jobs:
       - name: Resolve react-native artifact version
         id: resolve-rn-artifacts
         run: |
-          VERSION=$(bun scripts/artifacts-utils/resolve-artifacts.ts --platform=ios --package=react-hybrid --hybrid=true --new-dot-root="$GITHUB_WORKSPACE" | jq -r '.version // "source"')
+          VERSION=$(bun scripts/artifacts-utils/resolve-artifacts.ts --platform=ios --hybrid=true --new-dot-root="$GITHUB_WORKSPACE" | jq -r '.version // "source"')
           echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Cache react-native artifacts

scripts/artifacts-utils/android/ExpensiUtils.gradle

@@ -27,10 +27,10 @@ ext.ExpensiUtils = new Object() {
     }
 
     // Returns [buildFromSource, version, githubUsername, githubToken]; any failure -> build from source.
-    Map resolveArtifacts(String packageName, String newDotRootDir, boolean isHybrid) {
+    Map resolveArtifacts(String newDotRootDir, boolean isHybrid) {
         def cmd = [
             "bun", "${newDotRootDir}/scripts/artifacts-utils/resolve-artifacts.ts",
-            "--platform=android", "--package=${packageName}", "--hybrid=${isHybrid}", "--new-dot-root=${newDotRootDir}"
+            "--platform=android", "--hybrid=${isHybrid}", "--new-dot-root=${newDotRootDir}"
         ]
         try {
             def result = runCommand(cmd, 120, new File(newDotRootDir))

scripts/artifacts-utils/android/PatchedArtifactsSettings.gradle

@@ -25,7 +25,7 @@ settings.extensions.configure(PatchedArtifactsConfig) { config ->
     config.packageName = getProperty('patchedArtifacts.packageName')
 
     def isHybrid = config.packageName == 'react-hybrid'
-    def resolution = ExpensiUtils.resolveArtifacts(config.packageName, getNewDotRootDir().toString(), isHybrid)
+    def resolution = ExpensiUtils.resolveArtifacts(getNewDotRootDir().toString(), isHybrid)
     config.version = resolution.version
     config.buildFromSource = resolution.buildFromSource
 

scripts/artifacts-utils/ios/patched_ios_artifacts.rb

@@ -29,12 +29,11 @@ def self.log(message, level = :info)
 
     def self.setup
         is_hybrid = ENV['IS_HYBRID_APP'] == 'true'
-        package_name = is_hybrid ? 'react-hybrid' : 'react-standalone'
 
         # Manual escape hatch: force a full from-source build (e.g. to unblock a prebuild issue).
         build_from_source = ENV['BUILD_RN_FROM_SOURCE'] == '1'
         # The escape hatch short-circuits before anything touches the network: no resolver, no prefetch.
-        resolution = build_from_source ? {'buildFromSource' => true, 'version' => nil} : prefetch(resolve(package_name, is_hybrid))
+        resolution = build_from_source ? {'buildFromSource' => true, 'version' => nil} : prefetch(resolve(is_hybrid))
 
         # A single decision drives both prebuilt flags, so we never land in a mixed
         # prebuilt-deps / source-core state (which desyncs the CocoaPods sandbox).
@@ -181,10 +180,10 @@ def self.download_and_verify(url, destination, github_token)
         destination
     end
 
-    def self.resolve(package_name, is_hybrid)
+    def self.resolve(is_hybrid)
         cmd = [
             'bun', File.join(NEW_DOT_ROOT, 'scripts/artifacts-utils/resolve-artifacts.ts'),
-            '--platform=ios', "--package=#{package_name}", "--hybrid=#{is_hybrid}", "--new-dot-root=#{NEW_DOT_ROOT}"
+            '--platform=ios', "--hybrid=#{is_hybrid}", "--new-dot-root=#{NEW_DOT_ROOT}"
         ]
         # stdout is pure JSON; the resolver logs to stderr.
         output = IO.popen(cmd, chdir: NEW_DOT_ROOT, &:read)

scripts/artifacts-utils/resolve-artifacts.ts

@@ -7,21 +7,24 @@ import resolveArtifacts from './lib/artifactsResolver';
  *
  * Usage:
  *   bun scripts/artifacts-utils/resolve-artifacts.ts \
- *       --platform=ios --package=react-hybrid --hybrid=true --new-dot-root=.
+ *       --platform=ios --hybrid=true --new-dot-root=.
  *
  * Prints the result as JSON to stdout (logs go to stderr) and always exits 0.
  */
 const args = parseCommandLineArguments();
 const platform = args.platform;
-const packageName = args.package ?? '';
+const isHybrid = args.hybrid === 'true';
+// The only two package names that exist; every caller's package and hybrid-ness always move together, so
+// deriving it here instead of taking it as a flag keeps that pairing from being restated at each call site.
+const packageName = isHybrid ? 'react-hybrid' : 'react-standalone';
 
 if (platform !== 'ios' && platform !== 'android') {
     process.stderr.write(`[PatchedArtifacts] Invalid or missing --platform "${platform ?? ''}" (expected "ios" or "android"); building from source.\n`);
     process.stdout.write(JSON.stringify({buildFromSource: true, version: null, packageName, artifactId: ''}));
     process.exit(0);
 }
 
-const options = {packageName, newDotRoot: args['new-dot-root'] ?? '.', isHybrid: args.hybrid === 'true'};
+const options = {packageName, newDotRoot: args['new-dot-root'] ?? '.', isHybrid};
 const resolution = platform === 'ios' ? resolveArtifacts({...options, platform: 'ios'}) : resolveArtifacts({...options, platform: 'android'});
 
 resolution