Skip to content

Commit 7c5845a

Browse files
Dmitry Zakharovfacebook-github-bot
Dmitry Zakharov
authored andcommitted
Remove Native Extensions
Reviewed By: michalgr Differential Revision: D8057885 fbshipit-source-id: 6af7f7729201d26a704adaadb15813979cd035f8
1 parent 782971f commit 7c5845a

File tree

6 files changed

+10
-34
lines changed

6 files changed

+10
-34
lines changed

React/CxxBridge/RCTCxxBridge.mm

-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ - (void)start
338338
#if RCT_PROFILE
339339
("StartSamplingProfilerOnInit", (bool)self.devSettings.startSamplingProfilerOnLaunch)
340340
#endif
341-
, nullptr
342341
));
343342
}
344343
} else {

ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ void injectJSCExecutorAndroidPlatform() {
113113
}
114114

115115
std::unique_ptr<JSExecutorFactory> makeAndroidJSCExecutorFactory(
116-
const folly::dynamic& jscConfig, NativeExtensionsProvider nativeExtensionsProvider) {
116+
const folly::dynamic& jscConfig) {
117117
detail::injectJSCExecutorAndroidPlatform();
118-
return folly::make_unique<JSCExecutorFactory>(std::move(jscConfig), std::move(nativeExtensionsProvider));
118+
return folly::make_unique<JSCExecutorFactory>(std::move(jscConfig));
119119
}
120120

121121
}

ReactAndroid/src/main/jni/react/jni/AndroidJSCFactory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void injectJSCExecutorAndroidPlatform();
2424
}
2525

2626
std::unique_ptr<JSExecutorFactory> makeAndroidJSCExecutorFactory(
27-
const folly::dynamic& jscConfig, NativeExtensionsProvider nativeExtensionsProvider);
27+
const folly::dynamic& jscConfig);
2828

2929
}
3030
}

ReactAndroid/src/main/jni/react/jni/OnLoad.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class JSCJavaScriptExecutorHolder : public HybridClass<JSCJavaScriptExecutorHold
3434
static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JSCJavaScriptExecutor;";
3535

3636
static local_ref<jhybriddata> initHybrid(alias_ref<jclass>, ReadableNativeMap* jscConfig) {
37-
return makeCxxInstance(makeAndroidJSCExecutorFactory(jscConfig->consume(), nullptr));
37+
return makeCxxInstance(makeAndroidJSCExecutorFactory(jscConfig->consume()));
3838
}
3939

4040
static void registerNatives() {

ReactCommon/cxxreact/JSCExecutor.cpp

+3-22
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,17 @@ std::unique_ptr<JSExecutor> JSCExecutorFactory::createJSExecutor(
120120
std::shared_ptr<ExecutorDelegate> delegate,
121121
std::shared_ptr<MessageQueueThread> jsQueue) {
122122
return folly::make_unique<JSCExecutor>(
123-
delegate, jsQueue, m_jscConfig, m_nativeExtensionsProvider);
123+
delegate, jsQueue, m_jscConfig);
124124
}
125125

126126
JSCExecutor::JSCExecutor(
127127
std::shared_ptr<ExecutorDelegate> delegate,
128128
std::shared_ptr<MessageQueueThread> messageQueueThread,
129-
const folly::dynamic& jscConfig,
130-
NativeExtensionsProvider nativeExtensionsProvider) throw(JSException)
129+
const folly::dynamic& jscConfig) throw(JSException)
131130
: m_delegate(delegate),
132131
m_messageQueueThread(messageQueueThread),
133132
m_nativeModules(delegate ? delegate->getModuleRegistry() : nullptr),
134-
m_jscConfig(jscConfig),
135-
m_nativeExtensionsProvider(nativeExtensionsProvider) {
133+
m_jscConfig(jscConfig) {
136134
initOnJSVMThread();
137135

138136
{
@@ -142,12 +140,6 @@ JSCExecutor::JSCExecutor(
142140
"nativeModuleProxy",
143141
exceptionWrapMethod<&JSCExecutor::getNativeModule>());
144142
}
145-
if (nativeExtensionsProvider) {
146-
installGlobalProxy(
147-
m_context,
148-
"nativeExtensions",
149-
exceptionWrapMethod<&JSCExecutor::getNativeExtension>());
150-
}
151143
}
152144

153145
JSCExecutor::~JSCExecutor() {
@@ -732,17 +724,6 @@ JSValueRef JSCExecutor::getNativeModule(
732724
return m_nativeModules.getModule(m_context, propertyName);
733725
}
734726

735-
JSValueRef JSCExecutor::getNativeExtension(
736-
JSObjectRef object,
737-
JSStringRef propertyName) {
738-
if (m_nativeExtensionsProvider) {
739-
folly::dynamic value =
740-
m_nativeExtensionsProvider(String::ref(m_context, propertyName).str());
741-
return Value::fromDynamic(m_context, std::move(value));
742-
}
743-
return JSC_JSValueMakeUndefined(m_context);
744-
}
745-
746727
JSValueRef JSCExecutor::nativeRequire(
747728
size_t count,
748729
const JSValueRef arguments[]) {

ReactCommon/cxxreact/JSCExecutor.h

+3-7
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ class RAMBundleRegistry;
2727

2828
class RN_EXPORT JSCExecutorFactory : public JSExecutorFactory {
2929
public:
30-
JSCExecutorFactory(const folly::dynamic& jscConfig, NativeExtensionsProvider provider) :
31-
m_jscConfig(jscConfig), m_nativeExtensionsProvider(provider) {}
30+
JSCExecutorFactory(const folly::dynamic& jscConfig) :
31+
m_jscConfig(jscConfig) {}
3232
std::unique_ptr<JSExecutor> createJSExecutor(
3333
std::shared_ptr<ExecutorDelegate> delegate,
3434
std::shared_ptr<MessageQueueThread> jsQueue) override;
3535
private:
3636
std::string m_cacheDir;
3737
folly::dynamic m_jscConfig;
38-
NativeExtensionsProvider m_nativeExtensionsProvider;
3938
};
4039

4140
template<typename T>
@@ -59,8 +58,7 @@ class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
5958
*/
6059
explicit JSCExecutor(std::shared_ptr<ExecutorDelegate> delegate,
6160
std::shared_ptr<MessageQueueThread> messageQueueThread,
62-
const folly::dynamic& jscConfig,
63-
NativeExtensionsProvider nativeExtensionsProvider) throw(JSException);
61+
const folly::dynamic& jscConfig) throw(JSException);
6462
~JSCExecutor() override;
6563

6664
virtual void loadApplicationScript(
@@ -104,7 +102,6 @@ class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
104102
JSCNativeModules m_nativeModules;
105103
folly::dynamic m_jscConfig;
106104
std::once_flag m_bindFlag;
107-
NativeExtensionsProvider m_nativeExtensionsProvider;
108105

109106
folly::Optional<Object> m_invokeCallbackAndReturnFlushedQueueJS;
110107
folly::Optional<Object> m_callFunctionReturnFlushedQueueJS;
@@ -126,7 +123,6 @@ class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
126123
void installNativeHook(const char* name);
127124

128125
JSValueRef getNativeModule(JSObjectRef object, JSStringRef propertyName);
129-
JSValueRef getNativeExtension(JSObjectRef object, JSStringRef propertyName);
130126

131127
JSValueRef nativeRequire(
132128
size_t argumentCount,

0 commit comments

Comments
 (0)