Skip to content

Commit b05977c

Browse files
committed
add support for new clearscript version
1 parent 9cf0687 commit b05977c

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Runtime/Scripting/ClearScriptEngine.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,15 @@ public ClearScriptEngine(ReactContext context, bool debug, bool awaitDebugger)
6363
Runtime.DocumentSettings.ContextCallback = DocumentContextCallback;
6464

6565
Engine = Runtime.CreateScriptEngine(
66-
V8ScriptEngineFlags.MarshalAllLongAsBigInt |
67-
V8ScriptEngineFlags.MarshalUnsafeLongAsBigInt |
66+
V8ScriptEngineFlags.MarshalAllInt64AsBigInt |
67+
V8ScriptEngineFlags.MarshalUnsafeInt64AsBigInt |
6868
V8ScriptEngineFlags.DisableGlobalMembers |
6969
V8ScriptEngineFlags.UseCaseInsensitiveMemberBinding |
7070
V8ScriptEngineFlags.EnableTaskPromiseConversion |
7171
V8ScriptEngineFlags.EnableValueTaskPromiseConversion |
72+
V8ScriptEngineFlags.UseSynchronizationContexts |
73+
V8ScriptEngineFlags.AddPerformanceObject |
74+
V8ScriptEngineFlags.EnableArrayConversion |
7275

7376
(debug ? (
7477
V8ScriptEngineFlags.EnableDebugging |
@@ -300,9 +303,9 @@ public class DocumentLoader : DefaultDocumentLoader
300303
{
301304
ReactContext Context { get; set; }
302305

303-
public DocumentLoader(ReactContext ctx)
306+
public DocumentLoader(ReactContext ctx)
304307
{
305-
Context = ctx;
308+
Context = ctx;
306309
}
307310

308311
public override Task<Document> LoadDocumentAsync(DocumentSettings settings, DocumentInfo? sourceInfo, string specifier, DocumentCategory category, DocumentContextCallback contextCallback)

Runtime/Scripting/ScriptContext.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,12 @@ static void CreateDOMShims(IJavaScriptEngine engine, ReactContext context)
242242
if (!engine.Capabilities.HasFlag(EngineCapabilities.URL))
243243
{
244244
engine.SetGlobal("URL", typeof(URL));
245-
engine.SetGlobal("URLSearchParams", typeof(URLSearchParams));
245+
engine.SetGlobal("__URLSearchParamsOriginal", typeof(URLSearchParams));
246+
engine.Execute(@"
247+
global.URLSearchParams = function URLSearchParams(init) {
248+
return new global.__URLSearchParamsOriginal(init);
249+
}
250+
", "ReactUnity/shims/urlsearchparams");
246251
}
247252

248253
if (!engine.Capabilities.HasFlag(EngineCapabilities.WebSocket))

0 commit comments

Comments
 (0)