kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-29 04:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Turned on old bridge for OSS

Browse Source 
Summary:
This should revert back to using old bridge by default until we fix gradle script to build new bridge for OSS correctly
Closes https://github.com/facebook/react-native/pull/8539

Differential Revision: D3514263

Pulled By: bestander

fbshipit-source-id: db9e0232b9bde27206814212dedc487c366e3511
This commit is contained in:
Konstantin Raev
2016-07-03 14:39:45 -07:00
committed by Facebook Github Bot 1
parent f78e819f20
commit 1d86be3a6e
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Libraries/Utilities/createStrictShapeTypeChecker.js
View File

@@ -46,15 +46,14 @@ function createStrictShapeTypeChecker(
var allKeys = merge(props[propName], shapeTypes); var allKeys = merge(props[propName], shapeTypes);
for (var key in allKeys) { for (var key in allKeys) {
var checker = shapeTypes[key]; var checker = shapeTypes[key];
invariant( if (!checker) {
checker, invariant(
'Invalid props.%s key `%s` supplied to `%s`.\nBad object: %s\nValid keys: %s', false,
propName, `Invalid props.${propName} key \`${key}\` supplied to \`${componentName}\`.` +
key, `\nBad object: ` + JSON.stringify(props[propName], null, ' ') +
componentName, `\nValid keys: ` + JSON.stringify(Object.keys(shapeTypes), null, ' ')
JSON.stringify(props[propName], null, ' '), );
JSON.stringify(Object.keys(shapeTypes).sort(), null, ' '), }
);
var error = checker(propValue, key, componentName, location); var error = checker(propValue, key, componentName, location);
if (error) { if (error) {
invariant( invariant(

1
ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
View File

@@ -153,6 +153,7 @@ public class ReactAppTestActivity extends FragmentActivity implements
ReactInstanceManager.Builder builder = ReactInstanceManager.Builder builder =
ReactTestHelper.getReactTestFactory().getReactInstanceManagerBuilder() ReactTestHelper.getReactTestFactory().getReactInstanceManagerBuilder()
.setApplication(getApplication()) .setApplication(getApplication())
.setUseOldBridge(true)
.setBundleAssetName(bundleName) .setBundleAssetName(bundleName)
// By not setting a JS module name, we force the bundle to be always loaded from // By not setting a JS module name, we force the bundle to be always loaded from
// assets, not the devserver, even if dev mode is enabled (such as when testing redboxes). // assets, not the devserver, even if dev mode is enabled (such as when testing redboxes).

1
ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
View File

@@ -61,6 +61,7 @@ public abstract class ReactNativeHost {
protected ReactInstanceManager createReactInstanceManager() { protected ReactInstanceManager createReactInstanceManager() {
ReactInstanceManager.Builder builder = ReactInstanceManager.builder() ReactInstanceManager.Builder builder = ReactInstanceManager.builder()
.setUseOldBridge(true)
.setApplication(mApplication) .setApplication(mApplication)
.setJSMainModuleName(getJSMainModuleName()) .setJSMainModuleName(getJSMainModuleName())
.setUseDeveloperSupport(getUseDeveloperSupport()) .setUseDeveloperSupport(getUseDeveloperSupport())