From 7bb017827360d4e7a15e0fa6d9766becc7517e1a Mon Sep 17 00:00:00 2001 From: Jhen Date: Fri, 26 May 2023 08:21:16 +0800 Subject: [PATCH 01/19] Use @fugood/onnxruntime-react-native for test purpose --- babel.config.js | 2 ++ ios/Podfile.lock | 11 +++---- package.json | 2 +- ...nnxruntime-react-native+1.16.0-test2.patch | 33 +++++++++++++++++++ patches/onnxruntime-react-native+1.14.0.patch | 31 ----------------- yarn.lock | 14 ++++++++ 6 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 patches/@fugood+onnxruntime-react-native+1.16.0-test2.patch delete mode 100644 patches/onnxruntime-react-native+1.14.0.patch diff --git a/babel.config.js b/babel.config.js index d0a56df..7c0d075 100644 --- a/babel.config.js +++ b/babel.config.js @@ -11,6 +11,8 @@ module.exports = { 'zlib': 'browserify-zlib', 'fs': 'react-native-fs', 'path': 'path-browserify', + 'onnxruntime-common': '@fugood/onnxruntime-common', + 'onnxruntime-react-native': '@fugood/onnxruntime-react-native', }, }], ], diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7d8bede..756751d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.14.0) - - onnxruntime-react-native (1.14.0): + - onnxruntime-react-native (1.16.0-test2): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -464,7 +464,7 @@ DEPENDENCIES: - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) - libevent (~> 2.1.12) - - onnxruntime-react-native (from `../node_modules/onnxruntime-react-native`) + - "onnxruntime-react-native (from `../node_modules/@fugood/onnxruntime-react-native`)" - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -515,7 +515,6 @@ SPEC REPOS: - Flipper-RSocket - FlipperKit - fmt - - GCanvas - libevent - onnxruntime-c - OpenSSL-Universal @@ -538,7 +537,7 @@ EXTERNAL SOURCES: hermes-engine: :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" onnxruntime-react-native: - :path: "../node_modules/onnxruntime-react-native" + :path: "../node_modules/@fugood/onnxruntime-react-native" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -627,7 +626,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: 1f5923e555122d12239a1173229d6c5e8a0afd3e - onnxruntime-react-native: 8cef9ae43ece425e187415e28a2e02aee3bc80af + onnxruntime-react-native: 9a3212094baed160eaf16fbca91703f7419c143c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a @@ -665,6 +664,6 @@ SPEC CHECKSUMS: Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 6ffd45449d1e1316675abfb877476971a9009f56 +PODFILE CHECKSUM: b10522d68aadff0af5d00cb3edc5a2b89244d56c COCOAPODS: 1.11.3 diff --git a/package.json b/package.json index dfee9a6..1025cdd 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "events": "^3.3.0", "image-decode": "^1.2.2", "image-encode": "^1.3.1", - "onnxruntime-react-native": "^1.14.0", + "@fugood/onnxruntime-react-native": "~1.16.0-test2", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test2.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test2.patch new file mode 100644 index 0000000..3bb98b2 --- /dev/null +++ b/patches/@fugood+onnxruntime-react-native+1.16.0-test2.patch @@ -0,0 +1,33 @@ +diff --git a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle +index ebddddc..b8b96df 100644 +--- a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle ++++ b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle +@@ -225,7 +225,10 @@ dependencies { + + // Mobile build: + // implementation "com.microsoft.onnxruntime:onnxruntime-mobile:latest.integration@aar" +- implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" ++ ++ // implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" ++ // Use local AAR file ++ implementation project(":onnxruntime-patched") + + // By default it will just include onnxruntime full aar package + if (ortExtensionsEnabled) { +diff --git a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java +index d4d1902..d2b0ba3 100644 +--- a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java ++++ b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java +@@ -173,7 +173,11 @@ public class TensorHelper { + tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.UINT8); + break; + } +- case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: ++ case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: { ++ ByteBuffer buffer = values; ++ tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.BOOL); ++ break; ++ } + case ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16: + case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16: + case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32: diff --git a/patches/onnxruntime-react-native+1.14.0.patch b/patches/onnxruntime-react-native+1.14.0.patch deleted file mode 100644 index 71cc993..0000000 --- a/patches/onnxruntime-react-native+1.14.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/node_modules/onnxruntime-react-native/android/build.gradle b/node_modules/onnxruntime-react-native/android/build.gradle -index 4c8a318..65b58c1 100644 ---- a/node_modules/onnxruntime-react-native/android/build.gradle -+++ b/node_modules/onnxruntime-react-native/android/build.gradle -@@ -135,5 +135,8 @@ dependencies { - - // Mobile build: - // implementation "com.microsoft.onnxruntime:onnxruntime-mobile:latest.integration@aar" -- implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" -+ // implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" -+ // Use local AAR file -+ implementation project(":onnxruntime-patched") -+ - } -diff --git a/node_modules/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java b/node_modules/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java -index 500141a..49b3abd 100644 ---- a/node_modules/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java -+++ b/node_modules/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java -@@ -164,7 +164,11 @@ public class TensorHelper { - tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.UINT8); - break; - } -- case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: -+ case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: { -+ ByteBuffer buffer = values; -+ tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.BOOL); -+ break; -+ } - case ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16: - case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16: - case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32: diff --git a/yarn.lock b/yarn.lock index 02548e6..725ec49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1191,6 +1191,20 @@ dependencies: "@flyskywhy/react-native-browser-polyfill" "^2.0.1" +"@fugood/onnxruntime-common@~1.16.0-test": + version "1.16.0-test" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test.tgz#15aa6af8695cce93f9a4444bfb4acffa816bd8dc" + integrity sha512-qd0OvQzsas5icHLXtFE4zbCSTHFnIL0x9hO2dIGd5f84vvznMVoc5sL82SGi/xzHKaI0GRzhTWyBA1I6DsCFyA== + +"@fugood/onnxruntime-react-native@~1.16.0-test2": + version "1.16.0-test2" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test2.tgz#c9cb9361e93ebe84b75047e70f4fa1f013200031" + integrity sha512-MGYrcasfTcBSrBIQHwiHKWO2bZFGtAwHlgtmrGlAzh6qJivtvY75soZ3LS7Lgvzn1LLqM6+ZJ9Vm5uYbPUigEQ== + dependencies: + "@expo/config-plugins" "^4.1.5" + "@fugood/onnxruntime-common" "~1.16.0-test" + buffer "^6.0.3" + "@fugood/react-native-audio-pcm-stream@^1.1.4": version "1.1.4" resolved "https://registry.yarnpkg.com/@fugood/react-native-audio-pcm-stream/-/react-native-audio-pcm-stream-1.1.4.tgz#f7781773fac8a0ad82e60cc6e80d20b4778bd694" From 75f71e27c38f8354d4299b15f21e805e0af0dc39 Mon Sep 17 00:00:00 2001 From: Jhen Date: Fri, 26 May 2023 08:42:26 +0800 Subject: [PATCH 02/19] Add alias patch for transformers.js fork --- patches/@xenova+transformers+2.0.1.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/@xenova+transformers+2.0.1.patch diff --git a/patches/@xenova+transformers+2.0.1.patch b/patches/@xenova+transformers+2.0.1.patch new file mode 100644 index 0000000..b1845a4 --- /dev/null +++ b/patches/@xenova+transformers+2.0.1.patch @@ -0,0 +1,22 @@ +diff --git a/node_modules/@xenova/transformers/src/backends/onnx.js b/node_modules/@xenova/transformers/src/backends/onnx.js +index 92cbfb2..9701bc6 100644 +--- a/node_modules/@xenova/transformers/src/backends/onnx.js ++++ b/node_modules/@xenova/transformers/src/backends/onnx.js +@@ -17,7 +17,7 @@ + */ + + // NOTE: Import order matters here. We need to import `onnxruntime-node` before `onnxruntime-web`. +-export * as ONNX from 'onnxruntime-common'; ++export * as ONNX from '@fugood/onnxruntime-common'; + + export const executionProviders = [ + // 'webgpu', +@@ -25,7 +25,7 @@ export const executionProviders = [ + ]; + + if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') { +- import('onnxruntime-react-native'); ++ import('@fugood/onnxruntime-react-native'); + executionProviders.unshift('cpu'); + + } else if (typeof process !== 'undefined' && process?.release?.name === 'node') { From fc805bd33a79581f5b929d6f82f5cf7bfcc99809 Mon Sep 17 00:00:00 2001 From: Jhen Date: Fri, 26 May 2023 13:36:22 +0800 Subject: [PATCH 03/19] Bump to 1.16.0-test3 for fix android build --- package.json | 2 +- ...> @fugood+onnxruntime-react-native+1.16.0-test3.patch} | 0 react-native.config.js | 7 +++++++ yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 5 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test2.patch => @fugood+onnxruntime-react-native+1.16.0-test3.patch} (100%) diff --git a/package.json b/package.json index 1025cdd..0642e3b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "events": "^3.3.0", "image-decode": "^1.2.2", "image-encode": "^1.3.1", - "@fugood/onnxruntime-react-native": "~1.16.0-test2", + "@fugood/onnxruntime-react-native": "~1.16.0-test3", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test2.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test3.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test2.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test3.patch diff --git a/react-native.config.js b/react-native.config.js index 3b08839..2a4d23c 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -2,6 +2,13 @@ const path = require('path'); module.exports = { dependencies: { + // Use @fugood/onnxruntime-react-native + 'onnxruntime-react-native': { + platforms: { + android: null, + ios: null, + }, + }, '@flyskywhy/react-native-gcanvas': { platforms: { android: { diff --git a/yarn.lock b/yarn.lock index 725ec49..e066e1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1196,10 +1196,10 @@ resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test.tgz#15aa6af8695cce93f9a4444bfb4acffa816bd8dc" integrity sha512-qd0OvQzsas5icHLXtFE4zbCSTHFnIL0x9hO2dIGd5f84vvznMVoc5sL82SGi/xzHKaI0GRzhTWyBA1I6DsCFyA== -"@fugood/onnxruntime-react-native@~1.16.0-test2": - version "1.16.0-test2" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test2.tgz#c9cb9361e93ebe84b75047e70f4fa1f013200031" - integrity sha512-MGYrcasfTcBSrBIQHwiHKWO2bZFGtAwHlgtmrGlAzh6qJivtvY75soZ3LS7Lgvzn1LLqM6+ZJ9Vm5uYbPUigEQ== +"@fugood/onnxruntime-react-native@~1.16.0-test3": + version "1.16.0-test3" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test3.tgz#fb439dcf02a0db0ba5614185a6eabf964763f548" + integrity sha512-9X5vOLWbYb0q+PiVjV9XWn/5WGTLuVF/jhP45Y7PdS1EJJPNGzyvJPNUdREBSrqUQVE+qXGm1jfqBanpYItr1A== dependencies: "@expo/config-plugins" "^4.1.5" "@fugood/onnxruntime-common" "~1.16.0-test" From f5152cc8493f9edbf864c5ed1a78e87551718140 Mon Sep 17 00:00:00 2001 From: Jhen Date: Sat, 27 May 2023 19:12:45 +0800 Subject: [PATCH 04/19] Bump test package --- package.json | 2 +- ...> @fugood+onnxruntime-react-native+1.16.0-test5.patch} | 0 yarn.lock | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test3.patch => @fugood+onnxruntime-react-native+1.16.0-test5.patch} (100%) diff --git a/package.json b/package.json index 0642e3b..4c6b140 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "events": "^3.3.0", "image-decode": "^1.2.2", "image-encode": "^1.3.1", - "@fugood/onnxruntime-react-native": "~1.16.0-test3", + "@fugood/onnxruntime-react-native": "~1.16.0-test5", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test3.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test5.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test3.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test5.patch diff --git a/yarn.lock b/yarn.lock index e066e1b..acdf90e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1196,10 +1196,10 @@ resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test.tgz#15aa6af8695cce93f9a4444bfb4acffa816bd8dc" integrity sha512-qd0OvQzsas5icHLXtFE4zbCSTHFnIL0x9hO2dIGd5f84vvznMVoc5sL82SGi/xzHKaI0GRzhTWyBA1I6DsCFyA== -"@fugood/onnxruntime-react-native@~1.16.0-test3": - version "1.16.0-test3" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test3.tgz#fb439dcf02a0db0ba5614185a6eabf964763f548" - integrity sha512-9X5vOLWbYb0q+PiVjV9XWn/5WGTLuVF/jhP45Y7PdS1EJJPNGzyvJPNUdREBSrqUQVE+qXGm1jfqBanpYItr1A== +"@fugood/onnxruntime-react-native@~1.16.0-test5": + version "1.16.0-test5" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test5.tgz#1c9e1886d1e159d302d8e872316832ac1bf64cfd" + integrity sha512-CJAm3F/8jyjd7BjLFKxB6A1L7sTE6rgxkVNfpz7Sos22YKgd2nKfMO4vRiVLzK1JdsBrezbPrbIKUm0IQMLEiQ== dependencies: "@expo/config-plugins" "^4.1.5" "@fugood/onnxruntime-common" "~1.16.0-test" From efe3d9f366ea1e014887b0fbe015bb5907c1ff7a Mon Sep 17 00:00:00 2001 From: Jhen Date: Sat, 27 May 2023 19:24:18 +0800 Subject: [PATCH 05/19] Update lockfile --- ios/Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 756751d..4d62be5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.14.0) - - onnxruntime-react-native (1.16.0-test2): + - onnxruntime-react-native (1.16.0-test5): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -626,7 +626,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: 1f5923e555122d12239a1173229d6c5e8a0afd3e - onnxruntime-react-native: 9a3212094baed160eaf16fbca91703f7419c143c + onnxruntime-react-native: 8ac8c1dacf8160851da87cb464236ad809218840 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a From 80a59e50d6c071a72702f3e66e78d6b9205eae4c Mon Sep 17 00:00:00 2001 From: Jhen Date: Thu, 1 Jun 2023 04:51:02 +0800 Subject: [PATCH 06/19] Bump test package --- ios/Podfile.lock | 4 ++-- package.json | 2 +- ...nnxruntime-react-native+1.16.0-test7.patch} | 0 yarn.lock | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test5.patch => @fugood+onnxruntime-react-native+1.16.0-test7.patch} (100%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4d62be5..5067036 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.14.0) - - onnxruntime-react-native (1.16.0-test5): + - onnxruntime-react-native (1.16.0-test7): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -626,7 +626,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: 1f5923e555122d12239a1173229d6c5e8a0afd3e - onnxruntime-react-native: 8ac8c1dacf8160851da87cb464236ad809218840 + onnxruntime-react-native: d31347d9120602cc97dab8259df72976d9f128c6 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a diff --git a/package.json b/package.json index 4c6b140..9b3cbbf 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "events": "^3.3.0", "image-decode": "^1.2.2", "image-encode": "^1.3.1", - "@fugood/onnxruntime-react-native": "~1.16.0-test5", + "@fugood/onnxruntime-react-native": "~1.16.0-test7", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test5.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test7.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test5.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test7.patch diff --git a/yarn.lock b/yarn.lock index acdf90e..7bc17d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1191,18 +1191,18 @@ dependencies: "@flyskywhy/react-native-browser-polyfill" "^2.0.1" -"@fugood/onnxruntime-common@~1.16.0-test": - version "1.16.0-test" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test.tgz#15aa6af8695cce93f9a4444bfb4acffa816bd8dc" - integrity sha512-qd0OvQzsas5icHLXtFE4zbCSTHFnIL0x9hO2dIGd5f84vvznMVoc5sL82SGi/xzHKaI0GRzhTWyBA1I6DsCFyA== +"@fugood/onnxruntime-common@~1.16.0-test2": + version "1.16.0-test2" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test2.tgz#2f38f0af077a1da67e60f7f4d93dedfcd96f25c4" + integrity sha512-Re0pZ8SP+xf3r440+wBolNUKgYlWb5/j73uyzOvs6I1I7TmmcGmBLwa+6AN7dJj2hfnIhNnwzbiU5HLqaMzWbg== -"@fugood/onnxruntime-react-native@~1.16.0-test5": - version "1.16.0-test5" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test5.tgz#1c9e1886d1e159d302d8e872316832ac1bf64cfd" - integrity sha512-CJAm3F/8jyjd7BjLFKxB6A1L7sTE6rgxkVNfpz7Sos22YKgd2nKfMO4vRiVLzK1JdsBrezbPrbIKUm0IQMLEiQ== +"@fugood/onnxruntime-react-native@~1.16.0-test7": + version "1.16.0-test7" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test7.tgz#984cb3879e0f5c97310e0cb4957bf7af2a6ea089" + integrity sha512-+/MxutpXjMvuuZHrw7IzPywKXqB091JXv5mO5kU6yIKGH7KqPMOqyqH/RLONB8LWcVPyh0A7exm7bS0Jl7MxGQ== dependencies: "@expo/config-plugins" "^4.1.5" - "@fugood/onnxruntime-common" "~1.16.0-test" + "@fugood/onnxruntime-common" "~1.16.0-test2" buffer "^6.0.3" "@fugood/react-native-audio-pcm-stream@^1.1.4": From ccdae23cc4eec7a76246488f0347775d95648670 Mon Sep 17 00:00:00 2001 From: Jhen Date: Thu, 1 Jun 2023 04:55:42 +0800 Subject: [PATCH 07/19] Bump onnxruntime-c to v1.15 in pods --- ios/Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5067036..5ebc96c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -78,7 +78,7 @@ PODS: - hermes-engine/Pre-built (= 0.71.8) - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - - onnxruntime-c (1.14.0) + - onnxruntime-c (1.15.0) - onnxruntime-react-native (1.16.0-test7): - onnxruntime-c - React-Core @@ -625,7 +625,7 @@ SPEC CHECKSUMS: glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - onnxruntime-c: 1f5923e555122d12239a1173229d6c5e8a0afd3e + onnxruntime-c: e87399683ec19e3b812e13c6692882609a802b86 onnxruntime-react-native: d31347d9120602cc97dab8259df72976d9f128c6 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 From e5b7be2ebbfd7a42163095bb0dcf541fa8720bfa Mon Sep 17 00:00:00 2001 From: Jhen Date: Fri, 2 Jun 2023 06:45:22 +0800 Subject: [PATCH 08/19] Bump test package --- ios/Podfile.lock | 4 ++-- package.json | 2 +- ...> @fugood+onnxruntime-react-native+1.16.0-test8.patch} | 0 yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test7.patch => @fugood+onnxruntime-react-native+1.16.0-test8.patch} (100%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f8d768c..bb6f224 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.15.0) - - onnxruntime-react-native (1.16.0-test7): + - onnxruntime-react-native (1.16.0-test8): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -631,7 +631,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: e87399683ec19e3b812e13c6692882609a802b86 - onnxruntime-react-native: d31347d9120602cc97dab8259df72976d9f128c6 + onnxruntime-react-native: a555e2ad6ebfad8802b372ac0664ab11b8222190 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a diff --git a/package.json b/package.json index 3908913..b83e22e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "image-encode": "^1.3.1", "mp3": "^0.1.0", "node-wav": "^0.0.2", - "@fugood/onnxruntime-react-native": "~1.16.0-test7", + "@fugood/onnxruntime-react-native": "~1.16.0-test8", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test7.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test8.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test7.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test8.patch diff --git a/yarn.lock b/yarn.lock index 9ee341f..f8c2630 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1196,10 +1196,10 @@ resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test2.tgz#2f38f0af077a1da67e60f7f4d93dedfcd96f25c4" integrity sha512-Re0pZ8SP+xf3r440+wBolNUKgYlWb5/j73uyzOvs6I1I7TmmcGmBLwa+6AN7dJj2hfnIhNnwzbiU5HLqaMzWbg== -"@fugood/onnxruntime-react-native@~1.16.0-test7": - version "1.16.0-test7" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test7.tgz#984cb3879e0f5c97310e0cb4957bf7af2a6ea089" - integrity sha512-+/MxutpXjMvuuZHrw7IzPywKXqB091JXv5mO5kU6yIKGH7KqPMOqyqH/RLONB8LWcVPyh0A7exm7bS0Jl7MxGQ== +"@fugood/onnxruntime-react-native@~1.16.0-test8": + version "1.16.0-test8" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test8.tgz#7f9bb91bb81dd8ddaede46d11c24b7a18248f148" + integrity sha512-+mAIPu50av98T9+D0ru2F+jxy07zqJorRotzxPKcbd62MvfJSy2E+uyhnuSHY7V7j7LDJUC6zqP3+l/lUtXF5w== dependencies: "@expo/config-plugins" "^4.1.5" "@fugood/onnxruntime-common" "~1.16.0-test2" From 7e49879257f1ae72dfd4749580840d26d82a14c7 Mon Sep 17 00:00:00 2001 From: Jhen Date: Fri, 2 Jun 2023 13:00:13 +0800 Subject: [PATCH 09/19] Bump test package --- ios/Podfile.lock | 4 ++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ package.json | 2 +- ... @fugood+onnxruntime-react-native+1.16.0-test11.patch} | 0 yarn.lock | 8 ++++---- 5 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 ios/transformers_example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename patches/{@fugood+onnxruntime-react-native+1.16.0-test8.patch => @fugood+onnxruntime-react-native+1.16.0-test11.patch} (100%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index bb6f224..efd8551 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.15.0) - - onnxruntime-react-native (1.16.0-test8): + - onnxruntime-react-native (1.16.0-test11): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -631,7 +631,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: e87399683ec19e3b812e13c6692882609a802b86 - onnxruntime-react-native: a555e2ad6ebfad8802b372ac0664ab11b8222190 + onnxruntime-react-native: b4ee828a48054a9ad6a06f5d7c3457317997a565 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a diff --git a/ios/transformers_example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/transformers_example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/transformers_example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/package.json b/package.json index b83e22e..4abda6f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "image-encode": "^1.3.1", "mp3": "^0.1.0", "node-wav": "^0.0.2", - "@fugood/onnxruntime-react-native": "~1.16.0-test8", + "@fugood/onnxruntime-react-native": "~1.16.0-test11", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test8.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test8.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch diff --git a/yarn.lock b/yarn.lock index f8c2630..006c7a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1196,10 +1196,10 @@ resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test2.tgz#2f38f0af077a1da67e60f7f4d93dedfcd96f25c4" integrity sha512-Re0pZ8SP+xf3r440+wBolNUKgYlWb5/j73uyzOvs6I1I7TmmcGmBLwa+6AN7dJj2hfnIhNnwzbiU5HLqaMzWbg== -"@fugood/onnxruntime-react-native@~1.16.0-test8": - version "1.16.0-test8" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test8.tgz#7f9bb91bb81dd8ddaede46d11c24b7a18248f148" - integrity sha512-+mAIPu50av98T9+D0ru2F+jxy07zqJorRotzxPKcbd62MvfJSy2E+uyhnuSHY7V7j7LDJUC6zqP3+l/lUtXF5w== +"@fugood/onnxruntime-react-native@~1.16.0-test11": + version "1.16.0-test11" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test11.tgz#4b6c961ba67d1e34aa036ff9df2b09b0a7e9259f" + integrity sha512-+bG9m3pnsoK2yF/3iTl+BMeumeiIz9VtomUhk4x7RUVK78QU51Nf+D5EtvawdmuJBE3U9lUizNsBuBq4xkGRxA== dependencies: "@expo/config-plugins" "^4.1.5" "@fugood/onnxruntime-common" "~1.16.0-test2" From 86373c900ec2430ed23e2c272febcc9bffc9e87d Mon Sep 17 00:00:00 2001 From: Jhen Date: Fri, 2 Jun 2023 15:23:20 +0800 Subject: [PATCH 10/19] Try enable Core ML / NNAPI --- ...nxruntime-react-native+1.16.0-test11.patch | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch index 3bb98b2..4edd43f 100644 --- a/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch +++ b/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle -index ebddddc..b8b96df 100644 +index 60aea2d..fe151ad 100644 --- a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle +++ b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle -@@ -225,7 +225,10 @@ dependencies { +@@ -231,7 +231,10 @@ dependencies { // Mobile build: // implementation "com.microsoft.onnxruntime:onnxruntime-mobile:latest.integration@aar" @@ -14,8 +14,21 @@ index ebddddc..b8b96df 100644 // By default it will just include onnxruntime full aar package if (ortExtensionsEnabled) { +diff --git a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java +index 6ef550c..f575090 100644 +--- a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java ++++ b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java +@@ -189,6 +189,8 @@ public class OnnxruntimeModule extends ReactContextBaseJavaModule implements Lif + OrtSession ortSession; + SessionOptions sessionOptions = parseSessionOptions(options); + ++ sessionOptions.addNnapi(); // enabling nnapi ++ + // optional call for registering custom ops when ort extensions enabled + OnnxruntimeExtensions ortExt = new OnnxruntimeExtensions(); + ortExt.registerOrtExtensionsIfEnabled(sessionOptions); diff --git a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java -index d4d1902..d2b0ba3 100644 +index c39a382..189bd3a 100644 --- a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java +++ b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java @@ -173,7 +173,11 @@ public class TensorHelper { @@ -31,3 +44,25 @@ index d4d1902..d2b0ba3 100644 case ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16: case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16: case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32: +diff --git a/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm b/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm +index 36150e3..b50c370 100644 +--- a/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm ++++ b/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm +@@ -22,6 +22,7 @@ + #else + #include "onnxruntime/onnxruntime_cxx_api.h" + #endif ++#include "onnxruntime/coreml_provider_factory.h" + + @implementation OnnxruntimeModule + +@@ -189,6 +190,9 @@ - (NSDictionary *)loadModelImpl:(NSString *)modelPath modelData:(NSData *)modelD + sessionInfo = new SessionInfo(); + Ort::SessionOptions sessionOptions = [self parseSessionOptions:options]; + ++ uint32_t coreml_flags = 0; ++ Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CoreML(sessionOptions, coreml_flags)); ++ + #ifdef ORT_ENABLE_EXTENSIONS + Ort::ThrowOnError(RegisterCustomOps(sessionOptions, OrtGetApiBase())); + #endif From b0f8e01e817458fd3065ff9b03686a54724476c3 Mon Sep 17 00:00:00 2001 From: Jhen Date: Mon, 5 Jun 2023 13:08:31 +0800 Subject: [PATCH 11/19] Bump test package & support EP --- ios/Podfile.lock | 4 +- package.json | 2 +- ...nxruntime-react-native+1.16.0-test11.patch | 68 ------------------- ...nxruntime-react-native+1.16.0-test12.patch | 33 +++++++++ patches/@xenova+transformers+2.0.1.patch | 14 +++- yarn.lock | 8 +-- 6 files changed, 52 insertions(+), 77 deletions(-) delete mode 100644 patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch create mode 100644 patches/@fugood+onnxruntime-react-native+1.16.0-test12.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index efd8551..be1d933 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.15.0) - - onnxruntime-react-native (1.16.0-test11): + - onnxruntime-react-native (1.16.0-test12): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -631,7 +631,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: e87399683ec19e3b812e13c6692882609a802b86 - onnxruntime-react-native: b4ee828a48054a9ad6a06f5d7c3457317997a565 + onnxruntime-react-native: 49e73c9a756123e3b848ae679139d2ee12e86d63 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a diff --git a/package.json b/package.json index 4abda6f..e5cfe42 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "image-encode": "^1.3.1", "mp3": "^0.1.0", "node-wav": "^0.0.2", - "@fugood/onnxruntime-react-native": "~1.16.0-test11", + "@fugood/onnxruntime-react-native": "~1.16.0-test12", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch deleted file mode 100644 index 4edd43f..0000000 --- a/patches/@fugood+onnxruntime-react-native+1.16.0-test11.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle -index 60aea2d..fe151ad 100644 ---- a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle -+++ b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle -@@ -231,7 +231,10 @@ dependencies { - - // Mobile build: - // implementation "com.microsoft.onnxruntime:onnxruntime-mobile:latest.integration@aar" -- implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" -+ -+ // implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" -+ // Use local AAR file -+ implementation project(":onnxruntime-patched") - - // By default it will just include onnxruntime full aar package - if (ortExtensionsEnabled) { -diff --git a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java -index 6ef550c..f575090 100644 ---- a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java -+++ b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java -@@ -189,6 +189,8 @@ public class OnnxruntimeModule extends ReactContextBaseJavaModule implements Lif - OrtSession ortSession; - SessionOptions sessionOptions = parseSessionOptions(options); - -+ sessionOptions.addNnapi(); // enabling nnapi -+ - // optional call for registering custom ops when ort extensions enabled - OnnxruntimeExtensions ortExt = new OnnxruntimeExtensions(); - ortExt.registerOrtExtensionsIfEnabled(sessionOptions); -diff --git a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java -index c39a382..189bd3a 100644 ---- a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java -+++ b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java -@@ -173,7 +173,11 @@ public class TensorHelper { - tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.UINT8); - break; - } -- case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: -+ case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: { -+ ByteBuffer buffer = values; -+ tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.BOOL); -+ break; -+ } - case ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16: - case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16: - case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32: -diff --git a/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm b/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm -index 36150e3..b50c370 100644 ---- a/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm -+++ b/node_modules/@fugood/onnxruntime-react-native/ios/OnnxruntimeModule.mm -@@ -22,6 +22,7 @@ - #else - #include "onnxruntime/onnxruntime_cxx_api.h" - #endif -+#include "onnxruntime/coreml_provider_factory.h" - - @implementation OnnxruntimeModule - -@@ -189,6 +190,9 @@ - (NSDictionary *)loadModelImpl:(NSString *)modelPath modelData:(NSData *)modelD - sessionInfo = new SessionInfo(); - Ort::SessionOptions sessionOptions = [self parseSessionOptions:options]; - -+ uint32_t coreml_flags = 0; -+ Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CoreML(sessionOptions, coreml_flags)); -+ - #ifdef ORT_ENABLE_EXTENSIONS - Ort::ThrowOnError(RegisterCustomOps(sessionOptions, OrtGetApiBase())); - #endif diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test12.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test12.patch new file mode 100644 index 0000000..98ceee8 --- /dev/null +++ b/patches/@fugood+onnxruntime-react-native+1.16.0-test12.patch @@ -0,0 +1,33 @@ +diff --git a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle +index 60aea2d..fe151ad 100644 +--- a/node_modules/@fugood/onnxruntime-react-native/android/build.gradle ++++ b/node_modules/@fugood/onnxruntime-react-native/android/build.gradle +@@ -231,7 +231,10 @@ dependencies { + + // Mobile build: + // implementation "com.microsoft.onnxruntime:onnxruntime-mobile:latest.integration@aar" +- implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" ++ ++ // implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar" ++ // Use local AAR file ++ implementation project(":onnxruntime-patched") + + // By default it will just include onnxruntime full aar package + if (ortExtensionsEnabled) { +diff --git a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java +index c39a382..189bd3a 100644 +--- a/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java ++++ b/node_modules/@fugood/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java +@@ -173,7 +173,11 @@ public class TensorHelper { + tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.UINT8); + break; + } +- case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: ++ case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL: { ++ ByteBuffer buffer = values; ++ tensor = OnnxTensor.createTensor(ortEnvironment, buffer, dims, OnnxJavaType.BOOL); ++ break; ++ } + case ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16: + case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16: + case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32: diff --git a/patches/@xenova+transformers+2.0.1.patch b/patches/@xenova+transformers+2.0.1.patch index b1845a4..9a23c3a 100644 --- a/patches/@xenova+transformers+2.0.1.patch +++ b/patches/@xenova+transformers+2.0.1.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/@xenova/transformers/src/backends/onnx.js b/node_modules/@xenova/transformers/src/backends/onnx.js -index 92cbfb2..9701bc6 100644 +index 92cbfb2..b0fded6 100644 --- a/node_modules/@xenova/transformers/src/backends/onnx.js +++ b/node_modules/@xenova/transformers/src/backends/onnx.js @@ -17,7 +17,7 @@ @@ -11,12 +11,22 @@ index 92cbfb2..9701bc6 100644 export const executionProviders = [ // 'webgpu', -@@ -25,7 +25,7 @@ export const executionProviders = [ +@@ -25,8 +25,17 @@ export const executionProviders = [ ]; if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') { - import('onnxruntime-react-native'); + import('@fugood/onnxruntime-react-native'); executionProviders.unshift('cpu'); ++ executionProviders.splice(executionProviders.indexOf('wasm'), 1); ++ ++ import('react-native').then(({ Platform }) => { ++ if (Platform.OS === 'ios') { ++ executionProviders.unshift('coreml'); ++ } else if (Platform.OS === 'android') { ++ executionProviders.unshift('nnapi'); ++ } ++ }); } else if (typeof process !== 'undefined' && process?.release?.name === 'node') { + // Running in a node-like environment. diff --git a/yarn.lock b/yarn.lock index 006c7a2..ead2259 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1196,10 +1196,10 @@ resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test2.tgz#2f38f0af077a1da67e60f7f4d93dedfcd96f25c4" integrity sha512-Re0pZ8SP+xf3r440+wBolNUKgYlWb5/j73uyzOvs6I1I7TmmcGmBLwa+6AN7dJj2hfnIhNnwzbiU5HLqaMzWbg== -"@fugood/onnxruntime-react-native@~1.16.0-test11": - version "1.16.0-test11" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test11.tgz#4b6c961ba67d1e34aa036ff9df2b09b0a7e9259f" - integrity sha512-+bG9m3pnsoK2yF/3iTl+BMeumeiIz9VtomUhk4x7RUVK78QU51Nf+D5EtvawdmuJBE3U9lUizNsBuBq4xkGRxA== +"@fugood/onnxruntime-react-native@~1.16.0-test12": + version "1.16.0-test12" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test12.tgz#531622cfca496ac4fc89631b6f22bed4a10d1a54" + integrity sha512-DtFjJuTso+EN1Dr/oT2qnrse9pS8MfnFaTc8B4dDS8fmtU2QzdGYNsly70CQxm/aUA9zixXGFVQ75UNI53+yCQ== dependencies: "@expo/config-plugins" "^4.1.5" "@fugood/onnxruntime-common" "~1.16.0-test2" From d298298109a135529e3de572959d17725a22e621 Mon Sep 17 00:00:00 2001 From: Jhen Date: Sat, 10 Jun 2023 09:19:07 +0800 Subject: [PATCH 12/19] Bump test package --- ios/Podfile.lock | 4 ++-- package.json | 2 +- ...nxruntime-react-native+1.16.0-test15.patch} | 0 patches/@xenova+transformers+2.0.1.patch | 17 ++++++++++++----- yarn.lock | 18 +++++++++--------- 5 files changed, 24 insertions(+), 17 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test12.patch => @fugood+onnxruntime-react-native+1.16.0-test15.patch} (100%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index be1d933..d0a9f4b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.15.0) - - onnxruntime-react-native (1.16.0-test12): + - onnxruntime-react-native (1.16.0-test15): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -631,7 +631,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: e87399683ec19e3b812e13c6692882609a802b86 - onnxruntime-react-native: 49e73c9a756123e3b848ae679139d2ee12e86d63 + onnxruntime-react-native: f8718af3e35eb9ce34468b19c51de3c47b652f3c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a diff --git a/package.json b/package.json index e5cfe42..85b47e0 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "image-encode": "^1.3.1", "mp3": "^0.1.0", "node-wav": "^0.0.2", - "@fugood/onnxruntime-react-native": "~1.16.0-test12", + "@fugood/onnxruntime-react-native": "~1.16.0-test15", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test12.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test15.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test12.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test15.patch diff --git a/patches/@xenova+transformers+2.0.1.patch b/patches/@xenova+transformers+2.0.1.patch index 9a23c3a..a6ab89e 100644 --- a/patches/@xenova+transformers+2.0.1.patch +++ b/patches/@xenova+transformers+2.0.1.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/@xenova/transformers/src/backends/onnx.js b/node_modules/@xenova/transformers/src/backends/onnx.js -index 92cbfb2..b0fded6 100644 +index 92cbfb2..8e05e5c 100644 --- a/node_modules/@xenova/transformers/src/backends/onnx.js +++ b/node_modules/@xenova/transformers/src/backends/onnx.js -@@ -17,7 +17,7 @@ +@@ -17,16 +17,31 @@ */ // NOTE: Import order matters here. We need to import `onnxruntime-node` before `onnxruntime-web`. @@ -11,7 +11,8 @@ index 92cbfb2..b0fded6 100644 export const executionProviders = [ // 'webgpu', -@@ -25,8 +25,17 @@ export const executionProviders = [ +- 'wasm' ++ 'wasm', ]; if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') { @@ -22,9 +23,15 @@ index 92cbfb2..b0fded6 100644 + + import('react-native').then(({ Platform }) => { + if (Platform.OS === 'ios') { -+ executionProviders.unshift('coreml'); ++ executionProviders.unshift('coreml', 'xnnpack'); + } else if (Platform.OS === 'android') { -+ executionProviders.unshift('nnapi'); ++ executionProviders.unshift( ++ { ++ name: 'nnapi', ++ useFP16: true, ++ }, ++ 'xnnpack', ++ ); + } + }); diff --git a/yarn.lock b/yarn.lock index ead2259..a7ae770 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1191,18 +1191,18 @@ dependencies: "@flyskywhy/react-native-browser-polyfill" "^2.0.1" -"@fugood/onnxruntime-common@~1.16.0-test2": - version "1.16.0-test2" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test2.tgz#2f38f0af077a1da67e60f7f4d93dedfcd96f25c4" - integrity sha512-Re0pZ8SP+xf3r440+wBolNUKgYlWb5/j73uyzOvs6I1I7TmmcGmBLwa+6AN7dJj2hfnIhNnwzbiU5HLqaMzWbg== +"@fugood/onnxruntime-common@~1.16.0-test3": + version "1.16.0-test3" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test3.tgz#d872976db129ca5617c94d66dce5827ee8955bda" + integrity sha512-TZoFr5cOvw6R5FFWZgp3bN6IVq0VagvmlI2HQQEGrHXK4xa9BhacCE0KibBodcsbEdPwbdGaCBs4onJUu4ymuA== -"@fugood/onnxruntime-react-native@~1.16.0-test12": - version "1.16.0-test12" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test12.tgz#531622cfca496ac4fc89631b6f22bed4a10d1a54" - integrity sha512-DtFjJuTso+EN1Dr/oT2qnrse9pS8MfnFaTc8B4dDS8fmtU2QzdGYNsly70CQxm/aUA9zixXGFVQ75UNI53+yCQ== +"@fugood/onnxruntime-react-native@~1.16.0-test15": + version "1.16.0-test15" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test15.tgz#bc2fbcc4d2f3787b59ff9bdb70e28b78809014b8" + integrity sha512-N8VglCCZsQ2F0+j++pnPS7BIr2Z0vOXEFjeDy+RJgvjQ+D4FjjIP1U95yWPjmHYei+MbUl6CVNp99i+tEgM6FQ== dependencies: "@expo/config-plugins" "^4.1.5" - "@fugood/onnxruntime-common" "~1.16.0-test2" + "@fugood/onnxruntime-common" "~1.16.0-test3" buffer "^6.0.3" "@fugood/react-native-audio-pcm-stream@^1.1.4": From f0284c2a55cd750ce0f9b3de9aa848471280b49d Mon Sep 17 00:00:00 2001 From: Jhen Date: Fri, 30 Jun 2023 13:10:19 +0800 Subject: [PATCH 13/19] Bump test package --- package.json | 2 +- ...nxruntime-react-native+1.16.0-test16.patch} | 0 yarn.lock | 18 +++++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test15.patch => @fugood+onnxruntime-react-native+1.16.0-test16.patch} (100%) diff --git a/package.json b/package.json index 85b47e0..021c553 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "image-encode": "^1.3.1", "mp3": "^0.1.0", "node-wav": "^0.0.2", - "@fugood/onnxruntime-react-native": "~1.16.0-test15", + "@fugood/onnxruntime-react-native": "~1.16.0-test16", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test15.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test16.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test15.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test16.patch diff --git a/yarn.lock b/yarn.lock index a7ae770..f10e0ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1191,18 +1191,18 @@ dependencies: "@flyskywhy/react-native-browser-polyfill" "^2.0.1" -"@fugood/onnxruntime-common@~1.16.0-test3": - version "1.16.0-test3" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test3.tgz#d872976db129ca5617c94d66dce5827ee8955bda" - integrity sha512-TZoFr5cOvw6R5FFWZgp3bN6IVq0VagvmlI2HQQEGrHXK4xa9BhacCE0KibBodcsbEdPwbdGaCBs4onJUu4ymuA== +"@fugood/onnxruntime-common@~1.16.0-test4": + version "1.16.0-test4" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test4.tgz#ab8069dd89c71a20ee4aec1d262ca4268409f5e2" + integrity sha512-en+Tdg+KODeJiRgPDt1z7ysWxJcwQ9mYWPxrWXH3bw8g+ix546NmdS/yd3fp5TUEvpbJRaBpFE16uAbalVb9pw== -"@fugood/onnxruntime-react-native@~1.16.0-test15": - version "1.16.0-test15" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test15.tgz#bc2fbcc4d2f3787b59ff9bdb70e28b78809014b8" - integrity sha512-N8VglCCZsQ2F0+j++pnPS7BIr2Z0vOXEFjeDy+RJgvjQ+D4FjjIP1U95yWPjmHYei+MbUl6CVNp99i+tEgM6FQ== +"@fugood/onnxruntime-react-native@~1.16.0-test16": + version "1.16.0-test16" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test16.tgz#e67bd68e9d93b788ae2a754d0ba198ad1c81a9a7" + integrity sha512-M2kK+Yk/8o5kUkuR5btnixtWAGx+WVi5XFihGpz9mTeq3JkW++4MwUB1AaWZjhA88+Z3mc/FgqYql/kK/B4bgg== dependencies: "@expo/config-plugins" "^4.1.5" - "@fugood/onnxruntime-common" "~1.16.0-test3" + "@fugood/onnxruntime-common" "~1.16.0-test4" buffer "^6.0.3" "@fugood/react-native-audio-pcm-stream@^1.1.4": From 6f6844d7702bc976d7084442fbd68251ad76579e Mon Sep 17 00:00:00 2001 From: Jhen Date: Tue, 11 Jul 2023 15:17:07 +0800 Subject: [PATCH 14/19] Bump test package --- package.json | 2 +- ...nxruntime-react-native+1.16.0-test17.patch} | 0 yarn.lock | 18 +++++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test16.patch => @fugood+onnxruntime-react-native+1.16.0-test17.patch} (100%) diff --git a/package.json b/package.json index 021c553..49a8f97 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "image-encode": "^1.3.1", "mp3": "^0.1.0", "node-wav": "^0.0.2", - "@fugood/onnxruntime-react-native": "~1.16.0-test16", + "@fugood/onnxruntime-react-native": "~1.16.0-test17", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.8", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test16.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test17.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test16.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test17.patch diff --git a/yarn.lock b/yarn.lock index f10e0ef..010d557 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1191,18 +1191,18 @@ dependencies: "@flyskywhy/react-native-browser-polyfill" "^2.0.1" -"@fugood/onnxruntime-common@~1.16.0-test4": - version "1.16.0-test4" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test4.tgz#ab8069dd89c71a20ee4aec1d262ca4268409f5e2" - integrity sha512-en+Tdg+KODeJiRgPDt1z7ysWxJcwQ9mYWPxrWXH3bw8g+ix546NmdS/yd3fp5TUEvpbJRaBpFE16uAbalVb9pw== +"@fugood/onnxruntime-common@~1.16.0-test5": + version "1.16.0-test5" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test5.tgz#7c4a8169f7bcc617d391237c9836eede11e19ffc" + integrity sha512-ZiPUJs6hhN3DCGoTYk/S5aVDuuibvwWclXo/1FoKzwv3fSrgT13XRI3VUWNHgYH/2e0BmyqpbWlxiEGN1OmtGg== -"@fugood/onnxruntime-react-native@~1.16.0-test16": - version "1.16.0-test16" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test16.tgz#e67bd68e9d93b788ae2a754d0ba198ad1c81a9a7" - integrity sha512-M2kK+Yk/8o5kUkuR5btnixtWAGx+WVi5XFihGpz9mTeq3JkW++4MwUB1AaWZjhA88+Z3mc/FgqYql/kK/B4bgg== +"@fugood/onnxruntime-react-native@~1.16.0-test17": + version "1.16.0-test17" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test17.tgz#44b37444ab7c1b37be37d019f0cd1eb06b9f3de0" + integrity sha512-aVJfpyVYyg/o6YNce8boBaOJtGZF1tLqejpODbig5TPb/5AHEtVwAvHuf+cUpENlllO2btqwQwKrZXZD88ePTg== dependencies: "@expo/config-plugins" "^4.1.5" - "@fugood/onnxruntime-common" "~1.16.0-test4" + "@fugood/onnxruntime-common" "~1.16.0-test5" buffer "^6.0.3" "@fugood/react-native-audio-pcm-stream@^1.1.4": From 2742d13470bef89cad7a5df03ff42d84ef638280 Mon Sep 17 00:00:00 2001 From: Jhen Date: Tue, 11 Jul 2023 16:16:36 +0800 Subject: [PATCH 15/19] Use latest commit of transformers.js fork --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index ba86262..6fe144b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2067,7 +2067,7 @@ "@xenova/transformers@https://github.com/hans00/transformers.js#merge": version "2.3.0" - resolved "https://github.com/hans00/transformers.js#eee34a4f9d9e8f9e2fbcd2ad6a3ade86d1da020a" + resolved "https://github.com/hans00/transformers.js#9e7d629dfba1114af4bb78dca1f53a72a3a796a3" dependencies: image-decode "^1.2.2" image-encode "^1.3.1" From 4a71787f50c9c483287703dd29a0372ead92161b Mon Sep 17 00:00:00 2001 From: Jhen Date: Tue, 11 Jul 2023 16:24:46 +0800 Subject: [PATCH 16/19] Update patch --- ...patch => @xenova+transformers+2.3.0.patch} | 19 +++++++++---------- yarn.lock | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) rename patches/{@xenova+transformers+2.0.1.patch => @xenova+transformers+2.3.0.patch} (73%) diff --git a/patches/@xenova+transformers+2.0.1.patch b/patches/@xenova+transformers+2.3.0.patch similarity index 73% rename from patches/@xenova+transformers+2.0.1.patch rename to patches/@xenova+transformers+2.3.0.patch index a6ab89e..2bfcd4f 100644 --- a/patches/@xenova+transformers+2.0.1.patch +++ b/patches/@xenova+transformers+2.3.0.patch @@ -1,21 +1,20 @@ diff --git a/node_modules/@xenova/transformers/src/backends/onnx.js b/node_modules/@xenova/transformers/src/backends/onnx.js -index 92cbfb2..8e05e5c 100644 +index b8d9b8d..8d1013c 100644 --- a/node_modules/@xenova/transformers/src/backends/onnx.js +++ b/node_modules/@xenova/transformers/src/backends/onnx.js -@@ -17,16 +17,31 @@ +@@ -16,7 +16,7 @@ + * @module backends/onnx */ - // NOTE: Import order matters here. We need to import `onnxruntime-node` before `onnxruntime-web`. --export * as ONNX from 'onnxruntime-common'; -+export * as ONNX from '@fugood/onnxruntime-common'; +-import * as ONNX_COMMON from 'onnxruntime-common'; ++import * as ONNX_COMMON from '@fugood/onnxruntime-common'; - export const executionProviders = [ - // 'webgpu', -- 'wasm' -+ 'wasm', - ]; + /** @type {module} The ONNX runtime module. */ + export const ONNX = ONNX_COMMON?.default ?? ONNX_COMMON; +@@ -28,8 +28,23 @@ export const executionProviders = [ if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') { + // Running in a react native environment. - import('onnxruntime-react-native'); + import('@fugood/onnxruntime-react-native'); executionProviders.unshift('cpu'); diff --git a/yarn.lock b/yarn.lock index 1545584..8644dcd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6156,7 +6156,7 @@ onnxruntime-node@1.14.0: dependencies: onnxruntime-common "~1.14.0" -onnxruntime-react-native@1.14.0, onnxruntime-react-native@^1.14.0: +onnxruntime-react-native@1.14.0: version "1.14.0" resolved "https://registry.yarnpkg.com/onnxruntime-react-native/-/onnxruntime-react-native-1.14.0.tgz#8ef35c02a90414338e6fc392f4cf5a8498fdaa90" integrity sha512-hF0ZhJyOnUyV0rPWCAFmzPs/WHbv1msAJmYadRCQp3A4GcCgDHpHnopInskPnUPZU4NnH30lxcw3BhxtXGL17A== From 42563ac20196e8db1fbbce47ea24e0f9e6c0525d Mon Sep 17 00:00:00 2001 From: Jhen Date: Tue, 11 Jul 2023 18:12:27 +0800 Subject: [PATCH 17/19] Bump react-native version to fix build of Xcode 15 --- package.json | 2 +- yarn.lock | 367 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 216 insertions(+), 153 deletions(-) diff --git a/package.json b/package.json index 0b0a3c1..c2ec951 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@fugood/onnxruntime-react-native": "~1.16.0-test17", "path-browserify": "^1.0.1", "react": "18.2.0", - "react-native": "0.71.8", + "react-native": "0.71.12", "react-native-fs": "^2.20.0", "react-native-image-picker": "^5.3.1", "react-native-quick-base64": "^2.0.6", diff --git a/yarn.lock b/yarn.lock index 8644dcd..bb04f35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1633,13 +1633,13 @@ dependencies: serve-static "^1.13.1" -"@react-native-community/cli-doctor@^10.2.2": - version "10.2.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-10.2.2.tgz#b1893604fa9fc8971064e7c00042350f96868bfe" - integrity sha512-49Ep2aQOF0PkbAR/TcyMjOm9XwBa8VQr+/Zzf4SJeYwiYLCT1NZRAVAVjYRXl0xqvq5S5mAGZZShS4AQl4WsZw== +"@react-native-community/cli-doctor@^10.2.4": + version "10.2.5" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-10.2.5.tgz#e5e28c66c2373f05a94b296a8ec637f8df736707" + integrity sha512-1YbzXvsldBmSw1MmBsXB74bKiHXKNCjlb2ByLgkfTiarpSvETYam3g5vex0N+qc0Cdkzkq+8NznE744LFhnUpw== dependencies: "@react-native-community/cli-config" "^10.1.1" - "@react-native-community/cli-platform-ios" "^10.2.1" + "@react-native-community/cli-platform-ios" "^10.2.5" "@react-native-community/cli-tools" "^10.1.1" chalk "^4.1.2" command-exists "^1.2.8" @@ -1677,10 +1677,10 @@ glob "^7.1.3" logkitty "^0.7.1" -"@react-native-community/cli-platform-ios@10.2.1", "@react-native-community/cli-platform-ios@^10.2.1": - version "10.2.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.1.tgz#2e6bd2cb6d48cbb8720d7b7265bb1bab80745f72" - integrity sha512-hz4zu4Y6eyj7D0lnZx8Mf2c2si8y+zh/zUTgCTaPPLzQD8jSZNNBtUUiA1cARm2razpe8marCZ1QbTMAGbf3mg== +"@react-native-community/cli-platform-ios@10.2.4": + version "10.2.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.4.tgz#6af05cd4258438422a3a50d1c0cc757acd6be375" + integrity sha512-/6K+jeRhcGojFIJMWMXV2eY5n/In+YUzBr/DKWQOeHBOHkESRNheG310xSAIjgB46YniSSUKhSyeuhalTbm9OQ== dependencies: "@react-native-community/cli-tools" "^10.1.1" chalk "^4.1.2" @@ -1689,21 +1689,33 @@ glob "^7.1.3" ora "^5.4.1" -"@react-native-community/cli-plugin-metro@^10.2.2": - version "10.2.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.2.2.tgz#766914e3c8007dfe52b253544c4f6cd8549919ac" - integrity sha512-sTGjZlD3OGqbF9v1ajwUIXhGmjw9NyJ/14Lo0sg7xH8Pv4qUd5ZvQ6+DWYrQn3IKFUMfGFWYyL81ovLuPylrpw== +"@react-native-community/cli-platform-ios@^10.2.5": + version "10.2.5" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.5.tgz#7888c74b83099885bf9e6d52170c6e663ad971ee" + integrity sha512-hq+FZZuSBK9z82GLQfzdNDl8vbFx5UlwCLFCuTtNCROgBoapFtVZQKRP2QBftYNrQZ0dLAb01gkwxagHsQCFyg== + dependencies: + "@react-native-community/cli-tools" "^10.1.1" + chalk "^4.1.2" + execa "^1.0.0" + fast-xml-parser "^4.0.12" + glob "^7.1.3" + ora "^5.4.1" + +"@react-native-community/cli-plugin-metro@^10.2.3": + version "10.2.3" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.2.3.tgz#419e0155a50951c3329818fba51cb5021a7294f1" + integrity sha512-jHi2oDuTePmW4NEyVT8JEGNlIYcnFXCSV2ZMp4rnDrUk4TzzyvS3IMvDlESEmG8Kry8rvP0KSUx/hTpy37Sbkw== dependencies: "@react-native-community/cli-server-api" "^10.1.1" "@react-native-community/cli-tools" "^10.1.1" chalk "^4.1.2" execa "^1.0.0" - metro "0.73.9" - metro-config "0.73.9" - metro-core "0.73.9" - metro-react-native-babel-transformer "0.73.9" - metro-resolver "0.73.9" - metro-runtime "0.73.9" + metro "0.73.10" + metro-config "0.73.10" + metro-core "0.73.10" + metro-react-native-babel-transformer "0.73.10" + metro-resolver "0.73.10" + metro-runtime "0.73.10" readline "^1.3.0" "@react-native-community/cli-server-api@^10.1.1": @@ -1743,17 +1755,17 @@ dependencies: joi "^17.2.1" -"@react-native-community/cli@10.2.2": - version "10.2.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.2.2.tgz#3fa438ba7f19f83e07bc337765fc1cabdcf2cac2" - integrity sha512-aZVcVIqj+OG6CrliR/Yn8wHxrvyzbFBY9cj7n0MvRw/P54QUru2nNqUTSSbqv0Qaa297yHJbe6kFDojDMSTM8Q== +"@react-native-community/cli@10.2.4": + version "10.2.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.2.4.tgz#c6afe723055d430061a32bd31644fc56eb9ba330" + integrity sha512-E9BUDHfLEsnjkjeJqECuCjl4E/1Ox9Nl6hkQBhEqjZm4AaQxgU7M6AyFfOgaXn5v3am16/R4ZOUTrJnGJWS3GA== dependencies: "@react-native-community/cli-clean" "^10.1.1" "@react-native-community/cli-config" "^10.1.1" "@react-native-community/cli-debugger-ui" "^10.0.0" - "@react-native-community/cli-doctor" "^10.2.2" + "@react-native-community/cli-doctor" "^10.2.4" "@react-native-community/cli-hermes" "^10.2.0" - "@react-native-community/cli-plugin-metro" "^10.2.2" + "@react-native-community/cli-plugin-metro" "^10.2.3" "@react-native-community/cli-server-api" "^10.1.1" "@react-native-community/cli-tools" "^10.1.1" "@react-native-community/cli-types" "^10.0.0" @@ -5202,6 +5214,11 @@ jsc-android@^250231.0.0: resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250231.0.0.tgz#91720f8df382a108872fa4b3f558f33ba5e95262" integrity sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw== +jsc-safe-url@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz#141c14fbb43791e88d5dc64e85a374575a83477a" + integrity sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q== + jscodeshift@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.13.1.tgz#69bfe51e54c831296380585c6d9e733512aecdef" @@ -5481,53 +5498,53 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -metro-babel-transformer@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.9.tgz#bec8aaaf1bbdc2e469fde586fde455f8b2a83073" - integrity sha512-DlYwg9wwYIZTHtic7dyD4BP0SDftoltZ3clma76nHu43blMWsCnrImHeHsAVne3XsQ+RJaSRxhN5nkG2VyVHwA== +metro-babel-transformer@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.10.tgz#b27732fa3869f397246ee8ecf03b64622ab738c1" + integrity sha512-Yv2myTSnpzt/lTyurLvqYbBkytvUJcLHN8XD3t7W6rGiLTQPzmf1zypHQLphvcAXtCWBOXFtH7KLOSi2/qMg+A== dependencies: "@babel/core" "^7.20.0" hermes-parser "0.8.0" - metro-source-map "0.73.9" + metro-source-map "0.73.10" nullthrows "^1.1.1" -metro-cache-key@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.73.9.tgz#7d8c441a3b7150f7b201273087ef3cf7d3435d9f" - integrity sha512-uJg+6Al7UoGIuGfoxqPBy6y1Ewq7Y8/YapGYIDh6sohInwt/kYKnPZgLDYHIPvY2deORnQ/2CYo4tOeBTnhCXQ== +metro-cache-key@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.73.10.tgz#8d63591187d295b62a80aed64a87864b1e9d67a2" + integrity sha512-JMVDl/EREDiUW//cIcUzRjKSwE2AFxVWk47cFBer+KA4ohXIG2CQPEquT56hOw1Y1s6gKNxxs1OlAOEsubrFjw== -metro-cache@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.73.9.tgz#773c2df6ba53434e58ccbe421b0c54e6da8d2890" - integrity sha512-upiRxY8rrQkUWj7ieACD6tna7xXuXdu2ZqrheksT79ePI0aN/t0memf6WcyUtJUMHZetke3j+ppELNvlmp3tOw== +metro-cache@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.73.10.tgz#02e9cb7c1e42aab5268d2ecce35ad8f2c08891de" + integrity sha512-wPGlQZpdVlM404m7MxJqJ+hTReDr5epvfPbt2LerUAHY9RN99w61FeeAe25BMZBwgUgDtAsfGlJ51MBHg8MAqw== dependencies: - metro-core "0.73.9" + metro-core "0.73.10" rimraf "^3.0.2" -metro-config@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.73.9.tgz#6b43c70681bdd6b00f44400fc76dddbe53374500" - integrity sha512-NiWl1nkYtjqecDmw77tbRbXnzIAwdO6DXGZTuKSkH+H/c1NKq1eizO8Fe+NQyFtwR9YLqn8Q0WN1nmkwM1j8CA== +metro-config@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.73.10.tgz#a9ec3d0a1290369e3f46c467a4c4f6dd43acc223" + integrity sha512-wIlybd1Z9I8K2KcStTiJxTB7OK529dxFgogNpKCTU/3DxkgAASqSkgXnZP6kVyqjh5EOWAKFe5U6IPic7kXDdQ== dependencies: cosmiconfig "^5.0.5" jest-validate "^26.5.2" - metro "0.73.9" - metro-cache "0.73.9" - metro-core "0.73.9" - metro-runtime "0.73.9" + metro "0.73.10" + metro-cache "0.73.10" + metro-core "0.73.10" + metro-runtime "0.73.10" -metro-core@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.73.9.tgz#410c5c0aeae840536c10039f68098fdab3da568e" - integrity sha512-1NTs0IErlKcFTfYyRT3ljdgrISWpl1nys+gaHkXapzTSpvtX9F1NQNn5cgAuE+XIuTJhbsCdfIJiM2JXbrJQaQ== +metro-core@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.73.10.tgz#feb3c228aa8c0dde71d8e4cef614cc3a1dc3bbd7" + integrity sha512-5uYkajIxKyL6W45iz/ftNnYPe1l92CvF2QJeon1CHsMXkEiOJxEjo41l+iSnO/YodBGrmMCyupSO4wOQGUc0lw== dependencies: lodash.throttle "^4.1.1" - metro-resolver "0.73.9" + metro-resolver "0.73.10" -metro-file-map@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.73.9.tgz#09c04a8e8ef1eaa6ecb2b9cb8cb53bb0fa0167ec" - integrity sha512-R/Wg3HYeQhYY3ehWtfedw8V0ne4lpufG7a21L3GWer8tafnC9pmjoCKEbJz9XZkVj9i1FtxE7UTbrtZNeIILxQ== +metro-file-map@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.73.10.tgz#55bd906fb7c1bef8e1a31df4b29a3ef4b49f0b5a" + integrity sha512-XOMWAybeaXyD6zmVZPnoCCL2oO3rp4ta76oUlqWP0skBzhFxVtkE/UtDwApEMUY361JeBBago647gnKiARs+1g== dependencies: abort-controller "^3.0.0" anymatch "^3.0.3" @@ -5545,35 +5562,79 @@ metro-file-map@0.73.9: optionalDependencies: fsevents "^2.3.2" -metro-hermes-compiler@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.73.9.tgz#6f473e67e8f76066066f00e2e0ecce865f7d445d" - integrity sha512-5B3vXIwQkZMSh3DQQY23XpTCpX9kPLqZbA3rDuAcbGW0tzC3f8dCenkyBb0GcCzyTDncJeot/A7oVCVK6zapwg== +metro-hermes-compiler@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.73.10.tgz#4525a7835c803a5d0b3b05c6619202e2273d630f" + integrity sha512-rTRWEzkVrwtQLiYkOXhSdsKkIObnL+Jqo+IXHI7VEK2aSLWRAbtGNqECBs44kbOUypDYTFFE+WLtoqvUWqYkWg== -metro-inspector-proxy@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.73.9.tgz#8e11cd300adf3f904f1f5afe28b198312cdcd8c2" - integrity sha512-B3WrWZnlYhtTrv0IaX3aUAhi2qVILPAZQzb5paO1e+xrz4YZHk9c7dXv7qe7B/IQ132e3w46y3AL7rFo90qVjA== +metro-inspector-proxy@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.73.10.tgz#752fed2ab88199c9dcc3369c3d59da6c5b954a51" + integrity sha512-CEEvocYc5xCCZBtGSIggMCiRiXTrnBbh8pmjKQqm9TtJZALeOGyt5pXUaEkKGnhrXETrexsg6yIbsQHhEvVfvQ== dependencies: connect "^3.6.5" debug "^2.2.0" ws "^7.5.1" yargs "^17.5.1" -metro-minify-terser@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.73.9.tgz#301aef2e106b0802f7a14ef0f2b4883b20c80018" - integrity sha512-MTGPu2qV5qtzPJ2SqH6s58awHDtZ4jd7lmmLR+7TXDwtZDjIBA0YVfI0Zak2Haby2SqoNKrhhUns/b4dPAQAVg== +metro-minify-terser@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.73.10.tgz#557eab3a512b90b7779350ff5d25a215c4dbe61f" + integrity sha512-uG7TSKQ/i0p9kM1qXrwbmY3v+6BrMItsOcEXcSP8Z+68bb+t9HeVK0T/hIfUu1v1PEnonhkhfzVsaP8QyTd5lQ== dependencies: terser "^5.15.0" -metro-minify-uglify@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.73.9.tgz#cf4f8c19b688deea103905689ec736c2f2acd733" - integrity sha512-gzxD/7WjYcnCNGiFJaA26z34rjOp+c/Ft++194Wg91lYep3TeWQ0CnH8t2HRS7AYDHU81SGWgvD3U7WV0g4LGA== +metro-minify-uglify@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.73.10.tgz#4de79056d502479733854c90f2075374353ea154" + integrity sha512-eocnSeJKnLz/UoYntVFhCJffED7SLSgbCHgNvI6ju6hFb6EFHGJT9OLbkJWeXaWBWD3Zw5mYLS8GGqGn/CHZPA== dependencies: uglify-es "^3.1.9" +metro-react-native-babel-preset@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.10.tgz#304b24bb391537d2c987732cc0a9774be227d3f6" + integrity sha512-1/dnH4EHwFb2RKEKx34vVDpUS3urt2WEeR8FYim+ogqALg4sTpG7yeQPxWpbgKATezt4rNfqAANpIyH19MS4BQ== + dependencies: + "@babel/core" "^7.20.0" + "@babel/plugin-proposal-async-generator-functions" "^7.0.0" + "@babel/plugin-proposal-class-properties" "^7.0.0" + "@babel/plugin-proposal-export-default-from" "^7.0.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-proposal-object-rest-spread" "^7.0.0" + "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" + "@babel/plugin-proposal-optional-chaining" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.0.0" + "@babel/plugin-syntax-export-default-from" "^7.0.0" + "@babel/plugin-syntax-flow" "^7.18.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-syntax-optional-chaining" "^7.0.0" + "@babel/plugin-transform-arrow-functions" "^7.0.0" + "@babel/plugin-transform-async-to-generator" "^7.0.0" + "@babel/plugin-transform-block-scoping" "^7.0.0" + "@babel/plugin-transform-classes" "^7.0.0" + "@babel/plugin-transform-computed-properties" "^7.0.0" + "@babel/plugin-transform-destructuring" "^7.0.0" + "@babel/plugin-transform-flow-strip-types" "^7.0.0" + "@babel/plugin-transform-function-name" "^7.0.0" + "@babel/plugin-transform-literals" "^7.0.0" + "@babel/plugin-transform-modules-commonjs" "^7.0.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0" + "@babel/plugin-transform-parameters" "^7.0.0" + "@babel/plugin-transform-react-display-name" "^7.0.0" + "@babel/plugin-transform-react-jsx" "^7.0.0" + "@babel/plugin-transform-react-jsx-self" "^7.0.0" + "@babel/plugin-transform-react-jsx-source" "^7.0.0" + "@babel/plugin-transform-runtime" "^7.0.0" + "@babel/plugin-transform-shorthand-properties" "^7.0.0" + "@babel/plugin-transform-spread" "^7.0.0" + "@babel/plugin-transform-sticky-regex" "^7.0.0" + "@babel/plugin-transform-template-literals" "^7.0.0" + "@babel/plugin-transform-typescript" "^7.5.0" + "@babel/plugin-transform-unicode-regex" "^7.0.0" + "@babel/template" "^7.0.0" + react-refresh "^0.4.0" + metro-react-native-babel-preset@0.73.9: version "0.73.9" resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.9.tgz#ef54637dd20f025197beb49e71309a9c539e73e2" @@ -5618,64 +5679,64 @@ metro-react-native-babel-preset@0.73.9: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -metro-react-native-babel-transformer@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.9.tgz#4f4f0cfa5119bab8b53e722fabaf90687d0cbff0" - integrity sha512-DSdrEHuQ22ixY7DyipyKkIcqhOJrt5s6h6X7BYJCP9AMUfXOwLe2biY3BcgJz5GOXv8/Akry4vTCvQscVS1otQ== +metro-react-native-babel-transformer@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.10.tgz#4e20a9ce131b873cda0b5a44d3eb4002134a64b8" + integrity sha512-4G/upwqKdmKEjmsNa92/NEgsOxUWOygBVs+FXWfXWKgybrmcjh3NoqdRYrROo9ZRA/sB9Y/ZXKVkWOGKHtGzgg== dependencies: "@babel/core" "^7.20.0" babel-preset-fbjs "^3.4.0" hermes-parser "0.8.0" - metro-babel-transformer "0.73.9" - metro-react-native-babel-preset "0.73.9" - metro-source-map "0.73.9" + metro-babel-transformer "0.73.10" + metro-react-native-babel-preset "0.73.10" + metro-source-map "0.73.10" nullthrows "^1.1.1" -metro-resolver@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.73.9.tgz#f3cf77e6c7606a34aa81bad40edb856aad671cf3" - integrity sha512-Ej3wAPOeNRPDnJmkK0zk7vJ33iU07n+oPhpcf5L0NFkWneMmSM2bflMPibI86UjzZGmRfn0AhGhs8yGeBwQ/Xg== +metro-resolver@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.73.10.tgz#c39a3bd8d33e5d78cb256110d29707d8d49ed0be" + integrity sha512-HeXbs+0wjakaaVQ5BI7eT7uqxlZTc9rnyw6cdBWWMgUWB++KpoI0Ge7Hi6eQAOoVAzXC3m26mPFYLejpzTWjng== dependencies: absolute-path "^0.0.0" -metro-runtime@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.9.tgz#0b24c0b066b8629ee855a6e5035b65061fef60d5" - integrity sha512-d5Hs83FpKB9r8q8Vb95+fa6ESpwysmPr4lL1I2rM2qXAFiO7OAPT9Bc23WmXgidkBtD0uUFdB2lG+H1ATz8rZg== +metro-runtime@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.10.tgz#c3de19d17e75ffe1a145778d99422e7ffc208768" + integrity sha512-EpVKm4eN0Fgx2PEWpJ5NiMArV8zVoOin866jIIvzFLpmkZz1UEqgjf2JAfUJnjgv3fjSV3JqeGG2vZCaGQBTow== dependencies: "@babel/runtime" "^7.0.0" react-refresh "^0.4.0" -metro-source-map@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.9.tgz#89ca41f6346aeb12f7f23496fa363e520adafebe" - integrity sha512-l4VZKzdqafipriETYR6lsrwtavCF1+CMhCOY9XbyWeTrpGSNgJQgdeJpttzEZTHQQTLR0csQo0nD1ef3zEP6IQ== +metro-source-map@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.10.tgz#28e09a28f1a2f7a4f8d0845b845cbed74e2f48f9" + integrity sha512-NAGv14701p/YaFZ76KzyPkacBw/QlEJF1f8elfs23N1tC33YyKLDKvPAzFJiYqjdcFvuuuDCA8JCXd2TgLxNPw== dependencies: "@babel/traverse" "^7.20.0" "@babel/types" "^7.20.0" invariant "^2.2.4" - metro-symbolicate "0.73.9" + metro-symbolicate "0.73.10" nullthrows "^1.1.1" - ob1 "0.73.9" + ob1 "0.73.10" source-map "^0.5.6" vlq "^1.0.0" -metro-symbolicate@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.9.tgz#cb452299a36e5b86b2826e7426d51221635c48bf" - integrity sha512-4TUOwxRHHqbEHxRqRJ3wZY5TA8xq7AHMtXrXcjegMH9FscgYztsrIG9aNBUBS+VLB6g1qc6BYbfIgoAnLjCDyw== +metro-symbolicate@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.10.tgz#7853a9a8fbfd615a5c9db698fffc685441ac880f" + integrity sha512-PmCe3TOe1c/NVwMlB+B17me951kfkB3Wve5RqJn+ErPAj93od1nxicp6OJe7JT4QBRnpUP8p9tw2sHKqceIzkA== dependencies: invariant "^2.2.4" - metro-source-map "0.73.9" + metro-source-map "0.73.10" nullthrows "^1.1.1" source-map "^0.5.6" through2 "^2.0.1" vlq "^1.0.0" -metro-transform-plugins@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.73.9.tgz#9fffbe1b24269e3d114286fa681abc570072d9b8" - integrity sha512-r9NeiqMngmooX2VOKLJVQrMuV7PAydbqst5bFhdVBPcFpZkxxqyzjzo+kzrszGy2UpSQBZr2P1L6OMjLHwQwfQ== +metro-transform-plugins@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.73.10.tgz#1b762330cbbedb6c18438edc3d76b063c88882af" + integrity sha512-D4AgD3Vsrac+4YksaPmxs/0ocT67bvwTkFSIgWWeDvWwIG0U1iHzTS9f8Bvb4PITnXryDoFtjI6OWF7uOpGxpA== dependencies: "@babel/core" "^7.20.0" "@babel/generator" "^7.20.0" @@ -5683,29 +5744,29 @@ metro-transform-plugins@0.73.9: "@babel/traverse" "^7.20.0" nullthrows "^1.1.1" -metro-transform-worker@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.73.9.tgz#30384cef2d5e35a4abe91b15bf1a8344f5720441" - integrity sha512-Rq4b489sIaTUENA+WCvtu9yvlT/C6zFMWhU4sq+97W29Zj0mPBjdk+qGT5n1ZBgtBIJzZWt1KxeYuc17f4aYtQ== +metro-transform-worker@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.73.10.tgz#bb401dbd7b10a6fe443a5f7970cba38425efece0" + integrity sha512-IySvVubudFxahxOljWtP0QIMMpgUrCP0bW16cz2Enof0PdumwmR7uU3dTbNq6S+XTzuMHR+076aIe4VhPAWsIQ== dependencies: "@babel/core" "^7.20.0" "@babel/generator" "^7.20.0" "@babel/parser" "^7.20.0" "@babel/types" "^7.20.0" babel-preset-fbjs "^3.4.0" - metro "0.73.9" - metro-babel-transformer "0.73.9" - metro-cache "0.73.9" - metro-cache-key "0.73.9" - metro-hermes-compiler "0.73.9" - metro-source-map "0.73.9" - metro-transform-plugins "0.73.9" + metro "0.73.10" + metro-babel-transformer "0.73.10" + metro-cache "0.73.10" + metro-cache-key "0.73.10" + metro-hermes-compiler "0.73.10" + metro-source-map "0.73.10" + metro-transform-plugins "0.73.10" nullthrows "^1.1.1" -metro@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro/-/metro-0.73.9.tgz#150e69a6735fab0bcb4f6ee97fd1efc65b3ec36f" - integrity sha512-BlYbPmTF60hpetyNdKhdvi57dSqutb+/oK0u3ni4emIh78PiI0axGo7RfdsZ/mn3saASXc94tDbpC5yn7+NpEg== +metro@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/metro/-/metro-0.73.10.tgz#d9a0efb1e403e3aee5cf5140e0a96a7220c23901" + integrity sha512-J2gBhNHFtc/Z48ysF0B/bfTwUwaRDLjNv7egfhQCc+934dpXcjJG2KZFeuybF+CvA9vo4QUi56G2U+RSAJ5tsA== dependencies: "@babel/code-frame" "^7.0.0" "@babel/core" "^7.20.0" @@ -5728,24 +5789,25 @@ metro@0.73.9: image-size "^0.6.0" invariant "^2.2.4" jest-worker "^27.2.0" + jsc-safe-url "^0.2.2" lodash.throttle "^4.1.1" - metro-babel-transformer "0.73.9" - metro-cache "0.73.9" - metro-cache-key "0.73.9" - metro-config "0.73.9" - metro-core "0.73.9" - metro-file-map "0.73.9" - metro-hermes-compiler "0.73.9" - metro-inspector-proxy "0.73.9" - metro-minify-terser "0.73.9" - metro-minify-uglify "0.73.9" - metro-react-native-babel-preset "0.73.9" - metro-resolver "0.73.9" - metro-runtime "0.73.9" - metro-source-map "0.73.9" - metro-symbolicate "0.73.9" - metro-transform-plugins "0.73.9" - metro-transform-worker "0.73.9" + metro-babel-transformer "0.73.10" + metro-cache "0.73.10" + metro-cache-key "0.73.10" + metro-config "0.73.10" + metro-core "0.73.10" + metro-file-map "0.73.10" + metro-hermes-compiler "0.73.10" + metro-inspector-proxy "0.73.10" + metro-minify-terser "0.73.10" + metro-minify-uglify "0.73.10" + metro-react-native-babel-preset "0.73.10" + metro-resolver "0.73.10" + metro-runtime "0.73.10" + metro-source-map "0.73.10" + metro-symbolicate "0.73.10" + metro-transform-plugins "0.73.10" + metro-transform-worker "0.73.10" mime-types "^2.1.27" node-fetch "^2.2.0" nullthrows "^1.1.1" @@ -6003,10 +6065,10 @@ nullthrows@^1.1.1: resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== -ob1@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.9.tgz#d5677a0dd3e2f16ad84231278d79424436c38c59" - integrity sha512-kHOzCOFXmAM26fy7V/YuXNKne2TyRiXbFAvPBIbuedJCZZWQZHLdPzMeXJI4Egt6IcfDttRzN3jQ90wOwq1iNw== +ob1@0.73.10: + version "0.73.10" + resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.10.tgz#bf0a2e8922bb8687ddca82327c5cf209414a1bd4" + integrity sha512-aO6EYC+QRRCkZxVJhCWhLKgVjhNuD6Gu1riGjxrIm89CqLsmKgxzYDDEsktmKsoDeRdWGQM5EdMzXDl5xcVfsw== object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" @@ -6638,10 +6700,10 @@ react-native-fs@^2.20.0: base-64 "^0.1.0" utf8 "^3.0.0" -react-native-gradle-plugin@^0.71.18: - version "0.71.18" - resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.18.tgz#20ef199bc85be32e45bb6cc069ec2e7dcb1a74a6" - integrity sha512-7F6bD7B8Xsn3JllxcwHhFcsl9aHIig47+3eN4IHFNqfLhZr++3ElDrcqfMzugM+niWbaMi7bJ0kAkAL8eCpdWg== +react-native-gradle-plugin@^0.71.19: + version "0.71.19" + resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.19.tgz#3379e28341fcd189bc1f4691cefc84c1a4d7d232" + integrity sha512-1dVk9NwhoyKHCSxcrM6vY6cxmojeATsBobDicX0ZKr7DgUF2cBQRTKsimQFvzH8XhOVXyH8p4HyDSZNIFI8OlQ== react-native-image-picker@^5.3.1: version "5.3.1" @@ -6665,20 +6727,21 @@ react-native-sound-player@^0.13.2: resolved "https://registry.yarnpkg.com/react-native-sound-player/-/react-native-sound-player-0.13.2.tgz#c4be0b9a36b13204940d03f787cbbc0c742c8907" integrity sha512-m457mjp496sARAED7epYzbhorfiLZ3j6HzJn7zEL9RU+ZJKcans/0gFNUEBvlh31fSDZRliQ2WwE4mJ6836bNg== -react-native@0.71.8: - version "0.71.8" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.8.tgz#4314145341c49448cf7465b93ced52a433a5e191" - integrity sha512-ftMAuhpgTkbHU9brrqsEyxcNrpYvXKeATY+if22Nfhhg1zW+6wn95w9otwTnA3xHkljPCbng8mUhmmERjGEl7g== +react-native@0.71.12: + version "0.71.12" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.12.tgz#a4a37de71931b5f483a15b8ab9114b9c01e1317d" + integrity sha512-1zDOTdalLepcVB8ZRIZpWlIGyyJISzAF4MIYSDdW7VDJtIRC7ybXsj/kSARF1zpGSg+LgAV8NMCZzGg598M7Iw== dependencies: "@jest/create-cache-key-function" "^29.2.1" - "@react-native-community/cli" "10.2.2" + "@react-native-community/cli" "10.2.4" "@react-native-community/cli-platform-android" "10.2.0" - "@react-native-community/cli-platform-ios" "10.2.1" + "@react-native-community/cli-platform-ios" "10.2.4" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "2.1.0" "@react-native/polyfills" "2.0.0" abort-controller "^3.0.0" anser "^1.4.9" + ansi-regex "^5.0.0" base64-js "^1.1.2" deprecated-react-native-prop-types "^3.0.1" event-target-shim "^5.0.1" @@ -6686,16 +6749,16 @@ react-native@0.71.8: jest-environment-node "^29.2.1" jsc-android "^250231.0.0" memoize-one "^5.0.0" - metro-react-native-babel-transformer "0.73.9" - metro-runtime "0.73.9" - metro-source-map "0.73.9" + metro-react-native-babel-transformer "0.73.10" + metro-runtime "0.73.10" + metro-source-map "0.73.10" mkdirp "^0.5.1" nullthrows "^1.1.1" pretty-format "^26.5.2" promise "^8.3.0" react-devtools-core "^4.26.1" react-native-codegen "^0.71.5" - react-native-gradle-plugin "^0.71.18" + react-native-gradle-plugin "^0.71.19" react-refresh "^0.4.0" react-shallow-renderer "^16.15.0" regenerator-runtime "^0.13.2" From 21804163bd02764d9921c9b3ca873c55048fca3c Mon Sep 17 00:00:00 2001 From: Jhen Date: Tue, 11 Jul 2023 18:12:35 +0800 Subject: [PATCH 18/19] Enable new arch --- android/gradle.properties | 2 +- ios/Podfile | 2 + ios/Podfile.lock | 810 +++++++++++++++++++++++++++----------- 3 files changed, 587 insertions(+), 227 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index e4af465..e1ddc51 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -37,7 +37,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # your application. You should enable this flag either if you want # to write custom TurboModules/Fabric components OR use libraries that # are providing them. -newArchEnabled=false +newArchEnabled=true # Use this property to enable or disable the Hermes JS engine. # If set to false, you will be using JSC instead. diff --git a/ios/Podfile b/ios/Podfile index d03b40f..0084009 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -21,6 +21,8 @@ if linkage != nil use_frameworks! :linkage => linkage.to_sym end +ENV['RCT_NEW_ARCH_ENABLED'] = '1' + target 'transformers_example' do config = use_native_modules! diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d0a9f4b..976bd35 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,14 +2,14 @@ PODS: - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.71.8) - - FBReactNativeSpec (0.71.8): + - FBLazyVector (0.71.12) + - FBReactNativeSpec (0.71.12): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.71.8) - - RCTTypeSafety (= 0.71.8) - - React-Core (= 0.71.8) - - React-jsi (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-Core (= 0.71.12) + - React-jsi (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) - Flipper (0.125.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.15.0) - - onnxruntime-react-native (1.16.0-test15): + - onnxruntime-react-native (1.16.0-test17): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -94,337 +94,678 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog + - RCT-Folly/Fabric (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog - RCT-Folly/Futures (2021.07.22.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.71.8) - - RCTTypeSafety (0.71.8): - - FBLazyVector (= 0.71.8) - - RCTRequired (= 0.71.8) - - React-Core (= 0.71.8) - - React (0.71.8): - - React-Core (= 0.71.8) - - React-Core/DevSupport (= 0.71.8) - - React-Core/RCTWebSocket (= 0.71.8) - - React-RCTActionSheet (= 0.71.8) - - React-RCTAnimation (= 0.71.8) - - React-RCTBlob (= 0.71.8) - - React-RCTImage (= 0.71.8) - - React-RCTLinking (= 0.71.8) - - React-RCTNetwork (= 0.71.8) - - React-RCTSettings (= 0.71.8) - - React-RCTText (= 0.71.8) - - React-RCTVibration (= 0.71.8) - - React-callinvoker (0.71.8) - - React-Codegen (0.71.8): + - RCTRequired (0.71.12) + - RCTTypeSafety (0.71.12): + - FBLazyVector (= 0.71.12) + - RCTRequired (= 0.71.12) + - React-Core (= 0.71.12) + - React (0.71.12): + - React-Core (= 0.71.12) + - React-Core/DevSupport (= 0.71.12) + - React-Core/RCTWebSocket (= 0.71.12) + - React-RCTActionSheet (= 0.71.12) + - React-RCTAnimation (= 0.71.12) + - React-RCTBlob (= 0.71.12) + - React-RCTImage (= 0.71.12) + - React-RCTLinking (= 0.71.12) + - React-RCTNetwork (= 0.71.12) + - React-RCTSettings (= 0.71.12) + - React-RCTText (= 0.71.12) + - React-RCTVibration (= 0.71.12) + - React-callinvoker (0.71.12) + - React-Codegen (0.71.12): - FBReactNativeSpec - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core + - React-graphics - React-jsi - React-jsiexecutor + - React-rncore - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.71.8): + - React-Core (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.8) - - React-cxxreact (= 0.71.8) + - React-Core/Default (= 0.71.12) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/CoreModulesHeaders (0.71.8): + - React-Core/CoreModulesHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/Default (0.71.8): + - React-Core/Default (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/DevSupport (0.71.8): + - React-Core/DevSupport (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.8) - - React-Core/RCTWebSocket (= 0.71.8) - - React-cxxreact (= 0.71.8) + - React-Core/Default (= 0.71.12) + - React-Core/RCTWebSocket (= 0.71.12) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-jsinspector (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-jsinspector (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTActionSheetHeaders (0.71.8): + - React-Core/RCTActionSheetHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTAnimationHeaders (0.71.8): + - React-Core/RCTAnimationHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTBlobHeaders (0.71.8): + - React-Core/RCTBlobHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTImageHeaders (0.71.8): + - React-Core/RCTImageHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTLinkingHeaders (0.71.8): + - React-Core/RCTLinkingHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTNetworkHeaders (0.71.8): + - React-Core/RCTNetworkHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTSettingsHeaders (0.71.8): + - React-Core/RCTSettingsHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTTextHeaders (0.71.8): + - React-Core/RCTTextHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTVibrationHeaders (0.71.8): + - React-Core/RCTVibrationHeaders (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-Core/RCTWebSocket (0.71.8): + - React-Core/RCTWebSocket (0.71.12): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.8) - - React-cxxreact (= 0.71.8) + - React-Core/Default (= 0.71.12) + - React-cxxreact (= 0.71.12) - React-hermes - - React-jsi (= 0.71.8) - - React-jsiexecutor (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-perflogger (= 0.71.12) - Yoga - - React-CoreModules (0.71.8): + - React-CoreModules (0.71.12): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.8) - - React-Codegen (= 0.71.8) - - React-Core/CoreModulesHeaders (= 0.71.8) - - React-jsi (= 0.71.8) + - RCTTypeSafety (= 0.71.12) + - React-Codegen (= 0.71.12) + - React-Core/CoreModulesHeaders (= 0.71.12) + - React-jsi (= 0.71.12) - React-RCTBlob - - React-RCTImage (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-cxxreact (0.71.8): + - React-RCTImage (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-cxxreact (0.71.12): - boost (= 1.76.0) - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.8) - - React-jsi (= 0.71.8) - - React-jsinspector (= 0.71.8) - - React-logger (= 0.71.8) - - React-perflogger (= 0.71.8) - - React-runtimeexecutor (= 0.71.8) - - React-hermes (0.71.8): + - React-callinvoker (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsinspector (= 0.71.12) + - React-logger (= 0.71.12) + - React-perflogger (= 0.71.12) + - React-runtimeexecutor (= 0.71.12) + - React-Fabric (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-Fabric/animations (= 0.71.12) + - React-Fabric/attributedstring (= 0.71.12) + - React-Fabric/butter (= 0.71.12) + - React-Fabric/componentregistry (= 0.71.12) + - React-Fabric/componentregistrynative (= 0.71.12) + - React-Fabric/components (= 0.71.12) + - React-Fabric/config (= 0.71.12) + - React-Fabric/core (= 0.71.12) + - React-Fabric/debug_core (= 0.71.12) + - React-Fabric/debug_renderer (= 0.71.12) + - React-Fabric/imagemanager (= 0.71.12) + - React-Fabric/leakchecker (= 0.71.12) + - React-Fabric/mapbuffer (= 0.71.12) + - React-Fabric/mounting (= 0.71.12) + - React-Fabric/runtimescheduler (= 0.71.12) + - React-Fabric/scheduler (= 0.71.12) + - React-Fabric/telemetry (= 0.71.12) + - React-Fabric/templateprocessor (= 0.71.12) + - React-Fabric/textlayoutmanager (= 0.71.12) + - React-Fabric/uimanager (= 0.71.12) + - React-Fabric/utils (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/animations (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/attributedstring (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/butter (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/componentregistry (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/componentregistrynative (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-Fabric/components/activityindicator (= 0.71.12) + - React-Fabric/components/image (= 0.71.12) + - React-Fabric/components/inputaccessory (= 0.71.12) + - React-Fabric/components/legacyviewmanagerinterop (= 0.71.12) + - React-Fabric/components/modal (= 0.71.12) + - React-Fabric/components/root (= 0.71.12) + - React-Fabric/components/safeareaview (= 0.71.12) + - React-Fabric/components/scrollview (= 0.71.12) + - React-Fabric/components/slider (= 0.71.12) + - React-Fabric/components/text (= 0.71.12) + - React-Fabric/components/textinput (= 0.71.12) + - React-Fabric/components/unimplementedview (= 0.71.12) + - React-Fabric/components/view (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/activityindicator (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/image (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/inputaccessory (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/legacyviewmanagerinterop (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/modal (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/root (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/safeareaview (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/scrollview (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/slider (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/text (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/textinput (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/unimplementedview (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/components/view (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - Yoga + - React-Fabric/config (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/core (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/debug_core (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/debug_renderer (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/imagemanager (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - React-RCTImage (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/leakchecker (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/mapbuffer (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/mounting (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/runtimescheduler (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/scheduler (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/telemetry (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/templateprocessor (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/textlayoutmanager (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-Fabric/uimanager + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/uimanager (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-Fabric/utils (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 0.71.12) + - RCTTypeSafety (= 0.71.12) + - React-graphics (= 0.71.12) + - React-jsi (= 0.71.12) + - React-jsiexecutor (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-graphics (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - React-Core/Default (= 0.71.12) + - React-hermes (0.71.12): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.71.8) + - React-cxxreact (= 0.71.12) - React-jsi - - React-jsiexecutor (= 0.71.8) - - React-jsinspector (= 0.71.8) - - React-perflogger (= 0.71.8) - - React-jsi (0.71.8): + - React-jsiexecutor (= 0.71.12) + - React-jsinspector (= 0.71.12) + - React-perflogger (= 0.71.12) + - React-jsi (0.71.12): - boost (= 1.76.0) - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.71.8): + - React-jsiexecutor (0.71.12): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.8) - - React-jsi (= 0.71.8) - - React-perflogger (= 0.71.8) - - React-jsinspector (0.71.8) - - React-logger (0.71.8): + - React-cxxreact (= 0.71.12) + - React-jsi (= 0.71.12) + - React-perflogger (= 0.71.12) + - React-jsinspector (0.71.12) + - React-logger (0.71.12): - glog - react-native-gcanvas (6.0.3): - GCanvas - React - react-native-image-picker (5.3.1): - - React-Core + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React + - React-Codegen + - React-RCTFabric + - ReactCommon/turbomodule/core - react-native-quick-base64 (2.0.6): - React-Core - - React-perflogger (0.71.8) - - React-RCTActionSheet (0.71.8): - - React-Core/RCTActionSheetHeaders (= 0.71.8) - - React-RCTAnimation (0.71.8): + - React-perflogger (0.71.12) + - React-RCTActionSheet (0.71.12): + - React-Core/RCTActionSheetHeaders (= 0.71.12) + - React-RCTAnimation (0.71.12): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.8) - - React-Codegen (= 0.71.8) - - React-Core/RCTAnimationHeaders (= 0.71.8) - - React-jsi (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-RCTAppDelegate (0.71.8): + - RCTTypeSafety (= 0.71.12) + - React-Codegen (= 0.71.12) + - React-Core/RCTAnimationHeaders (= 0.71.12) + - React-jsi (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-RCTAppDelegate (0.71.12): - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core + - React-graphics + - React-RCTFabric - ReactCommon/turbomodule/core - - React-RCTBlob (0.71.8): + - React-RCTBlob (0.71.12): - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.8) - - React-Core/RCTBlobHeaders (= 0.71.8) - - React-Core/RCTWebSocket (= 0.71.8) - - React-jsi (= 0.71.8) - - React-RCTNetwork (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-RCTImage (0.71.8): + - React-Codegen (= 0.71.12) + - React-Core/RCTBlobHeaders (= 0.71.12) + - React-Core/RCTWebSocket (= 0.71.12) + - React-jsi (= 0.71.12) + - React-RCTNetwork (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-RCTFabric (0.71.12): + - RCT-Folly/Fabric (= 2021.07.22.00) + - React-Core (= 0.71.12) + - React-Fabric (= 0.71.12) + - React-RCTImage (= 0.71.12) + - React-RCTImage (0.71.12): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.8) - - React-Codegen (= 0.71.8) - - React-Core/RCTImageHeaders (= 0.71.8) - - React-jsi (= 0.71.8) - - React-RCTNetwork (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-RCTLinking (0.71.8): - - React-Codegen (= 0.71.8) - - React-Core/RCTLinkingHeaders (= 0.71.8) - - React-jsi (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-RCTNetwork (0.71.8): + - RCTTypeSafety (= 0.71.12) + - React-Codegen (= 0.71.12) + - React-Core/RCTImageHeaders (= 0.71.12) + - React-jsi (= 0.71.12) + - React-RCTNetwork (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-RCTLinking (0.71.12): + - React-Codegen (= 0.71.12) + - React-Core/RCTLinkingHeaders (= 0.71.12) + - React-jsi (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-RCTNetwork (0.71.12): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.8) - - React-Codegen (= 0.71.8) - - React-Core/RCTNetworkHeaders (= 0.71.8) - - React-jsi (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-RCTSettings (0.71.8): + - RCTTypeSafety (= 0.71.12) + - React-Codegen (= 0.71.12) + - React-Core/RCTNetworkHeaders (= 0.71.12) + - React-jsi (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-RCTSettings (0.71.12): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.8) - - React-Codegen (= 0.71.8) - - React-Core/RCTSettingsHeaders (= 0.71.8) - - React-jsi (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-RCTText (0.71.8): - - React-Core/RCTTextHeaders (= 0.71.8) - - React-RCTVibration (0.71.8): + - RCTTypeSafety (= 0.71.12) + - React-Codegen (= 0.71.12) + - React-Core/RCTSettingsHeaders (= 0.71.12) + - React-jsi (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-RCTText (0.71.12): + - React-Core/RCTTextHeaders (= 0.71.12) + - React-RCTVibration (0.71.12): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.8) - - React-Core/RCTVibrationHeaders (= 0.71.8) - - React-jsi (= 0.71.8) - - ReactCommon/turbomodule/core (= 0.71.8) - - React-runtimeexecutor (0.71.8): - - React-jsi (= 0.71.8) - - ReactCommon/turbomodule/bridging (0.71.8): + - React-Codegen (= 0.71.12) + - React-Core/RCTVibrationHeaders (= 0.71.12) + - React-jsi (= 0.71.12) + - ReactCommon/turbomodule/core (= 0.71.12) + - React-rncore (0.71.12) + - React-runtimeexecutor (0.71.12): + - React-jsi (= 0.71.12) + - ReactCommon/turbomodule/bridging (0.71.12): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.8) - - React-Core (= 0.71.8) - - React-cxxreact (= 0.71.8) - - React-jsi (= 0.71.8) - - React-logger (= 0.71.8) - - React-perflogger (= 0.71.8) - - ReactCommon/turbomodule/core (0.71.8): + - React-callinvoker (= 0.71.12) + - React-Core (= 0.71.12) + - React-cxxreact (= 0.71.12) + - React-jsi (= 0.71.12) + - React-logger (= 0.71.12) + - React-perflogger (= 0.71.12) + - ReactCommon/turbomodule/core (0.71.12): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.8) - - React-Core (= 0.71.8) - - React-cxxreact (= 0.71.8) - - React-jsi (= 0.71.8) - - React-logger (= 0.71.8) - - React-perflogger (= 0.71.8) + - React-callinvoker (= 0.71.12) + - React-Core (= 0.71.12) + - React-cxxreact (= 0.71.12) + - React-jsi (= 0.71.12) + - React-logger (= 0.71.12) + - React-perflogger (= 0.71.12) - RNAudioPcmStream (1.1.4): - React - RNFS (2.20.0): @@ -469,6 +810,7 @@ DEPENDENCIES: - "onnxruntime-react-native (from `../node_modules/@fugood/onnxruntime-react-native`)" - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) + - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) @@ -479,6 +821,8 @@ DEPENDENCIES: - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) + - React-Fabric (from `../node_modules/react-native/ReactCommon`) + - React-graphics (from `../node_modules/react-native/ReactCommon/react/renderer/graphics`) - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) @@ -492,12 +836,14 @@ DEPENDENCIES: - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - React-RCTAppDelegate (from `../node_modules/react-native/Libraries/AppDelegate`) - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) + - React-RCTFabric (from `../node_modules/react-native/React`) - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) + - React-rncore (from `../node_modules/react-native/ReactCommon`) - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNAudioPcmStream (from `../node_modules/@fugood/react-native-audio-pcm-stream`)" @@ -559,6 +905,10 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/CoreModules" React-cxxreact: :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-Fabric: + :path: "../node_modules/react-native/ReactCommon" + React-graphics: + :path: "../node_modules/react-native/ReactCommon/react/renderer/graphics" React-hermes: :path: "../node_modules/react-native/ReactCommon/hermes" React-jsi: @@ -585,6 +935,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/AppDelegate" React-RCTBlob: :path: "../node_modules/react-native/Libraries/Blob" + React-RCTFabric: + :path: "../node_modules/react-native/React" React-RCTImage: :path: "../node_modules/react-native/Libraries/Image" React-RCTLinking: @@ -597,6 +949,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/Text" React-RCTVibration: :path: "../node_modules/react-native/Libraries/Vibration" + React-rncore: + :path: "../node_modules/react-native/ReactCommon" React-runtimeexecutor: :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" ReactCommon: @@ -614,8 +968,8 @@ SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: f637f31eacba90d4fdeff3fa41608b8f361c173b - FBReactNativeSpec: 0d9a4f4de7ab614c49e98c00aedfd3bfbda33d59 + FBLazyVector: 4eb7ee83e8d0ad7e20a829485295ff48823c4e4c + FBReactNativeSpec: be2df14ea53a93ca2cfcee55312669505eb90c5f Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -631,45 +985,49 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: e87399683ec19e3b812e13c6692882609a802b86 - onnxruntime-react-native: f8718af3e35eb9ce34468b19c51de3c47b652f3c + onnxruntime-react-native: 358007f31fa3e78aaeed173c34d73a1d91429f86 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a - RCTTypeSafety: bee9dd161c175896c680d47ef1d9eaacf2b587f4 - React: d850475db9ba8006a8b875d79e1e0d6ac8a0f8b6 - React-callinvoker: 6a0c75475ddc17c9ed54e4ff0478074a18fd7ab5 - React-Codegen: 786571642e87add634e7f4d299c85314ec6cc158 - React-Core: 1adfab153f59e4f56e09b97a153089f466d7b8aa - React-CoreModules: 958d236715415d4ccdd5fa35c516cf0356637393 - React-cxxreact: 2e7a6283807ce8755c3d501735acd400bec3b5cd - React-hermes: 8102c3112ba32207c3052619be8cfae14bf99d84 - React-jsi: dd29264f041a587e91f994e4be97e86c127742b2 - React-jsiexecutor: 747911ab5921641b4ed7e4900065896597142125 - React-jsinspector: c712f9e3bb9ba4122d6b82b4f906448b8a281580 - React-logger: 342f358b8decfbf8f272367f4eacf4b6154061be + RCTRequired: 4db5e3e18b906377a502da5b358ff159ba4783ed + RCTTypeSafety: 6c1a8aed043050de0d537336c95cd1be7b66c272 + React: 214e77358d860a3ed707fede9088e7c00663a087 + React-callinvoker: 8fc1c79c26fbcadce2a5d4a3cb4b2ced2dec3436 + React-Codegen: d88c22066f9d685c3f67399aa595f7aa7e8ffc6b + React-Core: ea541085ca5be10b2be289c7d82eba368b5c4900 + React-CoreModules: d9680e1d551eef1dd764df736a473cf25f701070 + React-cxxreact: 0792e80e291d086b2cf588410f6bc6e752bc1d83 + React-Fabric: 223723f622a7cb4f77741a3a01fa91f66963aa18 + React-graphics: fa303eb6c3b52de9a8a9e38c7aab022b1ce6d3d4 + React-hermes: 0b1bba58112cb7421f1166d527a1a05489f48dbc + React-jsi: 1e41088515c4273ef5b118575337df4671851430 + React-jsiexecutor: 509cd947c28834614808ce056ee8eb700a0662aa + React-jsinspector: ec4dcbfb1f4e72f04f826a0301eceee5fa7ca540 + React-logger: 35538accacf2583693fbc3ee8b53e69a1776fcee react-native-gcanvas: f333990fb1593272cd66c70275099cdac9e33821 - react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb + react-native-image-picker: c48f133656e69506017e6d0059b3ed024faf2fbd react-native-quick-base64: 62290829c619fbabca4c41cfec75ae759d08fc1c - React-perflogger: d21f182895de9d1b077f8a3cd00011095c8c9100 - React-RCTActionSheet: 0151f83ef92d2a7139bba7dfdbc8066632a6d47b - React-RCTAnimation: 5ec9c0705bb2297549c120fe6473aa3e4a01e215 - React-RCTAppDelegate: 9895fd1b6d1176d88c4b10ddc169b2e1300c91f0 - React-RCTBlob: f3634eb45b6e7480037655e1ca93d1136ac984dd - React-RCTImage: 3c12cb32dec49549ae62ed6cba4018db43841ffc - React-RCTLinking: 310e930ee335ef25481b4a173d9edb64b77895f9 - React-RCTNetwork: b6837841fe88303b0c04c1e3c01992b30f1f5498 - React-RCTSettings: 600d91fe25fa7c16b0ff891304082440f2904b89 - React-RCTText: a0a19f749088280c6def5397ed6211b811e7eef3 - React-RCTVibration: 43ffd976a25f6057a7cf95ea3648ba4e00287f89 - React-runtimeexecutor: 7c51ae9d4b3e9608a2366e39ccaa606aa551b9ed - ReactCommon: 85c98ab0a509e70bf5ee5d9715cf68dbf495b84c + React-perflogger: 75b0e25075c67565a830985f3c373e2eae5389e0 + React-RCTActionSheet: a0c3e916b327e297d124d9ebe8b0c721840ee04d + React-RCTAnimation: 3da7025801d7bf0f8cfd94574d6278d5b82a8b88 + React-RCTAppDelegate: 2ef2a2b0f14b0b8e2ed91f88084801fadee5dee6 + React-RCTBlob: 53252ebabe7777fd1c440a34546c64e16b162908 + React-RCTFabric: 7667a890d204af8a42683133250251e698c67e5c + React-RCTImage: e230761bd34d71362dd8b3d51b5cd72674935aa0 + React-RCTLinking: 3294b1b540005628168e5a341963b0eddc3932e8 + React-RCTNetwork: 00c6b2215e54a9fb015c53a5e02b0a852dbb8568 + React-RCTSettings: 2e7e4964f45e9b24c6c32ad30b6ab2ef4a7e2ffc + React-RCTText: a9c712b13cab90e1432e0ad113edc8bdbc691248 + React-RCTVibration: a283fefb8cc29d9740a7ff2e87f72ad10f25a433 + React-rncore: 1809ecfc14066404da300c0d950876bf95852f87 + React-runtimeexecutor: 7902246857a4ead4166869e6c42d4df329ff721d + ReactCommon: a6d1c76b9e10b439e41db225263341240e1cda9f RNAudioPcmStream: d7491fdfe6bddcebd6ab325df8327014be16743f RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNSoundPlayer: 369105c565b8fe6ea0a43fc882dc81eba444e842 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556 + Yoga: 39310a10944fc864a7550700de349183450f8aaa YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: b10522d68aadff0af5d00cb3edc5a2b89244d56c +PODFILE CHECKSUM: b4c2d6879ff406e99d60213795514b74231b8bc8 COCOAPODS: 1.11.3 From 35d278f7c7a41d4470d623842ad404221c931be9 Mon Sep 17 00:00:00 2001 From: Jhen Date: Wed, 12 Jul 2023 18:17:30 +0800 Subject: [PATCH 19/19] Bump test package --- ios/Podfile.lock | 4 ++-- package.json | 2 +- ...nxruntime-react-native+1.16.0-test18.patch} | 0 yarn.lock | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) rename patches/{@fugood+onnxruntime-react-native+1.16.0-test17.patch => @fugood+onnxruntime-react-native+1.16.0-test18.patch} (100%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 976bd35..555915a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - hermes-engine/Pre-built (0.71.8) - libevent (2.1.12) - onnxruntime-c (1.15.0) - - onnxruntime-react-native (1.16.0-test17): + - onnxruntime-react-native (1.16.0-test18): - onnxruntime-c - React-Core - OpenSSL-Universal (1.1.1100) @@ -985,7 +985,7 @@ SPEC CHECKSUMS: hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 onnxruntime-c: e87399683ec19e3b812e13c6692882609a802b86 - onnxruntime-react-native: 358007f31fa3e78aaeed173c34d73a1d91429f86 + onnxruntime-react-native: 21aa4f7b553a57da110b23619ec5499a13290c66 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 4db5e3e18b906377a502da5b358ff159ba4783ed diff --git a/package.json b/package.json index c2ec951..de57040 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "image-encode": "^1.3.1", "mp3": "^0.1.0", "node-wav": "^0.0.2", - "@fugood/onnxruntime-react-native": "~1.16.0-test17", + "@fugood/onnxruntime-react-native": "~1.16.0-test18", "path-browserify": "^1.0.1", "react": "18.2.0", "react-native": "0.71.12", diff --git a/patches/@fugood+onnxruntime-react-native+1.16.0-test17.patch b/patches/@fugood+onnxruntime-react-native+1.16.0-test18.patch similarity index 100% rename from patches/@fugood+onnxruntime-react-native+1.16.0-test17.patch rename to patches/@fugood+onnxruntime-react-native+1.16.0-test18.patch diff --git a/yarn.lock b/yarn.lock index bb04f35..d6f03df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1191,18 +1191,18 @@ dependencies: "@flyskywhy/react-native-browser-polyfill" "^2.0.1" -"@fugood/onnxruntime-common@~1.16.0-test5": - version "1.16.0-test5" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test5.tgz#7c4a8169f7bcc617d391237c9836eede11e19ffc" - integrity sha512-ZiPUJs6hhN3DCGoTYk/S5aVDuuibvwWclXo/1FoKzwv3fSrgT13XRI3VUWNHgYH/2e0BmyqpbWlxiEGN1OmtGg== +"@fugood/onnxruntime-common@~1.16.0-test6": + version "1.16.0-test6" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-common/-/onnxruntime-common-1.16.0-test6.tgz#eba9840e11c17a0ef273840bc94e908023d64725" + integrity sha512-A6qLvq2ryHRqXCcgLL4OAFLyAuXbRVnD6Edrv966DB9fwo1EMs9yVmJQY6FihUNsKSSN8PBewFRkjcRZd75x/A== -"@fugood/onnxruntime-react-native@~1.16.0-test17": - version "1.16.0-test17" - resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test17.tgz#44b37444ab7c1b37be37d019f0cd1eb06b9f3de0" - integrity sha512-aVJfpyVYyg/o6YNce8boBaOJtGZF1tLqejpODbig5TPb/5AHEtVwAvHuf+cUpENlllO2btqwQwKrZXZD88ePTg== +"@fugood/onnxruntime-react-native@~1.16.0-test18": + version "1.16.0-test18" + resolved "https://registry.yarnpkg.com/@fugood/onnxruntime-react-native/-/onnxruntime-react-native-1.16.0-test18.tgz#191b486096464e97d5511472e0ef18e28012a681" + integrity sha512-0LIY3I6kgsy6KT4/5Sm7e+onbfBppdoj1lctdENvaTugvawBPHCKidSfURaIrngzHeE2RUEyx8Wid54FEgH9oQ== dependencies: "@expo/config-plugins" "^4.1.5" - "@fugood/onnxruntime-common" "~1.16.0-test5" + "@fugood/onnxruntime-common" "~1.16.0-test6" buffer "^6.0.3" "@fugood/react-native-audio-pcm-stream@^1.1.4":