Move to Yarn Workspace

.buildkite/jobs/pipeline.android_rn_77.yml

@@ -7,6 +7,6 @@
     - "./scripts/ci.android.sh"
     key: "android_rn_77"
     timeout_in_minutes: 90
-    artifact_paths: "/Users/builder/uibuilder/work/artifacts/**/*"
+    artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
 
 

.buildkite/jobs/pipeline.android_rn_78.yml

@@ -7,6 +7,6 @@
     - "./scripts/ci.android.sh"
     key: "android"
     timeout_in_minutes: 90
-    artifact_paths: "/Users/builder/uibuilder/work/artifacts/**/*"
+    artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
 
 

.buildkite/jobs/pipeline.ios_rn_77.yml

@@ -6,6 +6,6 @@
     - "./scripts/ci.ios.sh"
     key: "ios_rn_77"
     timeout_in_minutes: 90
-    artifact_paths: "/Users/builder/uibuilder/work/artifacts/**/*"
+    artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
 
 

.buildkite/jobs/pipeline.ios_rn_78.yml

@@ -6,6 +6,6 @@
     - "./scripts/ci.ios.sh"
     key: "ios"
     timeout_in_minutes: 90
-    artifact_paths: "/Users/builder/uibuilder/work/artifacts/**/*"
+    artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"
 
 

.buildkite/jobs/pipeline.publish.yml

@@ -5,11 +5,8 @@
     if: "build.pull_request.id == null"
     command:
     - "nvm install"
-    - "npm install"
-    - "npm run release"    
-    depends_on:
-    - ios
-    - android
+    - "./scripts/ci.sh"
+    - "yarn run release"
     timeout_in_minutes: 90
 
 

.gitignore

@@ -220,13 +220,13 @@ android/app/libs
 android/keystores/debug.keystore
 AndroidE2E/.project
 AndroidE2E/app/.project
-lib/android/.project
+android/.project
 playground/android/.project
 AndroidE2E/app/.classpath
 AndroidE2E/app/.settings/
 AndroidE2E/app/bin/
-lib/android/.settings/
-lib/android/app/.settings/
+android/.settings/
+android/app/.settings/
 playground/android/.settings/
 playground/android/app/.settings/
 AndroidE2E/.settings/
@@ -238,10 +238,18 @@ website/package-lock.json
 artifacts/
 
 # Navigation mocks
-lib/Mock/*.js
-lib/Mock/*.d.ts
+lib/*
 Mock.js
 Mock.d.ts
 
 Gemfile.lock
 /playground/ios/.xcode.env.local
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+nmHoistingLimits: workspaces
+

Mock.ts

@@ -1 +1 @@
-export * from './lib/Mock';
+export * from './Mock';

lib/Mock/Components/ComponentScreen.tsx → Mock/Components/ComponentScreen.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { View, Text, TouchableOpacity, Image, ImageURISource } from 'react-native';
-import { Navigation, ImageResource } from 'react-native-navigation';
+import { Navigation, ImageResource } from 'src';
 import { ComponentProps } from '../ComponentProps';
 import { VISIBLE_SCREEN_TEST_ID } from '../constants';
 import { LayoutStore } from '../Stores/LayoutStore';

lib/Mock/Components/NavigationButton.tsx → Mock/Components/NavigationButton.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Button, TouchableOpacity } from 'react-native';
-import { Navigation, OptionsTopBarButton } from 'react-native-navigation';
+import { Navigation, OptionsTopBarButton } from 'src';
 import { events } from '../Stores/EventsStore';
 
 interface ButtonProps {

lib/Mock/Components/TopBar.tsx → Mock/Components/TopBar.tsx

@@ -5,7 +5,7 @@ import {
   OptionsTopBar,
   OptionsTopBarBackButton,
   OptionsTopBarButton,
-} from 'react-native-navigation';
+} from 'src';
 import ParentNode from '../Layouts/ParentNode';
 import { LayoutStore } from '../Stores/LayoutStore';
 import { NavigationButton } from './NavigationButton';

lib/Mock/Layouts/BottomTabsNode.ts → Mock/Layouts/BottomTabsNode.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import { switchTabByIndex } from '../actions/layoutActions';
 import ParentNode from './ParentNode';
 

lib/Mock/Layouts/Node.ts → Mock/Layouts/Node.ts

@@ -1,4 +1,4 @@
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import ParentNode from './ParentNode';
 
 interface Data {

lib/Mock/Layouts/ParentNode.ts → Mock/Layouts/ParentNode.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { OptionsTopBarButton } from '../../src/interfaces/Options';
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import { LayoutStore } from '../Stores/LayoutStore';
 import ComponentNode from './ComponentNode';
 import LayoutNodeFactory from './LayoutNodeFactory';

lib/Mock/Layouts/SideMenu.ts → Mock/Layouts/SideMenu.ts

@@ -1,6 +1,6 @@
 import ParentNode from './ParentNode';
 import ComponentNode from './ComponentNode';
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import * as layoutActions from '../actions/layoutActions';
 import { NodeType } from './Node';
 

lib/Mock/Stores/EventsStore.ts → Mock/Stores/EventsStore.ts

@@ -4,7 +4,7 @@ import {
   ModalDismissedEvent,
   ScreenPoppedEvent,
 } from '../../src/interfaces/ComponentEvents';
-import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src/index';
+import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src';
 import { BottomTabPressedEvent, CommandCompletedEvent } from '../../src/interfaces/Events';
 
 export const events = {

lib/Mock/index.ts → Mock/index.ts

@@ -6,7 +6,7 @@ export function mockNativeComponents() {
   const { NativeCommandsSender } = require('./mocks/NativeCommandsSender');
   const { NativeEventsReceiver } = require('./mocks/NativeEventsReceiver');
   const { AppRegistryService } = require('./mocks/AppRegistryService');
-  const { Navigation } = require('react-native-navigation');
+  const { Navigation } = require('src');
 
   Navigation.mockNativeComponents(
     new NativeCommandsSender(),

lib/Mock/mocks/NativeEventsReceiver.ts → Mock/mocks/NativeEventsReceiver.ts

@@ -18,7 +18,7 @@ import {
   BottomTabLongPressedEvent,
   BottomTabPressedEvent,
 } from '../../src/interfaces/Events';
-import { events } from './../Stores/EventsStore';
+import { events } from '../Stores/EventsStore';
 
 export class NativeEventsReceiver {
   public registerAppLaunchedListener(callback: () => void): EmitterSubscription {

ReactNativeNavigation.podspec

@@ -6,7 +6,7 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 # Detect if this is a Swift project by looking for user AppDelegate.swift files
-start_dir = File.expand_path('../../', __dir__)
+start_dir = File.expand_path('../', __dir__)
 swift_delegate_path = nil
 Find.find(start_dir) do |path|
   if path =~ /AppDelegate\.swift$/
@@ -39,12 +39,12 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |ss|
     s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
-    s.source_files        = 'lib/ios/**/*.{h,m,mm,cpp}'
-    s.exclude_files       = "lib/ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
+    s.source_files        = 'ios/**/*.{h,m,mm,cpp}'
+    s.exclude_files       = "ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
     # Only expose headers for Swift projects
     if swift_project
       s.public_header_files = [
-          'lib/ios/RNNAppDelegate.h'
+          'ios/RNNAppDelegate.h'
         ]
     end
   end

