fix: try online install after ERESOLVE (#2449 fixes #2448)

nedtwigg · web-flow · commit 557d983d833f · 2025-03-14T11:24:27.000-07:00
diff --git a/CHANGES.md b/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
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeApp.java b/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");
 	}
 }
diff --git a/plugin-gradle/CHANGES.md b/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
diff --git a/plugin-maven/CHANGES.md b/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))

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2023 DiffPlug`
	`2`	`+ * Copyright 2023-2025 DiffPlug`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -98,18 +98,28 @@ private void optimizedNpmInstall() {`
`98`	`98`	`if (!offlineInstallFailed(e.getResult())) {`
`99`	`99`	`throw e; // pass through`
`100`	`100`	`}`
`101`		`- // if the npm install fails with message "No matching version found for <package>@<version>", we try again without the offline flag`
	`101`	`+ // if the npm install fails in a way that might be caused by missing dependency information, we try again without the offline flag`
`102`	`102`	`npmProcessFactory.createNpmInstallProcess(nodeServerLayout, formatterStepLocations, PREFER_ONLINE).waitFor();`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`- private boolean offlineInstallFailed(ProcessRunner.Result result) {`
	`106`	`+ private static boolean offlineInstallFailed(ProcessRunner.Result result) {`
`107`	`107`	`if (result == null) {`
`108`	`108`	`return false; // no result, something else must have happened`
`109`	`109`	`}`
`110`	`110`	`if (result.exitCode() == 0) {`
`111`	`111`	`return false; // all is well`
`112`	`112`	`}`
`113`		`- return result.stdOutUtf8().contains("code ETARGET") && result.stdOutUtf8().contains("No matching version found for"); // offline install failed, needs online install`
	`113`	`+ var installOutput = result.stdOutUtf8();`
	`114`	`+ // offline install failed, needs online install`
	`115`	`+ return isNoMatchingVersionFound(installOutput) \|\| isCannotResolveDependencyTree(installOutput);`
	`116`	`+ }`
	`117`	`+`
	`118`	`+ private static boolean isNoMatchingVersionFound(String installOutput) {`
	`119`	`+ return installOutput.contains("code ETARGET") && installOutput.contains("No matching version found for");`
	`120`	`+ }`
	`121`	`+`
	`122`	`+ private static boolean isCannotResolveDependencyTree(String installOutput) {`
	`123`	`+ return installOutput.contains("code ERESOLVE") && installOutput.contains("unable to resolve dependency tree");`
`114`	`124`	`}`
`115`	`125`	`}`