fix: try online install after ERESOLVE (#2448)

CHANGES.md

@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
+* Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
 
 ## [3.1.0] - 2025-02-20
 ### Added

lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,18 +98,28 @@ private void optimizedNpmInstall() {
 			if (!offlineInstallFailed(e.getResult())) {
 				throw e; // pass through
 			}
-			// if the npm install fails with message "No matching version found for <package>@<version>", we try again without the offline flag
+			// if the npm install fails in a way that might be caused by missing dependency information, we try again without the offline flag
 			npmProcessFactory.createNpmInstallProcess(nodeServerLayout, formatterStepLocations, PREFER_ONLINE).waitFor();
 		}
 	}
 
-	private boolean offlineInstallFailed(ProcessRunner.Result result) {
+	private static boolean offlineInstallFailed(ProcessRunner.Result result) {
 		if (result == null) {
 			return false; // no result, something else must have happened
 		}
 		if (result.exitCode() == 0) {
 			return false; // all is well
 		}
-		return result.stdOutUtf8().contains("code ETARGET") && result.stdOutUtf8().contains("No matching version found for"); // offline install failed, needs online install
+		var installOutput = result.stdOutUtf8();
+		// offline install failed, needs online install
+		return isNoMatchingVersionFound(installOutput) || isCannotResolveDependencyTree(installOutput);
+	}
+
+	private static boolean isNoMatchingVersionFound(String installOutput) {
+		return installOutput.contains("code ETARGET") && installOutput.contains("No matching version found for");
+	}
+
+	private static boolean isCannotResolveDependencyTree(String installOutput) {
+		return installOutput.contains("code ERESOLVE") && installOutput.contains("unable to resolve dependency tree");
 	}
 }

plugin-gradle/CHANGES.md

@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
+* Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed

plugin-maven/CHANGES.md

@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changed
 * Use palantir-java-format 2.57.0 on Java 21. ([#2447](https://github.com/diffplug/spotless/pull/2447))
+* Re-try `npm install` with `--prefer-online` after `ERESOLVE` error. ([#2448](https://github.com/diffplug/spotless/pull/2448))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))