chore: improve package export

Author: jokerttu

.npmignore

@@ -29,16 +29,10 @@ buildscript {
   }
 }
 
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["react_native_navigation_sdk_" + name]).toInteger()
@@ -69,7 +63,6 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
 
   buildFeatures {
@@ -88,12 +81,10 @@ android {
 
   sourceSets {
     main {
-      if (isNewArchitectureEnabled()) {
-          java.srcDirs += [
-            "generated/java",
-            "generated/jni"
-          ]
-      }
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
     }
   }
 }
@@ -122,10 +113,8 @@ dependencies {
   api 'com.google.guava:guava:31.0.1-android'
 }
 
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "ReactNativeNavigationSdk"
-    codegenJavaPackageName = "com.google.maps.android.rn.navsdk"
-  }
-}
+react {
+  jsRootDir = file("../src/")
+  libraryName = "ReactNativeNavigationSdk"
+  codegenJavaPackageName = "com.google.maps.android.rn.navsdk"
+}

android/build.gradle

@@ -15,5 +15,14 @@
  */
 
 module.exports = {
-  presets: ['module:react-native-builder-bob/babel-preset'],
+  overrides: [
+    {
+      exclude: /\/node_modules\//,
+      presets: ['module:react-native-builder-bob/babel-preset'],
+    },
+    {
+      include: /\/node_modules\//,
+      presets: ['module:@react-native/babel-preset'],
+    },
+  ],
 };

babel.config.js

@@ -3,10 +3,17 @@
   "version": "0.9.3",
   "author": "Google",
   "description": "A React Native library for Navigation SDK on Google Maps Platform",
-  "main": "./lib/commonjs/index.js",
-  "module": "./lib/module/index.js",
+  "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
-  "source": "./src/index.tsx",
+  "exports": {
+    ".": {
+      "source": "./src/index.tsx",
+      "types": "./lib/typescript/src/index.d.ts",
+      "import": "./lib/module/index.js",
+      "default": "./lib/module/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "src",
     "lib",
@@ -21,6 +28,9 @@
     "!android/gradlew",
     "!android/gradlew.bat",
     "!android/local.properties",
+    "!example",
+    "!coverage",
+    "!scripts",
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__",
@@ -137,12 +147,6 @@
     "output": "lib",
     "targets": [
       "codegen",
-      [
-        "commonjs",
-        {
-          "esm": true
-        }
-      ],
       [
         "module",
         {