diff --git a/.gitignore b/.gitignore index 7aef3fd9d4..986143efc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,211 @@ -#### -# Webstrom +############ +# Node +############ +# Logs +logs +*.log +npm-debug.log* +# Runtime data +pids +*.pid +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# Optional npm cache directory +.npm + +# Optional REPL history +.node_repl_history + +################ +# JetBrains +################ +.idea + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + + +############ +# iOS +############ +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated +ios/build/ +ios/DerivedData/ + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +ios/xcuserdata/ + +## Other +*.moved-aside +*.xcuserstate + +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +ios/Pods/ + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md + +fastlane/report.xml +fastlane/screenshots + + +############ +# Android +############ +# Built application files +*.apk +*.ap_ + +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +android/bin/ +android/gen/ +android/out/ + +# Gradle files +android/.gradle/ +android/build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +android/proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +android/.navigation/ + +# Android Studio captures folder +android/captures/ + +# Intellij +*.iml + +# Keystore files +*.jks + +################## +# React-Native +################## +# OSX +# +.DS_Store + +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +project.xcworkspace + +# Android/IJ +# .idea +.gradle +local.properties + +# node.js +# +node_modules/ +npm-debug.log + +# BUCK +buck-out/ +\.buckd/ +android/app/libs +android/keystores/debug.keystore diff --git a/detox/.gitignore b/detox/.gitignore index 3280028775..738e1ea505 100644 --- a/detox/.gitignore +++ b/detox/.gitignore @@ -4,151 +4,214 @@ ios/EarlGrey/Tests lib -npm-debug.log +############ +# Node +############ +# Logs +logs +*.log +npm-debug.log* -######################### -# .gitignore file for Xcode5 -# -# NB: if you are storing "built" products, this WILL NOT WORK, -# and you should use a different .gitignore (or none at all) -# This file is for SOURCE projects, where there are many extra -# files that we want to exclude -# -# For updates, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects -# and https://gist.github.com/adamgit/3786883 -######################### +# Runtime data +pids +*.pid +*.seed -##### -# OS X temporary files that should never be committed +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov -.DS_Store -*.swp -*.lock -profile -# cocoapods specific exclusions -!Podfile.lock -!Manifest.lock - -#### Code coverage -# json file which is used by Xcode plugin called PuncoverPlugin to show code coverrage informtaion in the Xcode gutter -# it is generated using Slather -.gutter.json - -#### -# Xcode temporary files that should never be committed -# -# NB: NIB/XIB files still exist even on Storyboard projects, so we want this... +# Coverage directory used by tools like istanbul +coverage -*~.nib +# nyc test coverage +.nyc_output +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt -#### -# Xcode build files - -# -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData" +# node-waf configuration +.lock-wscript -DerivedData/ +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build" +# Dependency directories +node_modules +jspm_packages -build/ +# Optional npm cache directory +.npm +# Optional REPL history +.node_repl_history -##### -# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups) -# -# This is complicated: +################ +# JetBrains +################ +.idea + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + + +############ +# iOS +############ +# Xcode # -# SOMETIMES you need to put this file in version control. -# Apple designed it poorly - if you use "custom executables", they are -# saved in this file. -# 99% of projects do NOT use those, so they do NOT want to version control this file. -# ..but if you're in the 1%, comment out the line "*.pbxuser" +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore +## Build generated +ios/build/ +ios/DerivedData/ + +## Various settings *.pbxuser -*.mode1v3 -*.mode2v3 -*.perspectivev3 -# NB: also, whitelist the default ones, some projects need to use these !default.pbxuser +*.mode1v3 !default.mode1v3 +*.mode2v3 !default.mode2v3 +*.perspectivev3 !default.perspectivev3 +ios/xcuserdata/ +## Other +*.moved-aside +*.xcuserstate -#### -# Xcode 4 - semi-personal settings, often included in workspaces -# -# You can safely ignore the xcuserdata files - but do NOT ignore the files next to them -# - -xcuserdata +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM -#### -# XCode 4 workspaces - more detailed -# -# Workspaces are important! They are a core feature of Xcode - don't exclude them :) -# -# Workspace layout is quite spammy. For reference: -# -# (root)/ -# (project-name).xcodeproj/ -# project.pbxproj -# project.xcworkspace/ -# contents.xcworkspacedata -# xcuserdata/ -# (your name)/xcuserdatad/ -# xcuserdata/ -# (your name)/xcuserdatad/ -# -# -# -# Xcode 4 workspaces - SHARED +# CocoaPods # -# This is UNDOCUMENTED (google: "developer.apple.com xcshareddata" - 0 results -# But if you're going to kill personal workspaces, at least keep the shared ones... +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # -# -!xcshareddata +ios/Pods/ -#### -# XCode 4 build-schemes +# Carthage # -# PRIVATE ones are stored inside xcuserdata -!xcschemes +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts -#### -# Xcode 4 - Deprecated classes -# -# Allegedly, if you manually "deprecate" your classes, they get moved here. +Carthage/Build + +# fastlane # -# We're using source-control, so this is a "feature" that we do not want! +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md -*.moved-aside +fastlane/report.xml +fastlane/screenshots -#### -# Xcode 5 - Source Control files -# -# Xcode 5 introduced a new file type .xccheckout. This files contains VCS metadata -# and should therefore not be checked into the VCS. -*.xccheckout +############ +# Android +############ +# Built application files +*.apk +*.ap_ -#### -# Xcode 7 -# -# Code coverage files +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +android/bin/ +android/gen/ +android/out/ -*.gcda -*.gcno +# Gradle files +android/.gradle/ +android/build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +android/proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +android/.navigation/ + +# Android Studio captures folder +android/captures/ + +# Intellij +*.iml + +# Keystore files +*.jks + +################## +# React-Native +################## +# OSX +# +.DS_Store -#### -# Webstrom +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +project.xcworkspace +# Android/IJ +# .idea +.gradle +local.properties -#### -# UNKNOWN: recommended by others, but I can't discover what these files are +# node.js # -# ...none. Everything is now explained.: -node_modules +node_modules/ +npm-debug.log + +# BUCK +buck-out/ +\.buckd/ +android/app/libs +android/keystores/debug.keystore diff --git a/detox/.npmignore b/detox/.npmignore index 9daeafb986..6d01076823 100644 --- a/detox/.npmignore +++ b/detox/.npmignore @@ -1 +1,224 @@ test +ios/EarlGrey/Demo +ios/EarlGrey/docs +ios/EarlGrey/Tests +build/ +DerivedData/ + + +################# +# from .gitignore +################# + +############ +# Node +############ +# Logs +logs +*.log +npm-debug.log* + +# Runtime data +pids +*.pid +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# Optional npm cache directory +.npm + +# Optional REPL history +.node_repl_history + +################ +# JetBrains +################ +.idea + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + + +############ +# iOS +############ +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated +ios/build/ +ios/DerivedData/ + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +ios/xcuserdata/ + +## Other +*.moved-aside +*.xcuserstate + +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +ios/Pods/ + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md + +fastlane/report.xml +fastlane/screenshots + + +############ +# Android +############ +# Built application files +*.apk +*.ap_ + +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +android/bin/ +android/gen/ +android/out/ + +# Gradle files +android/.gradle/ +android/build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +android/proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +android/.navigation/ + +# Android Studio captures folder +android/captures/ + +# Intellij +*.iml + +# Keystore files +*.jks + +################## +# React-Native +################## +# OSX +# +.DS_Store + +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +project.xcworkspace + +# Android/IJ +# +.idea +.gradle +local.properties + +# node.js +# +node_modules/ +npm-debug.log + +# BUCK +buck-out/ +\.buckd/ +android/app/libs +android/keystores/debug.keystore + diff --git a/detox/package.json b/detox/package.json index 48d3e15fd4..e7768dc3e9 100644 --- a/detox/package.json +++ b/detox/package.json @@ -30,9 +30,7 @@ "babel-core": "^6.8.0", "babel-eslint": "^6.0.4", "babel-polyfill": "^6.8.0", - "babel-preset-es2015": "^6.6.0", - "babel-preset-react": "^6.5.0", - "babel-preset-stage-0": "^6.5.0", + "babel-preset-react-native-stage-0": "^1.0.0", "babel-register": "^6.8.0", "shelljs": "^0.7.3", "ttab": "^0.3.1" @@ -41,9 +39,7 @@ "env": { "test": { "presets": [ - "es2015", - "react", - "stage-0" + "react-native-stage-0" ], "retainLines": true } diff --git a/detox/scripts/test.js b/detox/scripts/test.js index b8ddfece95..126d2b7eef 100644 --- a/detox/scripts/test.js +++ b/detox/scripts/test.js @@ -6,7 +6,7 @@ shell.cd('test'); shell.echo('\n#################################################################'); shell.echo('# npm run e2e'); -if (shell.exec('npm run e2e').code !== 0) { +if (shell.exec('npm run e2e', {stdio: ['pipe', 'pipe', 'pipe']}).code !== 0) { shell.echo('error: npm run e2e'); process.exit(1); }