diff --git a/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/JavaScriptPlugin.jslib b/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/JavaScriptPlugin.jslib new file mode 100644 index 000000000..17d12cb22 --- /dev/null +++ b/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/JavaScriptPlugin.jslib @@ -0,0 +1,9 @@ +mergeInto(LibraryManager.library, { + + ThrowJavaScript: function () { + var something = undefined; + console.log("JavaScript error incoming..."); + something.do(); + }, + +}); diff --git a/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/JavaScriptPlugin.jslib.meta b/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/JavaScriptPlugin.jslib.meta new file mode 100644 index 000000000..a03f2f88e --- /dev/null +++ b/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/JavaScriptPlugin.jslib.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: dc7f3d07d56c4baaa9abaa89f51d5738 +timeCreated: 1643474184 \ No newline at end of file diff --git a/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/NativeSupportButtons.cs b/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/NativeSupportButtons.cs index c84e88083..da0961894 100644 --- a/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/NativeSupportButtons.cs +++ b/samples/unity-of-bugs/Assets/Scripts/MobileNativeSupport/NativeSupportButtons.cs @@ -1,6 +1,6 @@ using System.Collections; using System.Collections.Generic; -#if ENABLE_IL2CPP || PLATFORM_IOS +#if ENABLE_IL2CPP || PLATFORM_IOS || PLATFORM_WEBGL using System.Runtime.InteropServices; #endif using UnityEngine; @@ -30,8 +30,13 @@ public void ThrowKotlin() { jo.CallStatic("throw"); } +#else +// TODO: Add this sample to its own button: +#if PLATFORM_WEBGL + ThrowJavaScript(); #else Debug.LogWarning("Not running on Android."); +#endif #endif } @@ -124,6 +129,21 @@ public void ThrowObjectiveC() private static extern void throwObjectiveC(); #endif + public void ThrowJavaScript() + { +#if PLATFORM_WEBGL + throwJavaScript(); +#else + Debug.Log("JavaScript interop only works on WebGL players."); +#endif + } + +#if PLATFORM_WEBGL + // JavaScriptPlugin.jslib + [DllImport("__Internal")] + private static extern void throwJavaScript(); +#endif + public void LoadBugfarm() => SceneManager.LoadScene("1_Bugfarm"); public void LoadAdditionalSamples() => SceneManager.LoadScene("3_AdditionalSamples"); } diff --git a/src/sentry-dotnet b/src/sentry-dotnet index 2ecb7c3bf..58046e5ef 160000 --- a/src/sentry-dotnet +++ b/src/sentry-dotnet @@ -1 +1 @@ -Subproject commit 2ecb7c3bf6aabc451a8251d714d9a76ec8fa3551 +Subproject commit 58046e5ef853fc3f54602c901fa992162c434ab3