From fbe2fcd491ea539594add67dda9c772715fc12fe Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 16 Jun 2018 22:24:12 +0800 Subject: [PATCH 1/7] use js instead of bash to start RNTester dev server --- local-cli/bundle/bundleCommandLineArgs.js | 1 + local-cli/dependencies/dependencies.js | 1 + local-cli/runAndroid/runAndroid.js | 1 + local-cli/runIOS/runIOS.js | 1 + package.json | 1 + 5 files changed, 5 insertions(+) diff --git a/local-cli/bundle/bundleCommandLineArgs.js b/local-cli/bundle/bundleCommandLineArgs.js index 4853f877ab7d6f..d0e85bb53f3d65 100644 --- a/local-cli/bundle/bundleCommandLineArgs.js +++ b/local-cli/bundle/bundleCommandLineArgs.js @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. * * @format + * @flow */ 'use strict'; diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js index 6191548073ca98..0795d38115d0dc 100644 --- a/local-cli/dependencies/dependencies.js +++ b/local-cli/dependencies/dependencies.js @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. * * @format + * @flow */ 'use strict'; diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js index 6835c97bcb0bf0..f6dc3db1de3a69 100644 --- a/local-cli/runAndroid/runAndroid.js +++ b/local-cli/runAndroid/runAndroid.js @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. * * @format + * @flow */ 'use strict'; diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js index dfabb92b894a4b..b79898b9e2d5b8 100644 --- a/local-cli/runIOS/runIOS.js +++ b/local-cli/runIOS/runIOS.js @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. * * @format + * @flow */ 'use strict'; diff --git a/package.json b/package.json index 6073ff9fc68896..a8b67cccf788c0 100644 --- a/package.json +++ b/package.json @@ -123,6 +123,7 @@ "third-party-podspecs" ], "scripts": { + "start": "flow-node ./local-cli/cli.js start -- --reset-cache", "test": "jest", "test-ci": "JEST_JUNIT_OUTPUT=\"reports/junit/js-test-results.xml\" jest --maxWorkers=2 --ci --testResultsProcessor=\"jest-junit\"", "flow": "flow", From ddbccc985e9bd9d39afd5f8f21fff0aa27a01887 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 16 Jun 2018 22:50:09 +0800 Subject: [PATCH 2/7] remove redundant type --- local-cli/bundle/bundleCommandLineArgs.js | 3 +-- local-cli/dependencies/dependencies.js | 3 +-- local-cli/runAndroid/runAndroid.js | 3 +-- local-cli/runIOS/runIOS.js | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/local-cli/bundle/bundleCommandLineArgs.js b/local-cli/bundle/bundleCommandLineArgs.js index d0e85bb53f3d65..445654234e7eb5 100644 --- a/local-cli/bundle/bundleCommandLineArgs.js +++ b/local-cli/bundle/bundleCommandLineArgs.js @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. * * @format - * @flow */ 'use strict'; @@ -56,7 +55,7 @@ module.exports = [ 'Specifies the maximum number of workers the worker-pool ' + 'will spawn for transforming files. This defaults to the number of the ' + 'cores available on your machine.', - parse: (workers: string) => Number(workers), + parse: (workers) => Number(workers), }, { command: '--sourcemap-output [string]', diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js index 0795d38115d0dc..379fe80513ce32 100644 --- a/local-cli/dependencies/dependencies.js +++ b/local-cli/dependencies/dependencies.js @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. * * @format - * @flow */ 'use strict'; @@ -101,7 +100,7 @@ module.exports = { 'Specifies the maximum number of workers the worker-pool ' + 'will spawn for transforming files. This defaults to the number of the ' + 'cores available on your machine.', - parse: (workers: string) => Number(workers), + parse: (workers) => Number(workers), }, { command: '--dev [boolean]', diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js index f6dc3db1de3a69..d33767857f67f4 100644 --- a/local-cli/runAndroid/runAndroid.js +++ b/local-cli/runAndroid/runAndroid.js @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. * * @format - * @flow */ 'use strict'; @@ -473,7 +472,7 @@ module.exports = { { command: '--port [number]', default: process.env.RCT_METRO_PORT || 8081, - parse: (val: string) => Number(val), + parse: (val) => Number(val), }, ], }; diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js index b79898b9e2d5b8..02c5e8213dfcbc 100644 --- a/local-cli/runIOS/runIOS.js +++ b/local-cli/runIOS/runIOS.js @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. * * @format - * @flow */ 'use strict'; @@ -448,7 +447,7 @@ module.exports = { { command: '--port [number]', default: process.env.RCT_METRO_PORT || 8081, - parse: (val: string) => Number(val), + parse: (val) => Number(val), }, ], }; From f4049cd580751560747759445488e50a88d1c4fb Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 16 Jun 2018 22:50:18 +0800 Subject: [PATCH 3/7] fix script --- scripts/objc-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh index c2a9a94d182e7b..f52f38737a9c34 100755 --- a/scripts/objc-test.sh +++ b/scripts/objc-test.sh @@ -56,7 +56,7 @@ function waitForPackager { if [ "$1" = "test" ]; then # Start the packager -./scripts/packager.sh --max-workers=1 || echo "Can't start packager automatically" & +npm run start || echo "Can't start packager automatically" & # Start the WebSocket test server open "./IntegrationTests/launchWebSocketServer.command" || echo "Can't start web socket server automatically" From ac0ea69668101621a0dd6ca04154ba9c5b3b0b6d Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Wed, 27 Jun 2018 21:12:12 +0800 Subject: [PATCH 4/7] remove obsolete file --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index a8b67cccf788c0..f62cdb2007076a 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,6 @@ "scripts/ios-install-third-party.sh", "scripts/launchPackager.bat", "scripts/launchPackager.command", - "scripts/packager.sh", "scripts/react-native-xcode.sh", "jest-preset.json", "jest", @@ -123,7 +122,7 @@ "third-party-podspecs" ], "scripts": { - "start": "flow-node ./local-cli/cli.js start -- --reset-cache", + "start": "flow-node ./local-cli/cli.js start", "test": "jest", "test-ci": "JEST_JUNIT_OUTPUT=\"reports/junit/js-test-results.xml\" jest --maxWorkers=2 --ci --testResultsProcessor=\"jest-junit\"", "flow": "flow", From bfd647508cddcb5bd81cf450b17965bac531d6a5 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Thu, 12 Jul 2018 20:41:30 +0800 Subject: [PATCH 5/7] revert flow-node --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index f62cdb2007076a..4ca574e15dbf33 100644 --- a/package.json +++ b/package.json @@ -122,13 +122,12 @@ "third-party-podspecs" ], "scripts": { - "start": "flow-node ./local-cli/cli.js start", + "start": "node ./local-cli/cli.js start", "test": "jest", "test-ci": "JEST_JUNIT_OUTPUT=\"reports/junit/js-test-results.xml\" jest --maxWorkers=2 --ci --testResultsProcessor=\"jest-junit\"", "flow": "flow", "lint": "eslint .", "prettier": "prettier \"./**/*.js\" --write", - "start": "/usr/bin/env bash -c './scripts/packager.sh \"$@\" || true' --", "docker-setup-android": "docker pull reactnativeci/android-base:latest", "docker-build-android-base": "docker build -t reactnativeci/android-base -f ContainerShip/Dockerfile.android-base .", "docker-build-android": "docker build -t reactnativeci/android -f ContainerShip/Dockerfile.android .", From 9c822c7fab0d8ab619ea1f1f2081c44b86b8650b Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Thu, 12 Jul 2018 20:45:24 +0800 Subject: [PATCH 6/7] add back max workers --- scripts/objc-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh index f52f38737a9c34..ed670cc2a2a5f2 100755 --- a/scripts/objc-test.sh +++ b/scripts/objc-test.sh @@ -56,7 +56,7 @@ function waitForPackager { if [ "$1" = "test" ]; then # Start the packager -npm run start || echo "Can't start packager automatically" & +npm run start --max-workers=1 || echo "Can't start packager automatically" & # Start the WebSocket test server open "./IntegrationTests/launchWebSocketServer.command" || echo "Can't start web socket server automatically" From b69a1549802daddc4dc69f548bffa54c3ab40b91 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Fri, 3 Aug 2018 23:23:51 +0800 Subject: [PATCH 7/7] revert remove type to stay this pr clean. --- local-cli/bundle/bundleCommandLineArgs.js | 2 +- local-cli/dependencies/dependencies.js | 2 +- local-cli/runAndroid/runAndroid.js | 2 +- local-cli/runIOS/runIOS.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/local-cli/bundle/bundleCommandLineArgs.js b/local-cli/bundle/bundleCommandLineArgs.js index 445654234e7eb5..4853f877ab7d6f 100644 --- a/local-cli/bundle/bundleCommandLineArgs.js +++ b/local-cli/bundle/bundleCommandLineArgs.js @@ -55,7 +55,7 @@ module.exports = [ 'Specifies the maximum number of workers the worker-pool ' + 'will spawn for transforming files. This defaults to the number of the ' + 'cores available on your machine.', - parse: (workers) => Number(workers), + parse: (workers: string) => Number(workers), }, { command: '--sourcemap-output [string]', diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js index 379fe80513ce32..6191548073ca98 100644 --- a/local-cli/dependencies/dependencies.js +++ b/local-cli/dependencies/dependencies.js @@ -100,7 +100,7 @@ module.exports = { 'Specifies the maximum number of workers the worker-pool ' + 'will spawn for transforming files. This defaults to the number of the ' + 'cores available on your machine.', - parse: (workers) => Number(workers), + parse: (workers: string) => Number(workers), }, { command: '--dev [boolean]', diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js index d33767857f67f4..6835c97bcb0bf0 100644 --- a/local-cli/runAndroid/runAndroid.js +++ b/local-cli/runAndroid/runAndroid.js @@ -472,7 +472,7 @@ module.exports = { { command: '--port [number]', default: process.env.RCT_METRO_PORT || 8081, - parse: (val) => Number(val), + parse: (val: string) => Number(val), }, ], }; diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js index 02c5e8213dfcbc..dfabb92b894a4b 100644 --- a/local-cli/runIOS/runIOS.js +++ b/local-cli/runIOS/runIOS.js @@ -447,7 +447,7 @@ module.exports = { { command: '--port [number]', default: process.env.RCT_METRO_PORT || 8081, - parse: (val) => Number(val), + parse: (val: string) => Number(val), }, ], };