Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15,843 changes: 261 additions & 15,582 deletions Apps/PackageTest/0.64.0-rc.0/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Apps/PackageTest/0.64.0-rc.0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"react": "^17.0.1",
"react-native": "^0.64.0-rc.0",
"react-native-permissions": "^3.0.0",
"react-native-windows": "^0.64.0-0"
"react-native-windows": "^0.64.0-preview.15"
},
"devDependencies": {
"@babel/core": "^7.8.4",
Expand Down
5 changes: 3 additions & 2 deletions Apps/PackageTest/0.64.0-rc.0/windows/PackageTest/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ App::App() noexcept
InstanceSettings().UseWebDebugger(false);
InstanceSettings().UseFastRefresh(false);
#else
JavaScriptBundleFile(L"index");
InstanceSettings().UseWebDebugger(true);
JavaScriptMainModuleName(L"index");
InstanceSettings().UseWebDebugger(false); // BabylonReactNative accesses the jsi runtime, which isn't possible with the web debugger
InstanceSettings().UseFastRefresh(true);
InstanceSettings().SourceBundleHost(L"localhost"); // Update to PC ip address when running on remote machines
#endif

#if _DEBUG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="ReactNativeWindowsProps">
<UseBundle>true</UseBundle>
<ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
Expand Down
28 changes: 14 additions & 14 deletions Apps/Playground/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Apps/Playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"react": "^17.0.1",
"react-native": "^0.64.0-rc.0",
"react-native-permissions": "^3.0.0",
"react-native-windows": "^0.64.0-0"
"react-native-windows": "^0.64.0-preview.15"
},
"devDependencies": {
"@babel/core": "^7.12.9",
Expand Down
4 changes: 2 additions & 2 deletions Apps/Playground/windows/Playground/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ using namespace Windows::ApplicationModel;
App::App() noexcept
{
#if BUNDLE
// Note: add <UseBundle>true</UseBundle> property to application's ReactNativeWindowsProps PropertyGroup to force BUNDLE to true
JavaScriptBundleFile(L"index.windows");
InstanceSettings().UseWebDebugger(false);
InstanceSettings().UseFastRefresh(false);
#else
JavaScriptMainModuleName(L"index");
InstanceSettings().UseWebDebugger(true);
InstanceSettings().UseWebDebugger(false); // BabylonReactNative accesses the jsi runtime, which isn't possible with the web debugger
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On other platforms, web debugger (remote debugging) is enabled/disabled dynamically from the app's debug/developer menu. Is this different on Windows? It would be annoying if all UWP RN apps have to change this configuration in order to use Babylon React Native.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it sounds like it may be possible to set this dynamically, but i'm still trying to track down documentation on how. For the time being, this hardcoding of the ip address is a valid workaround/has been allowing me to test things on hololens 2

InstanceSettings().UseFastRefresh(true);
InstanceSettings().SourceBundleHost(L"localhost"); // Update to PC ip address when running on remote machines
#endif

#if _DEBUG
Expand Down
1 change: 0 additions & 1 deletion Apps/Playground/windows/Playground/Playground.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="ReactNativeWindowsProps">
<UseBundle>true</UseBundle>
<ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native-windows/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"react": "^17.0.1",
"react-native": "^0.64.0-rc.0",
"react-native-permissions": "^3.0.0",
"react-native-windows": "^0.64.0-0"
"react-native-windows": "^0.64.0-preview.15"
},
"devDependencies": {
"@babel/core": "^7.8.4",
Expand Down