buildArguments(final YarnExecutorConfig config, Prox
return arguments;
}
+
+ /**
+ * Why not use? / Why not do this instead?
+ *
+ * - Execute node/yarn from the path?It's often different to the
+ * Node version used by this plugin because people often have to mix
+ * versions AND because this plugin executes all tasks from the version
+ * it downloaded
+ * - Use the same command between yarn versions?There is
+ * no command compatible with all version of yarn we use and support
+ * - Use yarn to call node?In Yarn classic it's not a reserved
+ * command which can lead to crashes if a project has a "node"
+ * script (reasonably common)
+ *
+ * Output of the commands
+ * In Yarn Berry
+ *
+ * Running {@code yarn node --version} in yarn classic gives us an output
+ * like this of all the C++ libraries and the package name in the
+ * {@code package.json}:
+ *
+ * yarn node v1.22.22
+ * v20.10.0
+ * Done in 0.02s.
+ *
+ * while yarn berry will give us just the output
+ *
+ * In Yarn Classic
+ *
+ * Running {@code yarn versions} gives an output like this:
+ *
+ * yarn versions v1.22.22
+ * {
+ * yarn: '1.22.22',
+ * '@atlassian/aui-workspace': '9.13.0-SNAPSHOT',
+ * node: '18.17.0',
+ * acorn: '8.8.2',
+ * ada: '2.5.0',
+ * ....
+ * }
+ * Done in 0.01s.
+ *
+ * The first line is repeated and the last one will cause an unnecessary diff. Running
+ * with {@code --silent} culls the first and last lines, but this isn't available on all yarn
+ * classic versions, e.g. 1.22.17
+ *
+ */
+ @Override
+ public Optional getRuntime() {
+ // Why not call config.isYarnBerry() ?? Well it can lie since it's not using what's
+ // on the path..... it's just looking at files
+ try {
+ String output = new YarnExecutor(config, asList("node", "--version"), emptyMap())
+ .executeAndGetResult(logger);
+ if (output.startsWith("yarn node")) {
+ output = output.substring(output.indexOf("\n"), output.lastIndexOf("\n")).trim();
+ }
+ return Optional.of(new Runtime("node", output));
+ } catch (Exception exception) {
+ logger.debug("Failed to get the Node version from yarn, will fallback and hope it's yarn classic. Failed because: ", exception);
+ }
+
+ try {
+ String rawVersions = new YarnExecutor(config, singletonList("versions"), emptyMap())
+ .executeAndGetResult(logger);
+ int startIndex = rawVersions.indexOf("{");
+ int endIndex = rawVersions.indexOf("}") + 1;
+ String desiredVersions = rawVersions.substring(startIndex, endIndex)
+ .replaceAll("\\s+", "");
+ // Yes, yarn is not a runtime, but here we can glean a little more
+ // information that's more ideal to track
+ return Optional.of(new Runtime("yarn", desiredVersions));
+ } catch (Exception exception) {
+ logger.debug("Failed to get the Node version from yarn, even after assuming it's yarn classic. Failed because: ", exception);
+ return empty();
+ }
+ }
}
diff --git a/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/YarnTaskExecutor.java b/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/YarnTaskExecutor.java
index 87d826a05..e0d5314ec 100644
--- a/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/YarnTaskExecutor.java
+++ b/frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/YarnTaskExecutor.java
@@ -16,13 +16,13 @@ abstract class YarnTaskExecutor {
private static final String AT = "@";
- private final Logger logger;
+ final Logger logger;
private final String taskName;
private final ArgumentsParser argumentsParser;
- private final YarnExecutorConfig config;
+ final YarnExecutorConfig config;
public YarnTaskExecutor(YarnExecutorConfig config, String taskLocation) {
this(config, taskLocation, Collections. emptyList());
diff --git a/frontend-plugin-core/src/test/java/com/github/eirslett/maven/plugins/frontend/lib/IncrementalBuildExecutionDigestTest.java b/frontend-plugin-core/src/test/java/com/github/eirslett/maven/plugins/frontend/lib/IncrementalBuildExecutionDigestTest.java
new file mode 100644
index 000000000..da98fbef7
--- /dev/null
+++ b/frontend-plugin-core/src/test/java/com/github/eirslett/maven/plugins/frontend/lib/IncrementalBuildExecutionDigestTest.java
@@ -0,0 +1,72 @@
+package com.github.eirslett.maven.plugins.frontend.lib;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.eirslett.maven.plugins.frontend.lib.IncrementalBuildExecutionDigest.Execution;
+import com.github.eirslett.maven.plugins.frontend.lib.IncrementalBuildExecutionDigest.Execution.File;
+import com.github.eirslett.maven.plugins.frontend.lib.IncrementalBuildExecutionDigest.Execution.Runtime;
+import com.github.eirslett.maven.plugins.frontend.lib.IncrementalBuildExecutionDigest.ExecutionCoordinates;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.HashSet;
+
+import static com.github.eirslett.maven.plugins.frontend.lib.IncrementalBuildExecutionDigest.SERIALIZATION_SEPARATOR;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class IncrementalBuildExecutionDigestTest {
+
+ /**
+ * De/serialization in Jackson is not trivial and a bunch of stuff can blow up at runtime.
+ */
+ @Test
+ public void serializationSmokeTest() throws Exception {
+ IncrementalBuildExecutionDigest digestToSerialize = new IncrementalBuildExecutionDigest(
+ 2L,
+ singletonMap(
+ new ExecutionCoordinates(
+ "test-goal",
+ "test-id"
+ // make sure we got a good character
+ + SERIALIZATION_SEPARATOR,
+ "test-phase"),
+ new Execution(
+ "test-arguments",
+ Collections.singletonMap("NODE_ENV", "test"),
+ new HashSet<>(singletonList(new File("test-file.js", 12345, "abc123"))),
+ new Runtime("node", "{\n" +
+ " '@atlassian/solicitorio': '3.4.0',\n" +
+ " npm: '8.15.0',\n" +
+ " node: '18.17.0',\n" +
+ " acorn: '8.8.2',\n" +
+ " ada: '2.5.0',\n" +
+ " ares: '1.19.1',\n" +
+ " brotli: '1.0.9',\n" +
+ " cldr: '43.0',\n" +
+ " icu: '73.1',\n" +
+ " llhttp: '6.0.11',\n" +
+ " modules: '108',\n" +
+ " napi: '9',\n" +
+ " nghttp2: '1.52.0',\n" +
+ " nghttp3: '0.7.0',\n" +
+ " ngtcp2: '0.8.1',\n" +
+ " openssl: '3.0.9+quic',\n" +
+ " simdutf: '3.2.12',\n" +
+ " tz: '2023c',\n" +
+ " undici: '5.22.1',\n" +
+ " unicode: '15.0',\n" +
+ " uv: '1.44.2',\n" +
+ " uvwasi: '0.0.18',\n" +
+ " v8: '10.2.154.26-node.26',\n" +
+ " zlib: '1.2.13.1-motley'\n" +
+ "}"))));
+
+ ObjectMapper objectMapper = IncrementalMojoHelper.getObjectMapper();
+
+ String jsonString = objectMapper.writeValueAsString(digestToSerialize);
+ IncrementalBuildExecutionDigest deserializedDigest = objectMapper.readValue(jsonString, IncrementalBuildExecutionDigest.class);
+
+ assertEquals(digestToSerialize, deserializedDigest);
+ }
+}
diff --git a/pom.xml b/pom.xml
index 54d397994..3d253ba2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
com.github.eirslett
frontend-plugins
- 1.15.1-atlassian-1-SNAPSHOT
+ 1.15.1-atlassian-4-SNAPSHOT
pom
@@ -33,7 +33,8 @@
https://github.com/atlassian-forks/frontend-maven-plugin
scm:git:https://github.com/atlassian-forks/frontend-maven-plugin.git
scm:git:git@github.com:atlassian-forks/frontend-maven-plugin.git
-
+ HEAD
+