chore: 10.2 prepare, upgrade to current create-react-native structure

.eslintrc.js

@@ -92,7 +92,7 @@ module.exports = {
     ],
     'prettier/prettier': 'warn',
   },
-  ignorePatterns: ['**/rnmapbox.web.symlink', 'plugin/build/', 'example/dist'],
+  ignorePatterns: ['**/rnmapbox.web.symlink', 'plugin/build/', 'example/dist', 'node_modules/', 'lib/'],
   overrides: [
     {
       // Match TypeScript Files

.github/workflows/on-push.yml

@@ -28,6 +28,9 @@ jobs:
         with:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
 
+      - run: echo 'dummytoken' > ./accesstoken
+        working-directory: example
+
       - name: Install
         run: yarn install --network-timeout 1000000
 

.gitignore

@@ -57,10 +57,21 @@ package-lock.json
 /example/package-lock.json
 /example/yarn.lock
 
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # Expo
 .expo
 example/dist
 
+# Turborepo
+.turbo/
+
 # Test generated files
 /ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
 *.js.meta

.yarnrc.yml

@@ -0,0 +1,10 @@
+nodeLinker: node-modules
+nmHoistingLimits: workspaces
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.6.1.cjs

babel.config.js

@@ -1,9 +1,12 @@
 module.exports = {
-  presets: ['@react-native/babel-preset'],
-  plugins: [['@babel/plugin-proposal-class-properties', { loose: true }]],
-  env: {
-    production: {
-      plugins: ['transform-remove-console'],
+  overrides: [
+    {
+      exclude: /\/node_modules\//,
+      presets: ['module:react-native-builder-bob/babel-preset'],
     },
-  },
+    {
+      include: /\/node_modules\//,
+      presets: ['module:@react-native/babel-preset'],
+    },
+  ],
 };

example/.detoxrc.js

@@ -8,18 +8,18 @@ module.exports = {
   apps: {
     "ios": {
       type: "ios.app",
-      build: "xcodebuild -quiet -workspace ios/RNMapboxGLExample.xcworkspace -configuration Release -scheme RNMapboxGLExample -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=16.4,name=iPhone SE (3rd generation)'",
-      binaryPath: "ios/build/Build/Products/Release-iphonesimulator/RNMapboxGLExample.app"
+      build: "xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Release -scheme RNMapboxExample -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=16.4,name=iPhone SE (3rd generation)'",
+      binaryPath: "ios/build/Build/Products/Release-iphonesimulator/RNMapboxExample.app"
     },
     "ios.debug": {
       type: "ios.app",
-      build: "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxGLExample.xcworkspace -configuration Debug -scheme RNMapboxGLExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=16.4,name=iPhone SE (3rd generation)'",
-      binaryPath: "ios/build/Build/Products/Debug-iphonesimulator/RNMapboxGLExample.app"
+      build: "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Debug -scheme RNMapboxExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=16.4,name=iPhone SE (3rd generation)'",
+      binaryPath: "ios/build/Build/Products/Debug-iphonesimulator/RNMapboxExample.app"
     },
     "ios.debug.ci": {
       type: "ios.app",
-      build: "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxGLExample.xcworkspace -configuration Debug -scheme RNMapboxGLExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=18.6,arch=arm64,name=iPhone SE (3rd generation)'",
-      binaryPath: "ios/build/Build/Products/Debug-iphonesimulator/RNMapboxGLExample.app"
+      build: "FORCE_BUNDLING=1 xcodebuild -quiet -workspace ios/RNMapboxExample.xcworkspace -configuration Debug -scheme RNMapboxExample DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING=1 GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DEBUG_RCT_BUNDLE=1' -sdk iphonesimulator -derivedDataPath ios/build -destination 'platform=iOS Simulator,OS=18.6,arch=arm64,name=iPhone SE (3rd generation)'",
+      binaryPath: "ios/build/Build/Products/Debug-iphonesimulator/RNMapboxExample.app"
     },
   },
   devices: {

example/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

example/Gemfile

@@ -1,16 +1,16 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.4'
+ruby ">= 2.6.10"
 
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
-gem 'activesupport', '>= 6.1.7.3', '!= 7.1.0'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
 gem 'xcodeproj', '< 1.26.0'
 gem 'concurrent-ruby', '< 1.3.4'
 
 # Ruby 3.4.0 has removed some libraries from the standard library.
 gem 'bigdecimal'
 gem 'logger'
 gem 'benchmark'
-gem 'mutex_m'
+gem 'mutex_m'

example/README.md

@@ -107,7 +107,7 @@ If you are using [`nvm`](https://github.com/nvm-sh/nvm), make sure you copy [ios
 If you run into
 
 ```
-Command failed: /usr/libexec/PlistBuddy -c Print:CFBundleIdentifier build/Build/Products/Debug-iphonesimulator/RNMapboxGLExample.app/Info.plist
+Command failed: /usr/libexec/PlistBuddy -c Print:CFBundleIdentifier build/Build/Products/Debug-iphonesimulator/RNMapboxExample.app/Info.plist
 Print: Entry, ":CFBundleIdentifier", Does Not Exist
 ```
 

example/android/app/BUCK

@@ -35,12 +35,12 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "com.rnmapboxglexample",
+    package = "com.rnmapboxexample",
 )
 
 android_resource(
     name = "res",
-    package = "com.rnmapboxglexample",
+    package = "com.rnmapboxexample",
     res = "src/main/res",
 )
 

example/android/app/build.gradle

@@ -77,9 +77,9 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
 
-    namespace "com.rnmapboxglexample"
+    namespace "com.rnmapboxexample"
     defaultConfig {
-        applicationId "com.rnmapboxglexample"
+        applicationId "com.rnmapboxexample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1

example/android/app/src/main/java/com/rnmapboxglexample/MainActivity.kt → example/android/app/src/main/java/com/rnmapboxexample/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.rnmapboxglexample
+package com.rnmapboxexample
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
@@ -10,16 +10,16 @@ class MainActivity : ReactActivity() {
    * Returns the name of the main component registered from JavaScript. This is used to schedule
    * rendering of the component.
    */
-  override fun getMainComponentName(): String = "RNMapboxGLExample"
+  override fun getMainComponentName(): String = "RNMapboxExample"
   /**
    * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
    * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
    */
   override fun createReactActivityDelegate(): ReactActivityDelegate =
       DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
-  
+
   //react-native-screens override
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(null);
   }
-}
+}

example/android/app/src/main/java/com/rnmapboxglexample/MainApplication.kt → example/android/app/src/main/java/com/rnmapboxexample/MainApplication.kt

@@ -1,4 +1,4 @@
-package com.rnmapboxglexample
+package com.rnmapboxexample
 import android.app.Application
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication

example/android/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">RNMapboxGLExample</string>
+    <string name="app_name">RNMapboxExample</string>
 </resources>

example/android/app/src/release/java/com/rnmapboxglexample/ReactNativeFlipper.java

@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.rnmapboxglexample;
+package com.rnmapboxexample;
 import android.content.Context;
 import com.facebook.react.ReactInstanceManager;
 /**
@@ -15,4 +15,4 @@ public class ReactNativeFlipper {
   public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
     // Do nothing as we don't want to initialize Flipper on Release.
   }
-}
+}

example/android/settings.gradle

@@ -1,7 +1,7 @@
 pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
 plugins { id("com.facebook.react.settings") }
 extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
-rootProject.name = 'RNMapboxGLExample'
+rootProject.name = 'RNMapboxExample'
 
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')

example/app.json

@@ -1,7 +1,7 @@
 {
   "expo": {
-    "name": "RNMapboxGLExample",
-    "displayName": "RNMapboxGLExample",
+    "name": "RNMapboxExample",
+    "displayName": "RNMapboxExample",
     "web": {
       "bundler": "metro",
       "output": "single"

example/babel.config.js

@@ -1,23 +1,14 @@
 const path = require('path');
 
-const pak = require('../package.json');
+const { getConfig } = require('react-native-builder-bob/babel-config');
 
-module.exports = function (api) {
-  api.cache(true);
+const pkg = require('../package.json');
 
-  return {
-    presets: ['@react-native/babel-preset'], //'babel-preset-expo'],
-    plugins: [
-      [
-        'module-resolver',
-        {
-          extensions: ['.tsx', '.ts', '.js', '.json'],
-          alias: {
-            // For development, we want to alias the library to the source
-            [pak.name]: path.join(__dirname, '..', pak.source),
-          },
-        },
-      ],
-    ],
-  };
-};
+const root = path.resolve(__dirname, '..');
+
+module.exports = getConfig(
+  {
+    presets: ['babel-preset-expo'],
+  },
+  { root, pkg },
+);

example/index.js

@@ -1,3 +1,4 @@
+console.log('index.js');
 import { AppRegistry } from 'react-native';
 
 import App from './src/App';

example/index.web.js

@@ -0,0 +1,5 @@
+import { registerRootComponent } from 'expo';
+
+import App from './src/App';
+
+registerRootComponent(App);

example/ios/Podfile

@@ -57,7 +57,7 @@ if INHIBIT_WARNING_BY_DEFAULT
   end
 end
 
-target 'RNMapboxGLExample' do
+target 'RNMapboxExample' do
   #pod 'rnmapbox-maps', :path => '../../', :inhibit_warnings => false
 
   config = use_native_modules!

example/ios/Podfile.lock

@@ -2376,19 +2376,19 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - rnmapbox-maps (10.1.44):
-    - MapboxMaps (= 11.15.0)
+  - rnmapbox-maps (10.2.0-beta.1):
+    - MapboxMaps (~> 11.15.0)
     - React
     - React-Core
-    - rnmapbox-maps/DynamicLibrary (= 10.1.44)
+    - rnmapbox-maps/DynamicLibrary (= 10.2.0-beta.1)
     - Turf
-  - rnmapbox-maps/DynamicLibrary (10.1.44):
+  - rnmapbox-maps/DynamicLibrary (10.2.0-beta.1):
     - boost
     - DoubleConversion
     - fast_float
     - fmt
     - hermes-engine
-    - MapboxMaps (= 11.15.0)
+    - MapboxMaps (~> 11.15.0)
     - RCT-Folly
     - RCT-Folly/Fabric
     - RCTRequired
@@ -2408,7 +2408,7 @@ PODS:
     - SocketRocket
     - Turf
     - Yoga
-  - RNScreens (4.15.4):
+  - RNScreens (4.16.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -2435,10 +2435,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNScreens/common (= 4.15.4)
+    - RNScreens/common (= 4.16.0)
     - SocketRocket
     - Yoga
-  - RNScreens/common (4.15.4):
+  - RNScreens/common (4.16.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -2818,13 +2818,13 @@ SPEC CHECKSUMS:
   ReactCodegen: 3baedb0c33f963250c866151b825a3c5194b12f1
   ReactCommon: e897f9a1b4afab370cfefaaf5fb3c80371bc3937
   RNCAsyncStorage: 302f2fac014fd450046c120567ca364632da682b
-  rnmapbox-maps: 501dfe6b1be7980e3423bace47609da6a831ff6d
-  RNScreens: 5c7f22b19ee2e900e5de2c578471aeb153d1e502
+  rnmapbox-maps: 52fa61f7507ba0c636bec75ac0360e83d224a9b1
+  RNScreens: 74985ca8e102294a60cec7513fa84c936fa0b20b
   RNVectorIcons: 6acc19c833be864e9c70894e101a587fe491150a
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Turf: c9eb11a65d96af58cac523460fd40fec5061b081
   Yoga: fa23995c18b65978347b096d0836f4f5093df545
 
-PODFILE CHECKSUM: 914a478ba40674a11ae8cf3f264d6c55daf25e6a
+PODFILE CHECKSUM: eee6773e092eb44b298b4a54c048d855d5654a9f
 
 COCOAPODS: 1.16.2