Skip to content

Add TurboModule to ReactCommon #3656

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

Merged
31 commits merged into from
Nov 14, 2019
Merged

Add TurboModule to ReactCommon #3656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
97d8b69
Add jscallinvoker\jsireact and turbomodule\core to ReactCommon.vcxproj
ZihanChen-MSFT Nov 6, 2019
06fae2a
Use $(ReactNativeDir)
ZihanChen-MSFT Nov 7, 2019
af82133
Update react-native-uwp.x86.def
ZihanChen-MSFT Nov 7, 2019
e8515b0
Update react-native-uwp.x64.def
ZihanChen-MSFT Nov 11, 2019
80fb72d
Update react-native-uwp.arm.def
ZihanChen-MSFT Nov 11, 2019
73ad736
Update dependency to react-native
ZihanChen-MSFT Nov 13, 2019
333b206
Use Microsoft.Windows.CppWinRT 2.0 (#3596)
licanhua Nov 6, 2019
cd5b378
applying package updates ***NO_CI***
rnbot Nov 6, 2019
adb85c7
Add support for scrollView.refreshControl (#3597)
ddalp Nov 7, 2019
79d717d
applying package updates ***NO_CI***
rnbot Nov 7, 2019
f0b944f
ViewManager Command Updates (#3614)
jonthysell Nov 8, 2019
f90ce08
applying package updates ***NO_CI***
rnbot Nov 8, 2019
5af1785
Use node10 (#3627)
licanhua Nov 8, 2019
58b595b
Native Module Setup Guide (#3628)
jonthysell Nov 9, 2019
360bf3d
applying package updates ***NO_CI***
rnbot Nov 9, 2019
0152bd3
Skips CI build for gif/png/jpeg (#3427) (#3632)
kartik-budhiraja Nov 11, 2019
de8995e
Bump @types/node from 10.17.4 to 10.17.5 (#3635)
dependabot-preview[bot] Nov 11, 2019
54a52db
Workaround for flyout centering problem (#3640)
Nov 11, 2019
8ed9512
applying package updates ***NO_CI***
rnbot Nov 11, 2019
c123e96
Native Module doc fixes. (#3641)
jonthysell Nov 12, 2019
6387c62
applying package updates ***NO_CI***
rnbot Nov 12, 2019
73e2fb9
Update to react-native@0.60.0-microsoft.20 (#3645)
rnbot Nov 12, 2019
9c3b5da
applying package updates ***NO_CI***
rnbot Nov 12, 2019
94cf65b
Bump @microsoft/api-documenter from 7.5.6 to 7.5.8 (#3648)
dependabot-preview[bot] Nov 12, 2019
408682e
Bump @microsoft/api-extractor from 7.5.4 to 7.5.6 (#3647)
dependabot-preview[bot] Nov 12, 2019
7621e3f
Do not eat exceptions in DevSupportManager::GetJavaScriptFromServer (…
NickGerleman Nov 12, 2019
ac8a95a
applying package updates ***NO_CI***
rnbot Nov 12, 2019
f6f4989
Merge from master
ZihanChen-MSFT Nov 13, 2019
d8e59ba
Merge branch 'master' into add-turbomodule
ZihanChen-MSFT Nov 14, 2019
8a97fed
Add TurboModule and JsCallInvoker files to ReactCommon only when targ…
ZihanChen-MSFT Nov 14, 2019
dd7ce0e
Change files
ZihanChen-MSFT Nov 14, 2019
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
8 changes: 8 additions & 0 deletions change/react-native-windows-2019-11-14-11-22-09-add-turbomodule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Add TurboModule and JsCallInvoker files to ReactCommon only when targeting to microsoft/react-native",
"packageName": "react-native-windows",
"email": "zihanc@microsoft.com",
"commit": "8a97fed007dbf4516a2b414723a6dc908ad357bf",
"date": "2019-11-14T19:22:09.917Z"
}
8 changes: 8 additions & 0 deletions change/react-native-windows-extended-2019-11-14-11-22-09-add-turbomodule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Add TurboModule and JsCallInvoker files to ReactCommon only when targeting to microsoft/react-native",
"packageName": "react-native-windows-extended",
"email": "zihanc@microsoft.com",
"commit": "8a97fed007dbf4516a2b414723a6dc908ad357bf",
"date": "2019-11-14T19:22:00.297Z"
}
2 changes: 1 addition & 1 deletion packages/E2ETest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@
"metro-react-native-babel-preset": "0.55.0",
"react-test-renderer": "16.8.6"
}
}
}
2 changes: 1 addition & 1 deletion packages/microsoft-reactnative-sampleapps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
"metro-react-native-babel-preset": "0.55.0",
"react-test-renderer": "16.8.6"
}
}
}
2 changes: 1 addition & 1 deletion packages/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
"metro-react-native-babel-preset": "0.55.0",
"react-test-renderer": "16.8.6"
}
}
}
2 changes: 1 addition & 1 deletion packages/react-native-windows-extended/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
"minor"
]
}
}
}
2 changes: 1 addition & 1 deletion vnext/CHANGELOG.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{
"comment": "fix TextInput and Switch component colors",
"author": "robmeyer@microsoft.com",
"commit": "ab50b2508092d9faa2b796821dfbbf0f0847ed7b"
"commit": "ab50b2508092d9faa2b796821dfbbf0f0847ed
}
]
}
Expand Down
29 changes: 23 additions & 6 deletions vnext/ReactCommon/ReactCommon.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeDir)\ReactCommon\jsiexecutor;$(FollyDir);$(ReactNativeWindowsDir)stubs;;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeDir)\ReactCommon\jscallinvoker;$(ReactNativeDir)\ReactCommon\jsiexecutor;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(ENABLE_NATIVE_SYSTRACE)'=='true' AND '$(OSS_RN)' != 'true'">ENABLE_NATIVE_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ENABLE_JS_SYSTRACE)'=='true' AND '$(OSS_RN)' != 'true'">ENABLE_JS_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ENABLE_TRACE_POSTPROCESSING)'=='true' AND '$(OSS_RN)' != 'true'">ENABLE_TRACE_POSTPROCESSING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down Expand Up @@ -137,11 +137,11 @@
<ClCompile Include="$(ReactNativeDir)\ReactCommon\cxxreact\Platform.cpp" Condition="'$(OSS_RN)' != 'true'" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\cxxreact\RAMBundleRegistry.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\cxxreact\ReactMarker.cpp" />
<ClCompile Include="$(JSI_Source)\jsi\jsi.cpp"/>
<ClCompile Include="$(JSI_Source)\jsi\JSIDynamic.cpp"/>
<ClCompile Include="$(JSI_Source)\jsi\jsilib-windows.cpp"/>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSIExecutor.cpp"/>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.cpp"/>
<ClCompile Include="$(JSI_Source)\jsi\jsi.cpp" />
<ClCompile Include="$(JSI_Source)\jsi\JSIDynamic.cpp" />
<ClCompile Include="$(JSI_Source)\jsi\jsilib-windows.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSIExecutor.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\privatedata\PrivateDataBase.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
Expand All @@ -156,6 +156,23 @@
<ClCompile Include="$(YogaDir)\yoga\YGValue.cpp" />
<ClCompile Include="$(YogaDir)\yoga\Yoga.cpp" />
</ItemGroup>
<ItemGroup Condition="'$(OSS_RN)'!='true'">
<ClInclude Include="$(ReactNativeDir)\ReactCommon\jscallinvoker\jsireact\BridgeJSCallInvoker.h" />
<ClInclude Include="$(ReactNativeDir)\ReactCommon\jscallinvoker\jsireact\JSCallInvoker.h" />
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\LongLivedObject.h" />
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboCxxModule.h" />
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModule.h" />
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleBinding.h" />
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleUtils.h" />
</ItemGroup>
<ItemGroup Condition="'$(OSS_RN)'!='true'">
<ClCompile Include="$(ReactNativeDir)\ReactCommon\jscallinvoker\jsireact\BridgeJSCallInvoker.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\LongLivedObject.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboCxxModule.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModule.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleBinding.cpp" />
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleUtils.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
Expand Down
53 changes: 52 additions & 1 deletion vnext/ReactCommon/ReactCommon.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="stubs">
Expand Down Expand Up @@ -28,6 +28,18 @@
<Filter Include="jsi\jsi">
<UniqueIdentifier>{9c8e7a7a-c77d-479d-8611-1ece3cdacad7}</UniqueIdentifier>
</Filter>
<Filter Include="turbomodule">
<UniqueIdentifier>{23b0c36f-4a4b-4380-9e4c-f8cb0c2f2714}</UniqueIdentifier>
</Filter>
<Filter Include="turbomodule\core">
<UniqueIdentifier>{c4d010df-7391-4171-8658-9048078a5523}</UniqueIdentifier>
</Filter>
<Filter Include="jscallinvoker">
<UniqueIdentifier>{d52a2ed0-f060-446c-a049-1dae4aca1194}</UniqueIdentifier>
</Filter>
<Filter Include="jscallinvoker\jsireact">
<UniqueIdentifier>{5bf47134-bd38-4ada-a2bb-9438240d70cf}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\cxxreact\CxxNativeModule.cpp">
Expand Down Expand Up @@ -111,6 +123,24 @@
<ClCompile Include="$(YogaDir)\yoga\log.cpp">
<Filter>yoga</Filter>
</ClCompile>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleBinding.cpp">
<Filter>turbomodule\core</Filter>
</ClCompile>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleUtils.cpp">
<Filter>turbomodule\core</Filter>
</ClCompile>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\LongLivedObject.cpp">
<Filter>turbomodule\core</Filter>
</ClCompile>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboCxxModule.cpp">
<Filter>turbomodule\core</Filter>
</ClCompile>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModule.cpp">
<Filter>turbomodule\core</Filter>
</ClCompile>
<ClCompile Include="$(ReactNativeDir)\ReactCommon\jscallinvoker\jsireact\BridgeJSCallInvoker.cpp">
<Filter>jscallinvoker\jsireact</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\stubs\sys\mman.h">
Expand Down Expand Up @@ -230,6 +260,27 @@
<ClInclude Include="$(ReactNativeDir)\ReactCommon\privatedata\PrivateDataBase.h">
<Filter>privatedata</Filter>
</ClInclude>
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleBinding.h">
<Filter>turbomodule\core</Filter>
</ClInclude>
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModuleUtils.h">
<Filter>turbomodule\core</Filter>
</ClInclude>
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\LongLivedObject.h">
<Filter>turbomodule\core</Filter>
</ClInclude>
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboCxxModule.h">
<Filter>turbomodule\core</Filter>
</ClInclude>
<ClInclude Include="$(ReactNativeDir)\ReactCommon\turbomodule\core\TurboModule.h">
<Filter>turbomodule\core</Filter>
</ClInclude>
<ClInclude Include="$(ReactNativeDir)\ReactCommon\jscallinvoker\jsireact\JSCallInvoker.h">
<Filter>jscallinvoker\jsireact</Filter>
</ClInclude>
<ClInclude Include="$(ReactNativeDir)\ReactCommon\jscallinvoker\jsireact\BridgeJSCallInvoker.h">
<Filter>jscallinvoker\jsireact</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand Down
6 changes: 6 additions & 0 deletions vnext/ReactUWP/EndPoints/dll/react-native-uwp.arm.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,9 @@ rallocxWeak
sallocxWeak
sdallocxWeak
xallocxWeak
?set@HostObject@jsi@facebook@@UAAXAAVRuntime@23@ABVPropNameID@23@ABVValue@23@@Z
?getPropertyNames@HostObject@jsi@facebook@@UAA?AV?$vector@VPropNameID@jsi@facebook@@V?$allocator@VPropNameID@jsi@facebook@@@std@@@std@@AAVRuntime@23@@Z
??1Value@jsi@facebook@@QAA@XZ
??0TurboModule@react@facebook@@QAA@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
??1TurboModule@react@facebook@@UAA@XZ
?get@TurboModule@react@facebook@@UAA?AVValue@jsi@3@AAVRuntime@53@ABVPropNameID@53@@Z
6 changes: 6 additions & 0 deletions vnext/ReactUWP/EndPoints/dll/react-native-uwp.x64.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,9 @@ rallocxWeak
sallocxWeak
sdallocxWeak
xallocxWeak
?set@HostObject@jsi@facebook@@UEAAXAEAVRuntime@23@AEBVPropNameID@23@AEBVValue@23@@Z
?getPropertyNames@HostObject@jsi@facebook@@UEAA?AV?$vector@VPropNameID@jsi@facebook@@V?$allocator@VPropNameID@jsi@facebook@@@std@@@std@@AEAVRuntime@23@@Z
??1Value@jsi@facebook@@QEAA@XZ
??0TurboModule@react@facebook@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
??1TurboModule@react@facebook@@UEAA@XZ
?get@TurboModule@react@facebook@@UEAA?AVValue@jsi@3@AEAVRuntime@53@AEBVPropNameID@53@@Z
6 changes: 6 additions & 0 deletions vnext/ReactUWP/EndPoints/dll/react-native-uwp.x86.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,9 @@ rallocxWeak
sallocxWeak
sdallocxWeak
xallocxWeak
?set@HostObject@jsi@facebook@@UAEXAAVRuntime@23@ABVPropNameID@23@ABVValue@23@@Z
?getPropertyNames@HostObject@jsi@facebook@@UAE?AV?$vector@VPropNameID@jsi@facebook@@V?$allocator@VPropNameID@jsi@facebook@@@std@@@std@@AAVRuntime@23@@Z
??1Value@jsi@facebook@@QAE@XZ
??0TurboModule@react@facebook@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
??1TurboModule@react@facebook@@UAE@XZ
?get@TurboModule@react@facebook@@UAE?AVValue@jsi@3@AAVRuntime@53@ABVPropNameID@53@@Z
2 changes: 1 addition & 1 deletion vnext/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
"patch"
]
}
}
}