fixes

Author: coado

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt

@@ -95,7 +95,7 @@ class ReactPlugin : Plugin<Project> {
         val versionAndGroupStrings =
             readVersionAndGroupStrings(project, propertiesFile, hermesVersionPropertiesFile)
         configureDependencies(project, versionAndGroupStrings)
-        configureRepositories(project, versionAndGroupStrings.isNightly)
+        configureRepositories(project, versionAndGroupStrings)
       }
 
       configureReactNativeNdk(project, extension)

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt

@@ -125,6 +125,41 @@ internal object DependencyUtils {
     }
   }
 
+  /**
+   * Configures repositories without asking remote repositories for versions that are known to be
+   * unpublished.
+   */
+  fun configureRepositories(project: Project, coordinates: Coordinates) {
+    configureRepositories(project, coordinates.isNightly)
+
+    project.rootProject.allprojects { eachProject ->
+      eachProject.repositories.withType(MavenArtifactRepository::class.java).configureEach { repo ->
+        if (repo.url.scheme != "file") {
+          repo.content { content ->
+            if (!coordinates.versionString.isMavenArtifactVersionPublished()) {
+              setOf(DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP, coordinates.reactGroupString)
+                  .forEach { group ->
+                    content.excludeVersion(group, "react-native", UNPUBLISHED_MAVEN_VERSION)
+                    content.excludeVersion(group, "react-android", UNPUBLISHED_MAVEN_VERSION)
+                  }
+            }
+            if (!coordinates.hermesVersionString.isMavenArtifactVersionPublished()) {
+              setOf(
+                      DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP,
+                      DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP,
+                      coordinates.hermesGroupString,
+                  )
+                  .forEach { group ->
+                    content.excludeVersion(group, "hermes-engine", UNPUBLISHED_MAVEN_VERSION)
+                    content.excludeVersion(group, "hermes-android", UNPUBLISHED_MAVEN_VERSION)
+                  }
+            }
+          }
+        }
+      }
+    }
+  }
+
   /**
    * This method takes care of configuring the resolution strategy for both the app and all the 3rd
    * party libraries which are auto-linked. Specifically it takes care of:
@@ -136,11 +171,6 @@ internal object DependencyUtils {
       coordinates: Coordinates,
   ) {
     if (coordinates.versionString.isBlank() || coordinates.hermesVersionString.isBlank()) return
-
-    val shouldConfigureReact = coordinates.versionString.isMavenArtifactVersionPublished()
-    val shouldConfigureHermes = coordinates.hermesVersionString.isMavenArtifactVersionPublished()
-    if (!shouldConfigureReact && !shouldConfigureHermes) return
-
     project.rootProject.allprojects { eachProject ->
       eachProject.configurations.all { configuration ->
         // Here we set a dependencySubstitution for both react-native and hermes-engine as those
@@ -152,15 +182,10 @@ internal object DependencyUtils {
             it.substitute(it.module(module)).using(it.module(dest)).because(reason)
           }
         }
-        if (shouldConfigureReact) {
-          configuration.resolutionStrategy.force(
-              "${coordinates.reactGroupString}:react-android:${coordinates.versionString}",
-          )
-        }
-        if (
-            shouldConfigureHermes &&
-                !(eachProject.findProperty(INTERNAL_USE_HERMES_NIGHTLY) as? String).toBoolean()
-        ) {
+        configuration.resolutionStrategy.force(
+            "${coordinates.reactGroupString}:react-android:${coordinates.versionString}",
+        )
+        if (!(eachProject.findProperty(INTERNAL_USE_HERMES_NIGHTLY) as? String).toBoolean()) {
           // Contributors only: The hermes-engine version is forced only if the user has
           // not opted into using nightlies for local development.
           configuration.resolutionStrategy.force(
@@ -223,10 +248,7 @@ internal object DependencyUtils {
           ),
       )
     }
-    // 1000.0.0 identifies a source checkout on main and is never published to Maven.
-    return dependencySubstitution.filterNot { (_, destination, _) ->
-      !destination.substringAfterLast(':').isMavenArtifactVersionPublished()
-    }
+    return dependencySubstitution
   }
 
   fun readVersionAndGroupStrings(
@@ -318,7 +340,7 @@ internal object DependencyUtils {
   internal fun String.isNightly(): Boolean = this.startsWith("0.0.0") || "-nightly-" in this
 
   internal fun String.isMavenArtifactVersionPublished(): Boolean =
-      isNotBlank() && this != UNPUBLISHED_MAVEN_VERSION
+      this != UNPUBLISHED_MAVEN_VERSION
 
   internal fun Project.exclusiveEnterpriseRepository() =
       when {

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt

@@ -19,7 +19,10 @@ import com.facebook.react.utils.DependencyUtils.mavenRepoFromURI
 import com.facebook.react.utils.DependencyUtils.mavenRepoFromUrl
 import com.facebook.react.utils.DependencyUtils.readVersionAndGroupStrings
 import com.facebook.react.utils.DependencyUtils.shouldAddJitPack
+import com.sun.net.httpserver.HttpServer
+import java.net.InetSocketAddress
 import java.net.URI
+import java.util.concurrent.atomic.AtomicInteger
 import org.assertj.core.api.Assertions.assertThat
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.testfixtures.ProjectBuilder
@@ -79,6 +82,41 @@ class DependencyUtilsTest {
         .isNotNull()
   }
 
+  @Test
+  fun configureRepositories_withUnpublishedVersion_doesNotQueryRemoteRepository() {
+    val requests = AtomicInteger()
+    val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
+    server.createContext("/") { exchange ->
+      requests.incrementAndGet()
+      exchange.sendResponseHeaders(404, -1)
+      exchange.close()
+    }
+    server.start()
+
+    try {
+      val project = createProject()
+      project.extensions.extraProperties.set(
+          "exclusiveEnterpriseRepository",
+          "http://127.0.0.1:${server.address.port}",
+      )
+      configureRepositories(project, DependencyUtils.Coordinates("1000.0.0", "4.5.6"))
+      (project.repositories.first() as MavenArtifactRepository).isAllowInsecureProtocol = true
+
+      val published = project.configurations.create("published")
+      project.dependencies.add(published.name, "com.facebook.react:react-android:0.88.0")
+      assertThat(runCatching { published.resolve() }.isFailure).isTrue()
+      assertThat(requests.get()).isGreaterThan(0)
+
+      requests.set(0)
+      val unpublished = project.configurations.create("unpublished")
+      project.dependencies.add(unpublished.name, "com.facebook.react:react-android:1000.0.0")
+      assertThat(runCatching { unpublished.resolve() }.isFailure).isTrue()
+      assertThat(requests.get()).isZero()
+    } finally {
+      server.stop(0)
+    }
+  }
+
   @Test
   fun configureRepositories_containsGoogleRepo() {
     val repositoryURI = URI.create("https://dl.google.com/dl/android/maven2/")
@@ -416,19 +454,29 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun configureDependencies_withUnpublishedVersion_doesNotRequestReactNativeArtifacts() {
+  fun configureDependencies_withUnpublishedVersion_preservesResolutionStrategy() {
     val project = createProject()
 
     configureDependencies(project, DependencyUtils.Coordinates("1000.0.0", "4.5.6"))
 
     val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
-    assertThat(forcedModules.none { it.toString().contains(":1000.0.0") }).isTrue()
+    assertThat(
+            forcedModules.any {
+              it.toString() == "com.facebook.react:react-android:1000.0.0"
+            },
+        )
+        .isTrue()
     assertThat(forcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:4.5.6" })
         .isTrue()
 
     val dependencySubstitutions =
         getDependencySubstitutions(DependencyUtils.Coordinates("1000.0.0", "4.5.6"))
-    assertThat(dependencySubstitutions.none { it.second.contains(":1000.0.0") }).isTrue()
+    assertThat(
+            dependencySubstitutions.any {
+              it.second == "com.facebook.react:react-android:1000.0.0"
+            },
+        )
+        .isTrue()
   }
 
   @Test

packages/react-native/scripts/cocoapods/__tests__/maven_mirror_flag-test.rb

@@ -45,12 +45,23 @@ def test_mavenMirror_isDisabledWhenExplicitlySetToFalse
     def test_unpublishedVersion_skipsAllArtifactLookups
         assert_false(ReactNativePodsUtils.maven_artifact_version_published?('1000.0.0'))
         assert_false(ReactNativePodsUtils.artifact_exists?('https://repo.reactnative.dev/maven2/example/1000.0.0/example.tar.gz'))
+        assert_false(ReactNativePodsUtils.artifact_exists?('https://central.sonatype.com/example/1000.0.0-SNAPSHOT/example.tar.gz'))
         assert_false(ReactNativeCoreUtils.release_artifact_exists('1000.0.0'))
         assert_false(ReactNativeCoreUtils.nightly_artifact_exists('1000.0.0'))
         assert_false(ReactNativeDependenciesUtils.release_artifact_exists('1000.0.0'))
         assert_false(ReactNativeDependenciesUtils.nightly_artifact_exists('1000.0.0'))
         assert_false(release_artifact_exists('1000.0.0'))
         assert_false(hermes_artifact_exists('https://repo.reactnative.dev/maven2/example/1000.0.0/example.tar.gz'))
+
+        assert_equal(
+            ReactNativeCoreUtils.stable_tarball_urls('1000.0.0', :debug).first,
+            ReactNativeCoreUtils.stable_tarball_url('1000.0.0', :debug),
+        )
+        assert_equal(
+            ReactNativeDependenciesUtils.release_tarball_urls('1000.0.0', :debug).first,
+            ReactNativeDependenciesUtils.release_tarball_url('1000.0.0', :debug),
+        )
+        assert_equal(release_tarball_urls('1000.0.0', :debug).first, release_tarball_url('1000.0.0', :debug))
     end
 
     def test_releaseVersion_isPublished

packages/react-native/scripts/cocoapods/rncore.rb

@@ -350,8 +350,6 @@ def self.generate_plist_content(mappings)
     end
 
     def self.stable_tarball_url(version, build_type, dsyms = false)
-        return nil if !ReactNativePodsUtils.maven_artifact_version_published?(version)
-
         candidates = stable_tarball_urls(version, build_type, dsyms)
         return candidates.find { |url| artifact_exists(url) } || candidates.first
     end
@@ -469,8 +467,6 @@ def self.download_rncore_tarball(react_native_path, tarball_url, version, config
     end
 
     def self.release_artifact_exists(version)
-        return false if !ReactNativePodsUtils.maven_artifact_version_published?(version)
-
         return stable_tarball_urls(version, :debug).any? { |url| artifact_exists(url) }
     end
 

packages/react-native/scripts/cocoapods/rndependencies.rb

@@ -232,8 +232,6 @@ def self.podspec_source_download_prebuild_release_tarball()
     end
 
     def self.release_tarball_url(version, build_type)
-        return nil if !ReactNativePodsUtils.maven_artifact_version_published?(version)
-
         candidates = release_tarball_urls(version, build_type)
         return candidates.find { |url| artifact_exists(url) } || candidates.first
     end
@@ -377,8 +375,6 @@ def self.download_rndeps_tarball(react_native_path, tarball_url, version, config
     end
 
     def self.release_artifact_exists(version)
-        return false if !ReactNativePodsUtils.maven_artifact_version_published?(version)
-
         return release_tarball_urls(version, :debug).any? { |url| artifact_exists(url) }
     end
 

packages/react-native/scripts/cocoapods/utils.rb

@@ -839,7 +839,8 @@ def self.resolve_use_frameworks(spec, header_mappings_dir: nil, module_name: nil
     # (DNS failure, no route, ...) the probe is left uncached so that a
     # transient hiccup doesn't permanently mark the artifact as missing.
     def self.artifact_exists?(tarball_url)
-        return false if tarball_url.include?("/#{UNPUBLISHED_MAVEN_VERSION}/")
+        unpublished_version = Regexp.escape(UNPUBLISHED_MAVEN_VERSION)
+        return false if tarball_url.match?(%r{/#{unpublished_version}(?:-SNAPSHOT)?/})
 
         unless @@artifact_exists_cache.key?(tarball_url)
             # -L is used to follow redirects, useful for the nightlies

packages/react-native/scripts/ios-prebuild/hermes.js

@@ -66,10 +66,7 @@ async function prepareHermesArtifactsAsync(
     // Resolve the version from the environment variable or use the default version
     let resolvedVersion = process.env.HERMES_VERSION ?? 'latest-v1';
 
-    if (
-      resolvedVersion === 'latest-v1' ||
-      !isMavenArtifactVersionPublished(resolvedVersion)
-    ) {
+    if (resolvedVersion === 'latest-v1') {
       // TODO: rename 'latest-v1' to 'latest' once V1 is the only Hermes on npm
       hermesLog('Using latest-v1 tarball');
       const hermesVersion = await getLatestHermesVersionFromNPM();
@@ -211,6 +208,10 @@ async function findExistingTarballUrl(
   version /*: string */,
   buildType /*: BuildFlavor */,
 ) /*: Promise<?string> */ {
+  if (!isMavenArtifactVersionPublished(version)) {
+    return null;
+  }
+
   const candidates = getTarballUrls(version, buildType);
   for (const url of candidates) {
     if (await hermesArtifactExists(url)) {
@@ -348,6 +349,11 @@ async function downloadHermesTarball(
     const tmpFile = `${artifactsPath}/hermes-ios.download`;
     try {
       fs.mkdirSync(artifactsPath, {recursive: true});
+      if (!isMavenArtifactVersionPublished(version)) {
+        throw new Error(
+          `Maven artifacts are not published for the development version ${version}`,
+        );
+      }
       hermesLog(`Downloading Hermes tarball from ${tarballUrl}`);
 
       const response /*: Response */ = await fetch(tarballUrl);

packages/react-native/scripts/ios-prebuild/reactNativeDependencies.js

@@ -50,10 +50,7 @@ async function prepareReactNativeDependenciesArtifactsAsync(
   // Resolve the version from the environment variable or use the default version
   let resolvedVersion = process.env.RN_DEP_VERSION ?? version;
 
-  if (
-    resolvedVersion === 'nightly' ||
-    !isMavenArtifactVersionPublished(resolvedVersion)
-  ) {
+  if (resolvedVersion === 'nightly') {
     dependencyLog('Using latest nightly tarball');
     const rnVersion = await getNightlyVersionFromNPM();
     resolvedVersion = rnVersion;
@@ -240,6 +237,10 @@ async function findExistingTarballUrl(
   version /*: string */,
   buildType /*: BuildFlavor */,
 ) /*: Promise<?string> */ {
+  if (!isMavenArtifactVersionPublished(version)) {
+    return null;
+  }
+
   const candidates = getTarballUrls(version, buildType);
   for (const url of candidates) {
     if (await reactNativeDependenciesArtifactExists(url)) {
@@ -405,6 +406,11 @@ async function downloadReactNativeDependenciesTarball(
     const tmpFile = `${artifactsPath}/reactnative-dependencies.download`;
     try {
       fs.mkdirSync(artifactsPath, {recursive: true});
+      if (!isMavenArtifactVersionPublished(version)) {
+        throw new Error(
+          `Maven artifacts are not published for the development version ${version}`,
+        );
+      }
       dependencyLog(
         `Downloading ReactNativeDependencies tarball from ${tarballUrl}`,
       );

packages/react-native/scripts/spm/__tests__/download-spm-artifacts-test.js

@@ -378,11 +378,25 @@ describe('mavenRepositoryUrls', () => {
 // ---------------------------------------------------------------------------
 
 describe('release URL builders', () => {
-  it('does not create Maven URLs for the unpublished main version', () => {
+  it('preserves Maven URLs for the unpublished main version', () => {
     expect(isMavenArtifactVersionPublished('1000.0.0')).toBe(false);
-    expect(rnCoreReleaseUrls('1000.0.0', 'debug')).toEqual([]);
-    expect(rnDepsReleaseUrls('1000.0.0', 'debug')).toEqual([]);
-    expect(hermesReleaseUrls('1000.0.0', 'debug')).toEqual([]);
+    expect(rnCoreReleaseUrls('1000.0.0', 'debug')).toHaveLength(2);
+    expect(rnDepsReleaseUrls('1000.0.0', 'debug')).toHaveLength(2);
+    expect(hermesReleaseUrls('1000.0.0', 'debug')).toHaveLength(2);
+  });
+
+  it('does not probe Maven for the unpublished main version', async () => {
+    const originalFetch = globalThis.fetch;
+    globalThis.fetch = jest.fn();
+
+    try {
+      await expect(
+        exists(rnCoreReleaseUrls('1000.0.0', 'debug')[0]),
+      ).resolves.toBe(false);
+      expect(globalThis.fetch).not.toHaveBeenCalled();
+    } finally {
+      globalThis.fetch = originalFetch;
+    }
   });
 
   it('rnCoreReleaseUrls builds a candidate per repository for the reactnative-core classifier', () => {