Skip to content

Commit 31cf3ef

Browse files
authored
fix: Upgrade auto-installed Node to v16 (#10772)
Fixes #10637
1 parent ef7c5a3 commit 31cf3ef

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public open class VaadinFlowPluginExtension(project: Project) {
147147

148148
/**
149149
* The node.js version to be used when node.js is installed automatically by
150-
* Vaadin, for example `"v14.15.4"`. Defaults to [FrontendTools.DEFAULT_NODE_VERSION].
150+
* Vaadin, for example `"v16.0.0"`. Defaults to [FrontendTools.DEFAULT_NODE_VERSION].
151151
*/
152152
public var nodeVersion: String = FrontendTools.DEFAULT_NODE_VERSION
153153

‎flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public abstract class FlowModeAbstractMojo extends AbstractMojo
107107

108108
/**
109109
* The node.js version to be used when node.js is installed automatically by
110-
* Vaadin, for example `"v14.15.4"`. Defaults to null which uses the
110+
* Vaadin, for example `"v16.0.0"`. Defaults to null which uses the
111111
* Vaadin-default node version - see {@link FrontendTools} for details.
112112
*/
113113
@Parameter(property = "node.version", defaultValue = FrontendTools.DEFAULT_NODE_VERSION)

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
*/
5353
public class FrontendTools {
5454

55-
public static final String DEFAULT_NODE_VERSION = "v14.15.4";
55+
public static final String DEFAULT_NODE_VERSION = "v16.0.0";
5656

5757
public static final String DEFAULT_PNPM_VERSION = "5";
5858

@@ -222,7 +222,7 @@ public FrontendTools(String baseDir,
222222
* {@code null}
223223
* @param nodeVersion
224224
* The node.js version to be used when node.js is installed
225-
* automatically by Vaadin, for example <code>"v14.15.4"</code>.
225+
* automatically by Vaadin, for example <code>"v16.0.0"</code>.
226226
* Use {@value #DEFAULT_NODE_VERSION} by default.
227227
* @param nodeDownloadRoot
228228
* Download node.js from this URL. Handy in heavily firewalled
@@ -258,7 +258,7 @@ public FrontendTools(String baseDir, Supplier<String> alternativeDirGetter,
258258
* {@code null}
259259
* @param nodeVersion
260260
* The node.js version to be used when node.js is installed
261-
* automatically by Vaadin, for example <code>"v14.15.4"</code>.
261+
* automatically by Vaadin, for example <code>"v16.0.0"</code>.
262262
* Use {@value #DEFAULT_NODE_VERSION} by default.
263263
* @param nodeDownloadRoot
264264
* Download node.js from this URL. Handy in heavily firewalled

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeTasks.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ public static class Builder implements Serializable {
125125

126126
/**
127127
* The node.js version to be used when node.js is installed
128-
* automatically by Vaadin, for example <code>"v14.15.4"</code>.
129-
* Defaults to {@value FrontendTools#DEFAULT_NODE_VERSION}.
128+
* automatically by Vaadin, for example <code>"v16.0.0"</code>. Defaults
129+
* to {@value FrontendTools#DEFAULT_NODE_VERSION}.
130130
*/
131131
private String nodeVersion = FrontendTools.DEFAULT_NODE_VERSION;
132132

@@ -502,8 +502,8 @@ public Builder withHomeNodeExecRequired(boolean requireHomeNodeExec) {
502502

503503
/**
504504
* Sets the node.js version to be used when node.js is installed
505-
* automatically by Vaadin, for example <code>"v14.15.4"</code>.
506-
* Defaults to {@value FrontendTools#DEFAULT_NODE_VERSION}.
505+
* automatically by Vaadin, for example <code>"v16.0.0"</code>. Defaults
506+
* to {@value FrontendTools#DEFAULT_NODE_VERSION}.
507507
*
508508
* @param nodeVersion
509509
* the new node version to download, not null.

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskRunNpmInstall.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public class TaskRunNpmInstall implements FallibleCommand {
9595
* whether vaadin home node executable has to be used
9696
* @param nodeVersion
9797
* The node.js version to be used when node.js is installed
98-
* automatically by Vaadin, for example <code>"v14.15.4"</code>.
98+
* automatically by Vaadin, for example <code>"v16.0.0"</code>.
9999
* Use {@value FrontendTools#DEFAULT_NODE_VERSION} by default.
100100
* @param nodeDownloadRoot
101101
* Download node.js from this URL. Handy in heavily firewalled

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public NodeInstaller(File installDirectory, Platform platform,
120120
}
121121

122122
/**
123-
* Set the node version to install. (given as "v14.15.4")
123+
* Set the node version to install. (given as "v16.0.0")
124124
*
125125
* @param nodeVersion
126126
* version string
@@ -136,10 +136,10 @@ public NodeInstaller setNodeVersion(String nodeVersion) {
136136
* <p>
137137
* This should be a url or directory under which we can find a directory
138138
* {@link #nodeVersion} and there should then exist the archived node
139-
* packages. For instance for v14.15.4 we should have under
140-
* nodeDownloadRoot: ./v14.15.4/node-v14.15.4-linux-x64.tar.xz
141-
* ./v14.15.4/node-v14.15.4-darwin-x64.tar.gz
142-
* ./v14.15.4/node-v14.15.4-win-x64.zip ./v14.15.4/node-v14.15.4-win-x86.zip
139+
* packages. For instance for v16.0.0 we should have under nodeDownloadRoot:
140+
* ./v16.0.0/node-v16.0.0-linux-x64.tar.xz
141+
* ./v16.0.0/node-v16.0.0-darwin-x64.tar.gz
142+
* ./v16.0.0/node-v16.0.0-win-x64.zip ./v16.0.0/node-v16.0.0-win-x86.zip
143143
*
144144
* @param nodeDownloadRoot
145145
* custom download root

0 commit comments

Comments
 (0)