diff --git a/.yarn/cache/@babel-plugin-transform-object-assign-npm-7.18.6-73b4680d00-a9738264cc.zip b/.yarn/cache/@babel-plugin-transform-object-assign-npm-7.18.6-73b4680d00-a9738264cc.zip deleted file mode 100644 index dd78f5be1..000000000 Binary files a/.yarn/cache/@babel-plugin-transform-object-assign-npm-7.18.6-73b4680d00-a9738264cc.zip and /dev/null differ diff --git a/.yarn/cache/@cnakazawa-watch-npm-1.0.4-ee43493884-88f395ca0a.zip b/.yarn/cache/@cnakazawa-watch-npm-1.0.4-ee43493884-88f395ca0a.zip deleted file mode 100644 index fa43fc403..000000000 Binary files a/.yarn/cache/@cnakazawa-watch-npm-1.0.4-ee43493884-88f395ca0a.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-clean-npm-9.2.1-6349a1f9dd-52286695a7.zip b/.yarn/cache/@react-native-community-cli-clean-npm-9.2.1-6349a1f9dd-52286695a7.zip new file mode 100644 index 000000000..86aee2109 Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-clean-npm-9.2.1-6349a1f9dd-52286695a7.zip differ diff --git a/.yarn/cache/@react-native-community-cli-config-npm-9.2.1-97d88ff25d-95a6f8f380.zip b/.yarn/cache/@react-native-community-cli-config-npm-9.2.1-97d88ff25d-95a6f8f380.zip new file mode 100644 index 000000000..2625c7801 Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-config-npm-9.2.1-97d88ff25d-95a6f8f380.zip differ diff --git a/.yarn/cache/@react-native-community-cli-debugger-ui-npm-6.0.0-2fe2fdbecc-3257e7efcd.zip b/.yarn/cache/@react-native-community-cli-debugger-ui-npm-6.0.0-2fe2fdbecc-3257e7efcd.zip deleted file mode 100644 index a05fdb17b..000000000 Binary files a/.yarn/cache/@react-native-community-cli-debugger-ui-npm-6.0.0-2fe2fdbecc-3257e7efcd.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-debugger-ui-npm-9.0.0-e0a8e4c0f4-32e16e3d5c.zip b/.yarn/cache/@react-native-community-cli-debugger-ui-npm-9.0.0-e0a8e4c0f4-32e16e3d5c.zip new file mode 100644 index 000000000..bb8437ae9 Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-debugger-ui-npm-9.0.0-e0a8e4c0f4-32e16e3d5c.zip differ diff --git a/.yarn/cache/@react-native-community-cli-doctor-npm-9.3.0-1f0e974871-5bea6203f0.zip b/.yarn/cache/@react-native-community-cli-doctor-npm-9.3.0-1f0e974871-5bea6203f0.zip new file mode 100644 index 000000000..b6e287297 Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-doctor-npm-9.3.0-1f0e974871-5bea6203f0.zip differ diff --git a/.yarn/cache/@react-native-community-cli-hermes-npm-6.3.1-d4e1415d02-7e82764c85.zip b/.yarn/cache/@react-native-community-cli-hermes-npm-6.3.1-d4e1415d02-7e82764c85.zip deleted file mode 100644 index 5bd78c7ae..000000000 Binary files a/.yarn/cache/@react-native-community-cli-hermes-npm-6.3.1-d4e1415d02-7e82764c85.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-hermes-npm-9.3.1-d9f6748277-2e021c64de.zip b/.yarn/cache/@react-native-community-cli-hermes-npm-9.3.1-d9f6748277-2e021c64de.zip new file mode 100644 index 000000000..02e1a0dcb Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-hermes-npm-9.3.1-d9f6748277-2e021c64de.zip differ diff --git a/.yarn/cache/@react-native-community-cli-npm-6.4.0-f99ee73e09-d42cf2f918.zip b/.yarn/cache/@react-native-community-cli-npm-6.4.0-f99ee73e09-d42cf2f918.zip deleted file mode 100644 index 1dc965c13..000000000 Binary files a/.yarn/cache/@react-native-community-cli-npm-6.4.0-f99ee73e09-d42cf2f918.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-npm-9.3.2-97adb6de6a-474711ebfa.zip b/.yarn/cache/@react-native-community-cli-npm-9.3.2-97adb6de6a-474711ebfa.zip new file mode 100644 index 000000000..702c2db2a Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-npm-9.3.2-97adb6de6a-474711ebfa.zip differ diff --git a/.yarn/cache/@react-native-community-cli-platform-android-npm-6.3.1-ea00774117-cb4d649213.zip b/.yarn/cache/@react-native-community-cli-platform-android-npm-6.3.1-ea00774117-cb4d649213.zip deleted file mode 100644 index ea8a26953..000000000 Binary files a/.yarn/cache/@react-native-community-cli-platform-android-npm-6.3.1-ea00774117-cb4d649213.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-platform-android-npm-9.3.1-9f8db2d8b6-147b581ce8.zip b/.yarn/cache/@react-native-community-cli-platform-android-npm-9.3.1-9f8db2d8b6-147b581ce8.zip new file mode 100644 index 000000000..2a1291381 Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-platform-android-npm-9.3.1-9f8db2d8b6-147b581ce8.zip differ diff --git a/.yarn/cache/@react-native-community-cli-platform-ios-npm-6.2.1-24c88dc83c-40c5a33183.zip b/.yarn/cache/@react-native-community-cli-platform-ios-npm-6.2.1-24c88dc83c-40c5a33183.zip deleted file mode 100644 index 6749ca72f..000000000 Binary files a/.yarn/cache/@react-native-community-cli-platform-ios-npm-6.2.1-24c88dc83c-40c5a33183.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-platform-ios-npm-9.3.0-33444e0785-c4bf882af9.zip b/.yarn/cache/@react-native-community-cli-platform-ios-npm-9.3.0-33444e0785-c4bf882af9.zip new file mode 100644 index 000000000..02913798e Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-platform-ios-npm-9.3.0-33444e0785-c4bf882af9.zip differ diff --git a/.yarn/cache/@react-native-community-cli-plugin-metro-npm-6.4.0-e11835f12d-b9bedad5da.zip b/.yarn/cache/@react-native-community-cli-plugin-metro-npm-6.4.0-e11835f12d-b9bedad5da.zip deleted file mode 100644 index 852f4845d..000000000 Binary files a/.yarn/cache/@react-native-community-cli-plugin-metro-npm-6.4.0-e11835f12d-b9bedad5da.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-plugin-metro-npm-9.2.1-69372e40e4-1581eb5515.zip b/.yarn/cache/@react-native-community-cli-plugin-metro-npm-9.2.1-69372e40e4-1581eb5515.zip new file mode 100644 index 000000000..5f020065c Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-plugin-metro-npm-9.2.1-69372e40e4-1581eb5515.zip differ diff --git a/.yarn/cache/@react-native-community-cli-server-api-npm-6.4.3-3043b25a6d-52b36ebbfc.zip b/.yarn/cache/@react-native-community-cli-server-api-npm-6.4.3-3043b25a6d-52b36ebbfc.zip deleted file mode 100644 index 5f6da8b82..000000000 Binary files a/.yarn/cache/@react-native-community-cli-server-api-npm-6.4.3-3043b25a6d-52b36ebbfc.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-server-api-npm-9.2.1-231adb9de2-0452310b2d.zip b/.yarn/cache/@react-native-community-cli-server-api-npm-9.2.1-231adb9de2-0452310b2d.zip new file mode 100644 index 000000000..4d415c514 Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-server-api-npm-9.2.1-231adb9de2-0452310b2d.zip differ diff --git a/.yarn/cache/@react-native-community-cli-tools-npm-6.2.1-6e5ab60320-dcc5084c0c.zip b/.yarn/cache/@react-native-community-cli-tools-npm-6.2.1-6e5ab60320-dcc5084c0c.zip deleted file mode 100644 index 18f1e767d..000000000 Binary files a/.yarn/cache/@react-native-community-cli-tools-npm-6.2.1-6e5ab60320-dcc5084c0c.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-tools-npm-9.2.1-f1be628cdb-8f99ec43b5.zip b/.yarn/cache/@react-native-community-cli-tools-npm-9.2.1-f1be628cdb-8f99ec43b5.zip new file mode 100644 index 000000000..6ce609178 Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-tools-npm-9.2.1-f1be628cdb-8f99ec43b5.zip differ diff --git a/.yarn/cache/@react-native-community-cli-types-npm-6.0.0-0e4bd3b1fe-7ef1a4e5e3.zip b/.yarn/cache/@react-native-community-cli-types-npm-6.0.0-0e4bd3b1fe-7ef1a4e5e3.zip deleted file mode 100644 index 158e67982..000000000 Binary files a/.yarn/cache/@react-native-community-cli-types-npm-6.0.0-0e4bd3b1fe-7ef1a4e5e3.zip and /dev/null differ diff --git a/.yarn/cache/@react-native-community-cli-types-npm-9.1.0-7c2519566d-4ac2b9ba8f.zip b/.yarn/cache/@react-native-community-cli-types-npm-9.1.0-7c2519566d-4ac2b9ba8f.zip new file mode 100644 index 000000000..cf06072be Binary files /dev/null and b/.yarn/cache/@react-native-community-cli-types-npm-9.1.0-7c2519566d-4ac2b9ba8f.zip differ diff --git a/.yarn/cache/@types-react-native-npm-0.67.15-d5fa496bd5-303648aff9.zip b/.yarn/cache/@types-react-native-npm-0.67.15-d5fa496bd5-303648aff9.zip deleted file mode 100644 index 247d5a1d5..000000000 Binary files a/.yarn/cache/@types-react-native-npm-0.67.15-d5fa496bd5-303648aff9.zip and /dev/null differ diff --git a/.yarn/cache/@types-react-native-npm-0.70.6-b15571903f-1b620095dd.zip b/.yarn/cache/@types-react-native-npm-0.70.6-b15571903f-1b620095dd.zip new file mode 100644 index 000000000..232042be6 Binary files /dev/null and b/.yarn/cache/@types-react-native-npm-0.70.6-b15571903f-1b620095dd.zip differ diff --git a/.yarn/cache/big-integer-npm-1.6.51-1a244d8e1f-3d444173d1.zip b/.yarn/cache/big-integer-npm-1.6.51-1a244d8e1f-3d444173d1.zip deleted file mode 100644 index 2961dbcc0..000000000 Binary files a/.yarn/cache/big-integer-npm-1.6.51-1a244d8e1f-3d444173d1.zip and /dev/null differ diff --git a/.yarn/cache/bplist-creator-npm-0.1.1-46ec2e397c-b0d40d1d16.zip b/.yarn/cache/bplist-creator-npm-0.1.1-46ec2e397c-b0d40d1d16.zip deleted file mode 100644 index 629c00cc5..000000000 Binary files a/.yarn/cache/bplist-creator-npm-0.1.1-46ec2e397c-b0d40d1d16.zip and /dev/null differ diff --git a/.yarn/cache/bplist-parser-npm-0.3.2-94c89d7427-fad0f6eb15.zip b/.yarn/cache/bplist-parser-npm-0.3.2-94c89d7427-fad0f6eb15.zip deleted file mode 100644 index d7747c8dc..000000000 Binary files a/.yarn/cache/bplist-parser-npm-0.3.2-94c89d7427-fad0f6eb15.zip and /dev/null differ diff --git a/.yarn/cache/browser-process-hrtime-npm-1.0.0-db700805c2-e30f868cdb.zip b/.yarn/cache/browser-process-hrtime-npm-1.0.0-db700805c2-e30f868cdb.zip new file mode 100644 index 000000000..a2de0dc57 Binary files /dev/null and b/.yarn/cache/browser-process-hrtime-npm-1.0.0-db700805c2-e30f868cdb.zip differ diff --git a/.yarn/cache/bunyan-debug-stream-npm-2.0.1-bb259d44e6-a43f6c2946.zip b/.yarn/cache/bunyan-debug-stream-npm-2.0.1-bb259d44e6-a43f6c2946.zip deleted file mode 100644 index eb412ecee..000000000 Binary files a/.yarn/cache/bunyan-debug-stream-npm-2.0.1-bb259d44e6-a43f6c2946.zip and /dev/null differ diff --git a/.yarn/cache/bunyan-debug-stream-npm-3.1.0-5c8d1deb0f-38a89a711d.zip b/.yarn/cache/bunyan-debug-stream-npm-3.1.0-5c8d1deb0f-38a89a711d.zip new file mode 100644 index 000000000..4bb32c78b Binary files /dev/null and b/.yarn/cache/bunyan-debug-stream-npm-3.1.0-5c8d1deb0f-38a89a711d.zip differ diff --git a/.yarn/cache/caf-npm-15.0.1-94adddebfd-832cc5d3a6.zip b/.yarn/cache/caf-npm-15.0.1-94adddebfd-832cc5d3a6.zip new file mode 100644 index 000000000..c9b3962a8 Binary files /dev/null and b/.yarn/cache/caf-npm-15.0.1-94adddebfd-832cc5d3a6.zip differ diff --git a/.yarn/cache/capture-exit-npm-2.0.0-564874b447-0b9f10daca.zip b/.yarn/cache/capture-exit-npm-2.0.0-564874b447-0b9f10daca.zip deleted file mode 100644 index dc17eae1b..000000000 Binary files a/.yarn/cache/capture-exit-npm-2.0.0-564874b447-0b9f10daca.zip and /dev/null differ diff --git a/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip b/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip deleted file mode 100644 index b8aff0b46..000000000 Binary files a/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip and /dev/null differ diff --git a/.yarn/cache/colors-npm-1.4.0-7e2cf12234-98aa2c2418.zip b/.yarn/cache/colors-npm-1.4.0-7e2cf12234-98aa2c2418.zip deleted file mode 100644 index 74451b04a..000000000 Binary files a/.yarn/cache/colors-npm-1.4.0-7e2cf12234-98aa2c2418.zip and /dev/null differ diff --git a/.yarn/cache/detox-npm-19.12.5-72644b4e85-b4ce730928.zip b/.yarn/cache/detox-npm-20.0.3-75c2714876-d47abef82f.zip similarity index 51% rename from .yarn/cache/detox-npm-19.12.5-72644b4e85-b4ce730928.zip rename to .yarn/cache/detox-npm-20.0.3-75c2714876-d47abef82f.zip index 7f0896979..5c5ff6458 100644 Binary files a/.yarn/cache/detox-npm-19.12.5-72644b4e85-b4ce730928.zip and b/.yarn/cache/detox-npm-20.0.3-75c2714876-d47abef82f.zip differ diff --git a/.yarn/cache/duplexer2-npm-0.1.4-6bca6bef12-744961f03c.zip b/.yarn/cache/duplexer2-npm-0.1.4-6bca6bef12-744961f03c.zip new file mode 100644 index 000000000..cb6fed9be Binary files /dev/null and b/.yarn/cache/duplexer2-npm-0.1.4-6bca6bef12-744961f03c.zip differ diff --git a/.yarn/cache/easy-stack-npm-1.0.1-cb6e2497d3-161a99e497.zip b/.yarn/cache/easy-stack-npm-1.0.1-cb6e2497d3-161a99e497.zip new file mode 100644 index 000000000..0d5e61052 Binary files /dev/null and b/.yarn/cache/easy-stack-npm-1.0.1-cb6e2497d3-161a99e497.zip differ diff --git a/.yarn/cache/event-pubsub-npm-4.3.0-cff6d9d596-6940f57790.zip b/.yarn/cache/event-pubsub-npm-4.3.0-cff6d9d596-6940f57790.zip new file mode 100644 index 000000000..b62984b4d Binary files /dev/null and b/.yarn/cache/event-pubsub-npm-4.3.0-cff6d9d596-6940f57790.zip differ diff --git a/.yarn/cache/exception-formatter-npm-1.0.7-9488582b79-31c197e799.zip b/.yarn/cache/exception-formatter-npm-1.0.7-9488582b79-31c197e799.zip deleted file mode 100644 index a4f433f16..000000000 Binary files a/.yarn/cache/exception-formatter-npm-1.0.7-9488582b79-31c197e799.zip and /dev/null differ diff --git a/.yarn/cache/exec-sh-npm-0.3.6-8a29d03ae2-0be4f06929.zip b/.yarn/cache/exec-sh-npm-0.3.6-8a29d03ae2-0be4f06929.zip deleted file mode 100644 index 5fc0b4ce7..000000000 Binary files a/.yarn/cache/exec-sh-npm-0.3.6-8a29d03ae2-0be4f06929.zip and /dev/null differ diff --git a/.yarn/cache/hermes-engine-npm-0.9.0-fc80b013c1-384549c544.zip b/.yarn/cache/hermes-engine-npm-0.9.0-fc80b013c1-384549c544.zip deleted file mode 100644 index 354c82fbf..000000000 Binary files a/.yarn/cache/hermes-engine-npm-0.9.0-fc80b013c1-384549c544.zip and /dev/null differ diff --git a/.yarn/cache/hermes-estree-npm-0.8.0-3f1c3da3ff-3a169d1751.zip b/.yarn/cache/hermes-estree-npm-0.8.0-3f1c3da3ff-3a169d1751.zip new file mode 100644 index 000000000..d10d77803 Binary files /dev/null and b/.yarn/cache/hermes-estree-npm-0.8.0-3f1c3da3ff-3a169d1751.zip differ diff --git a/.yarn/cache/hermes-parser-npm-0.4.7-b02281cf14-1210d9139b.zip b/.yarn/cache/hermes-parser-npm-0.4.7-b02281cf14-1210d9139b.zip deleted file mode 100644 index b2d98ed24..000000000 Binary files a/.yarn/cache/hermes-parser-npm-0.4.7-b02281cf14-1210d9139b.zip and /dev/null differ diff --git a/.yarn/cache/hermes-parser-npm-0.8.0-c19ebd64cf-0c992bdc6c.zip b/.yarn/cache/hermes-parser-npm-0.8.0-c19ebd64cf-0c992bdc6c.zip new file mode 100644 index 000000000..d3ee6e63d Binary files /dev/null and b/.yarn/cache/hermes-parser-npm-0.8.0-c19ebd64cf-0c992bdc6c.zip differ diff --git a/.yarn/cache/jest-haste-map-npm-26.6.2-16ea967617-8ad5236d56.zip b/.yarn/cache/jest-haste-map-npm-26.6.2-16ea967617-8ad5236d56.zip deleted file mode 100644 index 5e0561607..000000000 Binary files a/.yarn/cache/jest-haste-map-npm-26.6.2-16ea967617-8ad5236d56.zip and /dev/null differ diff --git a/.yarn/cache/jest-regex-util-npm-26.0.0-310f72dd82-930a00665e.zip b/.yarn/cache/jest-regex-util-npm-27.5.1-2fc9b32d99-d45ca7a954.zip similarity index 52% rename from .yarn/cache/jest-regex-util-npm-26.0.0-310f72dd82-930a00665e.zip rename to .yarn/cache/jest-regex-util-npm-27.5.1-2fc9b32d99-d45ca7a954.zip index fcd300560..1a91970b1 100644 Binary files a/.yarn/cache/jest-regex-util-npm-26.0.0-310f72dd82-930a00665e.zip and b/.yarn/cache/jest-regex-util-npm-27.5.1-2fc9b32d99-d45ca7a954.zip differ diff --git a/.yarn/cache/jest-serializer-npm-26.6.2-0907990487-dbecfb0d01.zip b/.yarn/cache/jest-serializer-npm-26.6.2-0907990487-dbecfb0d01.zip deleted file mode 100644 index 2c290c1ae..000000000 Binary files a/.yarn/cache/jest-serializer-npm-26.6.2-0907990487-dbecfb0d01.zip and /dev/null differ diff --git a/.yarn/cache/jest-serializer-npm-27.5.1-7cec732598-803e03a552.zip b/.yarn/cache/jest-serializer-npm-27.5.1-7cec732598-803e03a552.zip new file mode 100644 index 000000000..979047dbe Binary files /dev/null and b/.yarn/cache/jest-serializer-npm-27.5.1-7cec732598-803e03a552.zip differ diff --git a/.yarn/cache/jest-util-npm-26.6.2-28a10c2acf-3c6a5fba05.zip b/.yarn/cache/jest-util-npm-26.6.2-28a10c2acf-3c6a5fba05.zip deleted file mode 100644 index 333dff3e9..000000000 Binary files a/.yarn/cache/jest-util-npm-26.6.2-28a10c2acf-3c6a5fba05.zip and /dev/null differ diff --git a/.yarn/cache/jest-util-npm-27.5.1-26e68baa39-ac8d122f6d.zip b/.yarn/cache/jest-util-npm-27.5.1-26e68baa39-ac8d122f6d.zip new file mode 100644 index 000000000..179da8ed9 Binary files /dev/null and b/.yarn/cache/jest-util-npm-27.5.1-26e68baa39-ac8d122f6d.zip differ diff --git a/.yarn/cache/jetifier-npm-1.6.8-940248aabe-6cdecf7683.zip b/.yarn/cache/jetifier-npm-1.6.8-940248aabe-6cdecf7683.zip deleted file mode 100644 index 8fcc4b278..000000000 Binary files a/.yarn/cache/jetifier-npm-1.6.8-940248aabe-6cdecf7683.zip and /dev/null differ diff --git a/.yarn/cache/js-message-npm-1.0.7-16c7d7d27e-18dcc4d803.zip b/.yarn/cache/js-message-npm-1.0.7-16c7d7d27e-18dcc4d803.zip new file mode 100644 index 000000000..29ac6d283 Binary files /dev/null and b/.yarn/cache/js-message-npm-1.0.7-16c7d7d27e-18dcc4d803.zip differ diff --git a/.yarn/cache/js-queue-npm-2.0.2-e207cc4f8e-5049c3f648.zip b/.yarn/cache/js-queue-npm-2.0.2-e207cc4f8e-5049c3f648.zip new file mode 100644 index 000000000..24a2370ee Binary files /dev/null and b/.yarn/cache/js-queue-npm-2.0.2-e207cc4f8e-5049c3f648.zip differ diff --git a/.yarn/cache/jscodeshift-npm-0.11.0-1f09880900-647dc36a50.zip b/.yarn/cache/jscodeshift-npm-0.13.1-19f790d465-1c35938de5.zip similarity index 55% rename from .yarn/cache/jscodeshift-npm-0.11.0-1f09880900-647dc36a50.zip rename to .yarn/cache/jscodeshift-npm-0.13.1-19f790d465-1c35938de5.zip index 5342f7b81..172b08a67 100644 Binary files a/.yarn/cache/jscodeshift-npm-0.11.0-1f09880900-647dc36a50.zip and b/.yarn/cache/jscodeshift-npm-0.13.1-19f790d465-1c35938de5.zip differ diff --git a/.yarn/cache/json-cycle-npm-1.3.0-eeff202ca9-68237ba5c5.zip b/.yarn/cache/json-cycle-npm-1.3.0-eeff202ca9-68237ba5c5.zip new file mode 100644 index 000000000..8ec669058 Binary files /dev/null and b/.yarn/cache/json-cycle-npm-1.3.0-eeff202ca9-68237ba5c5.zip differ diff --git a/.yarn/cache/log-symbols-npm-2.2.0-9541ad4da6-4c95e3b65f.zip b/.yarn/cache/log-symbols-npm-2.2.0-9541ad4da6-4c95e3b65f.zip deleted file mode 100644 index 7a3fd5229..000000000 Binary files a/.yarn/cache/log-symbols-npm-2.2.0-9541ad4da6-4c95e3b65f.zip and /dev/null differ diff --git a/.yarn/cache/memoize-one-npm-5.2.1-ee0f8be979-a3cba7b824.zip b/.yarn/cache/memoize-one-npm-5.2.1-ee0f8be979-a3cba7b824.zip new file mode 100644 index 000000000..4359bd8a8 Binary files /dev/null and b/.yarn/cache/memoize-one-npm-5.2.1-ee0f8be979-a3cba7b824.zip differ diff --git a/.yarn/cache/metro-babel-register-npm-0.66.2-ba8aecd63d-03a467a814.zip b/.yarn/cache/metro-babel-register-npm-0.66.2-ba8aecd63d-03a467a814.zip deleted file mode 100644 index 3963533d2..000000000 Binary files a/.yarn/cache/metro-babel-register-npm-0.66.2-ba8aecd63d-03a467a814.zip and /dev/null differ diff --git a/.yarn/cache/metro-babel-transformer-npm-0.66.2-bbf4b8e7ea-fbec39283d.zip b/.yarn/cache/metro-babel-transformer-npm-0.66.2-bbf4b8e7ea-fbec39283d.zip deleted file mode 100644 index 03258caaf..000000000 Binary files a/.yarn/cache/metro-babel-transformer-npm-0.66.2-bbf4b8e7ea-fbec39283d.zip and /dev/null differ diff --git a/.yarn/cache/metro-babel-transformer-npm-0.72.3-1032df83ee-6bce52a924.zip b/.yarn/cache/metro-babel-transformer-npm-0.72.3-1032df83ee-6bce52a924.zip new file mode 100644 index 000000000..4cccb96b5 Binary files /dev/null and b/.yarn/cache/metro-babel-transformer-npm-0.72.3-1032df83ee-6bce52a924.zip differ diff --git a/.yarn/cache/metro-cache-key-npm-0.66.2-217c4adb14-c252fc9f67.zip b/.yarn/cache/metro-cache-key-npm-0.66.2-217c4adb14-c252fc9f67.zip deleted file mode 100644 index 1bc768448..000000000 Binary files a/.yarn/cache/metro-cache-key-npm-0.66.2-217c4adb14-c252fc9f67.zip and /dev/null differ diff --git a/.yarn/cache/metro-cache-key-npm-0.72.3-8b0539f89f-e188147435.zip b/.yarn/cache/metro-cache-key-npm-0.72.3-8b0539f89f-e188147435.zip new file mode 100644 index 000000000..d5745bd82 Binary files /dev/null and b/.yarn/cache/metro-cache-key-npm-0.72.3-8b0539f89f-e188147435.zip differ diff --git a/.yarn/cache/metro-cache-npm-0.66.2-c4da3f1b37-10dcc142e2.zip b/.yarn/cache/metro-cache-npm-0.66.2-c4da3f1b37-10dcc142e2.zip deleted file mode 100644 index 2c37a0444..000000000 Binary files a/.yarn/cache/metro-cache-npm-0.66.2-c4da3f1b37-10dcc142e2.zip and /dev/null differ diff --git a/.yarn/cache/metro-cache-npm-0.72.3-a54187ab96-958e304333.zip b/.yarn/cache/metro-cache-npm-0.72.3-a54187ab96-958e304333.zip new file mode 100644 index 000000000..4bcdfc73f Binary files /dev/null and b/.yarn/cache/metro-cache-npm-0.72.3-a54187ab96-958e304333.zip differ diff --git a/.yarn/cache/metro-config-npm-0.66.2-e011950457-9ea7732677.zip b/.yarn/cache/metro-config-npm-0.66.2-e011950457-9ea7732677.zip deleted file mode 100644 index 7801004e5..000000000 Binary files a/.yarn/cache/metro-config-npm-0.66.2-e011950457-9ea7732677.zip and /dev/null differ diff --git a/.yarn/cache/metro-config-npm-0.72.3-c151597b7d-c4dff3f2c6.zip b/.yarn/cache/metro-config-npm-0.72.3-c151597b7d-c4dff3f2c6.zip new file mode 100644 index 000000000..56babc5a7 Binary files /dev/null and b/.yarn/cache/metro-config-npm-0.72.3-c151597b7d-c4dff3f2c6.zip differ diff --git a/.yarn/cache/metro-core-npm-0.66.2-b508042422-cfaacdac2c.zip b/.yarn/cache/metro-core-npm-0.66.2-b508042422-cfaacdac2c.zip deleted file mode 100644 index 1ac56f8f0..000000000 Binary files a/.yarn/cache/metro-core-npm-0.66.2-b508042422-cfaacdac2c.zip and /dev/null differ diff --git a/.yarn/cache/metro-core-npm-0.72.3-2cba08ec8f-0a94f5d4b6.zip b/.yarn/cache/metro-core-npm-0.72.3-2cba08ec8f-0a94f5d4b6.zip new file mode 100644 index 000000000..8506d5182 Binary files /dev/null and b/.yarn/cache/metro-core-npm-0.72.3-2cba08ec8f-0a94f5d4b6.zip differ diff --git a/.yarn/cache/metro-file-map-npm-0.72.3-82873da89c-1c233a6843.zip b/.yarn/cache/metro-file-map-npm-0.72.3-82873da89c-1c233a6843.zip new file mode 100644 index 000000000..2d366ff3a Binary files /dev/null and b/.yarn/cache/metro-file-map-npm-0.72.3-82873da89c-1c233a6843.zip differ diff --git a/.yarn/cache/metro-hermes-compiler-npm-0.66.2-6e3fbf38a1-c1dc1627d0.zip b/.yarn/cache/metro-hermes-compiler-npm-0.66.2-6e3fbf38a1-c1dc1627d0.zip deleted file mode 100644 index 625c77756..000000000 Binary files a/.yarn/cache/metro-hermes-compiler-npm-0.66.2-6e3fbf38a1-c1dc1627d0.zip and /dev/null differ diff --git a/.yarn/cache/metro-hermes-compiler-npm-0.72.3-acc052cb31-ccf58abeae.zip b/.yarn/cache/metro-hermes-compiler-npm-0.72.3-acc052cb31-ccf58abeae.zip new file mode 100644 index 000000000..e4d8a4857 Binary files /dev/null and b/.yarn/cache/metro-hermes-compiler-npm-0.72.3-acc052cb31-ccf58abeae.zip differ diff --git a/.yarn/cache/metro-inspector-proxy-npm-0.66.2-21a94df61b-3f85acc4b3.zip b/.yarn/cache/metro-inspector-proxy-npm-0.66.2-21a94df61b-3f85acc4b3.zip deleted file mode 100644 index 7f607645c..000000000 Binary files a/.yarn/cache/metro-inspector-proxy-npm-0.66.2-21a94df61b-3f85acc4b3.zip and /dev/null differ diff --git a/.yarn/cache/metro-inspector-proxy-npm-0.72.3-a64cf7f814-0fef6c59c3.zip b/.yarn/cache/metro-inspector-proxy-npm-0.72.3-a64cf7f814-0fef6c59c3.zip new file mode 100644 index 000000000..5495c1083 Binary files /dev/null and b/.yarn/cache/metro-inspector-proxy-npm-0.72.3-a64cf7f814-0fef6c59c3.zip differ diff --git a/.yarn/cache/metro-minify-uglify-npm-0.66.2-9cebec63b4-15ceb1b21c.zip b/.yarn/cache/metro-minify-uglify-npm-0.66.2-9cebec63b4-15ceb1b21c.zip deleted file mode 100644 index 32e895bbe..000000000 Binary files a/.yarn/cache/metro-minify-uglify-npm-0.66.2-9cebec63b4-15ceb1b21c.zip and /dev/null differ diff --git a/.yarn/cache/metro-minify-uglify-npm-0.72.3-ab7cf48a35-6384a85fec.zip b/.yarn/cache/metro-minify-uglify-npm-0.72.3-ab7cf48a35-6384a85fec.zip new file mode 100644 index 000000000..ec19a42b7 Binary files /dev/null and b/.yarn/cache/metro-minify-uglify-npm-0.72.3-ab7cf48a35-6384a85fec.zip differ diff --git a/.yarn/cache/metro-npm-0.66.2-6bf2522f94-0c677fe631.zip b/.yarn/cache/metro-npm-0.66.2-6bf2522f94-0c677fe631.zip deleted file mode 100644 index 1c810e230..000000000 Binary files a/.yarn/cache/metro-npm-0.66.2-6bf2522f94-0c677fe631.zip and /dev/null differ diff --git a/.yarn/cache/metro-npm-0.72.3-daf8bfe4b8-03bdd94e78.zip b/.yarn/cache/metro-npm-0.72.3-daf8bfe4b8-03bdd94e78.zip new file mode 100644 index 000000000..7a32f1bff Binary files /dev/null and b/.yarn/cache/metro-npm-0.72.3-daf8bfe4b8-03bdd94e78.zip differ diff --git a/.yarn/cache/metro-react-native-babel-preset-npm-0.66.2-9b82d55432-c490c73d3a.zip b/.yarn/cache/metro-react-native-babel-preset-npm-0.66.2-9b82d55432-c490c73d3a.zip deleted file mode 100644 index 6aa90a371..000000000 Binary files a/.yarn/cache/metro-react-native-babel-preset-npm-0.66.2-9b82d55432-c490c73d3a.zip and /dev/null differ diff --git a/.yarn/cache/metro-react-native-babel-preset-npm-0.70.3-af4ec5f177-9abd3d811a.zip b/.yarn/cache/metro-react-native-babel-preset-npm-0.70.3-af4ec5f177-9abd3d811a.zip deleted file mode 100644 index afe8a1b13..000000000 Binary files a/.yarn/cache/metro-react-native-babel-preset-npm-0.70.3-af4ec5f177-9abd3d811a.zip and /dev/null differ diff --git a/.yarn/cache/metro-react-native-babel-preset-npm-0.72.3-4fe8d0145f-678595fe00.zip b/.yarn/cache/metro-react-native-babel-preset-npm-0.72.3-4fe8d0145f-678595fe00.zip new file mode 100644 index 000000000..aa6fb73da Binary files /dev/null and b/.yarn/cache/metro-react-native-babel-preset-npm-0.72.3-4fe8d0145f-678595fe00.zip differ diff --git a/.yarn/cache/metro-react-native-babel-preset-npm-0.73.3-ff13c38e3c-ff34a049ee.zip b/.yarn/cache/metro-react-native-babel-preset-npm-0.73.3-ff13c38e3c-ff34a049ee.zip new file mode 100644 index 000000000..c301c0604 Binary files /dev/null and b/.yarn/cache/metro-react-native-babel-preset-npm-0.73.3-ff13c38e3c-ff34a049ee.zip differ diff --git a/.yarn/cache/metro-react-native-babel-transformer-npm-0.66.2-3b693e976f-b849306f06.zip b/.yarn/cache/metro-react-native-babel-transformer-npm-0.66.2-3b693e976f-b849306f06.zip deleted file mode 100644 index 45971b5f0..000000000 Binary files a/.yarn/cache/metro-react-native-babel-transformer-npm-0.66.2-3b693e976f-b849306f06.zip and /dev/null differ diff --git a/.yarn/cache/metro-react-native-babel-transformer-npm-0.72.3-750097146b-e9ae85eb4b.zip b/.yarn/cache/metro-react-native-babel-transformer-npm-0.72.3-750097146b-e9ae85eb4b.zip new file mode 100644 index 000000000..b479f3fa6 Binary files /dev/null and b/.yarn/cache/metro-react-native-babel-transformer-npm-0.72.3-750097146b-e9ae85eb4b.zip differ diff --git a/.yarn/cache/metro-resolver-npm-0.66.2-8422b00485-c0e80230b6.zip b/.yarn/cache/metro-resolver-npm-0.66.2-8422b00485-c0e80230b6.zip deleted file mode 100644 index 3364091ae..000000000 Binary files a/.yarn/cache/metro-resolver-npm-0.66.2-8422b00485-c0e80230b6.zip and /dev/null differ diff --git a/.yarn/cache/metro-resolver-npm-0.72.3-3a83b9897f-bbf502a153.zip b/.yarn/cache/metro-resolver-npm-0.72.3-3a83b9897f-bbf502a153.zip new file mode 100644 index 000000000..db94c4d34 Binary files /dev/null and b/.yarn/cache/metro-resolver-npm-0.72.3-3a83b9897f-bbf502a153.zip differ diff --git a/.yarn/cache/metro-runtime-npm-0.66.2-be1c8a1d72-7b51abc53a.zip b/.yarn/cache/metro-runtime-npm-0.66.2-be1c8a1d72-7b51abc53a.zip deleted file mode 100644 index cbacc9eef..000000000 Binary files a/.yarn/cache/metro-runtime-npm-0.66.2-be1c8a1d72-7b51abc53a.zip and /dev/null differ diff --git a/.yarn/cache/metro-runtime-npm-0.72.3-eaaff5504d-7017fad668.zip b/.yarn/cache/metro-runtime-npm-0.72.3-eaaff5504d-7017fad668.zip new file mode 100644 index 000000000..e4f24797c Binary files /dev/null and b/.yarn/cache/metro-runtime-npm-0.72.3-eaaff5504d-7017fad668.zip differ diff --git a/.yarn/cache/metro-source-map-npm-0.66.2-0bfb80a852-67959828b0.zip b/.yarn/cache/metro-source-map-npm-0.66.2-0bfb80a852-67959828b0.zip deleted file mode 100644 index e7b975c58..000000000 Binary files a/.yarn/cache/metro-source-map-npm-0.66.2-0bfb80a852-67959828b0.zip and /dev/null differ diff --git a/.yarn/cache/metro-source-map-npm-0.72.3-24e505a932-4bbd27097d.zip b/.yarn/cache/metro-source-map-npm-0.72.3-24e505a932-4bbd27097d.zip new file mode 100644 index 000000000..2172e705c Binary files /dev/null and b/.yarn/cache/metro-source-map-npm-0.72.3-24e505a932-4bbd27097d.zip differ diff --git a/.yarn/cache/metro-symbolicate-npm-0.66.2-af99407b2c-7a2cfee2d9.zip b/.yarn/cache/metro-symbolicate-npm-0.66.2-af99407b2c-7a2cfee2d9.zip deleted file mode 100644 index 3c83e4aa7..000000000 Binary files a/.yarn/cache/metro-symbolicate-npm-0.66.2-af99407b2c-7a2cfee2d9.zip and /dev/null differ diff --git a/.yarn/cache/metro-symbolicate-npm-0.72.3-fa3c9c49ea-e2b434d008.zip b/.yarn/cache/metro-symbolicate-npm-0.72.3-fa3c9c49ea-e2b434d008.zip new file mode 100644 index 000000000..a5eec1a7b Binary files /dev/null and b/.yarn/cache/metro-symbolicate-npm-0.72.3-fa3c9c49ea-e2b434d008.zip differ diff --git a/.yarn/cache/metro-transform-plugins-npm-0.66.2-a32db199f7-0d0f510e28.zip b/.yarn/cache/metro-transform-plugins-npm-0.66.2-a32db199f7-0d0f510e28.zip deleted file mode 100644 index a4261e558..000000000 Binary files a/.yarn/cache/metro-transform-plugins-npm-0.66.2-a32db199f7-0d0f510e28.zip and /dev/null differ diff --git a/.yarn/cache/metro-transform-plugins-npm-0.72.3-a1962f9888-e85e5d8fb0.zip b/.yarn/cache/metro-transform-plugins-npm-0.72.3-a1962f9888-e85e5d8fb0.zip new file mode 100644 index 000000000..f1c0c8f91 Binary files /dev/null and b/.yarn/cache/metro-transform-plugins-npm-0.72.3-a1962f9888-e85e5d8fb0.zip differ diff --git a/.yarn/cache/metro-transform-worker-npm-0.66.2-7dc6684296-5d1ab3f9cb.zip b/.yarn/cache/metro-transform-worker-npm-0.66.2-7dc6684296-5d1ab3f9cb.zip deleted file mode 100644 index 8f522c564..000000000 Binary files a/.yarn/cache/metro-transform-worker-npm-0.66.2-7dc6684296-5d1ab3f9cb.zip and /dev/null differ diff --git a/.yarn/cache/metro-transform-worker-npm-0.72.3-c11091527d-2a0349b3e1.zip b/.yarn/cache/metro-transform-worker-npm-0.72.3-c11091527d-2a0349b3e1.zip new file mode 100644 index 000000000..7931b10f0 Binary files /dev/null and b/.yarn/cache/metro-transform-worker-npm-0.72.3-c11091527d-2a0349b3e1.zip differ diff --git a/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip b/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip deleted file mode 100644 index ae711478f..000000000 Binary files a/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip and /dev/null differ diff --git a/.yarn/cache/multi-sort-stream-npm-1.0.4-86d50681e6-b234754e0e.zip b/.yarn/cache/multi-sort-stream-npm-1.0.4-86d50681e6-b234754e0e.zip new file mode 100644 index 000000000..abbd57091 Binary files /dev/null and b/.yarn/cache/multi-sort-stream-npm-1.0.4-86d50681e6-b234754e0e.zip differ diff --git a/.yarn/cache/multipipe-npm-4.0.0-4279e989d0-5a494ec2ce.zip b/.yarn/cache/multipipe-npm-4.0.0-4279e989d0-5a494ec2ce.zip new file mode 100644 index 000000000..00e9bb4ad Binary files /dev/null and b/.yarn/cache/multipipe-npm-4.0.0-4279e989d0-5a494ec2ce.zip differ diff --git a/.yarn/cache/nocache-npm-2.1.0-cb459f771c-702ad516a7.zip b/.yarn/cache/nocache-npm-2.1.0-cb459f771c-702ad516a7.zip deleted file mode 100644 index 798d4e703..000000000 Binary files a/.yarn/cache/nocache-npm-2.1.0-cb459f771c-702ad516a7.zip and /dev/null differ diff --git a/.yarn/cache/nocache-npm-3.0.4-9393fdc373-6be9ee67eb.zip b/.yarn/cache/nocache-npm-3.0.4-9393fdc373-6be9ee67eb.zip new file mode 100644 index 000000000..a5915f24c Binary files /dev/null and b/.yarn/cache/nocache-npm-3.0.4-9393fdc373-6be9ee67eb.zip differ diff --git a/.yarn/cache/node-ipc-npm-9.2.1-540e69aa8b-a38aa4c8ca.zip b/.yarn/cache/node-ipc-npm-9.2.1-540e69aa8b-a38aa4c8ca.zip new file mode 100644 index 000000000..676898803 Binary files /dev/null and b/.yarn/cache/node-ipc-npm-9.2.1-540e69aa8b-a38aa4c8ca.zip differ diff --git a/.yarn/cache/ob1-npm-0.66.2-e102a55adf-18f4ddecd7.zip b/.yarn/cache/ob1-npm-0.66.2-e102a55adf-18f4ddecd7.zip deleted file mode 100644 index 9a26c0273..000000000 Binary files a/.yarn/cache/ob1-npm-0.66.2-e102a55adf-18f4ddecd7.zip and /dev/null differ diff --git a/.yarn/cache/ob1-npm-0.72.3-8177d8d54c-21ef5c2565.zip b/.yarn/cache/ob1-npm-0.72.3-8177d8d54c-21ef5c2565.zip new file mode 100644 index 000000000..62e9dde8d Binary files /dev/null and b/.yarn/cache/ob1-npm-0.72.3-8177d8d54c-21ef5c2565.zip differ diff --git a/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip b/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip deleted file mode 100644 index df76b4087..000000000 Binary files a/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip and /dev/null differ diff --git a/.yarn/cache/options-npm-0.0.6-1fce20f056-8601fdc0a3.zip b/.yarn/cache/options-npm-0.0.6-1fce20f056-8601fdc0a3.zip deleted file mode 100644 index ceba2ec7a..000000000 Binary files a/.yarn/cache/options-npm-0.0.6-1fce20f056-8601fdc0a3.zip and /dev/null differ diff --git a/.yarn/cache/ora-npm-3.4.0-1c83c64050-f1f8e7f290.zip b/.yarn/cache/ora-npm-3.4.0-1c83c64050-f1f8e7f290.zip deleted file mode 100644 index f5a21c591..000000000 Binary files a/.yarn/cache/ora-npm-3.4.0-1c83c64050-f1f8e7f290.zip and /dev/null differ diff --git a/.yarn/cache/promise-npm-8.2.0-3845bccde5-45d65ffe4f.zip b/.yarn/cache/promise-npm-8.2.0-3845bccde5-45d65ffe4f.zip deleted file mode 100644 index 01a9361ab..000000000 Binary files a/.yarn/cache/promise-npm-8.2.0-3845bccde5-45d65ffe4f.zip and /dev/null differ diff --git a/.yarn/cache/promise-npm-8.3.0-fbfb957417-a69f0ddbdd.zip b/.yarn/cache/promise-npm-8.3.0-fbfb957417-a69f0ddbdd.zip new file mode 100644 index 000000000..cc07b07d8 Binary files /dev/null and b/.yarn/cache/promise-npm-8.3.0-fbfb957417-a69f0ddbdd.zip differ diff --git a/.yarn/cache/react-devtools-core-npm-4.19.1-31d5177946-20471dde74.zip b/.yarn/cache/react-devtools-core-npm-4.19.1-31d5177946-20471dde74.zip deleted file mode 100644 index 412dd5bee..000000000 Binary files a/.yarn/cache/react-devtools-core-npm-4.19.1-31d5177946-20471dde74.zip and /dev/null differ diff --git a/.yarn/cache/react-devtools-core-npm-4.24.0-8b0e398750-c9e21ff262.zip b/.yarn/cache/react-devtools-core-npm-4.24.0-8b0e398750-c9e21ff262.zip new file mode 100644 index 000000000..ce83dce15 Binary files /dev/null and b/.yarn/cache/react-devtools-core-npm-4.24.0-8b0e398750-c9e21ff262.zip differ diff --git a/.yarn/cache/react-native-codegen-npm-0.0.8-9edfb3514e-c5ccdcb2a2.zip b/.yarn/cache/react-native-codegen-npm-0.0.8-9edfb3514e-c5ccdcb2a2.zip deleted file mode 100644 index 83514bf7f..000000000 Binary files a/.yarn/cache/react-native-codegen-npm-0.0.8-9edfb3514e-c5ccdcb2a2.zip and /dev/null differ diff --git a/.yarn/cache/react-native-codegen-npm-0.70.6-75b54b4828-2a50ad71e0.zip b/.yarn/cache/react-native-codegen-npm-0.70.6-75b54b4828-2a50ad71e0.zip new file mode 100644 index 000000000..eadd3e550 Binary files /dev/null and b/.yarn/cache/react-native-codegen-npm-0.70.6-75b54b4828-2a50ad71e0.zip differ diff --git a/.yarn/cache/react-native-gradle-plugin-npm-0.70.3-e150cc3796-04a3379842.zip b/.yarn/cache/react-native-gradle-plugin-npm-0.70.3-e150cc3796-04a3379842.zip new file mode 100644 index 000000000..d4ab58768 Binary files /dev/null and b/.yarn/cache/react-native-gradle-plugin-npm-0.70.3-e150cc3796-04a3379842.zip differ diff --git a/.yarn/cache/react-native-npm-0.67.4-cb18a161a9-662cee2e5d.zip b/.yarn/cache/react-native-npm-0.67.4-cb18a161a9-662cee2e5d.zip deleted file mode 100644 index 837bfea2d..000000000 Binary files a/.yarn/cache/react-native-npm-0.67.4-cb18a161a9-662cee2e5d.zip and /dev/null differ diff --git a/.yarn/cache/react-native-npm-0.70.6-94c39d80fa-ae57e1b86f.zip b/.yarn/cache/react-native-npm-0.70.6-94c39d80fa-ae57e1b86f.zip new file mode 100644 index 000000000..febf65cc0 Binary files /dev/null and b/.yarn/cache/react-native-npm-0.70.6-94c39d80fa-ae57e1b86f.zip differ diff --git a/.yarn/cache/react-native-share-npm-7.9.1-fb27b98242-276f872de7.zip b/.yarn/cache/react-native-share-npm-8.0.0-a4553a0cde-f22e672bae.zip similarity index 78% rename from .yarn/cache/react-native-share-npm-7.9.1-fb27b98242-276f872de7.zip rename to .yarn/cache/react-native-share-npm-8.0.0-a4553a0cde-f22e672bae.zip index d0ee90f71..98532b722 100644 Binary files a/.yarn/cache/react-native-share-npm-7.9.1-fb27b98242-276f872de7.zip and b/.yarn/cache/react-native-share-npm-8.0.0-a4553a0cde-f22e672bae.zip differ diff --git a/.yarn/cache/react-shallow-renderer-npm-16.15.0-cf95219885-6052c7e3e9.zip b/.yarn/cache/react-shallow-renderer-npm-16.15.0-cf95219885-6052c7e3e9.zip new file mode 100644 index 000000000..7cca375e6 Binary files /dev/null and b/.yarn/cache/react-shallow-renderer-npm-16.15.0-cf95219885-6052c7e3e9.zip differ diff --git a/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip b/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip deleted file mode 100644 index 3b01b88c0..000000000 Binary files a/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip and /dev/null differ diff --git a/.yarn/cache/rsvp-npm-4.8.5-09f3c6ed40-2d8ef30d8f.zip b/.yarn/cache/rsvp-npm-4.8.5-09f3c6ed40-2d8ef30d8f.zip deleted file mode 100644 index 72eab59f3..000000000 Binary files a/.yarn/cache/rsvp-npm-4.8.5-09f3c6ed40-2d8ef30d8f.zip and /dev/null differ diff --git a/.yarn/cache/sane-npm-4.1.0-8ab7d6a963-97716502d4.zip b/.yarn/cache/sane-npm-4.1.0-8ab7d6a963-97716502d4.zip deleted file mode 100644 index faa61f781..000000000 Binary files a/.yarn/cache/sane-npm-4.1.0-8ab7d6a963-97716502d4.zip and /dev/null differ diff --git a/.yarn/cache/scheduler-npm-0.22.0-63c9337981-a8ef5cab76.zip b/.yarn/cache/scheduler-npm-0.22.0-63c9337981-a8ef5cab76.zip new file mode 100644 index 000000000..1514b5550 Binary files /dev/null and b/.yarn/cache/scheduler-npm-0.22.0-63c9337981-a8ef5cab76.zip differ diff --git a/.yarn/cache/simple-plist-npm-1.4.0-e7f7c6ecb2-fa8086f6b7.zip b/.yarn/cache/simple-plist-npm-1.4.0-e7f7c6ecb2-fa8086f6b7.zip deleted file mode 100644 index e8f5f1425..000000000 Binary files a/.yarn/cache/simple-plist-npm-1.4.0-e7f7c6ecb2-fa8086f6b7.zip and /dev/null differ diff --git a/.yarn/cache/stream-buffers-npm-2.2.0-4d954acabc-4587d9e8f0.zip b/.yarn/cache/stream-buffers-npm-2.2.0-4d954acabc-4587d9e8f0.zip deleted file mode 100644 index 58971d702..000000000 Binary files a/.yarn/cache/stream-buffers-npm-2.2.0-4d954acabc-4587d9e8f0.zip and /dev/null differ diff --git a/.yarn/cache/stream-chain-npm-2.2.5-ad363478fb-c83cbf504b.zip b/.yarn/cache/stream-chain-npm-2.2.5-ad363478fb-c83cbf504b.zip new file mode 100644 index 000000000..95e87360e Binary files /dev/null and b/.yarn/cache/stream-chain-npm-2.2.5-ad363478fb-c83cbf504b.zip differ diff --git a/.yarn/cache/stream-json-npm-1.7.4-e158c367fa-50aca250ce.zip b/.yarn/cache/stream-json-npm-1.7.4-e158c367fa-50aca250ce.zip new file mode 100644 index 000000000..cdda608dd Binary files /dev/null and b/.yarn/cache/stream-json-npm-1.7.4-e158c367fa-50aca250ce.zip differ diff --git a/.yarn/cache/tail-npm-2.2.4-aa1bd9910b-2cc8b54d32.zip b/.yarn/cache/tail-npm-2.2.4-aa1bd9910b-2cc8b54d32.zip deleted file mode 100644 index 5b24b544f..000000000 Binary files a/.yarn/cache/tail-npm-2.2.4-aa1bd9910b-2cc8b54d32.zip and /dev/null differ diff --git a/.yarn/cache/trace-event-lib-npm-1.3.1-945ed2fb5b-82b3fe1f39.zip b/.yarn/cache/trace-event-lib-npm-1.3.1-945ed2fb5b-82b3fe1f39.zip new file mode 100644 index 000000000..0e885ca53 Binary files /dev/null and b/.yarn/cache/trace-event-lib-npm-1.3.1-945ed2fb5b-82b3fe1f39.zip differ diff --git a/.yarn/cache/ultron-npm-1.0.2-0b156c65b9-f98993b128.zip b/.yarn/cache/ultron-npm-1.0.2-0b156c65b9-f98993b128.zip deleted file mode 100644 index 79977e255..000000000 Binary files a/.yarn/cache/ultron-npm-1.0.2-0b156c65b9-f98993b128.zip and /dev/null differ diff --git a/.yarn/cache/use-subscription-npm-1.8.0-b73103d984-beac1f0ff1.zip b/.yarn/cache/use-subscription-npm-1.8.0-b73103d984-beac1f0ff1.zip deleted file mode 100644 index b37c7f989..000000000 Binary files a/.yarn/cache/use-subscription-npm-1.8.0-b73103d984-beac1f0ff1.zip and /dev/null differ diff --git a/.yarn/cache/ws-npm-1.1.5-cbcc5a0d94-d2dfb74fe4.zip b/.yarn/cache/ws-npm-1.1.5-cbcc5a0d94-d2dfb74fe4.zip deleted file mode 100644 index b409cf79c..000000000 Binary files a/.yarn/cache/ws-npm-1.1.5-cbcc5a0d94-d2dfb74fe4.zip and /dev/null differ diff --git a/.yarn/cache/xcode-npm-2.1.0-ec3625cdda-aaa4569f96.zip b/.yarn/cache/xcode-npm-2.1.0-ec3625cdda-aaa4569f96.zip deleted file mode 100644 index cfc1ffc11..000000000 Binary files a/.yarn/cache/xcode-npm-2.1.0-ec3625cdda-aaa4569f96.zip and /dev/null differ diff --git a/.yarn/cache/xmldoc-npm-1.2.0-69488d19bf-df42d06cf4.zip b/.yarn/cache/xmldoc-npm-1.2.0-69488d19bf-df42d06cf4.zip deleted file mode 100644 index baad297c1..000000000 Binary files a/.yarn/cache/xmldoc-npm-1.2.0-69488d19bf-df42d06cf4.zip and /dev/null differ diff --git a/packages/mobile/.flowconfig b/packages/mobile/.flowconfig index fcad31c77..7b11147a8 100644 --- a/packages/mobile/.flowconfig +++ b/packages/mobile/.flowconfig @@ -11,6 +11,8 @@ ; Flow doesn't support platforms .*/Libraries/Utilities/LoadingView.js +.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$ + [untyped] .*/node_modules/@react-native-community/cli/.*/.* @@ -62,4 +64,4 @@ untyped-import untyped-type-import [version] -^0.162.0 +^0.182.0 diff --git a/packages/mobile/.gitignore b/packages/mobile/.gitignore index ab6d3eeee..9f5a7fb05 100644 --- a/packages/mobile/.gitignore +++ b/packages/mobile/.gitignore @@ -20,6 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate +ios/.xcode.env.local .env @@ -31,6 +32,7 @@ build/ local.properties *.iml *.hprof +.cxx/ # node.js # @@ -62,9 +64,10 @@ ios-release.bundle.map # For more information about the recommended setup visit: # https://docs.fastlane.tools/best-practices/source-control/ -*/fastlane/report.xml -*/fastlane/Preview.html -*/fastlane/screenshots +**/fastlane/report.xml +**/fastlane/Preview.html +**/fastlane/screenshots +**/fastlane/test_output # Bundle artifact *.jsbundle @@ -72,6 +75,7 @@ ios-release.bundle.map # CocoaPods /ios/Pods/ /ios/StandardNotes.xcodeproj/project.xcworkspace +/vendor/bundle/ # HProf /android/*.hprof diff --git a/packages/mobile/.node-version b/packages/mobile/.node-version new file mode 100644 index 000000000..19c7bdba7 --- /dev/null +++ b/packages/mobile/.node-version @@ -0,0 +1 @@ +16 \ No newline at end of file diff --git a/packages/mobile/.ruby-version b/packages/mobile/.ruby-version index 74500cee1..460b6fd40 100644 --- a/packages/mobile/.ruby-version +++ b/packages/mobile/.ruby-version @@ -1 +1 @@ -2.7.4 \ No newline at end of file +2.7.5 \ No newline at end of file diff --git a/packages/mobile/Gemfile b/packages/mobile/Gemfile index ab7986b43..8775d019f 100644 --- a/packages/mobile/Gemfile +++ b/packages/mobile/Gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby '2.7.4' +ruby '2.7.5' gem 'cocoapods', '~> 1.11', '>= 1.11.2' gem 'fastlane' diff --git a/packages/mobile/Gemfile.lock b/packages/mobile/Gemfile.lock index f586db67b..610e7c7b2 100644 --- a/packages/mobile/Gemfile.lock +++ b/packages/mobile/Gemfile.lock @@ -288,7 +288,7 @@ DEPENDENCIES xcode-install RUBY VERSION - ruby 2.7.4p191 + ruby 2.7.5p203 BUNDLED WITH - 2.2.2 + 2.3.15 diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle index 7cd19cbd8..b8dfd4865 100644 --- a/packages/mobile/android/app/build.gradle +++ b/packages/mobile/android/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: "com.android.application" import com.android.build.OutputFile +import org.apache.tools.ant.taskdefs.condition.Os /** * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets @@ -123,7 +124,10 @@ def enableHermes = project.ext.react.get("enableHermes", false); /** * Architectures to build native code for in debug. */ -def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures") +def reactNativeArchitectures() { + def value = project.getProperties().get("reactNativeArchitectures") + return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] +} def appVersionCode = project.hasProperty('versionCode') ? Integer.valueOf(project.property('versionCode')) : 1 def appVersionName = project.hasProperty('versionName') ? project.property('versionName') : "1.0" @@ -141,17 +145,73 @@ android { versionCode appVersionCode versionName appVersionName - multiDexEnabled true + buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() - ndk { - abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" + if (isNewArchitectureEnabled()) { + // We configure the CMake build only if you decide to opt-in for the New Architecture. + externalNativeBuild { + cmake { + arguments "-DPROJECT_BUILD_DIR=$buildDir", + "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", + "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", + "-DNODE_MODULES_DIR=$rootDir/../node_modules", + "-DANDROID_STL=c++_shared" + } + } + if (!enableSeparateBuildPerCPUArchitecture) { + ndk { + abiFilters (*reactNativeArchitectures()) + } + } } + multiDexEnabled true + testBuildType System.getProperty('testBuildType', 'debug') // detox: This will later be used to control the test apk build type testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' missingDimensionStrategy 'store', 'play' } + if (isNewArchitectureEnabled()) { + // We configure the NDK build only if you decide to opt-in for the New Architecture. + externalNativeBuild { + cmake { + path "$projectDir/src/main/jni/CMakeLists.txt" + } + } + def reactAndroidProjectDir = project(':ReactAndroid').projectDir + def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) { + dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck") + from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") + into("$buildDir/react-ndk/exported") + } + def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) { + dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck") + from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") + into("$buildDir/react-ndk/exported") + } + afterEvaluate { + // If you wish to add a custom TurboModule or component locally, + // you should uncomment this line. + // preBuild.dependsOn("generateCodegenArtifactsFromSchema") + preDebugBuild.dependsOn(packageReactNdkDebugLibs) + preReleaseBuild.dependsOn(packageReactNdkReleaseLibs) + // Due to a bug inside AGP, we have to explicitly set a dependency + // between configureCMakeDebug* tasks and the preBuild tasks. + // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732 + configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild) + configureCMakeDebug.dependsOn(preDebugBuild) + reactNativeArchitectures().each { architecture -> + tasks.findByName("configureCMakeDebug[${architecture}]")?.configure { + dependsOn("preDebugBuild") + } + tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure { + dependsOn("preReleaseBuild") + } + } + } + } + signingConfigs { debug { storeFile file('debug.keystore') @@ -172,7 +232,7 @@ android { reset() enable enableSeparateBuildPerCPUArchitecture universalApk false // If true, also generate a universal APK - include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" + include (*reactNativeArchitectures()) } } productFlavors { @@ -186,10 +246,8 @@ android { buildTypes { debug { signingConfig signingConfigs.debug - if (nativeArchitectures) { - ndk { - abiFilters nativeArchitectures.split(',') - } + ndk { + abiFilters (*reactNativeArchitectures()) } } release { @@ -242,14 +300,32 @@ dependencies { androidTestImplementation('com.wix:detox:+') if (enableHermes) { - def hermesPath = "../../node_modules/hermes-engine/android/"; - debugImplementation files(hermesPath + "hermes-debug.aar") - releaseImplementation files(hermesPath + "hermes-release.aar") + //noinspection GradleDynamicVersion + implementation("com.facebook.react:hermes-engine:+") { // From node_modules + exclude group:'com.facebook.fbjni' + } } else { implementation jscFlavor } } +if (isNewArchitectureEnabled()) { + // If new architecture is enabled, we let you build RN from source + // Otherwise we fallback to a prebuilt .aar bundled in the NPM package. + // This will be applied to all the imported transtitive dependency. + configurations.all { + resolutionStrategy.dependencySubstitution { + substitute(module("com.facebook.react:react-native")) + .using(project(":ReactAndroid")) + .because("On New Architecture we're building React Native from source") + substitute(module("com.facebook.react:hermes-engine")) + .using(project(":ReactAndroid:hermes-engine")) + .because("On New Architecture we're building Hermes from source") + } + } +} + + // Run this once to be able to run the application with BUCK // puts all compile dependencies into folder libs for BUCK to use task copyDownloadableDepsToLibs(type: Copy) { @@ -258,3 +334,11 @@ task copyDownloadableDepsToLibs(type: Copy) { } apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) + +def isNewArchitectureEnabled() { + // To opt-in for the New Architecture, you can either: + // - Set `newArchEnabled` to true inside the `gradle.properties` file + // - Invoke gradle with `-newArchEnabled=true` + // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` + return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" +} diff --git a/packages/mobile/android/app/src/debug/AndroidManifest.xml b/packages/mobile/android/app/src/debug/AndroidManifest.xml index 12a4b5cb0..032587d49 100644 --- a/packages/mobile/android/app/src/debug/AndroidManifest.xml +++ b/packages/mobile/android/app/src/debug/AndroidManifest.xml @@ -7,6 +7,6 @@ android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"> - + diff --git a/packages/mobile/android/app/src/debug/java/com/standardnotes/ReactNativeFlipper.java b/packages/mobile/android/app/src/debug/java/com/standardnotes/ReactNativeFlipper.java index 07e08afd4..cf56461de 100644 --- a/packages/mobile/android/app/src/debug/java/com/standardnotes/ReactNativeFlipper.java +++ b/packages/mobile/android/app/src/debug/java/com/standardnotes/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.rndiffapp; +package com.standardnotes; import android.content.Context; import com.facebook.flipper.android.AndroidFlipperClient; import com.facebook.flipper.android.utils.FlipperUtils; @@ -18,6 +18,7 @@ import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; import com.facebook.flipper.plugins.network.NetworkFlipperPlugin; import com.facebook.flipper.plugins.react.ReactFlipperPlugin; import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin; +import com.facebook.react.ReactInstanceEventListener; import com.facebook.react.ReactInstanceManager; import com.facebook.react.bridge.ReactContext; import com.facebook.react.modules.network.NetworkingModule; @@ -46,7 +47,7 @@ public class ReactNativeFlipper { ReactContext reactContext = reactInstanceManager.getCurrentReactContext(); if (reactContext == null) { reactInstanceManager.addReactInstanceEventListener( - new ReactInstanceManager.ReactInstanceEventListener() { + new ReactInstanceEventListener() { @Override public void onReactContextInitialized(ReactContext reactContext) { reactInstanceManager.removeReactInstanceEventListener(this); diff --git a/packages/mobile/android/app/src/main/AndroidManifest.xml b/packages/mobile/android/app/src/main/AndroidManifest.xml index aca493408..3aaa05bd7 100644 --- a/packages/mobile/android/app/src/main/AndroidManifest.xml +++ b/packages/mobile/android/app/src/main/AndroidManifest.xml @@ -30,8 +30,9 @@ diff --git a/packages/mobile/android/app/src/main/java/com/standardnotes/MainActivity.java b/packages/mobile/android/app/src/main/java/com/standardnotes/MainActivity.java index 4f42e67a0..4f9ca7176 100644 --- a/packages/mobile/android/app/src/main/java/com/standardnotes/MainActivity.java +++ b/packages/mobile/android/app/src/main/java/com/standardnotes/MainActivity.java @@ -21,6 +21,11 @@ public class MainActivity extends ReactActivity { super.onCreate(null); } + /** + * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and + * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer + * (Paper). + */ @Override protected ReactActivityDelegate createReactActivityDelegate() { return new SNReactActivityDelegate(this, getMainComponentName()); @@ -35,6 +40,8 @@ public class MainActivity extends ReactActivity { @Override protected ReactRootView createRootView() { ReactRootView reactRootView = new ReactRootView(getContext()); + // If you opted-in for the New Architecture, we enable the Fabric Renderer. + reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED); return reactRootView; } @@ -45,6 +52,13 @@ public class MainActivity extends ReactActivity { SharedPreferences settings = this.getContext().getSharedPreferences("react-native", Context.MODE_PRIVATE); return props; } + + @Override + protected boolean isConcurrentRootEnabled() { + // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18). + // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html + return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + } } diff --git a/packages/mobile/android/app/src/main/java/com/standardnotes/MainApplication.java b/packages/mobile/android/app/src/main/java/com/standardnotes/MainApplication.java index 0fea60ff0..dce984b6e 100644 --- a/packages/mobile/android/app/src/main/java/com/standardnotes/MainApplication.java +++ b/packages/mobile/android/app/src/main/java/com/standardnotes/MainApplication.java @@ -10,6 +10,7 @@ import com.facebook.react.ReactApplication; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; +import com.facebook.react.config.ReactFeatureFlags; import com.facebook.soloader.SoLoader; import java.lang.reflect.Field; @@ -24,6 +25,7 @@ import android.os.Bundle; import android.view.WindowManager; import com.kristiansorens.flagsecure.FlagSecure; +import com.standardnotes.newarchitecture.MainApplicationReactNativeHost; public class MainApplication extends Application implements ReactApplication { @@ -47,9 +49,16 @@ public class MainApplication extends Application implements ReactApplication { } }; + private final ReactNativeHost mNewArchitectureNativeHost = + new MainApplicationReactNativeHost(this); + @Override public ReactNativeHost getReactNativeHost() { - return mReactNativeHost; + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + return mNewArchitectureNativeHost; + } else { + return mReactNativeHost; + } } @SuppressLint("NewApi") @@ -57,6 +66,9 @@ public class MainApplication extends Application implements ReactApplication { public void onCreate() { super.onCreate(); + // If you opted-in for the New Architecture, we enable the TurboModule system + ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + // Enable Remote debugging for WebViews String packageName = getApplicationContext().getPackageName(); if (packageName.equals("com.standardnotes.dev")) { @@ -139,7 +151,7 @@ public class MainApplication extends Application implements ReactApplication { We use reflection here to pick up the class that initializes Flipper, since Flipper library is not available in release mode */ - Class aClass = Class.forName("com.rndiffapp.ReactNativeFlipper"); + Class aClass = Class.forName("com.standardnotes.ReactNativeFlipper"); aClass .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class) .invoke(null, context, reactInstanceManager); diff --git a/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/MainApplicationReactNativeHost.java b/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/MainApplicationReactNativeHost.java new file mode 100644 index 000000000..05f9d2218 --- /dev/null +++ b/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/MainApplicationReactNativeHost.java @@ -0,0 +1,116 @@ +package com.standardnotes.newarchitecture; + +import android.app.Application; +import androidx.annotation.NonNull; +import com.facebook.react.PackageList; +import com.facebook.react.ReactInstanceManager; +import com.facebook.react.ReactNativeHost; +import com.facebook.react.ReactPackage; +import com.facebook.react.ReactPackageTurboModuleManagerDelegate; +import com.facebook.react.bridge.JSIModulePackage; +import com.facebook.react.bridge.JSIModuleProvider; +import com.facebook.react.bridge.JSIModuleSpec; +import com.facebook.react.bridge.JSIModuleType; +import com.facebook.react.bridge.JavaScriptContextHolder; +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.bridge.UIManager; +import com.facebook.react.fabric.ComponentFactory; +import com.facebook.react.fabric.CoreComponentsRegistry; +import com.facebook.react.fabric.FabricJSIModuleProvider; +import com.facebook.react.fabric.ReactNativeConfig; +import com.facebook.react.uimanager.ViewManagerRegistry; +import com.standardnotes.BuildConfig; +import com.standardnotes.newarchitecture.components.MainComponentsRegistry; +import com.standardnotes.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; +import java.util.ArrayList; +import java.util.List; + +/** + * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both + * TurboModule delegates and the Fabric Renderer. + * + *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the + * `newArchEnabled` property). Is ignored otherwise. + */ +public class MainApplicationReactNativeHost extends ReactNativeHost { + public MainApplicationReactNativeHost(Application application) { + super(application); + } + + @Override + public boolean getUseDeveloperSupport() { + return BuildConfig.DEBUG; + } + + @Override + protected List getPackages() { + List packages = new PackageList(this).getPackages(); + // Packages that cannot be autolinked yet can be added manually here, for example: + // packages.add(new MyReactNativePackage()); + // TurboModules must also be loaded here providing a valid TurboReactPackage implementation: + // packages.add(new TurboReactPackage() { ... }); + // If you have custom Fabric Components, their ViewManagers should also be loaded here + // inside a ReactPackage. + return packages; + } + + @Override + protected String getJSMainModuleName() { + return "index"; + } + + @NonNull + @Override + protected ReactPackageTurboModuleManagerDelegate.Builder + getReactPackageTurboModuleManagerDelegateBuilder() { + // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary + // for the new architecture and to use TurboModules correctly. + return new MainApplicationTurboModuleManagerDelegate.Builder(); + } + + @Override + protected JSIModulePackage getJSIModulePackage() { + return new JSIModulePackage() { + @Override + public List getJSIModules( + final ReactApplicationContext reactApplicationContext, + final JavaScriptContextHolder jsContext) { + final List specs = new ArrayList<>(); + + // Here we provide a new JSIModuleSpec that will be responsible of providing the + // custom Fabric Components. + specs.add( + new JSIModuleSpec() { + @Override + public JSIModuleType getJSIModuleType() { + return JSIModuleType.UIManager; + } + + @Override + public JSIModuleProvider getJSIModuleProvider() { + final ComponentFactory componentFactory = new ComponentFactory(); + CoreComponentsRegistry.register(componentFactory); + + // Here we register a Components Registry. + // The one that is generated with the template contains no components + // and just provides you the one from React Native core. + MainComponentsRegistry.register(componentFactory); + + final ReactInstanceManager reactInstanceManager = getReactInstanceManager(); + + ViewManagerRegistry viewManagerRegistry = + new ViewManagerRegistry( + reactInstanceManager.getOrCreateViewManagers(reactApplicationContext)); + + return new FabricJSIModuleProvider( + reactApplicationContext, + componentFactory, + ReactNativeConfig.DEFAULT_CONFIG, + viewManagerRegistry); + } + }); + return specs; + } + }; + } +} \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/components/MainComponentsRegistry.java b/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/components/MainComponentsRegistry.java new file mode 100644 index 000000000..46c94beb5 --- /dev/null +++ b/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/components/MainComponentsRegistry.java @@ -0,0 +1,36 @@ +package com.standardnotes.newarchitecture.components; + +import com.facebook.jni.HybridData; +import com.facebook.proguard.annotations.DoNotStrip; +import com.facebook.react.fabric.ComponentFactory; +import com.facebook.soloader.SoLoader; + +/** + * Class responsible to load the custom Fabric Components. This class has native methods and needs a + * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ + * folder for you). + * + *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the + * `newArchEnabled` property). Is ignored otherwise. + */ +@DoNotStrip +public class MainComponentsRegistry { + static { + SoLoader.loadLibrary("fabricjni"); + } + + @DoNotStrip private final HybridData mHybridData; + + @DoNotStrip + private native HybridData initHybrid(ComponentFactory componentFactory); + + @DoNotStrip + private MainComponentsRegistry(ComponentFactory componentFactory) { + mHybridData = initHybrid(componentFactory); + } + + @DoNotStrip + public static MainComponentsRegistry register(ComponentFactory componentFactory) { + return new MainComponentsRegistry(componentFactory); + } +} \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java new file mode 100644 index 000000000..2d6618f1d --- /dev/null +++ b/packages/mobile/android/app/src/main/java/com/standardnotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java @@ -0,0 +1,48 @@ +package com.standardnotes.newarchitecture.modules; + +import com.facebook.jni.HybridData; +import com.facebook.react.ReactPackage; +import com.facebook.react.ReactPackageTurboModuleManagerDelegate; +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.soloader.SoLoader; +import java.util.List; + +/** + * Class responsible to load the TurboModules. This class has native methods and needs a + * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ + * folder for you). + * + *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the + * `newArchEnabled` property). Is ignored otherwise. + */ +public class MainApplicationTurboModuleManagerDelegate + extends ReactPackageTurboModuleManagerDelegate { + + private static volatile boolean sIsSoLibraryLoaded; + + protected MainApplicationTurboModuleManagerDelegate( + ReactApplicationContext reactApplicationContext, List packages) { + super(reactApplicationContext, packages); + } + + protected native HybridData initHybrid(); + + native boolean canCreateTurboModule(String moduleName); + + public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder { + protected MainApplicationTurboModuleManagerDelegate build( + ReactApplicationContext context, List packages) { + return new MainApplicationTurboModuleManagerDelegate(context, packages); + } + } + + @Override + protected synchronized void maybeLoadOtherSoLibraries() { + if (!sIsSoLibraryLoaded) { + // If you change the name of your application .so file in the Android.mk file, + // make sure you update the name here as well. + SoLoader.loadLibrary("standardnotes_appmodules"); + sIsSoLibraryLoaded = true; + } + } +} \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/CMakeLists.txt b/packages/mobile/android/app/src/main/jni/CMakeLists.txt new file mode 100644 index 000000000..27da951e8 --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.13) + +# Define the library name here. +project(standardnotes_appmodules) + +# This file includes all the necessary to let you build your application with the New Architecture. +include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake) \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/packages/mobile/android/app/src/main/jni/MainApplicationModuleProvider.cpp new file mode 100644 index 000000000..d34a1e498 --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/MainApplicationModuleProvider.cpp @@ -0,0 +1,32 @@ +#include "MainApplicationModuleProvider.h" + +#include +#include + +namespace facebook { +namespace react { + +std::shared_ptr MainApplicationModuleProvider( + const std::string &moduleName, + const JavaTurboModule::InitParams ¶ms) { + // Here you can provide your own module provider for TurboModules coming from + // either your application or from external libraries. The approach to follow + // is similar to the following (for a library called `samplelibrary`: + // + // auto module = samplelibrary_ModuleProvider(moduleName, params); + // if (module != nullptr) { + // return module; + // } + // return rncore_ModuleProvider(moduleName, params); + + // Module providers autolinked by RN CLI + auto rncli_module = rncli_ModuleProvider(moduleName, params); + if (rncli_module != nullptr) { + return rncli_module; + } + + return rncore_ModuleProvider(moduleName, params); +} + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/MainApplicationModuleProvider.h b/packages/mobile/android/app/src/main/jni/MainApplicationModuleProvider.h new file mode 100644 index 000000000..48f1d107a --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/MainApplicationModuleProvider.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include + +#include + +namespace facebook { +namespace react { + +std::shared_ptr MainApplicationModuleProvider( + const std::string &moduleName, + const JavaTurboModule::InitParams ¶ms); + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/packages/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp new file mode 100644 index 000000000..ae730d132 --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp @@ -0,0 +1,45 @@ +#include "MainApplicationTurboModuleManagerDelegate.h" +#include "MainApplicationModuleProvider.h" + +namespace facebook { +namespace react { + +jni::local_ref +MainApplicationTurboModuleManagerDelegate::initHybrid( + jni::alias_ref) { + return makeCxxInstance(); +} + +void MainApplicationTurboModuleManagerDelegate::registerNatives() { + registerHybrid({ + makeNativeMethod( + "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid), + makeNativeMethod( + "canCreateTurboModule", + MainApplicationTurboModuleManagerDelegate::canCreateTurboModule), + }); +} + +std::shared_ptr +MainApplicationTurboModuleManagerDelegate::getTurboModule( + const std::string &name, + const std::shared_ptr &jsInvoker) { + // Not implemented yet: provide pure-C++ NativeModules here. + return nullptr; +} + +std::shared_ptr +MainApplicationTurboModuleManagerDelegate::getTurboModule( + const std::string &name, + const JavaTurboModule::InitParams ¶ms) { + return MainApplicationModuleProvider(name, params); +} + +bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule( + const std::string &name) { + return getTurboModule(name, nullptr) != nullptr || + getTurboModule(name, {.moduleName = name}) != nullptr; +} + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/packages/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h new file mode 100644 index 000000000..7a4463d6f --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h @@ -0,0 +1,38 @@ +#include +#include + +#include +#include + +namespace facebook { +namespace react { + +class MainApplicationTurboModuleManagerDelegate + : public jni::HybridClass< + MainApplicationTurboModuleManagerDelegate, + TurboModuleManagerDelegate> { + public: + // Adapt it to the package you used for your Java class. + static constexpr auto kJavaDescriptor = + "Lcom/standardnotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;"; + + static jni::local_ref initHybrid(jni::alias_ref); + + static void registerNatives(); + + std::shared_ptr getTurboModule( + const std::string &name, + const std::shared_ptr &jsInvoker) override; + std::shared_ptr getTurboModule( + const std::string &name, + const JavaTurboModule::InitParams ¶ms) override; + + /** + * Test-only method. Allows user to verify whether a TurboModule can be + * created by instances of this class. + */ + bool canCreateTurboModule(const std::string &name); +}; + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/MainComponentsRegistry.cpp b/packages/mobile/android/app/src/main/jni/MainComponentsRegistry.cpp new file mode 100644 index 000000000..1f42510bc --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/MainComponentsRegistry.cpp @@ -0,0 +1,65 @@ +#include "MainComponentsRegistry.h" + +#include +#include +#include +#include +#include + +namespace facebook { +namespace react { + +MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {} + +std::shared_ptr +MainComponentsRegistry::sharedProviderRegistry() { + auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry(); + + // Autolinked providers registered by RN CLI + rncli_registerProviders(providerRegistry); + + // Custom Fabric Components go here. You can register custom + // components coming from your App or from 3rd party libraries here. + // + // providerRegistry->add(concreteComponentDescriptorProvider< + // AocViewerComponentDescriptor>()); + return providerRegistry; +} + +jni::local_ref +MainComponentsRegistry::initHybrid( + jni::alias_ref, + ComponentFactory *delegate) { + auto instance = makeCxxInstance(delegate); + + auto buildRegistryFunction = + [](EventDispatcher::Weak const &eventDispatcher, + ContextContainer::Shared const &contextContainer) + -> ComponentDescriptorRegistry::Shared { + auto registry = MainComponentsRegistry::sharedProviderRegistry() + ->createComponentDescriptorRegistry( + {eventDispatcher, contextContainer}); + + auto mutableRegistry = + std::const_pointer_cast(registry); + + mutableRegistry->setFallbackComponentDescriptor( + std::make_shared( + ComponentDescriptorParameters{ + eventDispatcher, contextContainer, nullptr})); + + return registry; + }; + + delegate->buildRegistryFunction = buildRegistryFunction; + return instance; +} + +void MainComponentsRegistry::registerNatives() { + registerHybrid({ + makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid), + }); +} + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/MainComponentsRegistry.h b/packages/mobile/android/app/src/main/jni/MainComponentsRegistry.h new file mode 100644 index 000000000..5cbdcb839 --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/MainComponentsRegistry.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include +#include +#include + +namespace facebook { +namespace react { + +class MainComponentsRegistry + : public facebook::jni::HybridClass { + public: + // Adapt it to the package you used for your Java class. + constexpr static auto kJavaDescriptor = + "Lcom/standardnotes/newarchitecture/components/MainComponentsRegistry;"; + + static void registerNatives(); + + MainComponentsRegistry(ComponentFactory *delegate); + + private: + static std::shared_ptr + sharedProviderRegistry(); + + static jni::local_ref initHybrid( + jni::alias_ref, + ComponentFactory *delegate); +}; + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/packages/mobile/android/app/src/main/jni/OnLoad.cpp b/packages/mobile/android/app/src/main/jni/OnLoad.cpp new file mode 100644 index 000000000..ae1ef007d --- /dev/null +++ b/packages/mobile/android/app/src/main/jni/OnLoad.cpp @@ -0,0 +1,11 @@ +#include +#include "MainApplicationTurboModuleManagerDelegate.h" +#include "MainComponentsRegistry.h" + +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { + return facebook::jni::initialize(vm, [] { + facebook::react::MainApplicationTurboModuleManagerDelegate:: + registerNatives(); + facebook::react::MainComponentsRegistry::registerNatives(); + }); +} \ No newline at end of file diff --git a/packages/mobile/android/build.gradle b/packages/mobile/android/build.gradle index a221f5791..8e77c63a7 100644 --- a/packages/mobile/android/build.gradle +++ b/packages/mobile/android/build.gradle @@ -4,12 +4,19 @@ buildscript { ext.kotlinVersion = '1.5.20' ext { - buildToolsVersion = "30.0.3" + buildToolsVersion = "31.0.0" minSdkVersion = 28 - compileSdkVersion = 30 + compileSdkVersion = 31 targetSdkVersion = 31 androidXCore = "1.6.0" - ndkVersion = "21.4.7075529" + + if (System.properties['os.arch'] == "aarch64") { + // For M1 Users we need to use the NDK 24 which added support for aarch64 + ndkVersion = "24.0.8215888" + } else { + // Otherwise we default to the side-by-side NDK version from AGP. + ndkVersion = "21.4.7075529" + } } repositories { google() @@ -17,9 +24,10 @@ buildscript { mavenCentral() } dependencies { - classpath('com.android.tools.build:gradle:7.1.2') + classpath('com.android.tools.build:gradle:7.2.1') classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'de.undercouch:gradle-download-task:5.0.2' + classpath("com.facebook.react:react-native-gradle-plugin") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/packages/mobile/android/gradle.properties b/packages/mobile/android/gradle.properties index 0d1ceefc4..f14b3dde8 100644 --- a/packages/mobile/android/gradle.properties +++ b/packages/mobile/android/gradle.properties @@ -9,8 +9,9 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx1024m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m +org.gradle.jvmargs=-Xmx2560m -XX:MaxMetaspaceSize=512m +org.gradle.daemon=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit @@ -25,10 +26,17 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.112.0 +FLIPPER_VERSION=0.125.0 +# Use this property to specify which architecture you want to build. +# You can also override it from the CLI using +# ./gradlew -PreactNativeArchitectures=x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 +# Use this property to enable support to the new architecture. +# This will allow you to use TurboModules and the Fabric render in +# 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 # Set AsyncStorage limit -AsyncStorage_db_size_in_MB=50 - -org.gradle.daemon=true -org.gradle.jvmargs=-Xmx2560m \ No newline at end of file +AsyncStorage_db_size_in_MB=50 \ No newline at end of file diff --git a/packages/mobile/android/gradle/wrapper/gradle-wrapper.properties b/packages/mobile/android/gradle/wrapper/gradle-wrapper.properties index 32ae68af9..7b54e6906 100644 --- a/packages/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/packages/mobile/android/gradlew b/packages/mobile/android/gradlew index 645f6ca31..a58591e97 100755 --- a/packages/mobile/android/gradlew +++ b/packages/mobile/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,113 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -105,79 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/packages/mobile/android/settings.gradle b/packages/mobile/android/settings.gradle index 77de2609a..474f5acae 100644 --- a/packages/mobile/android/settings.gradle +++ b/packages/mobile/android/settings.gradle @@ -2,3 +2,11 @@ rootProject.name = 'StandardNotes' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle") applyNativeModulesSettingsGradle(settings) include ':app' +includeBuild('../node_modules/react-native-gradle-plugin') + +if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { + include(":ReactAndroid") + project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') + include(":ReactAndroid:hermes-engine") + project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine') +} \ No newline at end of file diff --git a/packages/mobile/ios/.xcode.env b/packages/mobile/ios/.xcode.env new file mode 100644 index 000000000..a9d90672d --- /dev/null +++ b/packages/mobile/ios/.xcode.env @@ -0,0 +1,11 @@ +# This `.xcode.env` file is versioned and is used to source the environment +# used when running script phases inside Xcode. +# To customize your local environment, you can create an `.xcode.env.local` +# file that is not versioned. + +# NODE_BINARY variable contains the PATH to the node executable. +# +# Customize the NODE_BINARY variable here. +# For example, to use nvm with brew, add the following line +# . "$(brew --prefix nvm)/nvm.sh" --no-use +export NODE_BINARY=$(command -v node) \ No newline at end of file diff --git a/packages/mobile/ios/Podfile b/packages/mobile/ios/Podfile index 11d8c0075..900c39b76 100644 --- a/packages/mobile/ios/Podfile +++ b/packages/mobile/ios/Podfile @@ -3,7 +3,8 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '11.0' +platform :ios, '12.4' +install! 'cocoapods', :deterministic_uuids => false # Standard Notes Specific pod 'TrustKit', '1.6.5' @@ -11,35 +12,62 @@ pod 'TrustKit', '1.6.5' target 'StandardNotes' do config = use_native_modules! + # Flags change depending on the env values. + flags = get_default_flags() + use_react_native!( path: config[:reactNativePath], - # to enable hermes on iOS, change `false` to `true` and then install pods - hermes_enabled: false + + # Hermes is now enabled by default. Disable by setting this flag to false. + # Upcoming versions of React Native may rely on get_default_flags(), but + # we make it explicit here to aid in the React Native upgrade process. + :hermes_enabled => true, + :fabric_enabled => flags[:fabric_enabled], + # Enables Flipper. + # + # Note that if you have use_frameworks! enabled, Flipper will not work and + # you should disable the next line. + :flipper_configuration => FlipperConfiguration.enabled, + # An absolute path to your application root. + :app_path => "#{Pod::Config.instance.installation_root}/.." ) target 'StandardNotesTests' do inherit! :complete # Pods for testing end - - # Enables Flipper. - # - # Note that if you have use_frameworks! enabled, Flipper will not work and - # you should disable the next line. - use_flipper! end target 'StandardNotesDev' do config = use_native_modules! - use_react_native!( - path: config['reactNativePath'], - # Enabling hermes breaks fastlane build (at time of commit) - hermes_enabled: false + # Flags change depending on the env values. + flags = get_default_flags() + + use_react_native!( + path: config[:reactNativePath], + + # Hermes is now enabled by default. Disable by setting this flag to false. + # Upcoming versions of React Native may rely on get_default_flags(), but + # we make it explicit here to aid in the React Native upgrade process. + :hermes_enabled => true, + :fabric_enabled => flags[:fabric_enabled], + # Enables Flipper. + # + # Note that if you have use_frameworks! enabled, Flipper will not work and + # you should disable the next line. + :flipper_configuration => FlipperConfiguration.enabled, + # An absolute path to your application root. + :app_path => "#{Pod::Config.instance.installation_root}/.." ) end post_install do |installer| - react_native_post_install(installer) + react_native_post_install( + installer, + # Set `mac_catalyst_enabled` to `true` in order to apply patches + # necessary for Mac Catalyst builds + :mac_catalyst_enabled => false + ) __apply_Xcode_12_5_M1_post_install_workaround(installer) end diff --git a/packages/mobile/ios/Podfile.lock b/packages/mobile/ios/Podfile.lock index 758c2cd32..a645350c6 100644 --- a/packages/mobile/ios/Podfile.lock +++ b/packages/mobile/ios/Podfile.lock @@ -2,275 +2,305 @@ PODS: - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.67.4) - - FBReactNativeSpec (0.67.4): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.67.4) - - RCTTypeSafety (= 0.67.4) - - React-Core (= 0.67.4) - - React-jsi (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - Flipper (0.99.0): + - FBLazyVector (0.70.6) + - FBReactNativeSpec (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - Flipper (0.125.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (3.1.7) + - Flipper-DoubleConversion (3.2.0.1) - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.7): + - Flipper-Folly (2.6.10): - Flipper-Boost-iOSX - Flipper-DoubleConversion - Flipper-Fmt (= 7.1.7) - Flipper-Glog - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.180) - - Flipper-Glog (0.3.6) + - OpenSSL-Universal (= 1.1.1100) + - Flipper-Glog (0.5.0.5) - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.4.3): - Flipper-Folly (~> 2.6) - - FlipperKit (0.99.0): - - FlipperKit/Core (= 0.99.0) - - FlipperKit/Core (0.99.0): - - Flipper (~> 0.99.0) + - FlipperKit (0.125.0): + - FlipperKit/Core (= 0.125.0) + - FlipperKit/Core (0.125.0): + - Flipper (~> 0.125.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.99.0): - - Flipper (~> 0.99.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.99.0): + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.99.0) - - FlipperKit/FKPortForwarding (0.99.0): + - FlipperKit/FBDefines (0.125.0) + - FlipperKit/FKPortForwarding (0.125.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.99.0) - - FlipperKit/FlipperKitLayoutHelpers (0.99.0): + - FlipperKit/FlipperKitHighlightOverlay (0.125.0) + - FlipperKit/FlipperKitLayoutHelpers (0.125.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.99.0): + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.99.0): + - FlipperKit/FlipperKitLayoutPlugin (0.125.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.99.0) - - FlipperKit/FlipperKitNetworkPlugin (0.99.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (0.125.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.99.0): + - FlipperKit/FlipperKitReactPlugin (0.125.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.99.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.99.0): + - FlipperKit/SKIOSNetworkPlugin (0.125.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) + - hermes-engine (0.70.6) - libevent (2.1.12) - - OpenSSL-Universal (1.1.180) - - RCT-Folly (2021.06.28.00-v2): + - OpenSSL-Universal (1.1.1100) + - RCT-Folly (2021.07.22.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Default (= 2021.06.28.00-v2) - - RCT-Folly/Default (2021.06.28.00-v2): + - RCT-Folly/Default (= 2021.07.22.00) + - RCT-Folly/Default (2021.07.22.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.67.4) - - RCTTypeSafety (0.67.4): - - FBLazyVector (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.67.4) - - React-Core (= 0.67.4) - - React (0.67.4): - - React-Core (= 0.67.4) - - React-Core/DevSupport (= 0.67.4) - - React-Core/RCTWebSocket (= 0.67.4) - - React-RCTActionSheet (= 0.67.4) - - React-RCTAnimation (= 0.67.4) - - React-RCTBlob (= 0.67.4) - - React-RCTImage (= 0.67.4) - - React-RCTLinking (= 0.67.4) - - React-RCTNetwork (= 0.67.4) - - React-RCTSettings (= 0.67.4) - - React-RCTText (= 0.67.4) - - React-RCTVibration (= 0.67.4) - - React-callinvoker (0.67.4) - - React-Core (0.67.4): + - RCT-Folly/Futures (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.67.4) - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - libevent + - RCTRequired (0.70.6) + - RCTTypeSafety (0.70.6): + - FBLazyVector (= 0.70.6) + - RCTRequired (= 0.70.6) + - React-Core (= 0.70.6) + - React (0.70.6): + - React-Core (= 0.70.6) + - React-Core/DevSupport (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-RCTActionSheet (= 0.70.6) + - React-RCTAnimation (= 0.70.6) + - React-RCTBlob (= 0.70.6) + - React-RCTImage (= 0.70.6) + - React-RCTLinking (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - React-RCTSettings (= 0.70.6) + - React-RCTText (= 0.70.6) + - React-RCTVibration (= 0.70.6) + - React-bridging (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-jsi (= 0.70.6) + - React-callinvoker (0.70.6) + - React-Codegen (0.70.6): + - FBReactNativeSpec (= 0.70.6) + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-Core (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/CoreModulesHeaders (0.67.4): + - React-Core/CoreModulesHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/Default (0.67.4): + - React-Core/Default (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/DevSupport (0.67.4): + - React-Core/DevSupport (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.67.4) - - React-Core/RCTWebSocket (= 0.67.4) - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-jsinspector (= 0.67.4) - - React-perflogger (= 0.67.4) + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTActionSheetHeaders (0.67.4): + - React-Core/RCTActionSheetHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTAnimationHeaders (0.67.4): + - React-Core/RCTAnimationHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTBlobHeaders (0.67.4): + - React-Core/RCTBlobHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTImageHeaders (0.67.4): + - React-Core/RCTImageHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTLinkingHeaders (0.67.4): + - React-Core/RCTLinkingHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTNetworkHeaders (0.67.4): + - React-Core/RCTNetworkHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTSettingsHeaders (0.67.4): + - React-Core/RCTSettingsHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTTextHeaders (0.67.4): + - React-Core/RCTTextHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTVibrationHeaders (0.67.4): + - React-Core/RCTVibrationHeaders (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-Core/RCTWebSocket (0.67.4): + - React-Core/RCTWebSocket (0.70.6): - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.67.4) - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsiexecutor (= 0.67.4) - - React-perflogger (= 0.67.4) + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) - Yoga - - React-CoreModules (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.4) - - React-Core/CoreModulesHeaders (= 0.67.4) - - React-jsi (= 0.67.4) - - React-RCTImage (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-cxxreact (0.67.4): + - React-CoreModules (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/CoreModulesHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTImage (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-cxxreact (0.70.6): - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.67.4) - - React-jsi (= 0.67.4) - - React-jsinspector (= 0.67.4) - - React-logger (= 0.67.4) - - React-perflogger (= 0.67.4) - - React-runtimeexecutor (= 0.67.4) - - React-jsi (0.67.4): + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-runtimeexecutor (= 0.70.6) + - React-hermes (0.70.6): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2021.07.22.00) + - RCT-Folly/Futures (= 2021.07.22.00) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-jsi (0.70.6): - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.67.4) - - React-jsi/Default (0.67.4): + - RCT-Folly (= 2021.07.22.00) + - React-jsi/Default (= 0.70.6) + - React-jsi/Default (0.70.6): - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.67.4): + - RCT-Folly (= 2021.07.22.00) + - React-jsiexecutor (0.70.6): - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-perflogger (= 0.67.4) - - React-jsinspector (0.67.4) - - React-logger (0.67.4): + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-jsinspector (0.70.6) + - React-logger (0.70.6): - glog - react-native-fingerprint-scanner (5.0.0): - React-Core @@ -278,71 +308,72 @@ PODS: - React-Core - react-native-webview (11.23.1): - React-Core - - React-perflogger (0.67.4) - - React-RCTActionSheet (0.67.4): - - React-Core/RCTActionSheetHeaders (= 0.67.4) - - React-RCTAnimation (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.4) - - React-Core/RCTAnimationHeaders (= 0.67.4) - - React-jsi (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-RCTBlob (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/RCTBlobHeaders (= 0.67.4) - - React-Core/RCTWebSocket (= 0.67.4) - - React-jsi (= 0.67.4) - - React-RCTNetwork (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-RCTImage (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.4) - - React-Core/RCTImageHeaders (= 0.67.4) - - React-jsi (= 0.67.4) - - React-RCTNetwork (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-RCTLinking (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - React-Core/RCTLinkingHeaders (= 0.67.4) - - React-jsi (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-RCTNetwork (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.4) - - React-Core/RCTNetworkHeaders (= 0.67.4) - - React-jsi (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-RCTSettings (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.67.4) - - React-Core/RCTSettingsHeaders (= 0.67.4) - - React-jsi (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-RCTText (0.67.4): - - React-Core/RCTTextHeaders (= 0.67.4) - - React-RCTVibration (0.67.4): - - FBReactNativeSpec (= 0.67.4) - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/RCTVibrationHeaders (= 0.67.4) - - React-jsi (= 0.67.4) - - ReactCommon/turbomodule/core (= 0.67.4) - - React-runtimeexecutor (0.67.4): - - React-jsi (= 0.67.4) - - ReactCommon/turbomodule/core (0.67.4): + - React-perflogger (0.70.6) + - React-RCTActionSheet (0.70.6): + - React-Core/RCTActionSheetHeaders (= 0.70.6) + - React-RCTAnimation (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTAnimationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTBlob (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.70.6) + - React-Core/RCTBlobHeaders (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTImage (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTImageHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTLinking (0.70.6): + - React-Codegen (= 0.70.6) + - React-Core/RCTLinkingHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTNetwork (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTNetworkHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTSettings (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTSettingsHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTText (0.70.6): + - React-Core/RCTTextHeaders (= 0.70.6) + - React-RCTVibration (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.70.6) + - React-Core/RCTVibrationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-runtimeexecutor (0.70.6): + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (0.70.6): - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.67.4) - - React-Core (= 0.67.4) - - React-cxxreact (= 0.67.4) - - React-jsi (= 0.67.4) - - React-logger (= 0.67.4) - - React-perflogger (= 0.67.4) + - RCT-Folly (= 2021.07.22.00) + - React-bridging (= 0.70.6) + - React-callinvoker (= 0.70.6) + - React-Core (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) - RNCAsyncStorage (1.12.1): - React-Core - RNFileViewer (2.1.5): @@ -355,10 +386,11 @@ PODS: - React-Core - RNPrivacySnapshot (1.0.0): - React-Core - - RNShare (7.9.1): + - RNShare (8.0.0): - React-Core - SNReactNative (1.0.1): - React-Core + - SocketRocket (0.6.0) - TrustKit (1.6.5) - Yoga (1.14.0) - YogaKit (1.18.1): @@ -369,39 +401,44 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - Flipper (= 0.99.0) + - Flipper (= 0.125.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - - Flipper-DoubleConversion (= 3.1.7) + - Flipper-DoubleConversion (= 3.2.0.1) - Flipper-Fmt (= 7.1.7) - - Flipper-Folly (= 2.6.7) - - Flipper-Glog (= 0.3.6) + - Flipper-Folly (= 2.6.10) + - Flipper-Glog (= 0.5.0.5) - Flipper-PeerTalk (= 0.0.4) - Flipper-RSocket (= 1.4.3) - - FlipperKit (= 0.99.0) - - FlipperKit/Core (= 0.99.0) - - FlipperKit/CppBridge (= 0.99.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.99.0) - - FlipperKit/FBDefines (= 0.99.0) - - FlipperKit/FKPortForwarding (= 0.99.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.99.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.99.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.99.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.99.0) - - FlipperKit/FlipperKitReactPlugin (= 0.99.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) + - FlipperKit (= 0.125.0) + - FlipperKit/Core (= 0.125.0) + - FlipperKit/CppBridge (= 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) + - FlipperKit/FBDefines (= 0.125.0) + - FlipperKit/FKPortForwarding (= 0.125.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) + - FlipperKit/FlipperKitReactPlugin (= 0.125.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - OpenSSL-Universal (= 1.1.180) + - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`) + - libevent (~> 2.1.12) + - 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`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) + - React-bridging (from `../node_modules/react-native/ReactCommon`) - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) + - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) - React-Core/DevSupport (from `../node_modules/react-native/`) - 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-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`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) @@ -447,6 +484,7 @@ SPEC REPOS: - fmt - libevent - OpenSSL-Universal + - SocketRocket - TrustKit - YogaKit @@ -461,6 +499,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/FBReactNativeSpec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + hermes-engine: + :podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -469,14 +509,20 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/TypeSafety" React: :path: "../node_modules/react-native/" + React-bridging: + :path: "../node_modules/react-native/ReactCommon" React-callinvoker: :path: "../node_modules/react-native/ReactCommon/callinvoker" + React-Codegen: + :path: build/generated/ios React-Core: :path: "../node_modules/react-native/" React-CoreModules: :path: "../node_modules/react-native/React/CoreModules" React-cxxreact: :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-hermes: + :path: "../node_modules/react-native/ReactCommon/hermes" React-jsi: :path: "../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: @@ -537,61 +583,66 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: f7b0632c6437e312acf6349288d9aa4cb6d59030 - FBReactNativeSpec: 0f4e1f4cfeace095694436e7c7fcc5bf4b03a0ff - Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733 + DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + FBLazyVector: 48289402952f4f7a4e235de70a9a590aa0b79ef4 + FBReactNativeSpec: dd1186fd05255e3457baa2f4ca65e94c2cd1e3ac + Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 + FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 + glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b + hermes-engine: 2af7b7a59128f250adfd86f15aa1d5a2ecd39995 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 - RCTRequired: 0aa6c1c27e1d65920df35ceea5341a5fe76bdb79 - RCTTypeSafety: d76a59d00632891e11ed7522dba3fd1a995e573a - React: ab8c09da2e7704f4b3ebad4baa6cfdfcc852dcb5 - React-callinvoker: 216fb96b482da516b8aba4142b145938f6ea92f0 - React-Core: af99b93aff83599485e0e0879879aafa35ceae32 - React-CoreModules: 137a054ce8c547e81dc3502933b1bc0fd08df05d - React-cxxreact: ec5ee6b08664f5b8ac71d8ad912f54d540c4f817 - React-jsi: 3e084c80fd364cee64668d5df46d40c39f7973e1 - React-jsiexecutor: cbdf37cebdc4f5d8b3d0bf5ccaa6147fd9de9f3d - React-jsinspector: f4775ea9118cbe1f72b834f0f842baa7a99508d8 - React-logger: a1f028f6d8639a3f364ef80419e5e862e1115250 + OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c + RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda + RCTRequired: e1866f61af7049eb3d8e08e8b133abd38bc1ca7a + RCTTypeSafety: 27c2ac1b00609a432ced1ae701247593f07f901e + React: bb3e06418d2cc48a84f9666a576c7b38e89cd7db + React-bridging: 572502ec59c9de30309afdc4932e278214288913 + React-callinvoker: 6b708b79c69f3359d42f1abb4663f620dbd4dadf + React-Codegen: 74e1cd7cee692a8b983c18df3274b5e749de07c8 + React-Core: b587d0a624f9611b0e032505f3d6f25e8daa2bee + React-CoreModules: c6ff48b985e7aa622e82ca51c2c353c7803eb04e + React-cxxreact: ade3d9e63c599afdead3c35f8a8bd12b3da6730b + React-hermes: ed09ae33512bbb8d31b2411778f3af1a2eb681a1 + React-jsi: 5a3952e0c6d57460ad9ee2c905025b4c28f71087 + React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f + React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b + React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0 react-native-fingerprint-scanner: be63e626b31fb951780a5fac5328b065a61a3d6e react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9 react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581 - React-perflogger: 0afaf2f01a47fd0fc368a93bfbb5bd3b26db6e7f - React-RCTActionSheet: 59f35c4029e0b532fc42114241a06e170b7431a2 - React-RCTAnimation: aae4f4bed122e78bdab72f7118d291d70a932ce2 - React-RCTBlob: f6fb23394b4f28cd86fa7e9f5f6ae45c23669fda - React-RCTImage: 638815cf96124386dd296067246d91441932ae3f - React-RCTLinking: 254dd06283dd6fdb784285f95e7cec8053c3270f - React-RCTNetwork: 8a4c2d4f357268e520b060572d02bc69a9b991fb - React-RCTSettings: 35d44cbb9972ab933bd0a59ea3e6646dcb030ba3 - React-RCTText: cc5315df8458cfa7b537e621271ef43273955a97 - React-RCTVibration: 3b52a7dced19cdb025b4f88ab26ceb2d85f30ba2 - React-runtimeexecutor: a9d3c82ddf7ffdad9fbe6a81c6d6f8c06385464d - ReactCommon: 07d0c460b9ba9af3eaf1b8f5abe7daaad28c9c4e + React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595 + React-RCTActionSheet: 7316773acabb374642b926c19aef1c115df5c466 + React-RCTAnimation: 5341e288375451297057391227f691d9b2326c3d + React-RCTBlob: b0615fc2daf2b5684ade8fadcab659f16f6f0efa + React-RCTImage: 6487b9600f268ecedcaa86114d97954d31ad4750 + React-RCTLinking: c8018ae9ebfefcec3839d690d4725f8d15e4e4b3 + React-RCTNetwork: 8aa63578741e0fe1205c28d7d4b40dbfdabce8a8 + React-RCTSettings: d00c15ad369cd62242a4dfcc6f277912b4a84ed3 + React-RCTText: f532e5ca52681ecaecea452b3ad7a5b630f50d75 + React-RCTVibration: c75ceef7aa60a33b2d5731ebe5800ddde40cefc4 + React-runtimeexecutor: 15437b576139df27635400de0599d9844f1ab817 + ReactCommon: 349be31adeecffc7986a0de875d7fb0dcf4e251c RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398 RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592 RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNIap: 3bcd6982cf99503339cf9243e4ba70a45ea2cf72 RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94 RNPrivacySnapshot: 8eaf571478a353f2e5184f5c803164f22428b023 - RNShare: a5dc3b9c53ddc73e155b8cd9a94c70c91913c43c + RNShare: 36aa3e6958373a0ad1c95a1c960adef589da3794 SNReactNative: b5e9e529c175c13f3a618e27c76cf3071213d5e1 + SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 TrustKit: 073855e3adecd317417bda4ac9e9ac54a2e3b9f2 - Yoga: d6b6a80659aa3e91aaba01d0012e7edcbedcbecd + Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 297552073de1fdbc5a3585e9037f5cfd60308641 +PODFILE CHECKSUM: 50b3e916da8c47a2c25dff9490b318aa08e78c79 COCOAPODS: 1.11.3 diff --git a/packages/mobile/ios/StandardNotes.xcodeproj/project.pbxproj b/packages/mobile/ios/StandardNotes.xcodeproj/project.pbxproj index 7f987140c..0415bfefd 100644 --- a/packages/mobile/ios/StandardNotes.xcodeproj/project.pbxproj +++ b/packages/mobile/ios/StandardNotes.xcodeproj/project.pbxproj @@ -8,15 +8,13 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* StandardNotesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StandardNotesTests.m */; }; - 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 1C2EEB3B45F4EB07AC795C77 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 1C2EEB3B45F4EB07AC795C77 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 33BB1B14071EBE5978EBF3A8 /* libPods-StandardNotes-StandardNotesTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04FCB5A3A3387CA3CFC82AA3 /* libPods-StandardNotes-StandardNotesTests.a */; }; BC8DEA834BF198E8511F04FF /* libPods-StandardNotesDev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F2D747BE02C2A1BCFEEFD1 /* libPods-StandardNotesDev.a */; }; CD6592A9291EEFCC00C09DC6 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6592A8291EEFCC00C09DC6 /* StoreKit.framework */; }; CD7D5ECA27800609005FE1BF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD7D5EC927800608005FE1BF /* LaunchScreen.storyboard */; }; - CD7D5ECF278015D2005FE1BF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; CD7D5ED0278015D2005FE1BF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; CD7D5ED4278015D2005FE1BF /* Red.png in Resources */ = {isa = PBXBuildFile; fileRef = CD7D83FE277FF8CB00915D89 /* Red.png */; }; CD7D5ED5278015D2005FE1BF /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; @@ -27,6 +25,8 @@ CD7D8400277FF8CB00915D89 /* Red@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = CD7D83FD277FF8CB00915D89 /* Red@3x.png */; }; CD7D8401277FF8CB00915D89 /* Red.png in Resources */ = {isa = PBXBuildFile; fileRef = CD7D83FE277FF8CB00915D89 /* Red.png */; }; CD7D8402277FF8CB00915D89 /* Red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CD7D83FF277FF8CB00915D89 /* Red@2x.png */; }; + CDC75796292552080019F4AF /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC75795292552080019F4AF /* AppDelegate.mm */; }; + CDC75797292552080019F4AF /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC75795292552080019F4AF /* AppDelegate.mm */; }; D261494528699DCE00B17102 /* Web.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D261494428699DCE00B17102 /* Web.bundle */; }; D261494628699DCE00B17102 /* Web.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D261494428699DCE00B17102 /* Web.bundle */; }; DD3D1CE428EC1C8BA0C49211 /* libPods-StandardNotes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 41388EB4F886116157DA092C /* libPods-StandardNotes.a */; }; @@ -50,7 +50,6 @@ 0BB10C8D896AFACECE748F6D /* Pods-StandardNotesDev.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StandardNotesDev.release.xcconfig"; path = "Target Support Files/Pods-StandardNotesDev/Pods-StandardNotesDev.release.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* StandardNotes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StandardNotes.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StandardNotes/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StandardNotes/AppDelegate.m; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StandardNotes/Images.xcassets; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StandardNotes/main.m; sourceTree = ""; }; 321F15E603CF0AF8B1769447 /* Pods-StandardNotes-StandardNotesTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StandardNotes-StandardNotesTests.release.xcconfig"; path = "Target Support Files/Pods-StandardNotes-StandardNotesTests/Pods-StandardNotes-StandardNotesTests.release.xcconfig"; sourceTree = ""; }; @@ -71,6 +70,7 @@ CD7D83FD277FF8CB00915D89 /* Red@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Red@3x.png"; sourceTree = ""; }; CD7D83FE277FF8CB00915D89 /* Red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Red.png; sourceTree = ""; }; CD7D83FF277FF8CB00915D89 /* Red@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Red@2x.png"; sourceTree = ""; }; + CDC75795292552080019F4AF /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StandardNotes/AppDelegate.mm; sourceTree = ""; }; D261494428699DCE00B17102 /* Web.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Web.bundle; path = ../html/Web.bundle; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -89,7 +89,7 @@ buildActionMask = 2147483647; files = ( CD6592A9291EEFCC00C09DC6 /* StoreKit.framework in Frameworks */, - 1C2EEB3B45F4EB07AC795C77 /* (null) in Frameworks */, + 1C2EEB3B45F4EB07AC795C77 /* BuildFile in Frameworks */, DD3D1CE428EC1C8BA0C49211 /* libPods-StandardNotes.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -140,7 +140,7 @@ children = ( D261494428699DCE00B17102 /* Web.bundle */, 13B07FAF1A68108700A75B9A /* AppDelegate.h */, - 13B07FB01A68108700A75B9A /* AppDelegate.m */, + CDC75795292552080019F4AF /* AppDelegate.mm */, CD7D5EE527801F10005FE1BF /* StandardNotes.entitlements */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 13B07FB71A68108700A75B9A /* main.m */, @@ -257,6 +257,7 @@ CD7D5ED3278015D2005FE1BF /* Resources */, CD7D5ED9278015D2005FE1BF /* Bundle React Native code and images */, CD7D5EDB278015D2005FE1BF /* [CP] Copy Pods Resources */, + 73628DBD12483F78939E4EEB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -400,6 +401,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 73628DBD12483F78939E4EEB /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-StandardNotesDev/Pods-StandardNotesDev-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-StandardNotesDev/Pods-StandardNotesDev-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-StandardNotesDev/Pods-StandardNotesDev-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; AA865067D78BE435788A7E7C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -574,7 +592,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */, + CDC75796292552080019F4AF /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -583,7 +601,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - CD7D5ECF278015D2005FE1BF /* AppDelegate.m in Sources */, + CDC75797292552080019F4AF /* AppDelegate.mm in Sources */, CD7D5ED0278015D2005FE1BF /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -714,7 +732,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -742,7 +760,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -770,6 +788,7 @@ ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -779,7 +798,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -807,7 +826,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -827,6 +846,7 @@ "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/packages/mobile/ios/StandardNotes/AppDelegate.m b/packages/mobile/ios/StandardNotes/AppDelegate.mm similarity index 61% rename from packages/mobile/ios/StandardNotes/AppDelegate.m rename to packages/mobile/ios/StandardNotes/AppDelegate.mm index d2c590d8d..14f359de3 100644 --- a/packages/mobile/ios/StandardNotes/AppDelegate.m +++ b/packages/mobile/ios/StandardNotes/AppDelegate.mm @@ -2,13 +2,39 @@ #import #import #import + +#import + #import #import +#if RCT_NEW_ARCH_ENABLED +#import +#import +#import +#import +#import +#import + +#import + +static NSString *const kRNConcurrentRoot = @"concurrentRoot"; + +@interface AppDelegate () { + RCTTurboModuleManager *_turboModuleManager; + RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; + std::shared_ptr _reactNativeConfig; + facebook::react::ContextContainer::Shared _contextContainer; +} +@end +#endif + @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + RCTAppSetupPrepareApp(application); + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; [self configurePinning]; @@ -22,6 +48,15 @@ NSDictionary * initialProperties = @{@"env" : [CFBundleIdentifier isEqualToString:@"com.standardnotes.standardnotes.dev"] ? @"dev" : @"prod"}; RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; + +#if RCT_NEW_ARCH_ENABLED + _contextContainer = std::make_shared(); + _reactNativeConfig = std::make_shared(); + _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); + _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer]; + bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; +#endif + RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"StandardNotes" initialProperties:initialProperties]; @@ -42,6 +77,66 @@ return YES; } +/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. +/// +/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html +/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). +/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`. +- (BOOL)concurrentRootEnabled +{ + // Switch this bool to turn on and off the concurrent root + return true; +} + +- (NSDictionary *)prepareInitialProps +{ + NSMutableDictionary *initProps = [NSMutableDictionary new]; +#ifdef RCT_NEW_ARCH_ENABLED + initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]); +#endif + return initProps; +} + +- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge +{ +#if DEBUG + return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"]; +#else + return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; +#endif +} + +#if RCT_NEW_ARCH_ENABLED +#pragma mark - RCTCxxBridgeDelegate +- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge +{ + _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge + delegate:self + jsInvoker:bridge.jsCallInvoker]; + return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager); +} +#pragma mark RCTTurboModuleManagerDelegate +- (Class)getModuleClassFromName:(const char *)name +{ + return RCTCoreModulesClassProvider(name); +} +- (std::shared_ptr)getTurboModule:(const std::string &)name + jsInvoker:(std::shared_ptr)jsInvoker +{ + return nullptr; +} +- (std::shared_ptr)getTurboModule:(const std::string &)name + initParams: + (const facebook::react::ObjCTurboModule::InitParams &)params +{ + return nullptr; +} +- (id)getModuleInstanceFromClass:(Class)moduleClass +{ + return RCTAppSetupDefaultModuleFromClass(moduleClass); +} +#endif + - (void)disableUrlCache { // Disable NSURLCache for general network requests. Caches are not protected by NSFileProtectionComplete. // Disabling, or implementing a custom subclass are only two solutions. https://stackoverflow.com/questions/27933387/nsurlcache-and-data-protection @@ -122,13 +217,4 @@ } } -- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge -{ -#if DEBUG - return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; -#else - return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; -#endif -} - @end diff --git a/packages/mobile/ios/StandardNotes/Images.xcassets/Contents.json b/packages/mobile/ios/StandardNotes/Images.xcassets/Contents.json index 2d92bd53f..ddd7fca89 100644 --- a/packages/mobile/ios/StandardNotes/Images.xcassets/Contents.json +++ b/packages/mobile/ios/StandardNotes/Images.xcassets/Contents.json @@ -1,6 +1,53 @@ { - "info" : { - "version" : 1, - "author" : "xcode" + "images": [ + { + "idiom": "iphone", + "scale": "2x", + "size": "20x20" + }, + { + "idiom": "iphone", + "scale": "3x", + "size": "20x20" + }, + { + "idiom": "iphone", + "scale": "2x", + "size": "29x29" + }, + { + "idiom": "iphone", + "scale": "3x", + "size": "29x29" + }, + { + "idiom": "iphone", + "scale": "2x", + "size": "40x40" + }, + { + "idiom": "iphone", + "scale": "3x", + "size": "40x40" + }, + { + "idiom": "iphone", + "scale": "2x", + "size": "60x60" + }, + { + "idiom": "iphone", + "scale": "3x", + "size": "60x60" + }, + { + "idiom": "ios-marketing", + "scale": "1x", + "size": "1024x1024" + } + ], + "info": { + "author": "xcode", + "version": 1 } } diff --git a/packages/mobile/ios/StandardNotes/main.m b/packages/mobile/ios/StandardNotes/main.m index b1df44b95..d645c7246 100644 --- a/packages/mobile/ios/StandardNotes/main.m +++ b/packages/mobile/ios/StandardNotes/main.m @@ -2,7 +2,8 @@ #import "AppDelegate.h" -int main(int argc, char * argv[]) { +int main(int argc, char *argv[]) +{ @autoreleasepool { return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } diff --git a/packages/mobile/ios/StandardNotesTests/StandardNotesTests.m b/packages/mobile/ios/StandardNotesTests/StandardNotesTests.m index 7371f1028..940246d5d 100644 --- a/packages/mobile/ios/StandardNotesTests/StandardNotesTests.m +++ b/packages/mobile/ios/StandardNotesTests/StandardNotesTests.m @@ -13,7 +13,7 @@ @implementation StandardNotesTests -- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test +- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL (^)(UIView *view))test { if (test(view)) { return YES; @@ -34,23 +34,25 @@ __block NSString *redboxError = nil; #ifdef DEBUG - RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) { - if (level >= RCTLogLevelError) { - redboxError = message; - } - }); + RCTSetLogFunction( + ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) { + if (level >= RCTLogLevelError) { + redboxError = message; + } + }); #endif while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) { [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; - foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) { - if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) { - return YES; - } - return NO; - }]; + foundElement = [self findSubviewInView:vc.view + matching:^BOOL(UIView *view) { + if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) { + return YES; + } + return NO; + }]; } #ifdef DEBUG @@ -61,5 +63,4 @@ XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS); } - -@end +@end \ No newline at end of file diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 4b9ee6cfa..0686b5459 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -37,30 +37,30 @@ "@standardnotes/react-native-utils": "1.0.1", "@standardnotes/snjs": "workspace:*", "@standardnotes/web": "workspace:*", - "@types/react": "^18.0.21", - "@types/react-native": "^0.67.3", + "@types/react": "^18.0.25", + "@types/react-native": "^0.70.6", "@typescript-eslint/eslint-plugin": "*", "@typescript-eslint/parser": "*", "babel-jest": "^29.3.1", - "detox": "^19.5.7", - "eslint": "^8.13.0", - "eslint-plugin-prettier": "^4.0.0", + "detox": "^20.0.3", + "eslint": "^8.27.0", + "eslint-plugin-prettier": "^4.2.1", "get-yarn-workspaces": "^1.0.2", - "metro-react-native-babel-preset": "^0.70.1", + "metro-react-native-babel-preset": "^0.73.3", "npm-check-updates": "*", - "pod-install": "^0.1.33", + "pod-install": "^0.1.38", "prettier": "^2.7.1", "prettier-plugin-organize-imports": "^3.2.0", - "react": "17.0.2", - "react-native": "0.67.4", + "react": "18.2.0", + "react-native": "0.70.6", "react-native-file-viewer": "^2.1.5", "react-native-fingerprint-scanner": "standardnotes/react-native-fingerprint-scanner#b55d1c0ca627a87a130f758603f12911fbac200f", "react-native-flag-secure-android": "standardnotes/react-native-flag-secure-android#cb08e74583c22a5d912842459b35ebbbb4bcd852", - "react-native-fs": "^2.19.0", + "react-native-fs": "^2.20.0", "react-native-iap": "^12.4.4", "react-native-keychain": "standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6", "react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904c90fc6f2b578da59138f2bfe5d7f942fe", - "react-native-share": "^7.9.0", + "react-native-share": "^8.0.0", "react-native-version-info": "^1.1.1", "react-native-webview": "11.23.1", "typescript": "^4.9.3" diff --git a/yarn.lock b/yarn.lock index 9a3933aaf..7a63e97a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -221,7 +221,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:*, @babel/core@npm:^7.1.6, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.16, @babel/core@npm:^7.12.3, @babel/core@npm:^7.14.0, @babel/core@npm:^7.18.5, @babel/core@npm:^7.18.6": +"@babel/core@npm:*, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.16, @babel/core@npm:^7.12.3, @babel/core@npm:^7.14.0, @babel/core@npm:^7.18.5, @babel/core@npm:^7.18.6": version: 7.19.3 resolution: "@babel/core@npm:7.19.3" dependencies: @@ -268,7 +268,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.19.6, @babel/core@npm:^7.20.2": +"@babel/core@npm:^7.13.16, @babel/core@npm:^7.19.6, @babel/core@npm:^7.20.2": version: 7.20.2 resolution: "@babel/core@npm:7.20.2" dependencies: @@ -690,7 +690,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.12.16, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.19.3, @babel/parser@npm:^7.19.4": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.16, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.19.3, @babel/parser@npm:^7.19.4": version: 7.19.4 resolution: "@babel/parser@npm:7.19.4" bin: @@ -699,6 +699,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.13.16, @babel/parser@npm:^7.20.1, @babel/parser@npm:^7.20.2": + version: 7.20.3 + resolution: "@babel/parser@npm:7.20.3" + bin: + parser: ./bin/babel-parser.js + checksum: 33bcdb45de65a3cf27ed376cb34f32be3c3485a10e3252f8d0126f6a034efc3145c0d219e57fcd5a8956361552008bc30b9bae4a723823fb3633027071be8a45 + languageName: node + linkType: hard + "@babel/parser@npm:^7.19.6": version: 7.19.6 resolution: "@babel/parser@npm:7.19.6" @@ -708,15 +717,6 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.20.1, @babel/parser@npm:^7.20.2": - version: 7.20.3 - resolution: "@babel/parser@npm:7.20.3" - bin: - parser: ./bin/babel-parser.js - checksum: 33bcdb45de65a3cf27ed376cb34f32be3c3485a10e3252f8d0126f6a034efc3145c0d219e57fcd5a8956361552008bc30b9bae4a723823fb3633027071be8a45 - languageName: node - linkType: hard - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6" @@ -769,7 +769,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-class-properties@npm:^7.0.0, @babel/plugin-proposal-class-properties@npm:^7.1.0, @babel/plugin-proposal-class-properties@npm:^7.18.6": +"@babel/plugin-proposal-class-properties@npm:^7.0.0, @babel/plugin-proposal-class-properties@npm:^7.13.0, @babel/plugin-proposal-class-properties@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6" dependencies: @@ -854,7 +854,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.0.0, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.1.0, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.12.13, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6": +"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.0.0, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.12.13, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6" dependencies: @@ -933,7 +933,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:^7.0.0, @babel/plugin-proposal-optional-chaining@npm:^7.1.0, @babel/plugin-proposal-optional-chaining@npm:^7.12.16, @babel/plugin-proposal-optional-chaining@npm:^7.18.9": +"@babel/plugin-proposal-optional-chaining@npm:^7.0.0, @babel/plugin-proposal-optional-chaining@npm:^7.12.16, @babel/plugin-proposal-optional-chaining@npm:^7.13.12, @babel/plugin-proposal-optional-chaining@npm:^7.18.9": version: 7.18.9 resolution: "@babel/plugin-proposal-optional-chaining@npm:7.18.9" dependencies: @@ -1483,7 +1483,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.1.0, @babel/plugin-transform-modules-commonjs@npm:^7.18.6": +"@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-modules-commonjs@npm:7.18.6" dependencies: @@ -1497,7 +1497,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.19.6": +"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.19.6": version: 7.19.6 resolution: "@babel/plugin-transform-modules-commonjs@npm:7.19.6" dependencies: @@ -1574,17 +1574,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-object-assign@npm:^7.0.0": - version: 7.18.6 - resolution: "@babel/plugin-transform-object-assign@npm:7.18.6" - dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: a9738264cc996c54febafa0701c5a182d99afbddbfe9fbcc0b2536e3b2332b3318a8143aacd0368e31e18c24cd1b1980be7a3b0b2e5122efb520952d863a1203 - languageName: node - linkType: hard - "@babel/plugin-transform-object-super@npm:^7.0.0, @babel/plugin-transform-object-super@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-object-super@npm:7.18.6" @@ -1723,7 +1712,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-regenerator@npm:^7.0.0, @babel/plugin-transform-regenerator@npm:^7.18.6": +"@babel/plugin-transform-regenerator@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-regenerator@npm:7.18.6" dependencies: @@ -2040,7 +2029,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-flow@npm:^7.0.0": +"@babel/preset-flow@npm:^7.13.13": version: 7.18.6 resolution: "@babel/preset-flow@npm:7.18.6" dependencies: @@ -2084,7 +2073,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.1.0, @babel/preset-typescript@npm:^7.12.16, @babel/preset-typescript@npm:^7.17.12, @babel/preset-typescript@npm:^7.18.6": +"@babel/preset-typescript@npm:^7.12.16, @babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.17.12, @babel/preset-typescript@npm:^7.18.6": version: 7.18.6 resolution: "@babel/preset-typescript@npm:7.18.6" dependencies: @@ -2097,7 +2086,7 @@ __metadata: languageName: node linkType: hard -"@babel/register@npm:^7.0.0": +"@babel/register@npm:^7.13.16": version: 7.18.9 resolution: "@babel/register@npm:7.18.9" dependencies: @@ -2245,18 +2234,6 @@ __metadata: languageName: node linkType: hard -"@cnakazawa/watch@npm:^1.0.3": - version: 1.0.4 - resolution: "@cnakazawa/watch@npm:1.0.4" - dependencies: - exec-sh: ^0.3.2 - minimist: ^1.2.0 - bin: - watch: cli.js - checksum: 88f395ca0af2f3c0665b8ce7bb29e83647ec5d141e8735712aeeee4117081555436712966b6957aa1c461f6f826a4d23b0034e379c443a10e919f81c8748bf29 - languageName: node - linkType: hard - "@colors/colors@npm:1.5.0": version: 1.5.0 resolution: "@colors/colors@npm:1.5.0" @@ -5123,162 +5100,190 @@ __metadata: languageName: node linkType: hard -"@react-native-community/cli-debugger-ui@npm:^6.0.0-rc.0": - version: 6.0.0 - resolution: "@react-native-community/cli-debugger-ui@npm:6.0.0" +"@react-native-community/cli-clean@npm:^9.2.1": + version: 9.2.1 + resolution: "@react-native-community/cli-clean@npm:9.2.1" dependencies: - serve-static: ^1.13.1 - checksum: 3257e7efcd9849124adca07facd414729c0402774fb5593cd0b5343f4410c8306f0b2a65d0ef2f676a372fd5ca130fe21365fa3411b5c490bd27b1fc1911bf9c - languageName: node - linkType: hard - -"@react-native-community/cli-hermes@npm:^6.3.0": - version: 6.3.1 - resolution: "@react-native-community/cli-hermes@npm:6.3.1" - dependencies: - "@react-native-community/cli-platform-android": ^6.3.1 - "@react-native-community/cli-tools": ^6.2.1 - chalk: ^4.1.2 - hermes-profile-transformer: ^0.0.6 - ip: ^1.1.5 - checksum: 7e82764c8531de228882e912158f26c9b3a426c36f2c1751f58ac68763689b8b733c43b745814c1b72cc1100de2d5bbc764ed105e7d846104d3d69427aa75a60 - languageName: node - linkType: hard - -"@react-native-community/cli-platform-android@npm:^6.0.0, @react-native-community/cli-platform-android@npm:^6.3.1": - version: 6.3.1 - resolution: "@react-native-community/cli-platform-android@npm:6.3.1" - dependencies: - "@react-native-community/cli-tools": ^6.2.1 + "@react-native-community/cli-tools": ^9.2.1 chalk: ^4.1.2 execa: ^1.0.0 - fs-extra: ^8.1.0 - glob: ^7.1.3 - jetifier: ^1.6.2 - lodash: ^4.17.15 - logkitty: ^0.7.1 - slash: ^3.0.0 - xmldoc: ^1.1.2 - checksum: cb4d649213c277c792cfff338d9530f622a5445de576402684dd322ac71b6cc8dfcf699179d8dee9fb89c76b18997740eac41cac7e7ff2c6032cc97afd405e0e + prompts: ^2.4.0 + checksum: 52286695a7197a3679125bf05e33bbcecd9d116d25ba2960a55888d35a9cecc5b1a6857d8edff7bfa2593e11ad496b823f7a5fae5d838c41556a63abd3d62955 languageName: node linkType: hard -"@react-native-community/cli-platform-ios@npm:^6.0.0": - version: 6.2.1 - resolution: "@react-native-community/cli-platform-ios@npm:6.2.1" +"@react-native-community/cli-config@npm:^9.2.1": + version: 9.2.1 + resolution: "@react-native-community/cli-config@npm:9.2.1" dependencies: - "@react-native-community/cli-tools": ^6.2.1 - chalk: ^4.1.2 - glob: ^7.1.3 - js-yaml: ^3.13.1 - lodash: ^4.17.15 - ora: ^3.4.0 - plist: ^3.0.2 - xcode: ^2.0.0 - checksum: 40c5a3318382319919f604724be62522c51681b7306cf0fa1d18cbafe1bea14cfa05758685adf620e8ba643475a7e1946b6c1a7795c4de285c92c0cc4181c37c - languageName: node - linkType: hard - -"@react-native-community/cli-plugin-metro@npm:^6.4.0": - version: 6.4.0 - resolution: "@react-native-community/cli-plugin-metro@npm:6.4.0" - dependencies: - "@react-native-community/cli-server-api": ^6.4.0 - "@react-native-community/cli-tools": ^6.2.0 - chalk: ^4.1.2 - metro: ^0.66.1 - metro-config: ^0.66.1 - metro-core: ^0.66.1 - metro-react-native-babel-transformer: ^0.66.1 - metro-resolver: ^0.66.1 - metro-runtime: ^0.66.1 - readline: ^1.3.0 - checksum: b9bedad5daded5b633401a6eaffef723da0ecf755991742cd138927bfd7995e463c3b6a22283d8ec1c8c39e300e983a238affb64fbf4a1cc33f089a5414281e8 - languageName: node - linkType: hard - -"@react-native-community/cli-server-api@npm:^6.4.0": - version: 6.4.3 - resolution: "@react-native-community/cli-server-api@npm:6.4.3" - dependencies: - "@react-native-community/cli-debugger-ui": ^6.0.0-rc.0 - "@react-native-community/cli-tools": ^6.2.0 - compression: ^1.7.1 - connect: ^3.6.5 - errorhandler: ^1.5.0 - nocache: ^2.1.0 - pretty-format: ^26.6.2 - serve-static: ^1.13.1 - ws: ^1.1.0 - checksum: 52b36ebbfc19c2f39350cbd01069703ed64885f90fccdd6e3f71b5e464fcb49ce41308bd6eb9b1306206122277f4b5bd2416fe326b7948b8d99300916aa738fa - languageName: node - linkType: hard - -"@react-native-community/cli-tools@npm:^6.2.0, @react-native-community/cli-tools@npm:^6.2.1": - version: 6.2.1 - resolution: "@react-native-community/cli-tools@npm:6.2.1" - dependencies: - appdirsjs: ^1.2.4 - chalk: ^4.1.2 - lodash: ^4.17.15 - mime: ^2.4.1 - node-fetch: ^2.6.0 - open: ^6.2.0 - semver: ^6.3.0 - shell-quote: ^1.7.3 - checksum: dcc5084c0c021cbec98099c97bdbdaedcd46d51fbd271a369a80c76754fa068dd90b4c5f4a61a9c1a852bce715bea5c4e0f30f2d6da958c7204c2fa14d0f99a8 - languageName: node - linkType: hard - -"@react-native-community/cli-types@npm:^6.0.0": - version: 6.0.0 - resolution: "@react-native-community/cli-types@npm:6.0.0" - dependencies: - ora: ^3.4.0 - checksum: 7ef1a4e5e340facca6280bc8d9f36cd44b8c6d05ba2afa228fea9bd3eabfa4d0b273e3c42f5e1f65144e126eb4f95ef7ffbd785981d30286799d74f267863265 - languageName: node - linkType: hard - -"@react-native-community/cli@npm:^6.0.0": - version: 6.4.0 - resolution: "@react-native-community/cli@npm:6.4.0" - dependencies: - "@react-native-community/cli-debugger-ui": ^6.0.0-rc.0 - "@react-native-community/cli-hermes": ^6.3.0 - "@react-native-community/cli-plugin-metro": ^6.4.0 - "@react-native-community/cli-server-api": ^6.4.0 - "@react-native-community/cli-tools": ^6.2.0 - "@react-native-community/cli-types": ^6.0.0 - appdirsjs: ^1.2.4 - chalk: ^4.1.2 - command-exists: ^1.2.8 - commander: ^2.19.0 + "@react-native-community/cli-tools": ^9.2.1 cosmiconfig: ^5.1.0 deepmerge: ^3.2.0 + glob: ^7.1.3 + joi: ^17.2.1 + checksum: 95a6f8f380677b4ed43bbb6853cf9c889cd5be05a89452cc471e4c873bb0939be698f5685261d99113c439df988e8f6022478302878ca8e682fd963b3488703f + languageName: node + linkType: hard + +"@react-native-community/cli-debugger-ui@npm:^9.0.0": + version: 9.0.0 + resolution: "@react-native-community/cli-debugger-ui@npm:9.0.0" + dependencies: + serve-static: ^1.13.1 + checksum: 32e16e3d5c7b5cc4f16a1b3242c7bb33e358301a11736ba03d567dd63d4e8517cf7428cfabcbbe59ce527f68d72489d5ede1e76ba8dd399965e9cf8366dc38e8 + languageName: node + linkType: hard + +"@react-native-community/cli-doctor@npm:^9.3.0": + version: 9.3.0 + resolution: "@react-native-community/cli-doctor@npm:9.3.0" + dependencies: + "@react-native-community/cli-config": ^9.2.1 + "@react-native-community/cli-platform-ios": ^9.3.0 + "@react-native-community/cli-tools": ^9.2.1 + chalk: ^4.1.2 + command-exists: ^1.2.8 envinfo: ^7.7.2 execa: ^1.0.0 - find-up: ^4.1.0 - fs-extra: ^8.1.0 - glob: ^7.1.3 - graceful-fs: ^4.1.3 - joi: ^17.2.1 - leven: ^3.1.0 - lodash: ^4.17.15 - minimist: ^1.2.0 + hermes-profile-transformer: ^0.0.6 + ip: ^1.1.5 node-stream-zip: ^1.9.1 - ora: ^3.4.0 - pretty-format: ^26.6.2 + ora: ^5.4.1 prompts: ^2.4.0 semver: ^6.3.0 - serve-static: ^1.13.1 strip-ansi: ^5.2.0 sudo-prompt: ^9.0.0 wcwidth: ^1.0.1 - peerDependencies: - react-native: "*" + checksum: 5bea6203f0f83f798ef4d7957f4de8b5fea2469d287c0d71c04cb108a2627893a6a385fc19b79337ad9bdc7ba474c65e23e2496735f9e4b4d5759a51dff71204 + languageName: node + linkType: hard + +"@react-native-community/cli-hermes@npm:^9.3.1": + version: 9.3.1 + resolution: "@react-native-community/cli-hermes@npm:9.3.1" + dependencies: + "@react-native-community/cli-platform-android": ^9.3.1 + "@react-native-community/cli-tools": ^9.2.1 + chalk: ^4.1.2 + hermes-profile-transformer: ^0.0.6 + ip: ^1.1.5 + checksum: 2e021c64de4dd23d27bdb55cd9480ed52a577d606039de038d64027fa159247c2a8b5e7b5380e92c4b5d136f701d061ff6af059aa30f84e18c2cd848d6e73eb8 + languageName: node + linkType: hard + +"@react-native-community/cli-platform-android@npm:9.3.1, @react-native-community/cli-platform-android@npm:^9.3.1": + version: 9.3.1 + resolution: "@react-native-community/cli-platform-android@npm:9.3.1" + dependencies: + "@react-native-community/cli-tools": ^9.2.1 + chalk: ^4.1.2 + execa: ^1.0.0 + fs-extra: ^8.1.0 + glob: ^7.1.3 + logkitty: ^0.7.1 + slash: ^3.0.0 + checksum: 147b581ce8e42aa3ef18484fd854a0c9931b799e78de11951bde46772520ca5d58da5bc00e86c5b23b0c1d56dc1251bd93dd7dd559aa974194f170fdc5cb578c + languageName: node + linkType: hard + +"@react-native-community/cli-platform-ios@npm:9.3.0, @react-native-community/cli-platform-ios@npm:^9.3.0": + version: 9.3.0 + resolution: "@react-native-community/cli-platform-ios@npm:9.3.0" + dependencies: + "@react-native-community/cli-tools": ^9.2.1 + chalk: ^4.1.2 + execa: ^1.0.0 + glob: ^7.1.3 + ora: ^5.4.1 + checksum: c4bf882af92e8557458de98cd57327845c2cc7045bdd1e6cc2ded5911134ea19d75276de4a1bb609e51096207970bc8ccb8a836a9d87bb692dc3f67b48ebfd24 + languageName: node + linkType: hard + +"@react-native-community/cli-plugin-metro@npm:^9.2.1": + version: 9.2.1 + resolution: "@react-native-community/cli-plugin-metro@npm:9.2.1" + dependencies: + "@react-native-community/cli-server-api": ^9.2.1 + "@react-native-community/cli-tools": ^9.2.1 + chalk: ^4.1.2 + metro: 0.72.3 + metro-config: 0.72.3 + metro-core: 0.72.3 + metro-react-native-babel-transformer: 0.72.3 + metro-resolver: 0.72.3 + metro-runtime: 0.72.3 + readline: ^1.3.0 + checksum: 1581eb5515f2f6e65fbf94c4ef0610ba68d9856715902cbbbb6205943828ac7c7b3f989881bcda88bdbf2acb855a8accca3114abb2922369d580922e62a33ea8 + languageName: node + linkType: hard + +"@react-native-community/cli-server-api@npm:^9.2.1": + version: 9.2.1 + resolution: "@react-native-community/cli-server-api@npm:9.2.1" + dependencies: + "@react-native-community/cli-debugger-ui": ^9.0.0 + "@react-native-community/cli-tools": ^9.2.1 + compression: ^1.7.1 + connect: ^3.6.5 + errorhandler: ^1.5.0 + nocache: ^3.0.1 + pretty-format: ^26.6.2 + serve-static: ^1.13.1 + ws: ^7.5.1 + checksum: 0452310b2d499560458249101d9ad75886a1553aab6deec6e84d968d5de95bb206266d6254d2b500b3492d266b99fd5e1e0eafb686142900fba6a272ceb4038a + languageName: node + linkType: hard + +"@react-native-community/cli-tools@npm:^9.2.1": + version: 9.2.1 + resolution: "@react-native-community/cli-tools@npm:9.2.1" + dependencies: + appdirsjs: ^1.2.4 + chalk: ^4.1.2 + find-up: ^5.0.0 + mime: ^2.4.1 + node-fetch: ^2.6.0 + open: ^6.2.0 + ora: ^5.4.1 + semver: ^6.3.0 + shell-quote: ^1.7.3 + checksum: 8f99ec43b5bc7b5f90e32cae5ba10f5d64e4f2ca2dfb0b51ac71aae5215747c0672ed05752def89eb47cbdc41231afc29f450ffdc6151bd06f4bf4584a3f4bea + languageName: node + linkType: hard + +"@react-native-community/cli-types@npm:^9.1.0": + version: 9.1.0 + resolution: "@react-native-community/cli-types@npm:9.1.0" + dependencies: + joi: ^17.2.1 + checksum: 4ac2b9ba8f05562a30201595f90e12ce7f28f0eed1f34e30a0a085525227c8862454dabeccb5da5eebc21e2856e365b2241599b7182eb5721ebcdfe631407eac + languageName: node + linkType: hard + +"@react-native-community/cli@npm:9.3.2": + version: 9.3.2 + resolution: "@react-native-community/cli@npm:9.3.2" + dependencies: + "@react-native-community/cli-clean": ^9.2.1 + "@react-native-community/cli-config": ^9.2.1 + "@react-native-community/cli-debugger-ui": ^9.0.0 + "@react-native-community/cli-doctor": ^9.3.0 + "@react-native-community/cli-hermes": ^9.3.1 + "@react-native-community/cli-plugin-metro": ^9.2.1 + "@react-native-community/cli-server-api": ^9.2.1 + "@react-native-community/cli-tools": ^9.2.1 + "@react-native-community/cli-types": ^9.1.0 + chalk: ^4.1.2 + commander: ^9.4.0 + execa: ^1.0.0 + find-up: ^4.1.0 + fs-extra: ^8.1.0 + graceful-fs: ^4.1.3 + prompts: ^2.4.0 + semver: ^6.3.0 bin: react-native: build/bin.js - checksum: d42cf2f91869b991a01a507710432f352b34203a66a39ed03918de6098365522f1717a3615ac9ecba2f621b1125e0dbc98c617bd0584ba8414f866f418cf6117 + checksum: 474711ebfad0834e34026889004bc823b79817fc50fb9b614e987755b7073e251643d1078884d3b49f195c83b18bc32b0e608c512e3928fb0dec8dd6be42e180 languageName: node linkType: hard @@ -5877,30 +5882,30 @@ __metadata: "@standardnotes/react-native-utils": 1.0.1 "@standardnotes/snjs": "workspace:*" "@standardnotes/web": "workspace:*" - "@types/react": ^18.0.21 - "@types/react-native": ^0.67.3 + "@types/react": ^18.0.25 + "@types/react-native": ^0.70.6 "@typescript-eslint/eslint-plugin": "*" "@typescript-eslint/parser": "*" babel-jest: ^29.3.1 - detox: ^19.5.7 - eslint: ^8.13.0 - eslint-plugin-prettier: ^4.0.0 + detox: ^20.0.3 + eslint: ^8.27.0 + eslint-plugin-prettier: ^4.2.1 get-yarn-workspaces: ^1.0.2 - metro-react-native-babel-preset: ^0.70.1 + metro-react-native-babel-preset: ^0.73.3 npm-check-updates: "*" - pod-install: ^0.1.33 + pod-install: ^0.1.38 prettier: ^2.7.1 prettier-plugin-organize-imports: ^3.2.0 - react: 17.0.2 - react-native: 0.67.4 + react: 18.2.0 + react-native: 0.70.6 react-native-file-viewer: ^2.1.5 react-native-fingerprint-scanner: "standardnotes/react-native-fingerprint-scanner#b55d1c0ca627a87a130f758603f12911fbac200f" react-native-flag-secure-android: "standardnotes/react-native-flag-secure-android#cb08e74583c22a5d912842459b35ebbbb4bcd852" - react-native-fs: ^2.19.0 + react-native-fs: ^2.20.0 react-native-iap: ^12.4.4 react-native-keychain: "standardnotes/react-native-keychain#d277d360494cbd02be4accb4a360772a8e0e97b6" react-native-privacy-snapshot: "standardnotes/react-native-privacy-snapshot#653e904c90fc6f2b578da59138f2bfe5d7f942fe" - react-native-share: ^7.9.0 + react-native-share: ^8.0.0 react-native-version-info: ^1.1.1 react-native-webview: 11.23.1 typescript: ^4.9.3 @@ -7077,7 +7082,7 @@ __metadata: languageName: node linkType: hard -"@types/graceful-fs@npm:^4.1.2, @types/graceful-fs@npm:^4.1.3": +"@types/graceful-fs@npm:^4.1.3": version: 4.1.5 resolution: "@types/graceful-fs@npm:4.1.5" dependencies: @@ -7403,12 +7408,12 @@ __metadata: languageName: node linkType: hard -"@types/react-native@npm:^0.67.3": - version: 0.67.15 - resolution: "@types/react-native@npm:0.67.15" +"@types/react-native@npm:^0.70.6": + version: 0.70.6 + resolution: "@types/react-native@npm:0.70.6" dependencies: - "@types/react": ^17 - checksum: 303648aff9b8f8232ad4313cc37d6cae6a6894f4a8e4e4980922237ccce16912bb1f8b6a0ce6c2a61b58ef31b2f41f6afa0bf492f65db9eb9f6defe91d4fe1bf + "@types/react": "*" + checksum: 1b620095ddf2fe85157df9d57435edc619587eacb1a4fadd91c977c200cef8008e7fec4d8c5429ce373e1a2158199f1162f9c84e8e5a7d0b71a2224f31b64dfd languageName: node linkType: hard @@ -7418,7 +7423,7 @@ __metadata: languageName: node linkType: soft -"@types/react@npm:*, @types/react@npm:^18.0.21": +"@types/react@npm:*": version: 18.0.21 resolution: "@types/react@npm:18.0.21" dependencies: @@ -9184,7 +9189,7 @@ __metadata: languageName: node linkType: hard -"async@npm:^2.4.0, async@npm:^2.6.4": +"async@npm:^2.6.4": version: 2.6.4 resolution: "async@npm:2.6.4" dependencies: @@ -9193,7 +9198,7 @@ __metadata: languageName: node linkType: hard -"async@npm:^3.2.3": +"async@npm:^3.2.2, async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89 @@ -9725,13 +9730,6 @@ __metadata: languageName: node linkType: hard -"big-integer@npm:1.6.x": - version: 1.6.51 - resolution: "big-integer@npm:1.6.51" - checksum: 3d444173d1b2e20747e2c175568bedeebd8315b0637ea95d75fd27830d3b8e8ba36c6af40374f36bdaea7b5de376dcada1b07587cb2a79a928fccdb6e6e3c518 - languageName: node - linkType: hard - "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -9932,24 +9930,6 @@ __metadata: languageName: node linkType: hard -"bplist-creator@npm:0.1.1": - version: 0.1.1 - resolution: "bplist-creator@npm:0.1.1" - dependencies: - stream-buffers: 2.2.x - checksum: b0d40d1d1623f1afdbb575cfc8075d742d2c4f0eb458574be809e3857752d1042a39553b3943d2d7f505dde92bcd43e1d7bdac61c9cd44475d696deb79f897ce - languageName: node - linkType: hard - -"bplist-parser@npm:0.3.2": - version: 0.3.2 - resolution: "bplist-parser@npm:0.3.2" - dependencies: - big-integer: 1.6.x - checksum: fad0f6eb155a9b636b4096a1725ce972a0386490d7d38df7be11a3a5645372446b7c44aacbc6626d24d2c17d8b837765361520ebf2960aeffcaf56765811620e - languageName: node - linkType: hard - "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -10003,6 +9983,13 @@ __metadata: languageName: node linkType: hard +"browser-process-hrtime@npm:^1.0.0": + version: 1.0.0 + resolution: "browser-process-hrtime@npm:1.0.0" + checksum: e30f868cdb770b1201afb714ad1575dd86366b6e861900884665fb627109b3cc757c40067d3bfee1ff2a29c835257ea30725a8018a9afd02ac1c24b408b1e45f + languageName: node + linkType: hard + "browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4": version: 1.2.0 resolution: "browserify-aes@npm:1.2.0" @@ -10277,15 +10264,14 @@ __metadata: languageName: node linkType: hard -"bunyan-debug-stream@npm:^2.0.1": - version: 2.0.1 - resolution: "bunyan-debug-stream@npm:2.0.1" +"bunyan-debug-stream@npm:^3.1.0": + version: 3.1.0 + resolution: "bunyan-debug-stream@npm:3.1.0" dependencies: - colors: 1.4.0 - exception-formatter: ^1.0.4 + chalk: ^4.1.2 peerDependencies: bunyan: "*" - checksum: a43f6c2946cfb7c63fc7926d90328be5f45fd42be7ef7390efc403156a071cd1f971ad91a7fd037fab593d7a989796223c697cba6455da55fa67a1f482d495ad + checksum: 38a89a711d7e7f540a233f7afdf2388c3178709a5d316734d6f2752805abfcb7f4688b453df11e58fdcd3a4a0a2da3b1db0dd96712ec99bdb181878aae2c1bcb languageName: node linkType: hard @@ -10500,6 +10486,13 @@ __metadata: languageName: node linkType: hard +"caf@npm:^15.0.1": + version: 15.0.1 + resolution: "caf@npm:15.0.1" + checksum: 832cc5d3a6053efb458ed1c1f5e5d3ebbc7710f2275f033c6362dcfd1565f15e29dbee15fa0f3301ecb5c4dbdc753c070b5a4a6d3dc8e246cb784cb26c601e8b + languageName: node + linkType: hard + "call-bind@npm:^1.0.0, call-bind@npm:^1.0.2": version: 1.0.2 resolution: "call-bind@npm:1.0.2" @@ -10638,15 +10631,6 @@ __metadata: languageName: node linkType: hard -"capture-exit@npm:^2.0.0": - version: 2.0.0 - resolution: "capture-exit@npm:2.0.0" - dependencies: - rsvp: ^4.8.4 - checksum: 0b9f10daca09e521da9599f34c8e7af14ad879c336e2bdeb19955b375398ae1c5bcc91ac9f2429944343057ee9ed028b1b2fb28816c384e0e55d70c439b226f4 - languageName: node - linkType: hard - "caseless@npm:~0.12.0": version: 0.12.0 resolution: "caseless@npm:0.12.0" @@ -10685,7 +10669,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.4.1, chalk@npm:^2.4.2": +"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -11013,15 +10997,6 @@ __metadata: languageName: node linkType: hard -"cli-cursor@npm:^2.1.0": - version: 2.1.0 - resolution: "cli-cursor@npm:2.1.0" - dependencies: - restore-cursor: ^2.0.0 - checksum: d88e97bfdac01046a3ffe7d49f06757b3126559d7e44aa2122637eb179284dc6cd49fca2fac4f67c19faaf7e6dab716b6fe1dfcd309977407d8c7578ec2d044d - languageName: node - linkType: hard - "cli-cursor@npm:^3.1.0": version: 3.1.0 resolution: "cli-cursor@npm:3.1.0" @@ -11031,7 +11006,7 @@ __metadata: languageName: node linkType: hard -"cli-spinners@npm:^2.0.0, cli-spinners@npm:^2.5.0": +"cli-spinners@npm:^2.5.0": version: 2.7.0 resolution: "cli-spinners@npm:2.7.0" checksum: a9afaf73f58d1f951fb23742f503631b3cf513f43f4c7acb1b640100eb76bfa16efbcd1994d149ffc6603a6d75dd3d4a516a76f125f90dce437de9b16fd0ee6f @@ -11321,13 +11296,6 @@ __metadata: languageName: node linkType: hard -"colors@npm:1.4.0, colors@npm:^1.0.3, colors@npm:^1.1.2": - version: 1.4.0 - resolution: "colors@npm:1.4.0" - checksum: 98aa2c2418ad87dedf25d781be69dc5fc5908e279d9d30c34d8b702e586a0474605b3a189511482b9d5ed0d20c867515d22749537f7bc546256c6014f3ebdcec - languageName: node - linkType: hard - "columnify@npm:^1.6.0": version: 1.6.0 resolution: "columnify@npm:1.6.0" @@ -11412,7 +11380,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^9.3.0, commander@npm:^9.4.1": +"commander@npm:^9.3.0, commander@npm:^9.4.0, commander@npm:^9.4.1": version: 9.4.1 resolution: "commander@npm:9.4.1" checksum: bfb18e325a5bdf772763c2213d5c7d9e77144d944124e988bcd8e5e65fb6d45d5d4e86b09155d0f2556c9a59c31e428720e57968bcd050b2306e910a0bf3cf13 @@ -13074,21 +13042,27 @@ __metadata: languageName: node linkType: hard -"detox@npm:^19.5.7": - version: 19.12.5 - resolution: "detox@npm:19.12.5" +"detox@npm:^20.0.3": + version: 20.0.3 + resolution: "detox@npm:20.0.3" dependencies: ajv: ^8.6.3 bunyan: ^1.8.12 - bunyan-debug-stream: ^2.0.1 + bunyan-debug-stream: ^3.1.0 + caf: ^15.0.1 chalk: ^2.4.2 child-process-promise: ^2.2.0 find-up: ^4.1.0 fs-extra: ^4.0.2 - funpermaproxy: ^1.0.1 + funpermaproxy: ^1.1.0 + glob: ^8.0.3 ini: ^1.3.4 + json-cycle: ^1.3.0 lodash: ^4.17.5 minimist: ^1.2.0 + multi-sort-stream: ^1.0.3 + multipipe: ^4.0.0 + node-ipc: ^9.2.1 proper-lockfile: ^3.0.2 resolve-from: ^5.0.0 sanitize-filename: ^1.6.1 @@ -13096,25 +13070,24 @@ __metadata: serialize-error: ^8.0.1 shell-quote: ^1.7.2 signal-exit: ^3.0.3 - tail: ^2.0.0 + stream-json: ^1.7.4 + strip-ansi: ^6.0.1 telnet-client: 1.2.8 tempfile: ^2.0.0 + trace-event-lib: ^1.3.1 which: ^1.3.1 ws: ^7.0.0 yargs: ^16.0.3 - yargs-parser: ^20.2.2 + yargs-parser: ^20.2.9 yargs-unparser: ^2.0.0 peerDependencies: - jest: 26.0.x - 26.4.x || ^26.5.2 || 27.x.x || 28.x.x - mocha: ">=6.0.0" + jest: 29.x.x || 28.x.x || ^27.2.5 peerDependenciesMeta: jest: optional: true - mocha: - optional: true bin: detox: local-cli/cli.js - checksum: b4ce7309283a2236d533f99fef1acb9079d679e33fe0bf069cdd90896c504b8e7195fcbf415643a394f4ed82371b55e75df87f12de99754b1b2c7fe7efac6357 + checksum: d47abef82f2a1300cf83165f8bc94ec2161aee86a1978f64f2d1ef17f55531d5f67ffeb0c963a7d75c0fe501dd6ffdee7c695665641ae28e6139a636033d5b8a languageName: node linkType: hard @@ -13519,6 +13492,15 @@ __metadata: languageName: node linkType: hard +"duplexer2@npm:^0.1.2": + version: 0.1.4 + resolution: "duplexer2@npm:0.1.4" + dependencies: + readable-stream: ^2.0.2 + checksum: 744961f03c7f54313f90555ac20284a3fb7bf22fdff6538f041a86c22499560eb6eac9d30ab5768054137cb40e6b18b40f621094e0261d7d8c35a37b7a5ad241 + languageName: node + linkType: hard + "duplexer3@npm:^0.1.4": version: 0.1.5 resolution: "duplexer3@npm:0.1.5" @@ -13552,6 +13534,13 @@ __metadata: languageName: node linkType: hard +"easy-stack@npm:^1.0.1": + version: 1.0.1 + resolution: "easy-stack@npm:1.0.1" + checksum: 161a99e497b3857b0be4ec9e1ebbe90b241ea9d84702f9881b8e5b3f6822065b8c4e33436996935103e191bffba3607de70712a792f4d406a050def48c6bc381 + languageName: node + linkType: hard + "ecc-jsbn@npm:~0.1.1": version: 0.1.2 resolution: "ecc-jsbn@npm:0.1.2" @@ -14312,7 +14301,7 @@ __metadata: languageName: node linkType: hard -"eslint@npm:*, eslint@npm:^8.13.0": +"eslint@npm:*": version: 8.25.0 resolution: "eslint@npm:8.25.0" dependencies: @@ -14493,6 +14482,13 @@ __metadata: languageName: node linkType: hard +"event-pubsub@npm:4.3.0": + version: 4.3.0 + resolution: "event-pubsub@npm:4.3.0" + checksum: 6940f57790c01a967b7c637f1c9fd000ee968a1d5894186ffb3356ffbe174c70e22e62adbbcfcee3f305482d99b6abe7613c1c27c909b07adc9127dc16c8cf73 + languageName: node + linkType: hard + "event-target-shim@npm:^5.0.0, event-target-shim@npm:^5.0.1": version: 5.0.1 resolution: "event-target-shim@npm:5.0.1" @@ -14532,22 +14528,6 @@ __metadata: languageName: node linkType: hard -"exception-formatter@npm:^1.0.4": - version: 1.0.7 - resolution: "exception-formatter@npm:1.0.7" - dependencies: - colors: ^1.0.3 - checksum: 31c197e7990660447392a1021ef44ddc119f0a0f4711a94bfa01c27fe784c77938249ace6acf7755a0283226b9e68fd58a10f51918b3c9914ce89c644c57378e - languageName: node - linkType: hard - -"exec-sh@npm:^0.3.2": - version: 0.3.6 - resolution: "exec-sh@npm:0.3.6" - checksum: 0be4f06929c8e4834ea4812f29fe59e2dfcc1bc3fc4b4bb71acb38a500c3b394628a05ef7ba432520bc6c5ec4fadab00cc9c513c4ff6a32104965af302e998e0 - languageName: node - linkType: hard - "execa@npm:^1.0.0": version: 1.0.0 resolution: "execa@npm:1.0.0" @@ -15543,7 +15523,7 @@ __metadata: languageName: node linkType: hard -"funpermaproxy@npm:^1.0.1": +"funpermaproxy@npm:^1.1.0": version: 1.1.0 resolution: "funpermaproxy@npm:1.1.0" checksum: 74cf0aafeadbd79053324f1fb981c1a4358618722ad01c65bd1466b42498fd07acb7749ab9224b25fc8e81c2e1283b92ceee61dded265bd7527b225351db998b @@ -15898,7 +15878,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1": +"glob@npm:^8.0.1, glob@npm:^8.0.3": version: 8.0.3 resolution: "glob@npm:8.0.3" dependencies: @@ -16518,17 +16498,19 @@ __metadata: languageName: node linkType: hard -"hermes-engine@npm:~0.9.0": - version: 0.9.0 - resolution: "hermes-engine@npm:0.9.0" - checksum: 384549c544de9efb07e9d84202f45bde00e62539a5b56fed2fd2763dbd02560eb37786e61349119966e3086e95a6b8e008822730180a679e229b43a611718f4c +"hermes-estree@npm:0.8.0": + version: 0.8.0 + resolution: "hermes-estree@npm:0.8.0" + checksum: 3a169d1751d8bed000c665314205e4f033f9dd0506ac0f72528c31853f7ac3d0a13abd34c7cd69d8f5b57effd730d7da9fdadb0a3fb35303769a12f90dd0a61f languageName: node linkType: hard -"hermes-parser@npm:0.4.7": - version: 0.4.7 - resolution: "hermes-parser@npm:0.4.7" - checksum: 1210d9139b048993938403e8bcf26249bac942512996449ed88522f3e1d31f206cfd54c3095fc279f51e9f4794dfaaab1a3dce828925a0aa784faeb6abe6863c +"hermes-parser@npm:0.8.0": + version: 0.8.0 + resolution: "hermes-parser@npm:0.8.0" + dependencies: + hermes-estree: 0.8.0 + checksum: 0c992bdc6c98482aef0c8bc3b55c84769d80536aa6becf9c3e296caf19647ba4fa1c516e50e313dfe44dadce140c7dc9f9f5ceee36091cf9835bbcd101b1b974 languageName: node linkType: hard @@ -18387,31 +18369,6 @@ __metadata: languageName: node linkType: hard -"jest-haste-map@npm:^26.5.2": - version: 26.6.2 - resolution: "jest-haste-map@npm:26.6.2" - dependencies: - "@jest/types": ^26.6.2 - "@types/graceful-fs": ^4.1.2 - "@types/node": "*" - anymatch: ^3.0.3 - fb-watchman: ^2.0.0 - fsevents: ^2.1.2 - graceful-fs: ^4.2.4 - jest-regex-util: ^26.0.0 - jest-serializer: ^26.6.2 - jest-util: ^26.6.2 - jest-worker: ^26.6.2 - micromatch: ^4.0.2 - sane: ^4.0.3 - walker: ^1.0.7 - dependenciesMeta: - fsevents: - optional: true - checksum: 8ad5236d5646d2388d2bd58a57ea53698923434f43d59ea9ebdc58bce4d0b8544c8de2f7acaa9a6d73171f04460388b2b6d7d6b6c256aea4ebb8780140781596 - languageName: node - linkType: hard - "jest-haste-map@npm:^29.3.1": version: 29.3.1 resolution: "jest-haste-map@npm:29.3.1" @@ -18526,10 +18483,10 @@ __metadata: languageName: node linkType: hard -"jest-regex-util@npm:^26.0.0": - version: 26.0.0 - resolution: "jest-regex-util@npm:26.0.0" - checksum: 930a00665e8dfbedc29140678b4a54f021b41b895cf35050f76f557c1da3ac48ff42dd7b18ba2ccba6f4e518c6445d6753730d03ec7049901b93992db1ef0483 +"jest-regex-util@npm:^27.0.6": + version: 27.5.1 + resolution: "jest-regex-util@npm:27.5.1" + checksum: d45ca7a9543616a34f7f3079337439cf07566e677a096472baa2810e274b9808b76767c97b0a4029b8a5b82b9d256dee28ef9ad4138b2b9e5933f6fac106c418 languageName: node linkType: hard @@ -18626,13 +18583,13 @@ __metadata: languageName: node linkType: hard -"jest-serializer@npm:^26.6.2": - version: 26.6.2 - resolution: "jest-serializer@npm:26.6.2" +"jest-serializer@npm:^27.0.6": + version: 27.5.1 + resolution: "jest-serializer@npm:27.5.1" dependencies: "@types/node": "*" - graceful-fs: ^4.2.4 - checksum: dbecfb0d01462fe486a0932cf1680cf6abb204c059db2a8f72c6c2a7c9842a82f6d256874112774cea700764ed8f38fc9e3db982456c138d87353e3390e746fe + graceful-fs: ^4.2.9 + checksum: 803e03a552278610edc6753c0dd9fa5bb5cd3ca47414a7b2918106efb62b79fd5e9ae785d0a21f12a299fa599fea8acc1fa6dd41283328cee43962cf7df9bb44 languageName: node linkType: hard @@ -18668,17 +18625,17 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^26.6.2": - version: 26.6.2 - resolution: "jest-util@npm:26.6.2" +"jest-util@npm:^27.2.0": + version: 27.5.1 + resolution: "jest-util@npm:27.5.1" dependencies: - "@jest/types": ^26.6.2 + "@jest/types": ^27.5.1 "@types/node": "*" chalk: ^4.0.0 - graceful-fs: ^4.2.4 - is-ci: ^2.0.0 - micromatch: ^4.0.2 - checksum: 3c6a5fba05c4c6892cd3a9f66196ea8867087b77a5aa1a3f6cd349c785c3f1ca24abfd454664983aed1a165cab7846688e44fe8630652d666ba326b08625bc3d + ci-info: ^3.2.0 + graceful-fs: ^4.2.9 + picomatch: ^2.2.3 + checksum: ac8d122f6daf7a035dcea156641fd3701aeba245417c40836a77e35b3341b9c02ddc5d904cfcd4ddbaa00ab854da76d3b911870cafdcdbaff90ea471de26c7d7 languageName: node linkType: hard @@ -18768,7 +18725,7 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^26.0.0, jest-worker@npm:^26.5.0, jest-worker@npm:^26.6.2": +"jest-worker@npm:^26.5.0": version: 26.6.2 resolution: "jest-worker@npm:26.6.2" dependencies: @@ -18779,7 +18736,7 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^27.4.5": +"jest-worker@npm:^27.2.0, jest-worker@npm:^27.4.5": version: 27.5.1 resolution: "jest-worker@npm:27.5.1" dependencies: @@ -18833,17 +18790,6 @@ __metadata: languageName: node linkType: hard -"jetifier@npm:^1.6.2": - version: 1.6.8 - resolution: "jetifier@npm:1.6.8" - bin: - jetifier: bin/jetify - jetifier-standalone: bin/jetifier-standalone - jetify: bin/jetify - checksum: 6cdecf7683bb2f6e89e48442365d8bac6244c74ffa286b1b45d97ffa2a833901d0f4b86d0b83d4babec2b71385104214248f1b8539d82e8909989adbf16d09b4 - languageName: node - linkType: hard - "jju@npm:^1.1.0": version: 1.4.0 resolution: "jju@npm:1.4.0" @@ -18871,6 +18817,22 @@ __metadata: languageName: node linkType: hard +"js-message@npm:1.0.7": + version: 1.0.7 + resolution: "js-message@npm:1.0.7" + checksum: 18dcc4d80356e8b5be978ca7838d96d4e350a1cb8adc5741c229dec6df09f53bfed7c75c1f360171d2d791a14e2f077d6c2b1013ba899ded7a27d7dfcd4f3784 + languageName: node + linkType: hard + +"js-queue@npm:2.0.2": + version: 2.0.2 + resolution: "js-queue@npm:2.0.2" + dependencies: + easy-stack: ^1.0.1 + checksum: 5049c3f648315ed13e46755704ff5453df70f7e8e1812acf1f98d6700efbec32421f76294a0e63fd2a9f8aabaf124233bbb308f9a2caec9d9f3d833ab5a73079 + languageName: node + linkType: hard + "js-sdsl@npm:^4.1.4": version: 4.1.5 resolution: "js-sdsl@npm:4.1.5" @@ -18929,34 +18891,34 @@ __metadata: languageName: node linkType: hard -"jscodeshift@npm:^0.11.0": - version: 0.11.0 - resolution: "jscodeshift@npm:0.11.0" +"jscodeshift@npm:^0.13.1": + version: 0.13.1 + resolution: "jscodeshift@npm:0.13.1" dependencies: - "@babel/core": ^7.1.6 - "@babel/parser": ^7.1.6 - "@babel/plugin-proposal-class-properties": ^7.1.0 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.1.0 - "@babel/plugin-proposal-optional-chaining": ^7.1.0 - "@babel/plugin-transform-modules-commonjs": ^7.1.0 - "@babel/preset-flow": ^7.0.0 - "@babel/preset-typescript": ^7.1.0 - "@babel/register": ^7.0.0 + "@babel/core": ^7.13.16 + "@babel/parser": ^7.13.16 + "@babel/plugin-proposal-class-properties": ^7.13.0 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.13.8 + "@babel/plugin-proposal-optional-chaining": ^7.13.12 + "@babel/plugin-transform-modules-commonjs": ^7.13.8 + "@babel/preset-flow": ^7.13.13 + "@babel/preset-typescript": ^7.13.0 + "@babel/register": ^7.13.16 babel-core: ^7.0.0-bridge.0 - colors: ^1.1.2 + chalk: ^4.1.2 flow-parser: 0.* graceful-fs: ^4.2.4 micromatch: ^3.1.10 neo-async: ^2.5.0 node-dir: ^0.1.17 - recast: ^0.20.3 - temp: ^0.8.1 + recast: ^0.20.4 + temp: ^0.8.4 write-file-atomic: ^2.3.0 peerDependencies: "@babel/preset-env": ^7.1.6 bin: jscodeshift: bin/jscodeshift.js - checksum: 647dc36a50d417b14659f81109685f9ea3924daf604d50d7d2b522c4a658d6abff921dedb4cf74a6d2173c1c48195f9e92cca3df1cb535c6d5f67455d35a19ce + checksum: 1c35938de5fc29cafec80e2c37d5c3411f85cd5d40e0243b52f2da0c1ab4b659daddfd62de558eca5d562303616f7838097727b651f4ad8e32b1e96f169cdd76 languageName: node linkType: hard @@ -19070,6 +19032,13 @@ __metadata: languageName: node linkType: hard +"json-cycle@npm:^1.3.0": + version: 1.3.0 + resolution: "json-cycle@npm:1.3.0" + checksum: 68237ba5c5e05c3a90b62737a1b77fbda09272dd4d764a3b17f1279a84ec09000aa8b519221c8aa8d8da4e3f6f8bacb6cf825e155341cf2f1f8667b001e7f237 + languageName: node + linkType: hard + "json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" @@ -19928,15 +19897,6 @@ __metadata: languageName: node linkType: hard -"log-symbols@npm:^2.2.0": - version: 2.2.0 - resolution: "log-symbols@npm:2.2.0" - dependencies: - chalk: ^2.0.1 - checksum: 4c95e3b65f0352dbe91dc4989c10baf7a44e2ef5b0db7e6721e1476268e2b6f7090c3aa880d4f833a05c5c3ff18f4ec5215a09bd0099986d64a8186cfeb48ac8 - languageName: node - linkType: hard - "log-symbols@npm:^4.1.0": version: 4.1.0 resolution: "log-symbols@npm:4.1.0" @@ -20343,6 +20303,13 @@ __metadata: languageName: node linkType: hard +"memoize-one@npm:^5.0.0": + version: 5.2.1 + resolution: "memoize-one@npm:5.2.1" + checksum: a3cba7b824ebcf24cdfcd234aa7f86f3ad6394b8d9be4c96ff756dafb8b51c7f71320785fbc2304f1af48a0467cbbd2a409efc9333025700ed523f254cb52e3d + languageName: node + linkType: hard + "memory-fs@npm:^0.4.1": version: 0.4.1 resolution: "memory-fs@npm:0.4.1" @@ -20430,160 +20397,116 @@ __metadata: languageName: node linkType: hard -"metro-babel-register@npm:0.66.2": - version: 0.66.2 - resolution: "metro-babel-register@npm:0.66.2" +"metro-babel-transformer@npm:0.72.3": + version: 0.72.3 + resolution: "metro-babel-transformer@npm:0.72.3" dependencies: "@babel/core": ^7.14.0 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.0.0 - "@babel/plugin-proposal-optional-chaining": ^7.0.0 - "@babel/plugin-syntax-class-properties": ^7.0.0 - "@babel/plugin-transform-flow-strip-types": ^7.0.0 - "@babel/plugin-transform-modules-commonjs": ^7.0.0 - "@babel/register": ^7.0.0 - escape-string-regexp: ^1.0.5 - checksum: 03a467a8144837c6a75cdec19d384f24f1f4dfc6d4ffabe1ab82e3235d5b12c16483704990660b9f37f0a19d7b7e2754e284b63f9f4a67595e9197a5996dfae9 - languageName: node - linkType: hard - -"metro-babel-transformer@npm:0.66.2": - version: 0.66.2 - resolution: "metro-babel-transformer@npm:0.66.2" - dependencies: - "@babel/core": ^7.14.0 - hermes-parser: 0.4.7 - metro-source-map: 0.66.2 + hermes-parser: 0.8.0 + metro-source-map: 0.72.3 nullthrows: ^1.1.1 - checksum: fbec39283db17c819c4ee7adbcdc9174468e767bd4093b3d0eb863c248b7c8d57e848baf45df8d26803442928ace11bb94a0bc0fde19603fed48389456a8ebe1 + checksum: 6bce52a924f1eb84ea2859b65d37ab6f90bd998ac68184680afaa627e4d0a933cd7ddba391bcd9ea9fb8cacd6228615a427342aeeec6e6053600b322990d16f6 languageName: node linkType: hard -"metro-cache-key@npm:0.66.2": - version: 0.66.2 - resolution: "metro-cache-key@npm:0.66.2" - checksum: c252fc9f67a7a0ec46cb9bd689f1d8f3fc707eae51954b55d3d0c9f5ed97dcec1e48503515cea937cc6b3d02bf17d4169d1b1e3b9a249eb73bde009443e3f542 +"metro-cache-key@npm:0.72.3": + version: 0.72.3 + resolution: "metro-cache-key@npm:0.72.3" + checksum: e188147435f2e1f3f711a0bc5ea5794d78dc882cc23702fa8676fbbabd54bb21b7c905ba52a5306bdf6869396102f02131845269be9f9a2719c243e48b004ad3 languageName: node linkType: hard -"metro-cache@npm:0.66.2": - version: 0.66.2 - resolution: "metro-cache@npm:0.66.2" +"metro-cache@npm:0.72.3": + version: 0.72.3 + resolution: "metro-cache@npm:0.72.3" dependencies: - metro-core: 0.66.2 - mkdirp: ^0.5.1 + metro-core: 0.72.3 rimraf: ^2.5.4 - checksum: 10dcc142e2bbef97fbbb487fb922ac3c2cf9900428c726b26499b03476a2f8c18f5581e99d54edda104c4b3e76881c04b70325282056fc91d146a666644663ec + checksum: 958e304333995ea44e5443f77250f3a5f64d6213d66408f46538dcfda9185a6518251fdaf8cdb7920a48f5c8ac7b05c867ec0268ebb9c7dc768a35e5eab47317 languageName: node linkType: hard -"metro-config@npm:0.66.2, metro-config@npm:^0.66.1": - version: 0.66.2 - resolution: "metro-config@npm:0.66.2" +"metro-config@npm:0.72.3": + version: 0.72.3 + resolution: "metro-config@npm:0.72.3" dependencies: cosmiconfig: ^5.0.5 jest-validate: ^26.5.2 - metro: 0.66.2 - metro-cache: 0.66.2 - metro-core: 0.66.2 - metro-runtime: 0.66.2 - checksum: 9ea773267723bf9eae6fd2c4aeff4d491a75eb18bc1e748748d97f4214b48b2b0d55e06b22ea941383474e51c26c5c0163cdad18c399b6fc8bd8998f77d1ef4b + metro: 0.72.3 + metro-cache: 0.72.3 + metro-core: 0.72.3 + metro-runtime: 0.72.3 + checksum: c4dff3f2c636894dc0deb44640ac0dc8a520a824cf2ba78098736ef0f796acc1a7fcb646d63ea8dbab55eb41340443a83d30f8749be5ddf577578de1cf74bb6e languageName: node linkType: hard -"metro-core@npm:0.66.2, metro-core@npm:^0.66.1": - version: 0.66.2 - resolution: "metro-core@npm:0.66.2" +"metro-core@npm:0.72.3": + version: 0.72.3 + resolution: "metro-core@npm:0.72.3" dependencies: - jest-haste-map: ^26.5.2 lodash.throttle: ^4.1.1 - metro-resolver: 0.66.2 - checksum: cfaacdac2cab60de8032bb7ffa100aea3e797b9cbda4fed314e6dc9defe72c428def57410d91f792e3130f13b426088791762f4952d92f828ca83c52d464b0a3 + metro-resolver: 0.72.3 + checksum: 0a94f5d4b6e8c46b6833897a924af9985ad2887b2e41dfd28a13799c3b6861b69d3d2e72bac891e827d58d767b8132b9325ab7f57c8110bb95ca15ce47348de8 languageName: node linkType: hard -"metro-hermes-compiler@npm:0.66.2": - version: 0.66.2 - resolution: "metro-hermes-compiler@npm:0.66.2" - checksum: c1dc1627d006b9202c70f4ace8fc5ceaf5a786667bdf324adb7c7c3c796d0aa62dc4fc635a4073b78c79c206a87a3b0d78ae9f85bfda7b7f4bb7e926e63ca891 +"metro-file-map@npm:0.72.3": + version: 0.72.3 + resolution: "metro-file-map@npm:0.72.3" + dependencies: + abort-controller: ^3.0.0 + anymatch: ^3.0.3 + debug: ^2.2.0 + fb-watchman: ^2.0.0 + fsevents: ^2.1.2 + graceful-fs: ^4.2.4 + invariant: ^2.2.4 + jest-regex-util: ^27.0.6 + jest-serializer: ^27.0.6 + jest-util: ^27.2.0 + jest-worker: ^27.2.0 + micromatch: ^4.0.4 + walker: ^1.0.7 + dependenciesMeta: + fsevents: + optional: true + checksum: 1c233a684395552eb47707027bad0ca8e868b1867774b305d07841b60f94ded301882dcc62c106009e3bfed1bafc7d705c74966b5afb4d68537fcda38f4c5241 languageName: node linkType: hard -"metro-inspector-proxy@npm:0.66.2": - version: 0.66.2 - resolution: "metro-inspector-proxy@npm:0.66.2" +"metro-hermes-compiler@npm:0.72.3": + version: 0.72.3 + resolution: "metro-hermes-compiler@npm:0.72.3" + checksum: ccf58abeae45e7e1489bb3bb9a88165cd73cbb9988c3f9bc0d5221677335cc89ccd8791da0734c0ff1a70191d3c0ef84a326964dd38944124414cb841f8210eb + languageName: node + linkType: hard + +"metro-inspector-proxy@npm:0.72.3": + version: 0.72.3 + resolution: "metro-inspector-proxy@npm:0.72.3" dependencies: connect: ^3.6.5 debug: ^2.2.0 - ws: ^1.1.5 + ws: ^7.5.1 yargs: ^15.3.1 bin: metro-inspector-proxy: src/cli.js - checksum: 3f85acc4b353c7936a900ddd64e0d0fec6e7c1c2d8985e9fb5e509879b5e3f25fb6138223869a225bf3a021500cb1c9564962638be97d7c912654dce4c673d46 + checksum: 0fef6c59c35e874f209ee40f93850dd0c2b9644e90883542296b5d11f68b7b8ed960e6435d0c90bd1e5e6e9dcdfa2e27a771a436f4840ec48f2d7e62a259af2a languageName: node linkType: hard -"metro-minify-uglify@npm:0.66.2": - version: 0.66.2 - resolution: "metro-minify-uglify@npm:0.66.2" +"metro-minify-uglify@npm:0.72.3": + version: 0.72.3 + resolution: "metro-minify-uglify@npm:0.72.3" dependencies: uglify-es: ^3.1.9 - checksum: 15ceb1b21cb06f2f369091e631f08b5f9e13c1001cab03ccda0610fe0845254627dbaade45f1c09dffbc5306736f97c42b593db33d4b909d4776b84127cfcf17 + checksum: 6384a85fec8133a2e54fe7123ec17649b183309f333c960cad42d999d8d2f0aa40d5cc8111e25013b1ccfe26de59a5a202e8a014fd673d8bb4f0eca52e9d9ac3 languageName: node linkType: hard -"metro-react-native-babel-preset@npm:0.66.2": - version: 0.66.2 - resolution: "metro-react-native-babel-preset@npm:0.66.2" - dependencies: - "@babel/core": ^7.14.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.2.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-exponentiation-operator": ^7.0.0 - "@babel/plugin-transform-flow-strip-types": ^7.0.0 - "@babel/plugin-transform-for-of": ^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-object-assign": ^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-regenerator": ^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 - peerDependencies: - "@babel/core": "*" - checksum: c490c73d3ae6674686253db110cc4ee4487a0d2a7b07acd09815abf6087b9358faaa69f8a6361b84024354c60b9f60afa44b57d4cf930f49a1b3cfed2a7ffb59 - languageName: node - linkType: hard - -"metro-react-native-babel-preset@npm:^0.70.1": - version: 0.70.3 - resolution: "metro-react-native-babel-preset@npm:0.70.3" +"metro-react-native-babel-preset@npm:0.72.3": + version: 0.72.3 + resolution: "metro-react-native-babel-preset@npm:0.72.3" dependencies: "@babel/core": ^7.14.0 "@babel/plugin-proposal-async-generator-functions": ^7.0.0 @@ -20626,112 +20549,163 @@ __metadata: react-refresh: ^0.4.0 peerDependencies: "@babel/core": "*" - checksum: 9abd3d811ad49f5e14c5ac5a62635fffbe5c3a19f0465eb1b8ad2ad2a065f709004d14d892a2d3a336de2c559ba2ef9eb5ef56401bf9718e2a02e7f89eebd227 + checksum: 678595fe00c8f9b39517094dc90facc93d514d68b32bc4bb64b7c58b9ab72a36da80b0969da932ef52e4a8d8b223a8ebc731ca0e88e221fb4187db7a4d7e5e79 languageName: node linkType: hard -"metro-react-native-babel-transformer@npm:0.66.2, metro-react-native-babel-transformer@npm:^0.66.1": - version: 0.66.2 - resolution: "metro-react-native-babel-transformer@npm:0.66.2" +"metro-react-native-babel-preset@npm:^0.73.3": + version: 0.73.3 + resolution: "metro-react-native-babel-preset@npm:0.73.3" + dependencies: + "@babel/core": ^7.14.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.2.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 + peerDependencies: + "@babel/core": "*" + checksum: ff34a049ee6d13f1fd015e021407907db5d48355ce6a2ee2848c6b680f180fa46c2da690161f6b194d8c2c62d45805b69bf2f885b16c884555d50a7ae510c6c5 + languageName: node + linkType: hard + +"metro-react-native-babel-transformer@npm:0.72.3": + version: 0.72.3 + resolution: "metro-react-native-babel-transformer@npm:0.72.3" dependencies: "@babel/core": ^7.14.0 babel-preset-fbjs: ^3.4.0 - hermes-parser: 0.4.7 - metro-babel-transformer: 0.66.2 - metro-react-native-babel-preset: 0.66.2 - metro-source-map: 0.66.2 + hermes-parser: 0.8.0 + metro-babel-transformer: 0.72.3 + metro-react-native-babel-preset: 0.72.3 + metro-source-map: 0.72.3 nullthrows: ^1.1.1 peerDependencies: "@babel/core": "*" - checksum: b849306f06c1dabdc0fedc35e10646d4c0cdc752601e2f75cc20a2b341057861c661a62443a00cfa9eda220fe1705c0f8eb8f074716590d1acc6ed329f2b39ce + checksum: e9ae85eb4be2d5e734f3c211f2aee4f655692429775e8fb1a2825faf3920ed00ca96a4506205de193c9de0576d015813636813de9a81ef7c56fe4ce7488e3ed4 languageName: node linkType: hard -"metro-resolver@npm:0.66.2, metro-resolver@npm:^0.66.1": - version: 0.66.2 - resolution: "metro-resolver@npm:0.66.2" +"metro-resolver@npm:0.72.3": + version: 0.72.3 + resolution: "metro-resolver@npm:0.72.3" dependencies: absolute-path: ^0.0.0 - checksum: c0e80230b698cbe38f748197d66c3ae6448a4965f464ed216dba4e3eaaaa71719a803548b372c53caed8fb88b1784c79af2057c1e678d356dcff8b96644d5e81 + checksum: bbf502a1533f3099b91be94c57a34be18bd79d68fa789f0ba26806a932865aa4394f8363dc7a09579f474046cedd837b826cc9391fa9cf562515afa00d2313c1 languageName: node linkType: hard -"metro-runtime@npm:0.66.2, metro-runtime@npm:^0.66.1": - version: 0.66.2 - resolution: "metro-runtime@npm:0.66.2" - checksum: 7b51abc53a04b7991ee0bbf5517d95b6f1305a4e8854c19afeed1087f8b15df25e67ecbd38fb5606909927d55757302089edbbf1e508b60accc5677aa671728b +"metro-runtime@npm:0.72.3": + version: 0.72.3 + resolution: "metro-runtime@npm:0.72.3" + dependencies: + "@babel/runtime": ^7.0.0 + react-refresh: ^0.4.0 + checksum: 7017fad668bdf44f1ab57eebd3d6841f7f4f3f5b747970d9e7ec9c4c497ed058c5a153eb41efd598e4bad3f89d036b38e71f3795298b8dbd31ba2a5d974d4019 languageName: node linkType: hard -"metro-source-map@npm:0.66.2": - version: 0.66.2 - resolution: "metro-source-map@npm:0.66.2" +"metro-source-map@npm:0.72.3": + version: 0.72.3 + resolution: "metro-source-map@npm:0.72.3" dependencies: "@babel/traverse": ^7.14.0 "@babel/types": ^7.0.0 invariant: ^2.2.4 - metro-symbolicate: 0.66.2 + metro-symbolicate: 0.72.3 nullthrows: ^1.1.1 - ob1: 0.66.2 + ob1: 0.72.3 source-map: ^0.5.6 vlq: ^1.0.0 - checksum: 67959828b023079747d60ed41cc2263cdf883218c477799b26159c42c593737768e589498ebee7a3333080a96b2f97e0c01fd7371d8e59b6c5f8f5a4b250bbb6 + checksum: 4bbd27097d0de46ed4a091424a3ef497a54f48ae3559751bb619a5a48f637786881ef170c6ef037e8e8581ff3b4f43af5ba44cf9e4bd106c703246e346bb1029 languageName: node linkType: hard -"metro-symbolicate@npm:0.66.2": - version: 0.66.2 - resolution: "metro-symbolicate@npm:0.66.2" +"metro-symbolicate@npm:0.72.3": + version: 0.72.3 + resolution: "metro-symbolicate@npm:0.72.3" dependencies: invariant: ^2.2.4 - metro-source-map: 0.66.2 + metro-source-map: 0.72.3 nullthrows: ^1.1.1 source-map: ^0.5.6 through2: ^2.0.1 vlq: ^1.0.0 bin: metro-symbolicate: src/index.js - checksum: 7a2cfee2d9cd9db6864f6dac5587891facab576ac5aed152981875b8150555ceeb3fcaa4a2d9647e8a3ec941b30c4812383f08af0154b889077187b5234d9367 + checksum: e2b434d008a086132b999cefa07316f4b9c6e666d169c1a4534085a50046320afd5dd15eeb6849354e82ac360cddb6fa9882ac2da13a70e93bd987675e9d4209 languageName: node linkType: hard -"metro-transform-plugins@npm:0.66.2": - version: 0.66.2 - resolution: "metro-transform-plugins@npm:0.66.2" +"metro-transform-plugins@npm:0.72.3": + version: 0.72.3 + resolution: "metro-transform-plugins@npm:0.72.3" dependencies: "@babel/core": ^7.14.0 "@babel/generator": ^7.14.0 "@babel/template": ^7.0.0 "@babel/traverse": ^7.14.0 nullthrows: ^1.1.1 - checksum: 0d0f510e28579947092c83423239e27b652db01249f23f0a99a4978bb7b46a01c32161c0390b6caa59a0e5e5850293318b35c50b38a5773316dd12357aff7a08 + checksum: e85e5d8fb05ff315431c30fdd3508844224afb516bc03aa4bb2eeebb67c29cfefad165ec3e950062335c28d1b31cf434dbd7c89e22f70a33f54fc2e4f0343448 languageName: node linkType: hard -"metro-transform-worker@npm:0.66.2": - version: 0.66.2 - resolution: "metro-transform-worker@npm:0.66.2" +"metro-transform-worker@npm:0.72.3": + version: 0.72.3 + resolution: "metro-transform-worker@npm:0.72.3" dependencies: "@babel/core": ^7.14.0 "@babel/generator": ^7.14.0 "@babel/parser": ^7.14.0 "@babel/types": ^7.0.0 babel-preset-fbjs: ^3.4.0 - metro: 0.66.2 - metro-babel-transformer: 0.66.2 - metro-cache: 0.66.2 - metro-cache-key: 0.66.2 - metro-hermes-compiler: 0.66.2 - metro-source-map: 0.66.2 - metro-transform-plugins: 0.66.2 + metro: 0.72.3 + metro-babel-transformer: 0.72.3 + metro-cache: 0.72.3 + metro-cache-key: 0.72.3 + metro-hermes-compiler: 0.72.3 + metro-source-map: 0.72.3 + metro-transform-plugins: 0.72.3 nullthrows: ^1.1.1 - checksum: 5d1ab3f9cb3b674c4f3d6148b8b08abf0cb93f30c3afe0e4f74b2149a272728ccbf515a582b5078a87ec1ea77840ca395974e06e082178f21d195858c5667aa1 + checksum: 2a0349b3e17a3c6d41f52185554a1cc4bb05665c99bcb2053c2085d72aac84fd8452cc3c51bef07a2416d0497855d02458e115b1203da308f5eb5e6da1e77e66 languageName: node linkType: hard -"metro@npm:0.66.2, metro@npm:^0.66.1": - version: 0.66.2 - resolution: "metro@npm:0.66.2" +"metro@npm:0.72.3": + version: 0.72.3 + resolution: "metro@npm:0.72.3" dependencies: "@babel/code-frame": ^7.0.0 "@babel/core": ^7.14.0 @@ -20742,7 +20716,7 @@ __metadata: "@babel/types": ^7.0.0 absolute-path: ^0.0.0 accepts: ^1.3.7 - async: ^2.4.0 + async: ^3.2.2 chalk: ^4.0.0 ci-info: ^2.0.0 connect: ^3.6.5 @@ -20750,31 +20724,29 @@ __metadata: denodeify: ^1.2.1 error-stack-parser: ^2.0.6 fs-extra: ^1.0.0 - graceful-fs: ^4.1.3 - hermes-parser: 0.4.7 + graceful-fs: ^4.2.4 + hermes-parser: 0.8.0 image-size: ^0.6.0 invariant: ^2.2.4 - jest-haste-map: ^26.5.2 - jest-worker: ^26.0.0 + jest-worker: ^27.2.0 lodash.throttle: ^4.1.1 - metro-babel-register: 0.66.2 - metro-babel-transformer: 0.66.2 - metro-cache: 0.66.2 - metro-cache-key: 0.66.2 - metro-config: 0.66.2 - metro-core: 0.66.2 - metro-hermes-compiler: 0.66.2 - metro-inspector-proxy: 0.66.2 - metro-minify-uglify: 0.66.2 - metro-react-native-babel-preset: 0.66.2 - metro-resolver: 0.66.2 - metro-runtime: 0.66.2 - metro-source-map: 0.66.2 - metro-symbolicate: 0.66.2 - metro-transform-plugins: 0.66.2 - metro-transform-worker: 0.66.2 + metro-babel-transformer: 0.72.3 + metro-cache: 0.72.3 + metro-cache-key: 0.72.3 + metro-config: 0.72.3 + metro-core: 0.72.3 + metro-file-map: 0.72.3 + metro-hermes-compiler: 0.72.3 + metro-inspector-proxy: 0.72.3 + metro-minify-uglify: 0.72.3 + metro-react-native-babel-preset: 0.72.3 + metro-resolver: 0.72.3 + metro-runtime: 0.72.3 + metro-source-map: 0.72.3 + metro-symbolicate: 0.72.3 + metro-transform-plugins: 0.72.3 + metro-transform-worker: 0.72.3 mime-types: ^2.1.27 - mkdirp: ^0.5.1 node-fetch: ^2.2.0 nullthrows: ^1.1.1 rimraf: ^2.5.4 @@ -20783,11 +20755,11 @@ __metadata: strip-ansi: ^6.0.0 temp: 0.8.3 throat: ^5.0.0 - ws: ^1.1.5 + ws: ^7.5.1 yargs: ^15.3.1 bin: metro: src/cli.js - checksum: 0c677fe63105c341b2d3ceec169e5cb88d8fd5340679d717574297d1ea75638c751a0ed602020aff506150c35d73ad4057031397caddd95d24f48bb087e24c82 + checksum: 03bdd94e7857e66046131eb943b8caccb986d86ccd87f3a9abd14d0dc860f4912e49adf8aa96c34f3ea55a25d3f4832f06199e97aac38d6df3fdbe9ac0ef1aa8 languageName: node linkType: hard @@ -20891,13 +20863,6 @@ __metadata: languageName: node linkType: hard -"mimic-fn@npm:^1.0.0": - version: 1.2.0 - resolution: "mimic-fn@npm:1.2.0" - checksum: 69c08205156a1f4906d9c46f9b4dc08d18a50176352e77fdeb645cedfe9f20c0b19865d465bd2dec27a5c432347f24dc07fc3695e11159d193f892834233e939 - languageName: node - linkType: hard - "mimic-fn@npm:^2.1.0": version: 2.1.0 resolution: "mimic-fn@npm:2.1.0" @@ -21026,7 +20991,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.1.1, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6": +"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6": version: 1.2.7 resolution: "minimist@npm:1.2.7" checksum: 7346574a1038ca23c32e02252f603801f09384dd1d78b69a943a4e8c2c28730b80e96193882d3d3b22a063445f460e48316b29b8a25addca2d7e5e8f75478bec @@ -21301,6 +21266,13 @@ __metadata: languageName: node linkType: hard +"multi-sort-stream@npm:^1.0.3": + version: 1.0.4 + resolution: "multi-sort-stream@npm:1.0.4" + checksum: b234754e0e7489623f5184ba0e887ffd8014fe829c846fd8a95569339b6e19a616ae1d44f3d064279adfbf92fa5c4d016a89fc5026e16dbd680ebd67067b19a0 + languageName: node + linkType: hard + "multicast-dns-service-types@npm:^1.1.0": version: 1.1.0 resolution: "multicast-dns-service-types@npm:1.1.0" @@ -21345,6 +21317,16 @@ __metadata: languageName: node linkType: hard +"multipipe@npm:^4.0.0": + version: 4.0.0 + resolution: "multipipe@npm:4.0.0" + dependencies: + duplexer2: ^0.1.2 + object-assign: ^4.1.0 + checksum: 5a494ec2ce5bfdb389882ca595e3c4a33cae6c90dad879db2e3aa9a94484d8b164b0fb7b58ccf7593ae7e8c6213fd3f53a736b2c98e4f14c5ed1d38debc33f98 + languageName: node + linkType: hard + "mute-stream@npm:0.0.8": version: 0.0.8 resolution: "mute-stream@npm:0.0.8" @@ -21486,10 +21468,10 @@ __metadata: languageName: node linkType: hard -"nocache@npm:^2.1.0": - version: 2.1.0 - resolution: "nocache@npm:2.1.0" - checksum: 702ad516a7f8b21364c3e9b6ed982b0dfbcbdad9c28ed35331c4025025c729eb9d93523c3370947c5c8391ae33c6f69b67e35ef301d0e9424cee84f0b1d015c2 +"nocache@npm:^3.0.1": + version: 3.0.4 + resolution: "nocache@npm:3.0.4" + checksum: 6be9ee67eb561ecedc56d805c024c0fda55b9836ecba659c720073b067929aa4fe04bb7121480e004c9cf52989e62d8720f29a7fe0269f1a4941221a1e4be1c2 languageName: node linkType: hard @@ -21645,6 +21627,17 @@ __metadata: languageName: node linkType: hard +"node-ipc@npm:^9.2.1": + version: 9.2.1 + resolution: "node-ipc@npm:9.2.1" + dependencies: + event-pubsub: 4.3.0 + js-message: 1.0.7 + js-queue: 2.0.2 + checksum: a38aa4c8ca4317b293e0ce21f0a3a4941fc51c054800b35e263fcfe3e0feeb60e7d2c497f015054b28783316c6e7d9cc3837af9d9958bcbd8c577d0cdf6964b7 + languageName: node + linkType: hard + "node-libs-browser@npm:^2.2.1": version: 2.2.1 resolution: "node-libs-browser@npm:2.2.1" @@ -22284,10 +22277,10 @@ __metadata: languageName: node linkType: hard -"ob1@npm:0.66.2": - version: 0.66.2 - resolution: "ob1@npm:0.66.2" - checksum: 18f4ddecd7631aef0cbbd1c11134cca26305e13e75324c51d0fcfb949aefbd3f18df33cdeb7e68b02e1d68a59163f3c7af3a08ff070ccfec6c91d3b67be2f8bb +"ob1@npm:0.72.3": + version: 0.72.3 + resolution: "ob1@npm:0.72.3" + checksum: 21ef5c2565b3ec0b5f190f117f205548ed3ee935e5884d916da7cb570ad1bd0206e1dbd542b91c004cd4e6eb5ee5100517f37e9664f23dbb6cbecc9cdb5b26eb languageName: node linkType: hard @@ -22466,15 +22459,6 @@ __metadata: languageName: node linkType: hard -"onetime@npm:^2.0.0": - version: 2.0.1 - resolution: "onetime@npm:2.0.1" - dependencies: - mimic-fn: ^1.0.0 - checksum: bb44015ac7a525d0fb43b029a583d4ad359834632b4424ca209b438aacf6d669dda81b5edfbdb42c22636e607b276ba5589f46694a729e3bc27948ce26f4cc1a - languageName: node - linkType: hard - "onetime@npm:^5.1.0, onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" @@ -22581,27 +22565,6 @@ __metadata: languageName: node linkType: hard -"options@npm:>=0.0.5": - version: 0.0.6 - resolution: "options@npm:0.0.6" - checksum: 8601fdc0a3e14987b7f2509676e5e5d8afe601c64600d9bad3a0aad7e8ed8631ad47e2fa155c63e4043832122d6f6e3251d276307a032d0bb50cc252980e3712 - languageName: node - linkType: hard - -"ora@npm:^3.4.0": - version: 3.4.0 - resolution: "ora@npm:3.4.0" - dependencies: - chalk: ^2.4.2 - cli-cursor: ^2.1.0 - cli-spinners: ^2.0.0 - log-symbols: ^2.2.0 - strip-ansi: ^5.2.0 - wcwidth: ^1.0.1 - checksum: f1f8e7f290b766276dcd19ddf2159a1971b1ec37eec4a5556b8f5e4afbe513a965ed65c183d38956724263b6a20989b3d8fb71b95ac4a2d6a01db2f1ed8899e4 - languageName: node - linkType: hard - "ora@npm:^5.4.1": version: 5.4.1 resolution: "ora@npm:5.4.1" @@ -23432,7 +23395,7 @@ __metadata: languageName: node linkType: hard -"plist@npm:^3.0.1, plist@npm:^3.0.2, plist@npm:^3.0.4, plist@npm:^3.0.5": +"plist@npm:^3.0.1, plist@npm:^3.0.4": version: 3.0.6 resolution: "plist@npm:3.0.6" dependencies: @@ -23460,7 +23423,7 @@ __metadata: languageName: node linkType: hard -"pod-install@npm:^0.1.33": +"pod-install@npm:^0.1.38": version: 0.1.38 resolution: "pod-install@npm:0.1.38" bin: @@ -24667,12 +24630,12 @@ __metadata: languageName: node linkType: hard -"promise@npm:^8.0.3": - version: 8.2.0 - resolution: "promise@npm:8.2.0" +"promise@npm:^8.3.0": + version: 8.3.0 + resolution: "promise@npm:8.3.0" dependencies: asap: ~2.0.6 - checksum: 45d65ffe4fbd9172ef848f790ac1366822e63f063a5ef42a14e75b577ffa3c37870a9d8472729d9d429d7c8a770428f9d13650b52aafaa361dcc69cf84873b20 + checksum: a69f0ddbddf78ffc529cffee7ad950d307347615970564b17988ce43fbe767af5c738a9439660b24a9a8cbea106c0dcbb6c2b20e23b7e96a8e89e5c2679e94d5 languageName: node linkType: hard @@ -25168,13 +25131,13 @@ __metadata: languageName: node linkType: hard -"react-devtools-core@npm:4.19.1": - version: 4.19.1 - resolution: "react-devtools-core@npm:4.19.1" +"react-devtools-core@npm:4.24.0": + version: 4.24.0 + resolution: "react-devtools-core@npm:4.24.0" dependencies: shell-quote: ^1.6.1 ws: ^7 - checksum: 20471dde740e25a6f51b7b2b719fb1e1a9213cfb2a14d6defb44eced93646f73c9c5e376fcfdc78827c4fb587bc030ca99a14a0154a94acf7a1e1496d2b59ef6 + checksum: c9e21ff2621447a6de51d4a350f3859e8077634f8be327f006d8da73dba349e78432ef910e432f066c615938fed697231ed3daee8f9eae049004c14ebac85625 languageName: node linkType: hard @@ -25324,6 +25287,13 @@ __metadata: languageName: node linkType: hard +"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0": + version: 18.2.0 + resolution: "react-is@npm:18.2.0" + checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e + languageName: node + linkType: hard + "react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0": version: 16.13.1 resolution: "react-is@npm:16.13.1" @@ -25338,13 +25308,6 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^18.0.0": - version: 18.2.0 - resolution: "react-is@npm:18.2.0" - checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e - languageName: node - linkType: hard - "react-json-view@npm:^1.21.1": version: 1.21.3 resolution: "react-json-view@npm:1.21.3" @@ -25402,14 +25365,15 @@ __metadata: languageName: node linkType: hard -"react-native-codegen@npm:^0.0.8": - version: 0.0.8 - resolution: "react-native-codegen@npm:0.0.8" +"react-native-codegen@npm:^0.70.6": + version: 0.70.6 + resolution: "react-native-codegen@npm:0.70.6" dependencies: + "@babel/parser": ^7.14.0 flow-parser: ^0.121.0 - jscodeshift: ^0.11.0 + jscodeshift: ^0.13.1 nullthrows: ^1.1.1 - checksum: c5ccdcb2a2f249756aca8e729cf96737368c8d33673b08d4c928a469bcb58ff37fbf3c7a070398f33b19846c4261948e2c5107c561934a41ac034620f7207bbd + checksum: 2a50ad71e09bc8cbb3694057cf47d6e9665c16f3968d1dc2b71e83c8c4e7be3b07b74bea08750ec9c8f6c60e6c746a5f695963c8694e5a76edcbce35a53a6a06 languageName: node linkType: hard @@ -25438,7 +25402,7 @@ __metadata: languageName: node linkType: hard -"react-native-fs@npm:^2.19.0": +"react-native-fs@npm:^2.20.0": version: 2.20.0 resolution: "react-native-fs@npm:2.20.0" dependencies: @@ -25454,6 +25418,13 @@ __metadata: languageName: node linkType: hard +"react-native-gradle-plugin@npm:^0.70.3": + version: 0.70.3 + resolution: "react-native-gradle-plugin@npm:0.70.3" + checksum: 04a3379842bcb4709ac6b37e093a3de59acd33b28b200885843b13908fac685a77ab81d732c34090c56e5c0eec971d578b227f302bd04fe7901e8792d434f41f + languageName: node + linkType: hard + "react-native-iap@npm:^12.4.4": version: 12.4.4 resolution: "react-native-iap@npm:12.4.4" @@ -25481,10 +25452,10 @@ __metadata: languageName: node linkType: hard -"react-native-share@npm:^7.9.0": - version: 7.9.1 - resolution: "react-native-share@npm:7.9.1" - checksum: 276f872de7342eacb6f3524bd276d25e43731359c10820630eac6a3869d69e85147b378fde0bceaa6315a8fea9585c20798bce2ff027fdf1c7b225a8d0a38b07 +"react-native-share@npm:^8.0.0": + version: 8.0.0 + resolution: "react-native-share@npm:8.0.0" + checksum: f22e672bae9eb5da793b1a2296d45a4554440a537e479b21ecfcc61fc5619ba7e7d238a3b69f5276709bb47e2758705cf47763b7c9c80fee84241b04b410d86e languageName: node linkType: hard @@ -25510,14 +25481,14 @@ __metadata: languageName: node linkType: hard -"react-native@npm:0.67.4": - version: 0.67.4 - resolution: "react-native@npm:0.67.4" +"react-native@npm:0.70.6": + version: 0.70.6 + resolution: "react-native@npm:0.70.6" dependencies: "@jest/create-cache-key-function": ^27.0.1 - "@react-native-community/cli": ^6.0.0 - "@react-native-community/cli-platform-android": ^6.0.0 - "@react-native-community/cli-platform-ios": ^6.0.0 + "@react-native-community/cli": 9.3.2 + "@react-native-community/cli-platform-android": 9.3.1 + "@react-native-community/cli-platform-ios": 9.3.0 "@react-native/assets": 1.0.0 "@react-native/normalize-color": 2.0.0 "@react-native/polyfills": 2.0.0 @@ -25525,30 +25496,32 @@ __metadata: anser: ^1.4.9 base64-js: ^1.1.2 event-target-shim: ^5.0.1 - hermes-engine: ~0.9.0 invariant: ^2.2.4 jsc-android: ^250230.2.1 - metro-react-native-babel-transformer: 0.66.2 - metro-runtime: 0.66.2 - metro-source-map: 0.66.2 + memoize-one: ^5.0.0 + metro-react-native-babel-transformer: 0.72.3 + metro-runtime: 0.72.3 + metro-source-map: 0.72.3 + mkdirp: ^0.5.1 nullthrows: ^1.1.1 pretty-format: ^26.5.2 - promise: ^8.0.3 - prop-types: ^15.7.2 - react-devtools-core: 4.19.1 - react-native-codegen: ^0.0.8 + promise: ^8.3.0 + react-devtools-core: 4.24.0 + react-native-codegen: ^0.70.6 + react-native-gradle-plugin: ^0.70.3 react-refresh: ^0.4.0 + react-shallow-renderer: ^16.15.0 regenerator-runtime: ^0.13.2 - scheduler: ^0.20.2 + scheduler: ^0.22.0 stacktrace-parser: ^0.1.3 - use-subscription: ^1.0.0 + use-sync-external-store: ^1.0.0 whatwg-fetch: ^3.0.0 ws: ^6.1.4 peerDependencies: - react: 17.0.2 + react: 18.1.0 bin: react-native: cli.js - checksum: 662cee2e5ddbfbaa2adfeaff42e6edc3b96a0116de2c75c2c73e605a87ff25d33319cf26349abbffef0c94ba9ba0c2231ddfd3568cbc2146bf715317370aa5e3 + checksum: ae57e1b86f4e6950913f8b59732ab57d2dd1ee30af6c2ca68f88b03b8448cb01c51967b148550a8b8cb6d42ca9b73cead2e854b9ecc2f4b9d5d75fccff798846 languageName: node linkType: hard @@ -25649,6 +25622,18 @@ __metadata: languageName: node linkType: hard +"react-shallow-renderer@npm:^16.15.0": + version: 16.15.0 + resolution: "react-shallow-renderer@npm:16.15.0" + dependencies: + object-assign: ^4.1.1 + react-is: ^16.12.0 || ^17.0.0 || ^18.0.0 + peerDependencies: + react: ^16.0.0 || ^17.0.0 || ^18.0.0 + checksum: 6052c7e3e9627485120ebd8257f128aad8f56386fe8d42374b7743eac1be457c33506d153c7886b4e32923c0c352d402ab805ef9ca02dbcd8393b2bdeb6e5af8 + languageName: node + linkType: hard + "react-side-effect@npm:^2.1.0": version: 2.1.2 resolution: "react-side-effect@npm:2.1.2" @@ -25694,7 +25679,16 @@ __metadata: languageName: node linkType: soft -"react@npm:17.0.2, react@npm:^17.0.2": +"react@npm:18.2.0, react@npm:^18.2.0": + version: 18.2.0 + resolution: "react@npm:18.2.0" + dependencies: + loose-envify: ^1.1.0 + checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b + languageName: node + linkType: hard + +"react@npm:^17.0.2": version: 17.0.2 resolution: "react@npm:17.0.2" dependencies: @@ -25704,15 +25698,6 @@ __metadata: languageName: node linkType: hard -"react@npm:^18.2.0": - version: 18.2.0 - resolution: "react@npm:18.2.0" - dependencies: - loose-envify: ^1.1.0 - checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b - languageName: node - linkType: hard - "read-cache@npm:^1.0.0": version: 1.0.0 resolution: "read-cache@npm:1.0.0" @@ -25914,7 +25899,7 @@ __metadata: languageName: node linkType: hard -"recast@npm:^0.20.3": +"recast@npm:^0.20.4": version: 0.20.5 resolution: "recast@npm:0.20.5" dependencies: @@ -26518,16 +26503,6 @@ __metadata: languageName: node linkType: hard -"restore-cursor@npm:^2.0.0": - version: 2.0.0 - resolution: "restore-cursor@npm:2.0.0" - dependencies: - onetime: ^2.0.0 - signal-exit: ^3.0.2 - checksum: 482e13d02d834b6e5e3aa90304a8b5e840775d6f06916cc92a50038adf9f098dcc72405b567da8a37e137ae40ad3e31896fa3136ae62f7a426c2fbf53d036536 - languageName: node - linkType: hard - "restore-cursor@npm:^3.1.0": version: 3.1.0 resolution: "restore-cursor@npm:3.1.0" @@ -26664,13 +26639,6 @@ __metadata: languageName: node linkType: hard -"rsvp@npm:^4.8.4": - version: 4.8.5 - resolution: "rsvp@npm:4.8.5" - checksum: 2d8ef30d8febdf05bdf856ccca38001ae3647e41835ca196bc1225333f79b94ae44def733121ca549ccc36209c9b689f6586905e2a043873262609744da8efc1 - languageName: node - linkType: hard - "rtl-detect@npm:^1.0.2, rtl-detect@npm:^1.0.4": version: 1.0.4 resolution: "rtl-detect@npm:1.0.4" @@ -26784,25 +26752,6 @@ __metadata: languageName: node linkType: hard -"sane@npm:^4.0.3": - version: 4.1.0 - resolution: "sane@npm:4.1.0" - dependencies: - "@cnakazawa/watch": ^1.0.3 - anymatch: ^2.0.0 - capture-exit: ^2.0.0 - exec-sh: ^0.3.2 - execa: ^1.0.0 - fb-watchman: ^2.0.0 - micromatch: ^3.1.4 - minimist: ^1.1.1 - walker: ~1.0.5 - bin: - sane: ./src/cli.js - checksum: 97716502d456c0d38670a902a4ea943d196dcdf998d1e40532d8f3e24e25d7eddfd4c3579025a1eee8eac09a48dfd05fba61a2156c56704e7feaa450eb249f7c - languageName: node - linkType: hard - "sanitize-filename@npm:^1.6.1, sanitize-filename@npm:^1.6.3": version: 1.6.3 resolution: "sanitize-filename@npm:1.6.3" @@ -26954,6 +26903,15 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.22.0": + version: 0.22.0 + resolution: "scheduler@npm:0.22.0" + dependencies: + loose-envify: ^1.1.0 + checksum: a8ef5cab769c020cd6382ad9ecc3f72dbde56a50a36639b3a42ad9c11f7724f03700bcad373044059b8067d4a6365154dc7c0ca8027ef20ff4900cf58a0fc2c5 + languageName: node + linkType: hard + "scheduler@npm:^0.23.0": version: 0.23.0 resolution: "scheduler@npm:0.23.0" @@ -27443,17 +27401,6 @@ __metadata: languageName: node linkType: hard -"simple-plist@npm:^1.0.0": - version: 1.4.0 - resolution: "simple-plist@npm:1.4.0" - dependencies: - bplist-creator: 0.1.1 - bplist-parser: 0.3.2 - plist: ^3.0.5 - checksum: fa8086f6b781c289f1abad21306481dda4af6373b32a5d998a70e53c2b7218a1d21ebb5ae3e736baae704c21d311d3d39d01d0e6a2387eda01b4020b9ebd909e - languageName: node - linkType: hard - "simple-swizzle@npm:^0.2.2": version: 0.2.2 resolution: "simple-swizzle@npm:0.2.2" @@ -28088,10 +28035,10 @@ __metadata: languageName: node linkType: hard -"stream-buffers@npm:2.2.x": - version: 2.2.0 - resolution: "stream-buffers@npm:2.2.0" - checksum: 4587d9e8f050d689fb38b4295e73408401b16de8edecc12026c6f4ae92956705ecfd995ae3845d7fa3ebf19502d5754df9143d91447fd881d86e518f43882c1c +"stream-chain@npm:^2.2.5": + version: 2.2.5 + resolution: "stream-chain@npm:2.2.5" + checksum: c83cbf504bd11e2bcbe761a92801295b3decac7ffa4092ceffca2eb1b5d0763bcc511fa22cd8044e8a18c21ca66794fd10c8d9cd1292a3e6c0d83a4194c6b8ed languageName: node linkType: hard @@ -28118,6 +28065,15 @@ __metadata: languageName: node linkType: hard +"stream-json@npm:^1.7.4": + version: 1.7.4 + resolution: "stream-json@npm:1.7.4" + dependencies: + stream-chain: ^2.2.5 + checksum: 50aca250cedde7b35fcc12b3f4936d28431f351392f25f1baa7898b618d363368f8049af07c486ce7c47ee19ea15fd31642df0819e62e514c6193f1e2b05d85e + languageName: node + linkType: hard + "stream-shift@npm:^1.0.0": version: 1.0.1 resolution: "stream-shift@npm:1.0.1" @@ -28599,13 +28555,6 @@ __metadata: languageName: node linkType: hard -"tail@npm:^2.0.0": - version: 2.2.4 - resolution: "tail@npm:2.2.4" - checksum: 2cc8b54d3286cbc3227cb356ece75b19ece0dd104267252744e573f4f6cd385629ec30321d9dac236adf23a3783fdb0c9c2ed437964c1aff0f8618f16043cb24 - languageName: node - linkType: hard - "tailwindcss@npm:^3.2.4": version: 3.2.4 resolution: "tailwindcss@npm:3.2.4" @@ -28738,7 +28687,7 @@ __metadata: languageName: node linkType: hard -"temp@npm:^0.8.1": +"temp@npm:^0.8.4": version: 0.8.4 resolution: "temp@npm:0.8.4" dependencies: @@ -29100,6 +29049,16 @@ __metadata: languageName: node linkType: hard +"trace-event-lib@npm:^1.3.1": + version: 1.3.1 + resolution: "trace-event-lib@npm:1.3.1" + dependencies: + browser-process-hrtime: ^1.0.0 + lodash: ^4.17.21 + checksum: 82b3fe1f391cce2cb0e95a0801a75bca8aba485429e28f3cfc4d9ae29b389a037ac2a2f2e1f2ba432167205a7b5826d6b15013debe9d3b20229f4b43121eb837 + languageName: node + linkType: hard + "treeverse@npm:^2.0.0": version: 2.0.0 resolution: "treeverse@npm:2.0.0" @@ -29543,13 +29502,6 @@ __metadata: languageName: node linkType: hard -"ultron@npm:1.0.x": - version: 1.0.2 - resolution: "ultron@npm:1.0.2" - checksum: f98993b128c774b4769aeeb86030158efb9c2440d3ad91d722af05e7418ddbee6d6fd974c257702b997e5e8fe417ca349c40d16c8cebc8de4b4a2fd40e872309 - languageName: node - linkType: hard - "unbox-primitive@npm:^1.0.2": version: 1.0.2 resolution: "unbox-primitive@npm:1.0.2" @@ -30086,18 +30038,7 @@ __metadata: languageName: node linkType: hard -"use-subscription@npm:^1.0.0": - version: 1.8.0 - resolution: "use-subscription@npm:1.8.0" - dependencies: - use-sync-external-store: ^1.2.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: beac1f0ff14fe23fd6ae9c34681258936729f343bf6532bbce36caa8f4c1019ff380783e35b4aeb7f3faaec1a83af242d7833bf7e660816d24555dbdd2c934da - languageName: node - linkType: hard - -"use-sync-external-store@npm:^1.2.0": +"use-sync-external-store@npm:^1.0.0, use-sync-external-store@npm:^1.2.0": version: 1.2.0 resolution: "use-sync-external-store@npm:1.2.0" peerDependencies: @@ -30409,7 +30350,7 @@ __metadata: languageName: node linkType: hard -"walker@npm:^1.0.7, walker@npm:^1.0.8, walker@npm:~1.0.5": +"walker@npm:^1.0.7, walker@npm:^1.0.8": version: 1.0.8 resolution: "walker@npm:1.0.8" dependencies: @@ -31159,16 +31100,6 @@ __metadata: languageName: node linkType: hard -"ws@npm:^1.1.0, ws@npm:^1.1.5": - version: 1.1.5 - resolution: "ws@npm:1.1.5" - dependencies: - options: ">=0.0.5" - ultron: 1.0.x - checksum: d2dfb74fe4f9bfa3f6e9e1d583210ce3d0b29fe376cfd93491e80844494842527ca3e68209205c1d6bc85849a7f379f9cc34150dc9e4b08a82cb031f4fbabc7b - languageName: node - linkType: hard - "ws@npm:^6.1.4, ws@npm:^6.2.1": version: 6.2.2 resolution: "ws@npm:6.2.2" @@ -31178,7 +31109,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:^7, ws@npm:^7.0.0, ws@npm:^7.3.1": +"ws@npm:^7, ws@npm:^7.0.0, ws@npm:^7.3.1, ws@npm:^7.5.1": version: 7.5.9 resolution: "ws@npm:7.5.9" peerDependencies: @@ -31208,16 +31139,6 @@ __metadata: languageName: node linkType: hard -"xcode@npm:^2.0.0": - version: 2.1.0 - resolution: "xcode@npm:2.1.0" - dependencies: - simple-plist: ^1.0.0 - uuid: ^3.3.2 - checksum: aaa4569f96411f3a024abfa9fb27f2b1dfcf0544b91d2a8b63a36214042b4560dc455942abd9b95836cdd24386d4a6731faf339e32b496b46b4ca810a1dea0e1 - languageName: node - linkType: hard - "xdg-basedir@npm:^4.0.0": version: 4.0.0 resolution: "xdg-basedir@npm:4.0.0" @@ -31264,15 +31185,6 @@ __metadata: languageName: node linkType: hard -"xmldoc@npm:^1.1.2": - version: 1.2.0 - resolution: "xmldoc@npm:1.2.0" - dependencies: - sax: ^1.2.4 - checksum: df42d06cf42bad47189f0d11d402de8da42652f1d96ee20586f906a3db72c6a0efbabc04d1a97cec7fe235fde55ff7e601c9dc4fdf31b9ef3ce30bd7836b4b08 - languageName: node - linkType: hard - "xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:^4.0.2, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" @@ -31349,7 +31261,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3": +"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3, yargs-parser@npm:^20.2.9": version: 20.2.9 resolution: "yargs-parser@npm:20.2.9" checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3