chore: remove nohoist from example

satya164 · satya164 · commit a23dfd419dce · 2020-01-10T13:12:32.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -61,10 +61,8 @@ jobs:
     - name: Build Detox
       if: steps.detox-cache.outputs.cache-hit != 'true'
       run: |
-        cd example
         detox build --configuration ios.sim.release
 
     - name: Run Detox tests
       run: |
-        cd example
         detox test --configuration ios.sim.release --cleanup --debug-synchronization 200
diff --git a/README.md b/README.md
@@ -41,12 +41,12 @@ Remember to add tests for your change if possible. Run the unit tests by:
 yarn test
 ```
 
-Running Detox (on iOS) requires the following:
+Running the e2e tests with Detox (on iOS) requires the following:
 
 - Mac with macOS (at least macOS High Sierra 10.13.6)
 - Xcode 10.1+ with Xcode command line tools
 
-To run the integration tests, first you need to install `applesimutils` and `detox-cli`:
+First you need to install `applesimutils` and `detox-cli`:
 
 ```sh
 brew tap wix/brew
@@ -57,7 +57,6 @@ yarn global add detox-cli
 Then you can build and run the tests:
 
 ```sh
-cd example
 detox build -c ios.sim.debug
 detox test -c ios.sim.debug
 ```
diff --git a/example/App.tsx b/example/App.tsx
@@ -1,3 +1,6 @@
 import 'react-native-gesture-handler';
+import { registerRootComponent } from 'expo';
 
-export { default } from './src/index';
+import App from './src/index';
+
+registerRootComponent(App);
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -80,8 +80,8 @@ project.ext.react = [
     enableHermes: false,  // clean and rebuild if changing
 ]
 
-apply from: '../../node_modules/react-native-unimodules/gradle.groovy'
-apply from: "../../node_modules/react-native/react.gradle"
+apply from: '../../../node_modules/react-native-unimodules/gradle.groovy'
+apply from: "../../../node_modules/react-native/react.gradle"
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -179,10 +179,10 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    addUnimodulesDependencies()
+    addUnimodulesDependencies([  modulesPaths : ['../../../node_modules'] ])
 
     if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
+        def hermesPath = "../../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")
         releaseImplementation files(hermesPath + "hermes-release.aar")
     } else {
@@ -197,4 +197,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
     into 'libs'
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -24,11 +24,11 @@ allprojects {
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
+            url("$rootDir/../../node_modules/react-native/android")
         }
         maven {
             // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
+            url("$rootDir/../../node_modules/jsc-android/dist")
         }
 
         google()
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -1,7 +1,7 @@
-apply from: '../node_modules/react-native-unimodules/gradle.groovy'
-includeUnimodulesProjects()
+apply from: '../../node_modules/react-native-unimodules/gradle.groovy'
+includeUnimodulesProjects([ modulesPaths : ['../../../node_modules'] ])
 
 
 rootProject.name = 'ReactNavigationExample'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
diff --git a/example/app.json b/example/app.json
@@ -1,7 +1,10 @@
 {
+  "name": "ReactNavigationExample",
+  "displayName": "React Navigation Example",
   "expo": {
     "name": "@react-navigation/example",
     "slug": "react-navigation-example",
+    "description": "Demo app to showcase various functionality of React Navigation",
     "privacy": "public",
     "sdkVersion": "36.0.0",
     "platforms": [
@@ -25,9 +28,6 @@
     "ios": {
       "supportsTablet": true
     },
-    "entryPoint": "node_modules/expo/AppEntry.js",
-    "description": "Demo app to showcase various functionality of React Navigation"
-  },
-  "displayName": "React Navigation Example",
-  "name": "ReactNavigationExample"
+    "entryPoint": "App.tsx"
+  }
 }
diff --git a/example/e2e/.eslintrc.json b/example/e2e/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+  "settings": {
+    "import/core-modules": [
+      "detox",
+      "detox/runners/jest/adapter",
+      "detox/runners/jest/specReporter"
+    ]
+  },
+  "env": { "jest": true, "jasmine": true }
+}
diff --git a/example/e2e/config.json b/example/e2e/config.json
@@ -1,6 +1,6 @@
 {
-    "setupFilesAfterEnv": ["./init.js"],
-    "testEnvironment": "node",
-    "reporters": ["detox/runners/jest/streamlineReporter"],
-    "verbose": true
+  "setupFilesAfterEnv": ["./init.js"],
+  "testEnvironment": "node",
+  "reporters": ["detox/runners/jest/streamlineReporter"],
+  "verbose": true
 }
diff --git a/example/e2e/init.js b/example/e2e/init.js
@@ -1,8 +1,7 @@
-/* eslint-disable import/no-commonjs, jest/no-jasmine-globals */
-/* eslint-env jest, jasmine */
+/* eslint-disable jest/no-jasmine-globals, import/no-commonjs */
 
 const detox = require('detox');
-const config = require('../package.json').detox;
+const config = require('../../package.json').detox;
 const adapter = require('detox/runners/jest/adapter');
 const specReporter = require('detox/runners/jest/specReporter');
 
diff --git a/example/index.js b/example/index.js
@@ -1,6 +1,4 @@
 import { AppRegistry } from 'react-native';
