3 files changed, 29 insertions, 6 deletions
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index 7e49feee61..823f9b8281 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -29,7 +29,6 @@
 /*************************************************************************/
 
 #include "core/io/image_loader.h"
-#include "core/io/json.h"
 #include "core/io/stream_peer_ssl.h"
 #include "core/io/tcp_server.h"
 #include "core/io/zip_io.h"
@@ -465,7 +464,7 @@ void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t> &p_html, const Re
 	}
 
 	// Replaces HTML string
-	const String str_config = JSON::print(config);
+	const String str_config = Variant(config).to_json_string();
 	const String custom_head_include = p_preset->get("html/head_include");
 	Map<String, String> replaces;
 	replaces["$GODOT_URL"] = p_name + ".js";
@@ -518,7 +517,7 @@ Error EditorExportPlatformJavaScript::_build_pwa(const Ref<EditorExportPreset> &
 	replaces["@GODOT_NAME@"] = name;
 	replaces["@GODOT_OFFLINE_PAGE@"] = name + ".offline.html";
 	Array files;
-	replaces["@GODOT_OPT_CACHE@"] = JSON::print(files);
+	replaces["@GODOT_OPT_CACHE@"] = Variant(files).to_json_string();
 	files.push_back(name + ".html");
 	files.push_back(name + ".js");
 	files.push_back(name + ".wasm");
@@ -537,7 +536,7 @@ Error EditorExportPlatformJavaScript::_build_pwa(const Ref<EditorExportPreset> &
 			files.push_back(p_shared_objects[i].path.get_file());
 		}
 	}
-	replaces["@GODOT_CACHE@"] = JSON::print(files);
+	replaces["@GODOT_CACHE@"] = Variant(files).to_json_string();
 
 	const String sw_path = dir.plus_file(name + ".service.worker.js");
 	Vector<uint8_t> sw;
@@ -605,7 +604,7 @@ Error EditorExportPlatformJavaScript::_build_pwa(const Ref<EditorExportPreset> &
 	}
 	manifest["icons"] = icons_arr;
 
-	CharString cs = JSON::print(manifest).utf8();
+	CharString cs = Variant(manifest).to_json_string().utf8();
 	err = _write_or_error((const uint8_t *)cs.get_data(), cs.length(), dir.plus_file(name + ".manifest.json"));
 	if (err != OK) {
 		return err;
diff --git a/platform/javascript/javascript_singleton.cpp b/platform/javascript/javascript_singleton.cpp
index c441ed0517..9de2edc9a7 100644
--- a/platform/javascript/javascript_singleton.cpp
+++ b/platform/javascript/javascript_singleton.cpp
@@ -54,6 +54,7 @@ extern int godot_js_wrapper_object_setvar(int p_id, int p_key_type, godot_js_wra
 extern void godot_js_wrapper_object_set(int p_id, const char *p_name, int p_type, godot_js_wrapper_ex *p_val);
 extern void godot_js_wrapper_object_unref(int p_id);
 extern int godot_js_wrapper_create_cb(void *p_ref, void (*p_callback)(void *p_ref, int p_arg_id, int p_argc));
+extern void godot_js_wrapper_object_set_cb_ret(int p_type, godot_js_wrapper_ex *p_val);
 extern int godot_js_wrapper_create_object(const char *p_method, void **p_args, int p_argc, GodotJSWrapperVariant2JSCallback p_variant2js_callback, godot_js_wrapper_ex *p_cb_rval, void **p_lock, GodotJSWrapperFreeLockCallback p_lock_callback);
 };
 
@@ -257,6 +258,16 @@ void JavaScriptObjectImpl::_callback(void *p_ref, int p_args_id, int p_argc) {
 	Callable::CallError err;
 	Variant ret;
 	obj->_callable.call(argv, 1, ret, err);
+
+	// Set return value
+	godot_js_wrapper_ex exchange;
+	void *lock = nullptr;
+	const Variant *v = &ret;
+	int type = _variant2js((const void **)&v, 0, &exchange, &lock);
+	godot_js_wrapper_object_set_cb_ret(type, &exchange);
+	if (lock) {
+		_free_lock(&lock, type);
+	}
 }
 
 Ref<JavaScriptObject> JavaScript::create_callback(const Callable &p_callable) {
diff --git a/platform/javascript/js/libs/library_godot_javascript_singleton.js b/platform/javascript/js/libs/library_godot_javascript_singleton.js
index cb80273ca8..22ce003cd2 100644
--- a/platform/javascript/js/libs/library_godot_javascript_singleton.js
+++ b/platform/javascript/js/libs/library_godot_javascript_singleton.js
@@ -34,6 +34,7 @@ const GodotJSWrapper = {
 	$GodotJSWrapper__postset: 'GodotJSWrapper.proxies = new Map();',
 	$GodotJSWrapper: {
 		proxies: null,
+		cb_ret: null,
 
 		MyProxy: function (val) {
 			const id = IDHandler.add(this);
@@ -202,15 +203,27 @@ const GodotJSWrapper = {
 		let id = 0;
 		const cb = function () {
 			if (!GodotJSWrapper.get_proxied_value(id)) {
-				return;
+				return undefined;
 			}
+			// The callback will store the returned value in this variable via
+			// "godot_js_wrapper_object_set_cb_ret" upon calling the user function.
+			// This is safe! JavaScript is single threaded (and using it in threads is not a good idea anyway).
+			GodotJSWrapper.cb_ret = null;
 			const args = Array.from(arguments);
 			func(p_ref, GodotJSWrapper.get_proxied(args), args.length);
+			const ret = GodotJSWrapper.cb_ret;
+			GodotJSWrapper.cb_ret = null;
+			return ret;
 		};
 		id = GodotJSWrapper.get_proxied(cb);
 		return id;
 	},
 
+	godot_js_wrapper_object_set_cb_ret__sig: 'vii',
+	godot_js_wrapper_object_set_cb_ret: function (p_val_type, p_val_ex) {
+		GodotJSWrapper.cb_ret = GodotJSWrapper.variant2js(p_val_type, p_val_ex);
+	},
+
 	godot_js_wrapper_object_getvar__sig: 'iiii',
 	godot_js_wrapper_object_getvar: function (p_id, p_type, p_exchange) {
 		const obj = GodotJSWrapper.get_proxied_value(p_id);