lib/android/app/build.gradle → android/build.gradle

@@ -1,17 +1,46 @@
 import groovy.json.JsonSlurper
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: "com.facebook.react"
+buildscript {
+    ext {
+        kotlinVersion = "1.9.24"
+        RNNKotlinVersion = kotlinVersion
+        detoxKotlinVersion = kotlinVersion
+        compileSdkVersion = 35
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        targetSdkVersion = 34
+        ndkVersion = "26.1.10909125"
+    }
 
+    repositories {
+        google()
+        mavenCentral()
+    }
 
-react {
-    jsRootDir = file("../../src/")
-    libraryName = "rnnavigation"
-    codegenJavaPackageName = "com.reactnativenavigation.react"
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath 'com.android.tools.build:gradle'
+    }
 }
 
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven { url "$rootDir/../../node_modules/detox/Detox-android" }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+        flatDir {
+            dirs "$rootProject.projectDir/libs"
+        }
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: "com.facebook.react"
+
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -95,7 +124,6 @@ android {
 }
 
 dependencies {
-
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:$kotlinStdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore"
@@ -107,14 +135,12 @@ dependencies {
 
     implementation 'com.github.wix-playground:ahbottomnavigation:4.0.0'
     implementation 'com.github.Dimezis:BlurView:version-3.0.0'
-//    implementation project(':AHBottomNavigation')
     implementation 'com.github.wix-playground:reflow-animator:1.0.6'
     implementation 'com.github.clans:fab:1.6.4'
 
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
 
-
     if ("Playground".toLowerCase() == rootProject.name.toLowerCase()) {
         // tests only for our playground
         testImplementation 'junit:junit:4.13.2'
@@ -141,6 +167,5 @@ dependencies {
         androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
 
         androidTestImplementation("com.facebook.react:hermes-android")
-
     }
 }

lib/android/app/src/androidTest/java/com/reactnativenavigation/TestApplication.kt → android/src/androidTest/java/com/reactnativenavigation/TestApplication.kt

@@ -6,7 +6,7 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.shell.MainReactPackage
-import com.reactnativenavigation.react.NavigationPackage
+import com.reactnativenavigation.NavigationPackage
 import com.reactnativenavigation.react.NavigationReactNativeHost
 
 class TestApplication : NavigationApplication() {

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java → android/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -52,7 +52,7 @@ public void onCreate() {
      * of {@link ReactGateway}. For example, subclasses may wish to provide a custom {@link ReactNativeHost}
      * with the ReactGateway. This method will be called exactly once, in the application's {@link #onCreate()} method.
      *
-     * Custom {@link ReactNativeHost}s must be sure to include {@link com.reactnativenavigation.react.NavigationPackage}
+     * Custom {@link ReactNativeHost}s must be sure to include {@link com.reactnativenavigation.NavigationPackage}
      *
      * @return a singleton {@link ReactGateway}
      */

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationPackage.kt → android/src/main/java/com/reactnativenavigation/NavigationPackage.kt

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.react
+package com.reactnativenavigation
 
 import com.facebook.react.BaseReactPackage
 import com.facebook.react.ReactApplication
@@ -8,6 +8,7 @@ import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.reactnativenavigation.options.LayoutFactory
+import com.reactnativenavigation.react.NavigationTurboModule
 import com.reactnativenavigation.react.modal.ModalViewManager
 
 class NavigationPackage() : BaseReactPackage() {
@@ -39,3 +40,4 @@ class NavigationPackage() : BaseReactPackage() {
         return mutableListOf(ModalViewManager(reactContext))
     }
 }
+