From 9b513ede77442636b39a7eb283c537eb231b33e6 Mon Sep 17 00:00:00 2001 From: Alex Kotliarskyi Date: Tue, 14 Apr 2015 11:36:13 -0700 Subject: [PATCH] Add flowconfig to SampleApp --- .gitignore | 1 + Examples/SampleApp/_flowconfig | 27 +++++++++++++++++++ Examples/SampleApp/{.gitignore => _gitignore} | 1 + init.sh | 4 ++- scripts/e2e-test.sh | 2 ++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Examples/SampleApp/_flowconfig rename Examples/SampleApp/{.gitignore => _gitignore} (93%) diff --git a/.gitignore b/.gitignore index 6f1bc0b9c1b082..ed8c09532e8c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate +project.xcworkspace # OS X .DS_Store diff --git a/Examples/SampleApp/_flowconfig b/Examples/SampleApp/_flowconfig new file mode 100644 index 00000000000000..1082fb195b01e3 --- /dev/null +++ b/Examples/SampleApp/_flowconfig @@ -0,0 +1,27 @@ +[ignore] + +# We fork some components by platform. +.*/*.web.js +.*/*.android.js + +# Some modules have their own node_modules with overlap +.*/node_modules/node-haste/.* + +# Ignore react-tools where there are overlaps, but don't ignore anything that +# react-native relies on +.*/node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js +.*/node_modules/react-tools/src/browser/eventPlugins/ResponderEventPlugin.js +.*/node_modules/react-tools/src/browser/ui/React.js +.*/node_modules/react-tools/src/core/ReactInstanceHandles.js +.*/node_modules/react-tools/src/event/EventPropagators.js + +# Ignore jest +.*/react-native/node_modules/jest-cli/.* + +[include] + +[libs] +node_modules/react-native/Libraries/react-native/react-native-interface.js + +[options] +module.system=haste diff --git a/Examples/SampleApp/.gitignore b/Examples/SampleApp/_gitignore similarity index 93% rename from Examples/SampleApp/.gitignore rename to Examples/SampleApp/_gitignore index c39012e9e737a6..b927355df441e3 100644 --- a/Examples/SampleApp/.gitignore +++ b/Examples/SampleApp/_gitignore @@ -20,6 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate +project.xcworkspace # node.js # diff --git a/init.sh b/init.sh index 3a9216e4a53c44..e7703f2965f2a5 100755 --- a/init.sh +++ b/init.sh @@ -18,7 +18,9 @@ def main(dest, app_name) files = Dir.chdir(source) { Dir["**/*"] } .reject { |file| file["project.xcworkspace"] || file["xcuserdata"] } .each { |file| - new_file = file.gsub("SampleApp", app_name) + new_file = file + .gsub("SampleApp", app_name) + .gsub(/^_/, ".") cp File.join(source, file), File.join(dest, new_file), app_name } end diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh index 1a988620eb3741..edb154ec3d5213 100755 --- a/scripts/e2e-test.sh +++ b/scripts/e2e-test.sh @@ -49,4 +49,6 @@ cd EndToEndTest # Make sure we installed local version of react-native ls `basename $MARKER` > /dev/null +flow + xctool -scheme EndToEndTest -sdk iphonesimulator test