Skip to content

fix: remove global.__COMPOSE_CHAT_LIST_ENV__ from runtime #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
riteshshukla04 wants to merge 1 commit into from
+2 −22
Closed

fix: remove global.__COMPOSE_CHAT_LIST_ENV__ from runtime #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/core/android/src/main/java/com/nativecompose/threadedruntime/ThreadedRuntime.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,19 +500,13 @@ private class ThreadedRuntimeBundleLoader(
typeof globalThis !== 'undefined' ? globalThis : Function('return this')();
__threadedRuntimeGlobal.global = __threadedRuntimeGlobal;
__threadedRuntimeGlobal.globalThis = __threadedRuntimeGlobal;
__threadedRuntimeGlobal._is_it_a_list_env = true;
__threadedRuntimeGlobal.__THREADED_RUNTIME_ENV__ = {
kind: ${jsString(options.kind)},
runtimeName: ${jsString(runtimeName)},
isBackgroundRuntime: ${options.kind != ThreadedRuntime.DEFAULT_RUNTIME_KIND},
useMainNativeModules: ${options.useMainNativeModules},
version: 1
};
__threadedRuntimeGlobal.__COMPOSE_CHAT_LIST_ENV__ = {
kind: 'background-list',
runtimeName: ${jsString(runtimeName)},
version: 1
};
""".trimIndent(),
)

Expand Down
7 changes: 0 additions & 7 deletions packages/core/ios/ThreadedRuntime.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ - (void)host:(RCTHost *)host didInitializeRuntime:(facebook::jsi::Runtime &)runt
auto global = runtime.global();
global.setProperty(runtime, "global", global);
global.setProperty(runtime, "globalThis", global);
global.setProperty(runtime, "_is_it_a_list_env", true);

auto threadedEnv = facebook::jsi::Object(runtime);
threadedEnv.setProperty(runtime, "kind", facebook::jsi::String::createFromUtf8(runtime, [_kind UTF8String]));
Expand All @@ -90,12 +89,6 @@ - (void)host:(RCTHost *)host didInitializeRuntime:(facebook::jsi::Runtime &)runt
threadedEnv.setProperty(runtime, "version", 1);
global.setProperty(runtime, "__THREADED_RUNTIME_ENV__", threadedEnv);

auto listEnv = facebook::jsi::Object(runtime);
listEnv.setProperty(runtime, "kind", facebook::jsi::String::createFromUtf8(runtime, "background-list"));
listEnv.setProperty(runtime, "runtimeName", facebook::jsi::String::createFromUtf8(runtime, [_runtimeName UTF8String]));
listEnv.setProperty(runtime, "version", 1);
global.setProperty(runtime, "__COMPOSE_CHAT_LIST_ENV__", listEnv);

nativecompose::threadedruntime::installRuntimeFunctionJsi(runtime, [_runtimeName UTF8String]);

if ([_delegate respondsToSelector:@selector(host:didInitializeRuntime:)]) {
Expand Down
11 changes: 2 additions & 9 deletions packages/core/src/ThreadedRuntime.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,8 @@ let didWarnRuntimeFunctionsNitroUnavailable = false;
function currentRuntimeName() {
const globals = globalThis as {
__THREADED_RUNTIME_ENV__?: { runtimeName?: string };
__COMPOSE_CHAT_LIST_ENV__?: { runtimeName?: string };
};
return (
globals.__THREADED_RUNTIME_ENV__?.runtimeName ??
globals.__COMPOSE_CHAT_LIST_ENV__?.runtimeName ??
DEFAULT_RUNTIME_NAME
);
return globals.__THREADED_RUNTIME_ENV__?.runtimeName ?? DEFAULT_RUNTIME_NAME;
}

export const MAIN_RUNTIME_NAME = 'main';
Expand All @@ -125,10 +120,8 @@ export type CurrentRuntimeInfo = {
export function getCurrentRuntime(): CurrentRuntimeInfo {
const globals = globalThis as {
__THREADED_RUNTIME_ENV__?: { runtimeName?: string; kind?: string };
__COMPOSE_CHAT_LIST_ENV__?: { runtimeName?: string; kind?: string };
};
const env =
globals.__THREADED_RUNTIME_ENV__ ?? globals.__COMPOSE_CHAT_LIST_ENV__;
const env = globals.__THREADED_RUNTIME_ENV__;
if (env?.runtimeName) {
return {
isMain: false,
Expand Down