react-native-webview-bootpay 13.6.13 → 13.8.3

package/package.json

@@ -11,26 +11,24 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "13.6.13",
+  "version": "13.8.3",
   "homepage": "https://github.com/bootpay/react-native-webview-bootpay",
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
-    "build:ios": "react-native bundle --entry-file='./index.js' --bundle-output='./example/ios/main.jsbundle' --dev=false --platform='ios'",  
-    
     "macos": "react-native run-macos --scheme WebviewExample --project-path example/macos",
     "start": "cd example && react-native start",
     "windows": "install-windows-test-app --project-directory example/windows && react-native run-windows --root example --arch x64",
     "ci": "CI=true && yarn lint",
     "ci:publish": "yarn semantic-release",
-    "lint": "yarn tsc --noEmit && yarn eslint ./src --ext .ts,.tsx",
-    "build": "yarn tsc",
-    "prepare": "yarn build", 
+    "lint": "yarn tsc --noEmit && yarn eslint ./src --ext .ts,.tsx,.js,.jsx",
+    "build": "babel --extensions \".ts,.tsx\" --out-dir lib src",
+    "prepare": "yarn build",
     "appium": "appium",
     "test:windows": "yarn jest --setupFiles=./jest-setups/jest.setup.js",
-    "add:macos": "yarn add react-native-macos@0.71.33"
+    "add:macos": "yarn add react-native-macos@0.73.17"
   },
-  
+
   "rn-docs": {
     "title": "Webview",
     "type": "Component"
@@ -44,35 +42,32 @@
     "invariant": "2.2.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/runtime": "^7.0.0",
+    "@babel/cli": "^7.20.0",
+    "@babel/core": "^7.20.0",
+    "@babel/runtime": "^7.20.0",
+    "@react-native/babel-preset": "0.73.21",
+    "@react-native/eslint-config": "0.73.2",
+    "@react-native/metro-config": "0.73.5",
+    "@react-native/typescript-config": "0.73.1",
+    "@rnx-kit/metro-config": "1.3.14",
     "@semantic-release/git": "7.0.16",
     "@types/invariant": "^2.2.30",
-    "@types/jest": "^29.4.0",
-    "@types/react": "18.0.27",
+    "@types/jest": "^29.5.12",
+    "@types/react": "18.2.61",
     "@types/selenium-webdriver": "4.0.9",
-    "@typescript-eslint/eslint-plugin": "2.1.0",
-    "@typescript-eslint/parser": "2.1.0",
     "appium": "1.17.0",
-    "eslint": "6.3.0",
-    "eslint-config-airbnb": "18.0.1",
-    "eslint-config-prettier": "6.2.0",
-    "eslint-plugin-import": "2.18.2",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-react": "7.14.3",
-    "eslint-plugin-react-hooks": "^4.5.0",
-    "eslint-plugin-react-native": "3.7.0",
-    "jest": "^29.4.1",
-    "metro-react-native-babel-preset": "0.73.7",
+    "eslint": "8.57.0",
+    "jest": "^29.6.3",
+    "prettier": "2.8.8",
     "react": "18.2.0",
-    "react-native": "0.71.12",
-    "react-native-macos": "0.71.33",
-    "react-native-test-app": "2.5.15",
-    "react-native-windows": "0.71.30",
+    "react-native": "0.73.5",
+    "react-native-macos": "0.73.17",
+    "react-native-test-app": "3.2.16",
+    "react-native-windows": "0.73.8",
     "selenium-appium": "1.0.2",
     "selenium-webdriver": "4.0.0-alpha.7",
     "semantic-release": "15.13.24",
-    "typescript": "^4.0.0",
+    "typescript": "5.1.3",
     "winappdriver": "^0.0.7"
   },
   "repository": {
@@ -106,5 +101,6 @@
     "android": {
       "javaPackageName": "kr.co.bootpay.webview"
     }
-  }
+  },
+  "packageManager": "yarn@1.22.19"
 }

package/react-native-webview-bootpay.podspec

@@ -1,8 +1,9 @@
 require 'json'
 
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+ios_platform = new_arch_enabled ? '11.0' : '9.0'
 
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
   s.name         = package['name']
@@ -18,21 +19,28 @@ Pod::Spec.new do |s|
 
   s.source_files    = "apple/**/*.{h,m,mm,swift}"
 
-  s.dependency "React-Core"
-
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-
-    s.dependency "React-RCTFabric"
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
+  if defined?(install_modules_dependencies()) != nil
+    install_modules_dependencies(s);
+  else
+    if new_arch_enabled
+      folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+
+      s.pod_target_xcconfig = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+
+      s.dependency "React-RCTFabric"
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    else
+      s.dependency "React-Core"
+    end
   end
 end

package/react-native.config.js

@@ -2,27 +2,24 @@ const project = (() => {
   const fs = require('fs');
   const path = require('path');
   try {
-    const {
-      androidManifestPath,
-      windowsProjectPath,
-    } = require('react-native-test-app');
-    return {
+    const { configureProjects } = require('react-native-test-app');
+
+    return configureProjects({
       android: {
         sourceDir: path.join('example', 'android'),
-        manifestPath: androidManifestPath(
-          path.join(__dirname, 'example', 'android'),
-        ),
+        manifestPath: path.join(__dirname, 'example', 'android'),
       },
       ios: {
         sourceDir: 'example/ios',
       },
       windows: fs.existsSync('example/windows/WebviewExample.sln') && {
         sourceDir: path.join('example', 'windows'),
-        solutionFile: 'WebviewExample.sln',
-        project: windowsProjectPath(path.join(__dirname, 'example', 'windows')),
+        solutionFile: path.join('example', 'windows', 'WebviewExample.sln'),
+        project: path.join(__dirname, 'example', 'windows'),
       },
-    };
-  } catch (_) {
+    });
+  } catch (e) {
+    console.log('Hello?', e);
     return undefined;
   }
 })();