From 584dbda4cb55783ff4a671b91e8b64f6bb393db4 Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Wed, 21 Jun 2023 17:18:07 +0300 Subject: [PATCH 1/9] sdk(react-native-sdk): renamed .podspec file --- ...i-meet-react-native.podspec => jitsi-react-native-sdk.podspec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename react-native-sdk/{jitsi-meet-react-native.podspec => jitsi-react-native-sdk.podspec} (100%) diff --git a/react-native-sdk/jitsi-meet-react-native.podspec b/react-native-sdk/jitsi-react-native-sdk.podspec similarity index 100% rename from react-native-sdk/jitsi-meet-react-native.podspec rename to react-native-sdk/jitsi-react-native-sdk.podspec From 1c709e17ac6d57569d478cceff9f3f8acea47445 Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Wed, 21 Jun 2023 17:18:33 +0300 Subject: [PATCH 2/9] sdk(react-native-sdk): added project archive to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8c763fa965f..23c6e23b36f 100644 --- a/.gitignore +++ b/.gitignore @@ -97,6 +97,7 @@ tsconfig.json # React Native SDK # +react-native-sdk/*.tgz react-native-sdk/android/src react-native-sdk/images react-native-sdk/ios From c0c774998541af75dccce66baa77fb5b1a67b070 Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Wed, 21 Jun 2023 17:19:17 +0300 Subject: [PATCH 3/9] sdk(react-native-sdk): fixed issue regarding project name --- react-native-sdk/package-lock.json | 36 +++++++++++++++--------------- react-native-sdk/package.json | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/react-native-sdk/package-lock.json b/react-native-sdk/package-lock.json index 1ac8e351dfb..38d9daf3cd5 100644 --- a/react-native-sdk/package-lock.json +++ b/react-native-sdk/package-lock.json @@ -1,17 +1,17 @@ { - "name": "@jitsi/react-native-sdk", + "name": "jitsi-react-native-sdk", "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "@jitsi/react-native-sdk", + "name": "jitsi-react-native-sdk", "version": "0.1.0", "license": "Apache-2.0", "dependencies": { "@amplitude/react-native": "2.7.0", "@giphy/react-components": "6.8.1", - "@giphy/react-native-sdk": "1.7.0", + "@giphy/react-native-sdk": "2.3.0", "@hapi/bourne": "2.0.0", "@jitsi/js-utils": "2.0.5", "@jitsi/logger": "2.0.0", @@ -32,7 +32,7 @@ "js-md5": "0.6.1", "js-sha512": "0.8.0", "jwt-decode": "2.2.0", - "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1632.0.0+e4966db9/lib-jitsi-meet.tgz", + "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1643.0.0+0748d89a/lib-jitsi-meet.tgz", "lodash": "4.17.21", "moment": "2.29.4", "moment-duration-format": "2.2.2", @@ -387,12 +387,12 @@ } }, "node_modules/@giphy/react-native-sdk": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@giphy/react-native-sdk/-/react-native-sdk-1.7.0.tgz", - "integrity": "sha512-mCIqtPkDAstL+BDTbC1EQ4SiRkND3zd9uLKUeR4RkK2AhjRTUIheGzfxOZrdR014LVwcwKw5s9qpogoXr66mgw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@giphy/react-native-sdk/-/react-native-sdk-2.3.0.tgz", + "integrity": "sha512-hSCbgdi4Fptd1QwiZrhDhOuvy51HjWNOJE2Pa7/XkQ9NFSeu14N02m1Be2bXOhbN4kf/SptTzRzkMzn5U+IgmA==", "dependencies": { - "@giphy/js-types": "^4.0.3", - "type-fest": "^2.10.0" + "@giphy/js-types": "^4.2.1", + "type-fest": "^2.18.0" }, "peerDependencies": { "react": "*", @@ -2117,8 +2117,8 @@ }, "node_modules/lib-jitsi-meet": { "version": "0.0.0", - "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1632.0.0+e4966db9/lib-jitsi-meet.tgz", - "integrity": "sha512-8TA9goJW35hGSh+dcbpo8x/EoyjCtsDVeHpoNnuiz525AhkxPH3kXU/rk8pLFINg276P8yDkNqXuNtG9EPRaNg==", + "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1643.0.0+0748d89a/lib-jitsi-meet.tgz", + "integrity": "sha512-HtLhGkrSHEztTcMZ1iJmG7a5Bj8KvsT8bGL/h3G+4kro5JRp/E40XJPPWiaGT0e9av4RQZa4u1giSgF/50ssoQ==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -3719,12 +3719,12 @@ } }, "@giphy/react-native-sdk": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@giphy/react-native-sdk/-/react-native-sdk-1.7.0.tgz", - "integrity": "sha512-mCIqtPkDAstL+BDTbC1EQ4SiRkND3zd9uLKUeR4RkK2AhjRTUIheGzfxOZrdR014LVwcwKw5s9qpogoXr66mgw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@giphy/react-native-sdk/-/react-native-sdk-2.3.0.tgz", + "integrity": "sha512-hSCbgdi4Fptd1QwiZrhDhOuvy51HjWNOJE2Pa7/XkQ9NFSeu14N02m1Be2bXOhbN4kf/SptTzRzkMzn5U+IgmA==", "requires": { - "@giphy/js-types": "^4.0.3", - "type-fest": "^2.10.0" + "@giphy/js-types": "^4.2.1", + "type-fest": "^2.18.0" } }, "@hapi/bourne": { @@ -5077,8 +5077,8 @@ } }, "lib-jitsi-meet": { - "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1632.0.0+e4966db9/lib-jitsi-meet.tgz", - "integrity": "sha512-8TA9goJW35hGSh+dcbpo8x/EoyjCtsDVeHpoNnuiz525AhkxPH3kXU/rk8pLFINg276P8yDkNqXuNtG9EPRaNg==", + "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1643.0.0+0748d89a/lib-jitsi-meet.tgz", + "integrity": "sha512-HtLhGkrSHEztTcMZ1iJmG7a5Bj8KvsT8bGL/h3G+4kro5JRp/E40XJPPWiaGT0e9av4RQZa4u1giSgF/50ssoQ==", "requires": { "@jitsi/js-utils": "2.0.0", "@jitsi/logger": "2.0.0", diff --git a/react-native-sdk/package.json b/react-native-sdk/package.json index adc95a9953c..c80891e46ef 100644 --- a/react-native-sdk/package.json +++ b/react-native-sdk/package.json @@ -1,5 +1,5 @@ { - "name": "@jitsi/react-native-sdk", + "name": "jitsi-react-native-sdk", "version": "0.1.0", "description": "React Native SDK for Jitsi Meet.", "main": "index.js", @@ -104,4 +104,4 @@ "keywords": [ "react-native" ] -} \ No newline at end of file +} From 41a3e1ea28c9259ca5d56e547b5cb64d0b2d3102 Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Mon, 26 Jun 2023 11:09:42 +0300 Subject: [PATCH 4/9] sdk(react-native-sdk): minor updates --- react-native-sdk/package-lock.json | 385 ++++++++++++++--------------- react-native-sdk/package.json | 6 +- 2 files changed, 182 insertions(+), 209 deletions(-) diff --git a/react-native-sdk/package-lock.json b/react-native-sdk/package-lock.json index 38d9daf3cd5..358bc4e29da 100644 --- a/react-native-sdk/package-lock.json +++ b/react-native-sdk/package-lock.json @@ -1,11 +1,11 @@ { - "name": "jitsi-react-native-sdk", + "name": "@jitsi/react-native-sdk", "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "jitsi-react-native-sdk", + "name": "@jitsi/react-native-sdk", "version": "0.1.0", "license": "Apache-2.0", "dependencies": { @@ -99,49 +99,49 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", - "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", + "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz", - "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", + "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", "dependencies": { - "@babel/types": "^7.21.4" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", - "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", + "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", + "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -150,9 +150,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz", - "integrity": "sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz", + "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==", "dependencies": { "regenerator-runtime": "^0.13.11" }, @@ -161,12 +161,12 @@ } }, "node_modules/@babel/types": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz", - "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", + "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", "dependencies": { - "@babel/helper-string-parser": "^7.21.5", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", "to-fast-properties": "^2.0.0" }, "engines": { @@ -315,31 +315,31 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "node_modules/@giphy/js-analytics": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@giphy/js-analytics/-/js-analytics-4.3.0.tgz", - "integrity": "sha512-FgdwGcNzRleUbYMgysarCAvUexFhLCuk86P/QZjTxv+h5Ik6z4i0ayhwQK3Tk3RB8Nb+L8U8ivqyXGEG4gV6gw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@giphy/js-analytics/-/js-analytics-4.3.2.tgz", + "integrity": "sha512-DCBOAxGixRg8+5Pz/H9gmMP7b5qDhNw49spWleIGLT+4FQHm9eDjVrY5wKlY8Y0c91CmK9V6kqTCpJ+2aGLdmQ==", "dependencies": { - "@giphy/js-types": "^4.4.0", - "@giphy/js-util": "^4.4.0", + "@giphy/js-types": "*", + "@giphy/js-util": "*", "append-query": "^2.1.0", "throttle-debounce": "^3.0.1" } }, "node_modules/@giphy/js-brand": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@giphy/js-brand/-/js-brand-2.3.0.tgz", - "integrity": "sha512-XcUj8vXkhTFvSxfoB9X8I8qxg/NPY6Dip6MSQmds9/cffDch9wFu+TG98oAMWxeIZ5V+ci941o+9x7wVORcoSA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@giphy/js-brand/-/js-brand-2.3.2.tgz", + "integrity": "sha512-mclG3NI3cpeVEnacum8Hq4+Ste0yF/TIu+cs7VgLlJMybE6K+cvShsz6JiXkyvi8csP7DhFJlbeXERhgV5yFOQ==", "dependencies": { "emotion": "10.0.27" } }, "node_modules/@giphy/js-fetch-api": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@giphy/js-fetch-api/-/js-fetch-api-4.9.0.tgz", - "integrity": "sha512-B29sSHOv4gtFR/ueClscfgnlGK9yhkg9UkBFuonDyi9s0K4SQng9FX/YK+esqquGbqCNNjqKzPdTb1KbaR6KcA==", + "version": "4.9.3", + "resolved": "https://registry.npmjs.org/@giphy/js-fetch-api/-/js-fetch-api-4.9.3.tgz", + "integrity": "sha512-SV+7ttNrU9pGRp7otVRSAKTQxT8fHNObYAeJ5gCVk3pr9LhP1b2Az8KIXn2IlpxdIHOnuFNKP919oO5MvESDkA==", "dependencies": { - "@giphy/js-types": "^4.4.0", - "@giphy/js-util": "^4.4.0", + "@giphy/js-types": "*", + "@giphy/js-util": "*", "qs": "^6.9.4" } }, @@ -349,11 +349,11 @@ "integrity": "sha512-W9G6crS2oqTn7g0RpvYu1l/sna4LnivRTk25jmxdzujOFb9kvQ+VFM/v9RPYV2GIBnzT/maW/EwjFIba9jkflA==" }, "node_modules/@giphy/js-util": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@giphy/js-util/-/js-util-4.4.0.tgz", - "integrity": "sha512-BUkcxsXHYFKoesAxuYoKv1gLbPOMM4bDtUYfQzwl8oqNuwEzdkidbJVYIh96Sa3vnFGx5xarjvxmTn3C2BOWIQ==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@giphy/js-util/-/js-util-4.4.2.tgz", + "integrity": "sha512-ltthBrFDGXeDTdtuHM+Y8x1FMX7WaT3sCZ8MC/I179+1DJg82/IvDks9yR0mDywYtHvkNxgg5IqC5arvnA8V/w==", "dependencies": { - "@giphy/js-types": "^4.4.0", + "@giphy/js-types": "*", "dompurify": "^2.2.2", "uuid": "^9.0.0" } @@ -483,11 +483,11 @@ } }, "node_modules/@react-navigation/core": { - "version": "6.4.8", - "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.8.tgz", - "integrity": "sha512-klZ9Mcf/P2j+5cHMoGyIeurEzyBM2Uq9+NoSFrF6sdV5iCWHLFhrCXuhbBiQ5wVLCKf4lavlkd/DDs47PXs9RQ==", + "version": "6.4.9", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.9.tgz", + "integrity": "sha512-G9GH7bP9x0qqupxZnkSftnkn4JoXancElTvFc8FVGfEvxnxP+gBo3wqcknyBi7M5Vad4qecsYjCOa9wqsftv9g==", "dependencies": { - "@react-navigation/routers": "^6.1.8", + "@react-navigation/routers": "^6.1.9", "escape-string-regexp": "^4.0.0", "nanoid": "^3.1.23", "query-string": "^7.1.3", @@ -541,9 +541,9 @@ } }, "node_modules/@react-navigation/routers": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.8.tgz", - "integrity": "sha512-CEge+ZLhb1HBrSvv4RwOol7EKLW1QoqVIQlE9TN5MpxS/+VoQvP+cLbuz0Op53/iJfYhtXRFd1ZAd3RTRqto9w==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz", + "integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==", "dependencies": { "nanoid": "^3.1.23" } @@ -610,6 +610,19 @@ "node": ">=4" } }, + "node_modules/ansi-styles/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/ansi-styles/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -923,28 +936,6 @@ } }, "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "node_modules/color-string": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", - "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "node_modules/color/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -955,11 +946,20 @@ "node": ">=7.0.0" } }, - "node_modules/color/node_modules/color-name": { + "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1425,12 +1425,13 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" }, "funding": { @@ -1802,9 +1803,9 @@ } }, "node_modules/is-core-module": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", - "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", + "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", "dependencies": { "has": "^1.0.3" }, @@ -2510,22 +2511,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/patch-package/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/patch-package/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, "node_modules/patch-package/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2623,9 +2608,9 @@ } }, "node_modules/qs": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz", - "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dependencies": { "side-channel": "^1.0.4" }, @@ -3213,9 +3198,9 @@ } }, "node_modules/tlds": { - "version": "1.238.0", - "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.238.0.tgz", - "integrity": "sha512-lFPF9pZFhLrPodaJ0wt9QIN0l8jOxqmUezGZnm7BfkDSVd9q667oVIJukLVzhF+4oW7uDlrLlfJrL5yu9RWwew==", + "version": "1.240.0", + "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.240.0.tgz", + "integrity": "sha512-1OYJQenswGZSOdRw7Bql5Qu7uf75b+F3HFBXbqnG/ifHa0fev1XcG+3pJf3pA/KC6RtHQzfKgIf1vkMlMG7mtQ==", "bin": { "tlds": "bin.js" } @@ -3261,9 +3246,9 @@ "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==" }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "node_modules/type-fest": { "version": "2.19.0", @@ -3479,56 +3464,56 @@ "integrity": "sha512-2dMxCVgRPwReHRDm9JKbL+sZGyozJlcdr5Jokv8TQR7idNxxGmm4YSYkjhGjSWkoEyGEyy+lh9kRJQL/DcUWJQ==" }, "@babel/code-frame": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", - "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", + "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", "requires": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.5" } }, "@babel/helper-module-imports": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz", - "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", + "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", "requires": { - "@babel/types": "^7.21.4" + "@babel/types": "^7.22.5" } }, "@babel/helper-string-parser": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", - "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==" + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==" }, "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", + "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==" }, "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", + "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", "requires": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/runtime": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz", - "integrity": "sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz", + "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==", "requires": { "regenerator-runtime": "^0.13.11" } }, "@babel/types": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz", - "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", + "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", "requires": { - "@babel/helper-string-parser": "^7.21.5", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", "to-fast-properties": "^2.0.0" } }, @@ -3651,31 +3636,31 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@giphy/js-analytics": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@giphy/js-analytics/-/js-analytics-4.3.0.tgz", - "integrity": "sha512-FgdwGcNzRleUbYMgysarCAvUexFhLCuk86P/QZjTxv+h5Ik6z4i0ayhwQK3Tk3RB8Nb+L8U8ivqyXGEG4gV6gw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@giphy/js-analytics/-/js-analytics-4.3.2.tgz", + "integrity": "sha512-DCBOAxGixRg8+5Pz/H9gmMP7b5qDhNw49spWleIGLT+4FQHm9eDjVrY5wKlY8Y0c91CmK9V6kqTCpJ+2aGLdmQ==", "requires": { - "@giphy/js-types": "^4.4.0", - "@giphy/js-util": "^4.4.0", + "@giphy/js-types": "*", + "@giphy/js-util": "*", "append-query": "^2.1.0", "throttle-debounce": "^3.0.1" } }, "@giphy/js-brand": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@giphy/js-brand/-/js-brand-2.3.0.tgz", - "integrity": "sha512-XcUj8vXkhTFvSxfoB9X8I8qxg/NPY6Dip6MSQmds9/cffDch9wFu+TG98oAMWxeIZ5V+ci941o+9x7wVORcoSA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@giphy/js-brand/-/js-brand-2.3.2.tgz", + "integrity": "sha512-mclG3NI3cpeVEnacum8Hq4+Ste0yF/TIu+cs7VgLlJMybE6K+cvShsz6JiXkyvi8csP7DhFJlbeXERhgV5yFOQ==", "requires": { "emotion": "10.0.27" } }, "@giphy/js-fetch-api": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@giphy/js-fetch-api/-/js-fetch-api-4.9.0.tgz", - "integrity": "sha512-B29sSHOv4gtFR/ueClscfgnlGK9yhkg9UkBFuonDyi9s0K4SQng9FX/YK+esqquGbqCNNjqKzPdTb1KbaR6KcA==", + "version": "4.9.3", + "resolved": "https://registry.npmjs.org/@giphy/js-fetch-api/-/js-fetch-api-4.9.3.tgz", + "integrity": "sha512-SV+7ttNrU9pGRp7otVRSAKTQxT8fHNObYAeJ5gCVk3pr9LhP1b2Az8KIXn2IlpxdIHOnuFNKP919oO5MvESDkA==", "requires": { - "@giphy/js-types": "^4.4.0", - "@giphy/js-util": "^4.4.0", + "@giphy/js-types": "*", + "@giphy/js-util": "*", "qs": "^6.9.4" } }, @@ -3685,11 +3670,11 @@ "integrity": "sha512-W9G6crS2oqTn7g0RpvYu1l/sna4LnivRTk25jmxdzujOFb9kvQ+VFM/v9RPYV2GIBnzT/maW/EwjFIba9jkflA==" }, "@giphy/js-util": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@giphy/js-util/-/js-util-4.4.0.tgz", - "integrity": "sha512-BUkcxsXHYFKoesAxuYoKv1gLbPOMM4bDtUYfQzwl8oqNuwEzdkidbJVYIh96Sa3vnFGx5xarjvxmTn3C2BOWIQ==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@giphy/js-util/-/js-util-4.4.2.tgz", + "integrity": "sha512-ltthBrFDGXeDTdtuHM+Y8x1FMX7WaT3sCZ8MC/I179+1DJg82/IvDks9yR0mDywYtHvkNxgg5IqC5arvnA8V/w==", "requires": { - "@giphy/js-types": "^4.4.0", + "@giphy/js-types": "*", "dompurify": "^2.2.2", "uuid": "^9.0.0" }, @@ -3802,11 +3787,11 @@ } }, "@react-navigation/core": { - "version": "6.4.8", - "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.8.tgz", - "integrity": "sha512-klZ9Mcf/P2j+5cHMoGyIeurEzyBM2Uq9+NoSFrF6sdV5iCWHLFhrCXuhbBiQ5wVLCKf4lavlkd/DDs47PXs9RQ==", + "version": "6.4.9", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.9.tgz", + "integrity": "sha512-G9GH7bP9x0qqupxZnkSftnkn4JoXancElTvFc8FVGfEvxnxP+gBo3wqcknyBi7M5Vad4qecsYjCOa9wqsftv9g==", "requires": { - "@react-navigation/routers": "^6.1.8", + "@react-navigation/routers": "^6.1.9", "escape-string-regexp": "^4.0.0", "nanoid": "^3.1.23", "query-string": "^7.1.3", @@ -3840,9 +3825,9 @@ } }, "@react-navigation/routers": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.8.tgz", - "integrity": "sha512-CEge+ZLhb1HBrSvv4RwOol7EKLW1QoqVIQlE9TN5MpxS/+VoQvP+cLbuz0Op53/iJfYhtXRFd1ZAd3RTRqto9w==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz", + "integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==", "requires": { "nanoid": "^3.1.23" } @@ -3893,6 +3878,21 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "requires": { "color-convert": "^1.9.0" + }, + "dependencies": { + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + } } }, "anymatch": { @@ -4146,35 +4146,20 @@ "requires": { "color-convert": "^2.0.1", "color-string": "^1.9.0" - }, - "dependencies": { - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - } } }, "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "requires": { - "color-name": "1.1.3" + "color-name": "~1.1.4" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "color-string": { "version": "1.9.1", @@ -4584,12 +4569,13 @@ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" }, "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" } }, @@ -4861,9 +4847,9 @@ } }, "is-core-module": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", - "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", + "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", "requires": { "has": "^1.0.3" } @@ -5375,19 +5361,6 @@ "supports-color": "^7.1.0" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -5457,9 +5430,9 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "qs": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz", - "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "requires": { "side-channel": "^1.0.4" } @@ -5886,9 +5859,9 @@ "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==" }, "tlds": { - "version": "1.238.0", - "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.238.0.tgz", - "integrity": "sha512-lFPF9pZFhLrPodaJ0wt9QIN0l8jOxqmUezGZnm7BfkDSVd9q667oVIJukLVzhF+4oW7uDlrLlfJrL5yu9RWwew==" + "version": "1.240.0", + "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.240.0.tgz", + "integrity": "sha512-1OYJQenswGZSOdRw7Bql5Qu7uf75b+F3HFBXbqnG/ifHa0fev1XcG+3pJf3pA/KC6RtHQzfKgIf1vkMlMG7mtQ==" }, "tmp": { "version": "0.0.33", @@ -5922,9 +5895,9 @@ "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==" }, "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "type-fest": { "version": "2.19.0", diff --git a/react-native-sdk/package.json b/react-native-sdk/package.json index c80891e46ef..4d6c6fd5431 100644 --- a/react-native-sdk/package.json +++ b/react-native-sdk/package.json @@ -1,14 +1,14 @@ { - "name": "jitsi-react-native-sdk", + "name": "@jitsi/react-native-sdk", "version": "0.1.0", "description": "React Native SDK for Jitsi Meet.", - "main": "index.js", + "main": "components/JitsiMeet.tsx", "license": "Apache-2.0", "author": "", "homepage": "https://jitsi.org", "repository": { "type": "git", - "url": "git://github.com/jitsi/jitsi-meet.git" + "url": "git+https://github.com/jitsi/jitsi-meet.git" }, "dependencies": { "@amplitude/react-native": "2.7.0", From 75e0ab4f3f1e0dd9e5574b11bb28be187bd7407c Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Mon, 26 Jun 2023 15:30:23 +0300 Subject: [PATCH 5/9] sdk(react-native-sdk): renamed podspec file --- ...itsi-react-native-sdk.podspec => jitsi-meet-rnsdk.podspec} | 2 +- react-native-sdk/package-lock.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename react-native-sdk/{jitsi-react-native-sdk.podspec => jitsi-meet-rnsdk.podspec} (94%) diff --git a/react-native-sdk/jitsi-react-native-sdk.podspec b/react-native-sdk/jitsi-meet-rnsdk.podspec similarity index 94% rename from react-native-sdk/jitsi-react-native-sdk.podspec rename to react-native-sdk/jitsi-meet-rnsdk.podspec index ad7213ec732..1641dc43965 100644 --- a/react-native-sdk/jitsi-react-native-sdk.podspec +++ b/react-native-sdk/jitsi-meet-rnsdk.podspec @@ -3,7 +3,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) Pod::Spec.new do |s| - s.name = package['name'] + s.name = 'jitsi-meet-rnsdk' s.version = package['version'] s.summary = package['description'] s.description = package['description'] diff --git a/react-native-sdk/package-lock.json b/react-native-sdk/package-lock.json index 358bc4e29da..eb39bce1a49 100644 --- a/react-native-sdk/package-lock.json +++ b/react-native-sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "@jitsi/react-native-sdk", - "version": "0.1.0", + "version": "0.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@jitsi/react-native-sdk", - "version": "0.1.0", + "version": "0.2.0", "license": "Apache-2.0", "dependencies": { "@amplitude/react-native": "2.7.0", From ee2cfd78e71b79082e6d044fff7a72ff1de7757e Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Mon, 26 Jun 2023 15:31:12 +0300 Subject: [PATCH 6/9] sdk(react-native-sdk): reverted version change --- react-native-sdk/package-lock.json | 4 ++-- react-native-sdk/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/react-native-sdk/package-lock.json b/react-native-sdk/package-lock.json index eb39bce1a49..358bc4e29da 100644 --- a/react-native-sdk/package-lock.json +++ b/react-native-sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "@jitsi/react-native-sdk", - "version": "0.2.0", + "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@jitsi/react-native-sdk", - "version": "0.2.0", + "version": "0.1.0", "license": "Apache-2.0", "dependencies": { "@amplitude/react-native": "2.7.0", diff --git a/react-native-sdk/package.json b/react-native-sdk/package.json index 4d6c6fd5431..50fe9834ef4 100644 --- a/react-native-sdk/package.json +++ b/react-native-sdk/package.json @@ -104,4 +104,4 @@ "keywords": [ "react-native" ] -} +} \ No newline at end of file From f9468580f1a36a88e4d6eed71cf6cd5369052448 Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Mon, 26 Jun 2023 18:07:09 +0300 Subject: [PATCH 7/9] sdk(react-native-sdk): renamed main file, deleted constants and functions files --- react-native-sdk/constants.ts | 7 ------ react-native-sdk/functions.ts | 8 ------- .../{components/JitsiMeet.tsx => index.tsx} | 22 +++++++++++++------ react-native-sdk/package.json | 2 +- react-native-sdk/prepare_sdk.js | 11 +++++----- 5 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 react-native-sdk/constants.ts delete mode 100644 react-native-sdk/functions.ts rename react-native-sdk/{components/JitsiMeet.tsx => index.tsx} (81%) diff --git a/react-native-sdk/constants.ts b/react-native-sdk/constants.ts deleted file mode 100644 index f8d6b8d7767..00000000000 --- a/react-native-sdk/constants.ts +++ /dev/null @@ -1,7 +0,0 @@ - -module.exports = { - androidSourcePath: '../android/sdk/src/main/java/org/jitsi/meet/sdk', - androidTargetPath: './android/src/main/java/org/jitsi/meet/sdk', - iosSrcPath: '../ios/sdk/src', - iosDestPath: './ios/src' -}; diff --git a/react-native-sdk/functions.ts b/react-native-sdk/functions.ts deleted file mode 100644 index 4a675acdbd6..00000000000 --- a/react-native-sdk/functions.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Converts the meetingOptions domain and roomName to a URL that can be passed to the App component. - * @param {*} domain domain address from props. - * @param {*} roomName room name from props. - */ -export function convertPropsToURL(domain, roomName) { - return `${domain}/${roomName}`; -} diff --git a/react-native-sdk/components/JitsiMeet.tsx b/react-native-sdk/index.tsx similarity index 81% rename from react-native-sdk/components/JitsiMeet.tsx rename to react-native-sdk/index.tsx index 60bc9004983..1a0a8cc15df 100644 --- a/react-native-sdk/components/JitsiMeet.tsx +++ b/react-native-sdk/index.tsx @@ -4,16 +4,15 @@ import 'react-native-gesture-handler'; // Apply all necessary polyfills as early as possible // to make sure anything imported henceforth sees them. import 'react-native-get-random-values'; -import '../react/features/mobile/polyfills'; +import './react/features/mobile/polyfills'; // @ts-ignore import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react'; import { View } from 'react-native'; -import { convertPropsToURL } from '../functions'; -import { appNavigate } from '../react/features/app/actions.native'; -import { App } from '../react/features/app/components/App.native'; -import { setAudioMuted, setVideoMuted } from '../react/features/base/media/actions'; +import { appNavigate } from './react/features/app/actions.native'; +import { App } from './react/features/app/components/App.native'; +import { setAudioMuted, setVideoMuted } from './react/features/base/media/actions'; // @ts-ignore import JitsiThemePaperProvider from '../react/features/base/ui/components/JitsiThemeProvider'; @@ -37,10 +36,19 @@ interface IAppProps { style?: Object; } +/** + * Converts the meetingOptions domain and roomName to a URL that can be passed to the App component. + * @param {*} domain domain address from props. + * @param {*} roomName room name from props. + */ +const convertPropsToURL = (domain, roomName) => { + return `${domain}/${roomName}`; +} + /** * Main React Native SDK component that displays a Jitsi Meet conference and gets all required params as props */ -const JitsiMeet = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) => { +const Index = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) => { const [ appProps, setAppProps ] = useState({}); const app = useRef(null); @@ -96,4 +104,4 @@ const JitsiMeet = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) ); }); -export default JitsiMeet; +export default Index; diff --git a/react-native-sdk/package.json b/react-native-sdk/package.json index 50fe9834ef4..4f4cec95546 100644 --- a/react-native-sdk/package.json +++ b/react-native-sdk/package.json @@ -2,7 +2,7 @@ "name": "@jitsi/react-native-sdk", "version": "0.1.0", "description": "React Native SDK for Jitsi Meet.", - "main": "components/JitsiMeet.tsx", + "main": "index.tsx", "license": "Apache-2.0", "author": "", "homepage": "https://jitsi.org", diff --git a/react-native-sdk/prepare_sdk.js b/react-native-sdk/prepare_sdk.js index 27a637c14c1..365be7ef096 100644 --- a/react-native-sdk/prepare_sdk.js +++ b/react-native-sdk/prepare_sdk.js @@ -3,14 +3,13 @@ const path = require('path'); const packageJSON = require('../package.json'); -const { - androidSourcePath, - androidTargetPath, - iosDestPath, - iosSrcPath -} = require('./constants.ts'); const SDKPackageJSON = require('./package.json'); +const androidSourcePath = '../android/sdk/src/main/java/org/jitsi/meet/sdk'; +const androidTargetPath = './android/src/main/java/org/jitsi/meet/sdk'; +const iosSrcPath = '../ios/sdk/src'; +const iosDestPath = './ios/src'; + /** * Copies a specified file in a way that recursive copy is possible. From fe6ca238dc8b6449be9950e782b1bf7a2b43b73f Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Tue, 27 Jun 2023 13:12:40 +0300 Subject: [PATCH 8/9] sdk(react-native-sdk): updated imports --- react-native-sdk/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-sdk/index.tsx b/react-native-sdk/index.tsx index 1a0a8cc15df..6e1f59b78d6 100644 --- a/react-native-sdk/index.tsx +++ b/react-native-sdk/index.tsx @@ -14,7 +14,7 @@ import { appNavigate } from './react/features/app/actions.native'; import { App } from './react/features/app/components/App.native'; import { setAudioMuted, setVideoMuted } from './react/features/base/media/actions'; // @ts-ignore -import JitsiThemePaperProvider from '../react/features/base/ui/components/JitsiThemeProvider'; +import JitsiThemePaperProvider from './react/features/base/ui/components/JitsiThemeProvider.native'; interface IAppProps { From 20b8e7d659609233dd7daaf752b78819d2a36555 Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Tue, 27 Jun 2023 15:06:26 +0300 Subject: [PATCH 9/9] sdk(react-native-sdk): review remarks --- react-native-sdk/index.tsx | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/react-native-sdk/index.tsx b/react-native-sdk/index.tsx index 6e1f59b78d6..850409bc595 100644 --- a/react-native-sdk/index.tsx +++ b/react-native-sdk/index.tsx @@ -36,19 +36,10 @@ interface IAppProps { style?: Object; } -/** - * Converts the meetingOptions domain and roomName to a URL that can be passed to the App component. - * @param {*} domain domain address from props. - * @param {*} roomName room name from props. - */ -const convertPropsToURL = (domain, roomName) => { - return `${domain}/${roomName}`; -} - /** * Main React Native SDK component that displays a Jitsi Meet conference and gets all required params as props */ -const Index = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) => { +export const JitsiMeeting = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) => { const [ appProps, setAppProps ] = useState({}); const app = useRef(null); @@ -73,7 +64,7 @@ const Index = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) => { useEffect( () => { - const url = convertPropsToURL(meetingOptions.domain, meetingOptions.roomName); + const url = `${meetingOptions.domain}/${meetingOptions.roomName}`; setAppProps({ 'url': { @@ -103,5 +94,3 @@ const Index = forwardRef(({ flags, meetingOptions, style }: IAppProps, ref) => { ); }); - -export default Index;