Dedupe react-native versions, add jotai for global state (#39)

* Dedupe react-native versions, add jotai for global state

* Update lockfile

Author: markmur

sample/metro.config.js metro.config.jssample/metro.config.js renamed to metro.config.js

@@ -2,9 +2,9 @@ const path = require('path');
 const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
 const escape = require('escape-string-regexp');
 const exclusionList = require('metro-config/src/defaults/exclusionList');
-const pkg = require('../package.json');
+const pkg = require('./package.json');
 
-const root = path.resolve(__dirname, '..');
+const root = path.resolve(__dirname);
 const sample = path.resolve(root, 'sample');
 
 const modules = Object.keys({...pkg.peerDependencies});

modules/react-native-shopify-checkout-kit/src/index.ts

@@ -45,14 +45,14 @@ if (!('ShopifyCheckoutKit' in NativeModules)) {
 }
 
 class ShopifyCheckoutKit implements ShopifyCheckout {
-  private eventEmitter: NativeEventEmitter;
+  private static eventEmitter: NativeEventEmitter = new NativeEventEmitter(
+    RNShopifyCheckoutKit,
+  );
 
   constructor(configuration?: Configuration) {
     if (configuration != null) {
       this.setConfig(configuration);
     }
-
-    this.eventEmitter = new NativeEventEmitter(RNShopifyCheckoutKit);
   }
 
   public readonly version: string = RNShopifyCheckoutKit.version;
@@ -77,11 +77,11 @@ class ShopifyCheckoutKit implements ShopifyCheckout {
     eventName: CheckoutEvent,
     callback: CheckoutEventCallback,
   ): EmitterSubscription | undefined {
-    return this.eventEmitter.addListener(eventName, callback);
+    return ShopifyCheckoutKit.eventEmitter.addListener(eventName, callback);
   }
 
   public removeEventListeners(event: CheckoutEvent) {
-    this.eventEmitter.removeAllListeners(event);
+    ShopifyCheckoutKit.eventEmitter.removeAllListeners(event);
   }
 }
 

modules/react-native-shopify-checkout-kit/tests/index.test.ts

@@ -20,6 +20,7 @@ jest.mock('react-native', () => {
   };
 
   const ShopifyCheckoutKit = {
+    eventEmitter: NativeEventEmitter(),
     version: '0.7.0',
     preload: jest.fn(),
     present: jest.fn(),
@@ -110,7 +111,7 @@ describe('ShopifyCheckoutKit', () => {
       const callback = jest.fn();
       instance.addEventListener(eventName, callback);
       // @ts-expect-error
-      expect(instance.eventEmitter.addListener).toHaveBeenCalledWith(
+      expect(ShopifyCheckoutKit.eventEmitter.addListener).toHaveBeenCalledWith(
         eventName,
         callback,
       );
@@ -123,10 +124,10 @@ describe('ShopifyCheckoutKit', () => {
       instance.addEventListener('close', () => {});
       instance.addEventListener('close', () => {});
       instance.removeEventListeners('close');
-      // @ts-expect-error
-      expect(instance.eventEmitter.removeAllListeners).toHaveBeenCalledWith(
-        'close',
-      );
+      expect(
+        // @ts-expect-error
+        ShopifyCheckoutKit.eventEmitter.removeAllListeners,
+      ).toHaveBeenCalledWith('close');
     });
   });
 });

package.json

@@ -23,9 +23,6 @@
     "turbo": "turbo",
     "test": "jest"
   },
-  "dependencies": {
-    "react": "^18.2.0"
-  },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
@@ -34,15 +31,17 @@
     "@react-native/metro-config": "^0.72.11",
     "@tsconfig/react-native": "^3.0.0",
     "@types/jest": "^29.5.10",
-    "@types/react": "^18.0.24",
+    "@types/react": "^18",
+    "@types/react-native": "0.72.7",
     "@types/react-native-dotenv": "^0.2.1",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.7.0",
     "eslint": "^8.19.0",
     "jest": "^29.2.1",
     "pod-install": "^0.1.39",
     "prettier": "^2.4.1",
-    "react-native": "^0.72.7",
+    "react": "^18.2.0",
+    "react-native": "0.72.7",
     "react-native-dotenv": "^3.4.9",
     "react-native-gradle-plugin": "^0.71.19",
     "react-test-renderer": "18.2.0",
@@ -76,5 +75,8 @@
       "no-console": "error"
     }
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "dependencies": {
+    "react-native-gesture-handler": "^2.14.0"
+  }
 }

sample/android/app/build.gradle

@@ -1,18 +1,20 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
 
+project.ext["REACT_NATIVE_NODE_MODULES_DIR"] = file("../../../node_modules/react-native")
+
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
  */
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    root = file("../")
+    root = file("../../")
     //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    reactNativeDir = file("../../node_modules/react-native")
+    reactNativeDir = file("../../../node_modules/react-native")
     //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    codegenDir = file("../../node_modules/@react-native/codegen")
+    codegenDir = file("../../../node_modules/@react-native/codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
     cliFile = file("../../node_modules/react-native/cli.js")
 
@@ -143,4 +145,4 @@ project.ext.vectoricons = [
 
 apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")
 
-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)

sample/android/gradle.properties

@@ -43,7 +43,6 @@ newArchEnabled=false
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
 
-
 android.disableAutomaticComponentCreation=true
 
 # Version of Shopify Checkout SDK to use with React Native

sample/android/settings.gradle

@@ -1,4 +1,7 @@
 rootProject.name = 'ReactNative'
-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'
-includeBuild('../node_modules/@react-native/gradle-plugin')
+
+includeBuild('../../node_modules/@react-native/gradle-plugin')

sample/ios/Podfile

@@ -5,7 +5,7 @@ require Pod::Executable.execute_command('node', ['-p',
     {paths: [process.argv[1]]},
   )', __dir__]).strip
 
-platform :ios, 13
+platform :ios, '13'
 
 prepare_react_native_project!