fix: Upgrade auto-installed Node to v16 (#10772)

Fixes #10637
vaadin · May 6, 2021 · 31cf3ef · 31cf3ef
1 parent ef7c5a3
commit 31cf3ef
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/...plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt b/...plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt
@@ -147,7 +147,7 @@ public open class VaadinFlowPluginExtension(project: Project) {
 
     /**
      * The node.js version to be used when node.js is installed automatically by
-     * Vaadin, for example `"v14.15.4"`. Defaults to [FrontendTools.DEFAULT_NODE_VERSION].
+     * Vaadin, for example `"v16.0.0"`. Defaults to [FrontendTools.DEFAULT_NODE_VERSION].
      */
     public var nodeVersion: String = FrontendTools.DEFAULT_NODE_VERSION
 

diff --git a/...ns/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java b/...ns/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java
@@ -107,7 +107,7 @@ public abstract class FlowModeAbstractMojo extends AbstractMojo
 
     /**
      * The node.js version to be used when node.js is installed automatically by
-     * Vaadin, for example `"v14.15.4"`. Defaults to null which uses the
+     * Vaadin, for example `"v16.0.0"`. Defaults to null which uses the
      * Vaadin-default node version - see {@link FrontendTools} for details.
      */
     @Parameter(property = "node.version", defaultValue = FrontendTools.DEFAULT_NODE_VERSION)

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java
@@ -52,7 +52,7 @@
  */
 public class FrontendTools {
 
-    public static final String DEFAULT_NODE_VERSION = "v14.15.4";
+    public static final String DEFAULT_NODE_VERSION = "v16.0.0";
 
     public static final String DEFAULT_PNPM_VERSION = "5";
 
@@ -222,7 +222,7 @@ public FrontendTools(String baseDir,
      *            {@code null}
      * @param nodeVersion
      *            The node.js version to be used when node.js is installed
-     *            automatically by Vaadin, for example <code>"v14.15.4"</code>.
+     *            automatically by Vaadin, for example <code>"v16.0.0"</code>.
      *            Use {@value #DEFAULT_NODE_VERSION} by default.
      * @param nodeDownloadRoot
      *            Download node.js from this URL. Handy in heavily firewalled
@@ -258,7 +258,7 @@ public FrontendTools(String baseDir, Supplier<String> alternativeDirGetter,
      *            {@code null}
      * @param nodeVersion
      *            The node.js version to be used when node.js is installed
-     *            automatically by Vaadin, for example <code>"v14.15.4"</code>.
+     *            automatically by Vaadin, for example <code>"v16.0.0"</code>.
      *            Use {@value #DEFAULT_NODE_VERSION} by default.
      * @param nodeDownloadRoot
      *            Download node.js from this URL. Handy in heavily firewalled

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeTasks.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeTasks.java
@@ -125,8 +125,8 @@ public static class Builder implements Serializable {
 
         /**
          * The node.js version to be used when node.js is installed
-         * automatically by Vaadin, for example <code>"v14.15.4"</code>.
-         * Defaults to {@value FrontendTools#DEFAULT_NODE_VERSION}.
+         * automatically by Vaadin, for example <code>"v16.0.0"</code>. Defaults
+         * to {@value FrontendTools#DEFAULT_NODE_VERSION}.
          */
         private String nodeVersion = FrontendTools.DEFAULT_NODE_VERSION;
 
@@ -502,8 +502,8 @@ public Builder withHomeNodeExecRequired(boolean requireHomeNodeExec) {
 
         /**
          * Sets the node.js version to be used when node.js is installed
-         * automatically by Vaadin, for example <code>"v14.15.4"</code>.
-         * Defaults to {@value FrontendTools#DEFAULT_NODE_VERSION}.
+         * automatically by Vaadin, for example <code>"v16.0.0"</code>. Defaults
+         * to {@value FrontendTools#DEFAULT_NODE_VERSION}.
          *
          * @param nodeVersion
          *            the new node version to download, not null.

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskRunNpmInstall.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskRunNpmInstall.java
@@ -95,7 +95,7 @@ public class TaskRunNpmInstall implements FallibleCommand {
      *            whether vaadin home node executable has to be used
      * @param nodeVersion
      *            The node.js version to be used when node.js is installed
-     *            automatically by Vaadin, for example <code>"v14.15.4"</code>.
+     *            automatically by Vaadin, for example <code>"v16.0.0"</code>.
      *            Use {@value FrontendTools#DEFAULT_NODE_VERSION} by default.
      * @param nodeDownloadRoot
      *            Download node.js from this URL. Handy in heavily firewalled

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java
@@ -120,7 +120,7 @@ public NodeInstaller(File installDirectory, Platform platform,
     }
 
     /**
-     * Set the node version to install. (given as "v14.15.4")
+     * Set the node version to install. (given as "v16.0.0")
      *
      * @param nodeVersion
      *            version string
@@ -136,10 +136,10 @@ public NodeInstaller setNodeVersion(String nodeVersion) {
      * <p>
      * This should be a url or directory under which we can find a directory
      * {@link #nodeVersion} and there should then exist the archived node
-     * packages. For instance for v14.15.4 we should have under
-     * nodeDownloadRoot: ./v14.15.4/node-v14.15.4-linux-x64.tar.xz
-     * ./v14.15.4/node-v14.15.4-darwin-x64.tar.gz
-     * ./v14.15.4/node-v14.15.4-win-x64.zip ./v14.15.4/node-v14.15.4-win-x86.zip
+     * packages. For instance for v16.0.0 we should have under nodeDownloadRoot:
+     * ./v16.0.0/node-v16.0.0-linux-x64.tar.xz
+     * ./v16.0.0/node-v16.0.0-darwin-x64.tar.gz
+     * ./v16.0.0/node-v16.0.0-win-x64.zip ./v16.0.0/node-v16.0.0-win-x86.zip
      *
      * @param nodeDownloadRoot
      *            custom download root