-
-// Need to add extension or eslint confuses it with app.json
-import App from './App.tsx';
+import App from './src/index.tsx';
 
 AppRegistry.registerComponent('ReactNavigationExample', () => App);
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,40 +1,40 @@
 platform :ios, '10.0'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
-require_relative '../node_modules/react-native-unimodules/cocoapods.rb'
+require_relative '../../node_modules/@react-native-community/cli-platform-ios/native_modules'
+require_relative '../../node_modules/react-native-unimodules/cocoapods.rb'
 
 target 'ReactNavigationExample' do
   # Pods for ReactNavigationExample
-  pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
-  pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
-  pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
-  pod 'React', :path => '../node_modules/react-native/'
-  pod 'React-Core', :path => '../node_modules/react-native/'
-  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
-  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
-  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
-  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
-  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
-  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
-  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
-  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
-  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
-  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
+  pod 'FBLazyVector', :path => '../../node_modules/react-native/Libraries/FBLazyVector'
+  pod 'FBReactNativeSpec', :path => '../../node_modules/react-native/Libraries/FBReactNativeSpec'
+  pod 'RCTRequired', :path => '../../node_modules/react-native/Libraries/RCTRequired'
+  pod 'RCTTypeSafety', :path => '../../node_modules/react-native/Libraries/TypeSafety'
+  pod 'React', :path => '../../node_modules/react-native/'
+  pod 'React-Core', :path => '../../node_modules/react-native/'
+  pod 'React-CoreModules', :path => '../../node_modules/react-native/React/CoreModules'
+  pod 'React-Core/DevSupport', :path => '../../node_modules/react-native/'
+  pod 'React-RCTActionSheet', :path => '../../node_modules/react-native/Libraries/ActionSheetIOS'
+  pod 'React-RCTAnimation', :path => '../../node_modules/react-native/Libraries/NativeAnimation'
+  pod 'React-RCTBlob', :path => '../../node_modules/react-native/Libraries/Blob'
+  pod 'React-RCTImage', :path => '../../node_modules/react-native/Libraries/Image'
+  pod 'React-RCTLinking', :path => '../../node_modules/react-native/Libraries/LinkingIOS'
+  pod 'React-RCTNetwork', :path => '../../node_modules/react-native/Libraries/Network'
+  pod 'React-RCTSettings', :path => '../../node_modules/react-native/Libraries/Settings'
+  pod 'React-RCTText', :path => '../../node_modules/react-native/Libraries/Text'
+  pod 'React-RCTVibration', :path => '../../node_modules/react-native/Libraries/Vibration'
+  pod 'React-Core/RCTWebSocket', :path => '../../node_modules/react-native/'
 
-  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
-  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
-  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
-  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
-  pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+  pod 'React-cxxreact', :path => '../../node_modules/react-native/ReactCommon/cxxreact'
+  pod 'React-jsi', :path => '../../node_modules/react-native/ReactCommon/jsi'
+  pod 'React-jsiexecutor', :path => '../../node_modules/react-native/ReactCommon/jsiexecutor'
+  pod 'React-jsinspector', :path => '../../node_modules/react-native/ReactCommon/jsinspector'
+  pod 'ReactCommon/jscallinvoker', :path => '../../node_modules/react-native/ReactCommon'
+  pod 'ReactCommon/turbomodule/core', :path => '../../node_modules/react-native/ReactCommon'
+  pod 'Yoga', :path => '../../node_modules/react-native/ReactCommon/yoga'
 
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+  pod 'DoubleConversion', :podspec => '../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+  pod 'glog', :podspec => '../../node_modules/react-native/third-party-podspecs/glog.podspec'
+  pod 'Folly', :podspec => '../../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
   use_native_modules!
-  use_unimodules!
+  use_unimodules!({ modules_paths: ['../../node_modules'] })
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
diff --git a/example/ios/ReactNavigationExample.xcodeproj/project.pbxproj b/example/ios/ReactNavigationExample.xcodeproj/project.pbxproj
diff --git a/example/metro.config.js b/example/metro.config.js
diff --git a/example/package.json b/example/package.json
diff --git a/example/webpack.config.js b/example/webpack.config.js
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ allprojects {`
`24`	`24`	`mavenLocal()`
`25`	`25`	`maven {`
`26`	`26`	`// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm`
`27`		`- url("$rootDir/../node_modules/react-native/android")`
	`27`	`+ url("$rootDir/../../node_modules/react-native/android")`
`28`	`28`	`}`
`29`	`29`	`maven {`
`30`	`30`	`// Android JSC is installed from npm`
`31`		`- url("$rootDir/../node_modules/jsc-android/dist")`
	`31`	`+ url("$rootDir/../../node_modules/jsc-android/dist")`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`google()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "setupFilesAfterEnv": ["./init.js"],`
`3`		`- "testEnvironment": "node",`
`4`		`- "reporters": ["detox/runners/jest/streamlineReporter"],`
`5`		`- "verbose": true`
	`2`	`+ "setupFilesAfterEnv": ["./init.js"],`
	`3`	`+ "testEnvironment": "node",`
	`4`	`+ "reporters": ["detox/runners/jest/streamlineReporter"],`
	`5`	`+ "verbose": true`
`6`	`6`	`}`