diff -ru rstudio-2024.09.0-375/src/cpp/conf/rsession-dev.conf rstudio-2024.09.0-375.new/src/cpp/conf/rsession-dev.conf --- rstudio-2024.09.0-375/src/cpp/conf/rsession-dev.conf 2024-09-17 05:02:32.000000000 +1200 +++ rstudio-2024.09.0-375.new/src/cpp/conf/rsession-dev.conf 2024-09-24 11:25:57.648251605 +1200 @@ -41,7 +41,7 @@ external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang # node version below should match RSTUDIO_INSTALLED_NODE_VERSION -external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/20.15.1-patched/bin/node +external-node-path=/usr/bin/node # enable copilot copilot-enabled=1 diff -ru rstudio-2024.09.0-375/src/cpp/session/CMakeLists.txt rstudio-2024.09.0-375.new/src/cpp/session/CMakeLists.txt --- rstudio-2024.09.0-375/src/cpp/session/CMakeLists.txt 2024-09-17 05:02:32.000000000 +1200 +++ rstudio-2024.09.0-375.new/src/cpp/session/CMakeLists.txt 2024-09-24 11:27:41.827637114 +1200 @@ -700,10 +700,12 @@ DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") # install node - install( - DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}-patched/" - DESTINATION "${RSTUDIO_INSTALL_BIN}/node" - USE_SOURCE_PERMISSIONS) + if(NOT RSTUDIO_USE_SYSTEM_NODE) + install( + DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}/" + DESTINATION "${RSTUDIO_INSTALL_BIN}/node" + USE_SOURCE_PERMISSIONS) + endif() # install quarto (or pandoc if quarto disabled) if(QUARTO_ENABLED) diff -ru rstudio-2024.09.0-375/src/cpp/session/SessionOptions.cpp rstudio-2024.09.0-375.new/src/cpp/session/SessionOptions.cpp --- rstudio-2024.09.0-375/src/cpp/session/SessionOptions.cpp 2024-09-17 05:02:32.000000000 +1200 +++ rstudio-2024.09.0-375.new/src/cpp/session/SessionOptions.cpp 2024-09-24 11:28:57.490536726 +1200 @@ -713,7 +713,7 @@ { #if defined(__linux__) && !defined(RSTUDIO_PACKAGE_BUILD) // node version should match RSTUDIO_INSTALLED_NODE_VERSION - FilePath dependenciesPath = resourcePath.completePath("../../dependencies/common/node/20.15.1-patched"); + FilePath dependenciesPath = resourcePath.completePath("/usr"); resolvePath(dependenciesPath, pPath); #else resolvePath(resourcePath, pPath); diff -ru rstudio-2024.09.0-375/src/gwt/build.xml rstudio-2024.09.0-375.new/src/gwt/build.xml --- rstudio-2024.09.0-375/src/gwt/build.xml 2024-09-17 05:02:32.000000000 +1200 +++ rstudio-2024.09.0-375.new/src/gwt/build.xml 2024-09-24 11:30:26.016707136 +1200 @@ -85,8 +85,8 @@ - - + + diff -ru rstudio-2024.09.0-375/src/node/CMakeNodeTools.txt rstudio-2024.09.0-375.new/src/node/CMakeNodeTools.txt --- rstudio-2024.09.0-375/src/node/CMakeNodeTools.txt 2024-09-17 05:02:32.000000000 +1200 +++ rstudio-2024.09.0-375.new/src/node/CMakeNodeTools.txt 2024-09-24 11:30:51.146568219 +1200 @@ -19,7 +19,7 @@ # set the node version if(NOT DEFINED RSTUDIO_NODE_VERSION) - set(RSTUDIO_NODE_VERSION "20.14.0") + set(RSTUDIO_NODE_VERSION "Current") endif() if(DEFINED ENV{RSTUDIO_NODE_VERSION}) set(RSTUDIO_NODE_VERSION $ENV{RSTUDIO_NODE_VERSION}) @@ -45,7 +45,7 @@ NO_DEFAULT_PATH PATH_SUFFIXES "bin" PATHS "/opt/rstudio-tools/dependencies/common/node/${RSTUDIO_NODE_VERSION}" "c:/rstudio-tools/dependencies/common/node/${RSTUDIO_NODE_VERSION}" - "${CMAKE_CURRENT_LIST_DIR}/../../dependencies/common/node/${RSTUDIO_NODE_VERSION}") + "/usr") find_program(NPM NAMES npm @@ -53,7 +53,7 @@ NO_DEFAULT_PATH PATHS "/opt/rstudio-tools/dependencies/common/node/${RSTUDIO_NODE_VERSION}" "c:/rstudio-tools/dependencies/common/node/${RSTUDIO_NODE_VERSION}" - "${CMAKE_CURRENT_LIST_DIR}/../../dependencies/common/node/${RSTUDIO_NODE_VERSION}") + "/usr") find_program(NPX NAMES npx @@ -61,7 +61,7 @@ NO_DEFAULT_PATH PATHS "/opt/rstudio-tools/dependencies/common/node/${RSTUDIO_NODE_VERSION}" "c:/rstudio-tools/dependencies/common/node/${RSTUDIO_NODE_VERSION}" - "${CMAKE_CURRENT_LIST_DIR}/../../dependencies/common/node/${RSTUDIO_NODE_VERSION}") + "/usr") endif()