Upgrade default Node to 16.14.2 and npm to 8.5.0 #226

Author: deepy

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Version 3.x *(unreleased)*
+* Upgrade default Node to 16.14.2 and npm to 8.5.0 [#226](https://github.com/node-gradle/gradle-node-plugin/issues/226) 
 
 ## Version 3.2.1 *(2022-02-14)*
 * Backwards compatibility fix for those using VariantComputer [#213](https://github.com/node-gradle/gradle-node-plugin/issues/213)

src/main/kotlin/com/github/gradle/node/NodeExtension.kt

@@ -118,12 +118,12 @@ open class NodeExtension(project: Project) {
         /**
          * Default version of Node to download if none is set
          */
-        const val DEFAULT_NODE_VERSION = "14.15.4"
+        const val DEFAULT_NODE_VERSION = "16.14.2"
 
         /**
          * Default version of npm to download if none is set
          */
-        const val DEFAULT_NPM_VERSION = "6.14.10"
+        const val DEFAULT_NPM_VERSION = "8.5.0"
 
         @JvmStatic
         operator fun get(project: Project): NodeExtension {

src/test/groovy/com/github/gradle/node/npm/task/NpmRule_integTest.groovy

@@ -1,6 +1,7 @@
 package com.github.gradle.node.npm.task
 
 import com.github.gradle.AbstractIntegTest
+import com.github.gradle.node.NodeExtension
 import org.gradle.testkit.runner.TaskOutcome
 
 import java.util.regex.Pattern
@@ -76,7 +77,7 @@ class NpmRule_integTest extends AbstractIntegTest {
         then:
         result.task(":npmInstall").outcome == TaskOutcome.SUCCESS
         result.task(":npm_run_npmVersion").outcome == TaskOutcome.SUCCESS
-        def versionPattern = Pattern.compile(".*Version\\s+6.12.0.*", Pattern.DOTALL)
+        def versionPattern = Pattern.compile(".*Version\\s+${NodeExtension.DEFAULT_NPM_VERSION}.*", Pattern.DOTALL)
         versionPattern.matcher(result.output).find()
     }
 }

src/test/groovy/com/github/gradle/node/npm/task/NpmTask_integTest.groovy

@@ -1,6 +1,7 @@
 package com.github.gradle.node.npm.task
 
 import com.github.gradle.AbstractIntegTest
+import com.github.gradle.node.NodeExtension
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Rule
 import org.junit.contrib.java.lang.system.EnvironmentVariables
@@ -49,7 +50,7 @@ class NpmTask_integTest extends AbstractIntegTest {
 
         then:
         result4.task(":version").outcome == TaskOutcome.SUCCESS
-        result4.output.contains("> Task :version${System.lineSeparator()}6.12.0")
+        result4.output.contains("> Task :version${System.lineSeparator()}${NodeExtension.DEFAULT_NPM_VERSION}")
     }
 
     def 'execute npm command with custom execution configuration and check up-to-date-detection'() {
@@ -95,7 +96,7 @@ class NpmTask_integTest extends AbstractIntegTest {
         result4.task(":npmSetup").outcome == TaskOutcome.SKIPPED
         result4.task(":npmInstall").outcome == TaskOutcome.UP_TO_DATE
         result4.task(":env").outcome == TaskOutcome.SUCCESS
-        result4.output.contains("Usage: npm <command>")
+        result4.output.contains("Unknown command: \"notExistingCommand\"")
 
         when:
         def result5 = buildAndFail(":env", "-DnotExistingCommand=true")
@@ -105,7 +106,7 @@ class NpmTask_integTest extends AbstractIntegTest {
         result5.task(":npmSetup").outcome == TaskOutcome.SKIPPED
         result5.task(":npmInstall").outcome == TaskOutcome.UP_TO_DATE
         result5.task(":env").outcome == TaskOutcome.FAILED
-        result5.output.contains("Usage: npm <command>")
+        result5.output.contains("Unknown command: \"notExistingCommand\"")
 
         when:
         def result6 = build(":env", "-DoutputFile=true")
@@ -169,6 +170,6 @@ class NpmTask_integTest extends AbstractIntegTest {
 
         then:
         result.task(":version").outcome == TaskOutcome.SUCCESS
-        result.output.contains("> Task :version${System.lineSeparator()}6.12.0")
+        result.output.contains("> Task :version${System.lineSeparator()}${NodeExtension.DEFAULT_NPM_VERSION}")
     }
 }

src/test/groovy/com/github/gradle/node/npm/task/NpxTask_integTest.groovy

@@ -1,6 +1,7 @@
 package com.github.gradle.node.npm.task
 
 import com.github.gradle.AbstractIntegTest
+import com.github.gradle.node.NodeExtension
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Rule
 import org.junit.contrib.java.lang.system.EnvironmentVariables
@@ -78,7 +79,7 @@ class NpxTask_integTest extends AbstractIntegTest {
 
         then:
         result4.task(":version").outcome == TaskOutcome.SUCCESS
-        result4.output.contains("> Task :version${System.lineSeparator()}6.12.0")
+        result4.output.contains("> Task :version${System.lineSeparator()}${NodeExtension.DEFAULT_NPM_VERSION}")
     }
 
     def 'execute npx command with custom execution configuration and check up-to-date-detection'() {
@@ -199,6 +200,6 @@ class NpxTask_integTest extends AbstractIntegTest {
 
         then:
         result.task(":version").outcome == TaskOutcome.SUCCESS
-        result.output.contains("> Task :version${System.lineSeparator()}6.12.0")
+        result.output.contains("> Task :version${System.lineSeparator()}${NodeExtension.DEFAULT_NPM_VERSION}")
     }
 }