React sync for revisions 9d484ed...1c2876d

Reviewed By: gaearon

Differential Revision: D7500761

fbshipit-source-id: 8dc1cda879942fc4990b23144a616039fdbe6dc0
This commit is contained in:
Brian Vaughn
2018-04-05 23:43:48 +02:00
committed by Mike Grabowski
parent ab5db0c81c
commit 54f23f4b3c
7 changed files with 5187 additions and 3564 deletions
+1 -1
View File
@@ -1 +1 @@
ad9544f48e58f2599a8ea0de1e9f4dd104db30bb
1c2876d5b558b8591feb335d8d7204bc46f7da8a
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -62,7 +62,7 @@ export type ReactProvider<T> = {
export type ReactProviderType<T> = {
$$typeof: Symbol | number,
context: ReactContext<T>,
_context: ReactContext<T>,
};
export type ReactConsumer<T> = {
@@ -72,7 +72,7 @@ export type ReactConsumer<T> = {
ref: null,
props: {
children: (value: T) => ReactNodeList,
bits?: number,
unstable_observedBits?: number,
},
};
+16 -16
View File
@@ -1,6 +1,6 @@
{
"name": "react-native",
"version": "0.55.0",
"version": "1000.0.0",
"description": "A framework for building native apps using React",
"license": "MIT",
"repository": {
@@ -127,22 +127,22 @@
"lint": "eslint .",
"prettier": "find . -name node_modules -prune -or -name '*.js' -print | xargs prettier --write",
"start": "/usr/bin/env bash -c './scripts/packager.sh \"$@\" || true' --",
"test-android-setup": "docker pull hramos/android-base:latest",
"test-android-build-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .",
"test-android-build": "docker build -t react/android -f ContainerShip/Dockerfile.android .",
"docker-setup-android": "docker pull hramos/android-base:latest",
"docker-build-android-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .",
"docker-build-android": "docker build -t react/android -f ContainerShip/Dockerfile.android .",
"test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-instrumentation-tests.sh",
"test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-unit-tests.sh",
"test-android-run-e2e": "docker run --privileged -it react/android bash ContainerShip/scripts/run-ci-e2e-tests.sh --android --js",
"test-android-all": "npm run test-android-build && npm run test-android-run-unit && npm run test-android-run-instrumentation && npm run test-android-run-e2e",
"test-android-instrumentation": "npm run test-android-build && npm run test-android-run-instrumentation",
"test-android-unit": "npm run test-android-build && npm run test-android-run-unit",
"test-android-e2e": "npm run test-android-build && npm run test-android-run-e2e"
"test-android-all": "yarn run docker-build-android && yarn run test-android-run-unit && yarn run test-android-run-instrumentation && yarn run test-android-run-e2e",
"test-android-instrumentation": "yarn run docker-build-android && yarn run test-android-run-instrumentation",
"test-android-unit": "yarn run docker-build-android && yarn run test-android-run-unit",
"test-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e"
},
"bin": {
"react-native": "local-cli/wrong-react-native.js"
},
"peerDependencies": {
"react": "^16.3.0-alpha.0"
"react": "16.3.1"
},
"dependencies": {
"absolute-path": "^0.0.0",
@@ -175,8 +175,8 @@
"graceful-fs": "^4.1.3",
"inquirer": "^3.0.6",
"lodash": "^4.17.5",
"metro": "^0.30.0",
"metro-core": "^0.30.0",
"metro": "^0.31.0",
"metro-core": "^0.31.0",
"mime": "^1.3.4",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
@@ -215,13 +215,13 @@
"eslint-plugin-jest": "21.8.0",
"eslint-plugin-prettier": "2.6.0",
"eslint-plugin-react": "7.6.1",
"flow-bin": "^0.67.1",
"jest": "22.4.2",
"flow-bin": "^0.69.0",
"jest": "23.0.0-alpha.4",
"jest-junit": "3.6.0",
"prettier": "1.9.1",
"react": "^16.3.0-alpha.1",
"react-test-renderer": "^16.3.0-alpha.1",
"react": "16.3.1",
"react-test-renderer": "16.3.1",
"shelljs": "^0.7.8",
"sinon": "^2.2.0"
}
}
}