Skip to content

Commit 69989fb

Browse files
committed
log
1 parent 9f4fb10 commit 69989fb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeResolver.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ private ActiveNodeInstallation tryUseGlobalNode() {
147147
String nodeCommand = FrontendUtils.isWindows() ? "node.exe" : "node";
148148
File nodeExecutable = frontendToolsLocator.tryLocateTool(nodeCommand)
149149
.orElse(null);
150+
log.info("Located global node {}", nodeExecutable);
150151

151152
if (nodeExecutable == null) {
152153
return null;
@@ -184,7 +185,7 @@ private ActiveNodeInstallation tryUseGlobalNode() {
184185
// Found suitable global node - now get npm information
185186
String npmCliScript = getGlobalNpmCliScript(nodeExecutable);
186187
if (npmCliScript == null) {
187-
getLogger().debug(
188+
getLogger().info(
188189
"npm-cli.js not found in global Node.js installation, will use alternative directory");
189190
return null;
190191
}
@@ -197,7 +198,7 @@ private ActiveNodeInstallation tryUseGlobalNode() {
197198
npmCliScript, "--version"))
198199
.getFullVersion();
199200
} catch (UnknownVersionException e) {
200-
getLogger().debug(
201+
getLogger().info(
201202
"Could not determine npm version from global installation",
202203
e);
203204
npmVersion = "unknown";
@@ -229,7 +230,7 @@ private String getGlobalNpmCliScript(File nodeExecutable) {
229230
// Try common locations relative to node executable
230231
String[] possiblePaths = isWindows
231232
? new String[] { "node_modules\\npm\\bin\\npm-cli.js" }
232-
: new String[] { "lib/node_modules/npm/bin/npm-cli.js" };
233+
: new String[] { "lib/node_modules/npm/bin/npm-cli.js", "node_modules/npm/bin/npm-cli.js" };
233234

234235
for (String path : possiblePaths) {
235236
File npmCliScript = new File(nodeDir, path);

0 commit comments

Comments
 (0)