Add tsx test to docker.

Author: viferga

docker-compose.yml

@@ -56,6 +56,7 @@ services:
       SERIAL_LIBRARY_PATH: $METACALL_PATH/build
       DETOUR_LIBRARY_PATH: $METACALL_PATH/build
       PORT_LIBRARY_PATH: $METACALL_PATH/build
+      NODE_PATH: /usr/lib/node_modules
     depends_on:
       - deps
 

source/tests/CMakeLists.txt

@@ -172,6 +172,6 @@ add_subdirectory(metacall_function_test)
 add_subdirectory(metacall_cobol_test)
 add_subdirectory(metacall_file_test)
 add_subdirectory(metacall_typescript_test)
-# add_subdirectory(metacall_typescript_tsx_test) # TODO: Implement dependency management for React and ReactDOM
+add_subdirectory(metacall_typescript_tsx_test)
 add_subdirectory(metacall_lua_test)
 add_subdirectory(metacall_rpc_test)

source/tests/metacall_typescript_tsx_test/CMakeLists.txt

@@ -4,6 +4,32 @@ if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_NODE OR NOT OPTION_BUILD
 	return()
 endif()
 
+#
+# External dependencies
+#
+
+set(NODEJS_EXECUTABLE_ONLY ON)
+
+find_package(NodeJS 10.22.0)
+
+if(NOT NODEJS_FOUND)
+	message(STATUS "NodeJS executable not found")
+	return()
+endif()
+
+# Detect if React is available
+execute_process(
+	COMMAND ${NODEJS_EXECUTABLE} -e "require('react'); require('react-dom')"
+	RESULT_VARIABLE NODEJS_REACT_FOUND
+	ERROR_QUIET
+	OUTPUT_QUIET
+)
+
+if("${NODEJS_REACT_FOUND}" EQUAL "1")
+	message(WARNING "NodeJS React not found, skipping the TypeScript X templating test")
+	return()
+endif()
+
 #
 # Executable name and options
 #

tools/deps/hooks/env

@@ -23,7 +23,7 @@
 source ../../hooks/env
 
 # Base arguments
-METACALL_INSTALL_OPTIONS="root base python ruby netcore2 nodejs file rapidjson funchook swig" # v8rep51 pack and coverage not needed in DockerHub
+METACALL_INSTALL_OPTIONS="root base python ruby netcore2 nodejs typescript file rapidjson funchook swig" # v8rep51 pack and coverage not needed in DockerHub
 
 # Base environment variables
 DEBIAN_FRONTEND=noninteractive

tools/dev/Dockerfile

@@ -38,7 +38,8 @@ ENV LOADER_LIBRARY_PATH=$METACALL_PATH/build \
 	SERIAL_LIBRARY_PATH=$METACALL_PATH/build \
 	DETOUR_LIBRARY_PATH=$METACALL_PATH/build \
 	PORT_LIBRARY_PATH=$METACALL_PATH/build \
-	DEBIAN_FRONTEND=noninteractive
+	DEBIAN_FRONTEND=noninteractive \
+	NODE_PATH=/usr/lib/node_modules
 
 # Define working directory
 WORKDIR $METACALL_PATH

tools/metacall-clear.sh

@@ -96,6 +96,10 @@ sub_nodejs(){
 # TypeScript
 sub_typescript(){
 	echo "clean typescript"
+
+	# Clear React dependencies of tests
+	npm uninstall -g react@latest
+	npm uninstall -g react-dom@latest
 }
 
 # File

tools/metacall-environment.sh

@@ -275,7 +275,11 @@ sub_nodejs(){
 
 # TypeScript
 sub_typescript(){
-	echo "configure typesecript"
+	echo "configure typescript"
+
+	# Install React dependencies in order to run the tests
+	npm i react@latest -g
+	npm i react-dom@latest -g
 }
 
 # File

tools/runtime/hooks/env

@@ -23,7 +23,7 @@
 source ../../hooks/env
 
 # Core arguments
-METACALL_RUNTIME_OPTIONS="root base python ruby netcore2 nodejs file ports clean" # v8
+METACALL_RUNTIME_OPTIONS="root base python ruby netcore2 nodejs typescript file ports clean" # v8
 
 # Core environment variables
 DEBIAN_FRONTEND=noninteractive