From 45183620dd3e4c042d65c78585cde3087be46ef0 Mon Sep 17 00:00:00 2001
From: Ivo Almeida <ialmeida@redhat.com>
Date: Tue, 28 May 2024 13:20:53 +0100
Subject: [PATCH] mgr/dashboard: update node js version

Fixes: https://tracker.ceph.com/issues/66249

Signed-off-by: Ivo Almeida <ialmeida@redhat.com>
---
 doc/dev/developer_guide/dash-devel.rst           | 4 ++--
 make-dist                                        | 2 +-
 src/pybind/mgr/dashboard/frontend/CMakeLists.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/dev/developer_guide/dash-devel.rst b/doc/dev/developer_guide/dash-devel.rst
index 4fa992b8d551e..2285690e383cf 100644
--- a/doc/dev/developer_guide/dash-devel.rst
+++ b/doc/dev/developer_guide/dash-devel.rst
@@ -214,8 +214,8 @@ The build process is based on `Node.js <https://nodejs.org/>`_ and requires the
 Prerequisites
 ~~~~~~~~~~~~~
 
- * Node 18.17.0 or higher
- * NPM 9.6.7 or higher
+ * Node 20.13.1 or higher
+ * NPM 10.5.2 or higher
 
 nodeenv:
   During Ceph's build we create a virtualenv with ``node`` and ``npm``
diff --git a/make-dist b/make-dist
index 4b4d0e85e0cf0..fde1773c9b1c2 100755
--- a/make-dist
+++ b/make-dist
@@ -132,7 +132,7 @@ build_dashboard_frontend() {
 
   $CURR_DIR/src/tools/setup-virtualenv.sh $TEMP_DIR
   $TEMP_DIR/bin/pip install nodeenv
-  $TEMP_DIR/bin/nodeenv --verbose -p --node=18.17.0
+  $TEMP_DIR/bin/nodeenv --verbose -p --node=20.13.1
   cd src/pybind/mgr/dashboard/frontend
 
   . $TEMP_DIR/bin/activate
diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
index 2527ef23e85e5..c0d16511e9668 100644
--- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
@@ -64,7 +64,7 @@ else(WITH_SYSTEM_NPM)
     OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
     COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
     COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=18.17.0
+    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=20.13.1
     COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "dashboard nodeenv is being installed")