From ee168bf3f110b4a53f711d93b3b643c05e3164e5 Mon Sep 17 00:00:00 2001 From: uerceg Date: Wed, 27 Mar 2024 21:50:54 +0100 Subject: [PATCH 1/5] build: update submodules --- ext/android/sdk | 2 +- ext/ios/sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/android/sdk b/ext/android/sdk index e4222a82..65b3b8a1 160000 --- a/ext/android/sdk +++ b/ext/android/sdk @@ -1 +1 @@ -Subproject commit e4222a82ca93c99902acd95d716aa851074cb6e5 +Subproject commit 65b3b8a1f4277a756cdf0f53760225db2ec642ed diff --git a/ext/ios/sdk b/ext/ios/sdk index cd05aecf..3ebb6fe1 160000 --- a/ext/ios/sdk +++ b/ext/ios/sdk @@ -1 +1 @@ -Subproject commit cd05aecfcb9af2f5c5f23cac162974e94eab10d4 +Subproject commit 3ebb6fe16fa67d5307bdafc93005d006bfa5fb74 From 975bd2a0e895de879d8b1704e24819170837c29c Mon Sep 17 00:00:00 2001 From: uerceg Date: Wed, 27 Mar 2024 21:53:49 +0100 Subject: [PATCH 2/5] feat: update version number to 4.38.0 --- VERSION | 2 +- index.js | 4 ++-- package.json | 2 +- plugins/oaid/package.json | 2 +- react-native-adjust.podspec | 2 +- test/lib/package.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 641d94f2..fff125e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.37.2 +4.38.0 diff --git a/index.js b/index.js index e1e21a0c..6ccda1f1 100644 --- a/index.js +++ b/index.js @@ -136,7 +136,7 @@ Adjust.getAmazonAdId = function(callback) { }; Adjust.getSdkVersion = function(callback) { - module_adjust.getSdkVersion("react-native4.37.2", callback); + module_adjust.getSdkVersion("react-native4.38.0", callback); }; Adjust.setReferrer = function(referrer) { @@ -280,7 +280,7 @@ Adjust.onPause = function(testParam) { // AdjustConfig var AdjustConfig = function(appToken, environment) { - this.sdkPrefix = "react-native4.37.2"; + this.sdkPrefix = "react-native4.38.0"; this.appToken = appToken; this.environment = environment; this.logLevel = null; diff --git a/package.json b/package.json index 6631bee0..3f30fc9d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-native-adjust", "description": "Adjust React Native SDK", - "version": "4.37.2", + "version": "4.38.0", "main": "index.js", "author": "Adjust", "license": "MIT", diff --git a/plugins/oaid/package.json b/plugins/oaid/package.json index 8f451ea3..72249d05 100644 --- a/plugins/oaid/package.json +++ b/plugins/oaid/package.json @@ -1,7 +1,7 @@ { "name": "react-native-adjust-oaid", "description": "Adjust React Native OAID plugin", - "version": "4.37.2", + "version": "4.38.0", "main": "index.js", "author": "Adjust", "license": "MIT", diff --git a/react-native-adjust.podspec b/react-native-adjust.podspec index 4266d920..82e64e23 100644 --- a/react-native-adjust.podspec +++ b/react-native-adjust.podspec @@ -18,6 +18,6 @@ Pod::Spec.new do |s| s.preserve_paths = 'LICENSE', 'README.md', 'package.json', 'index.js' s.source_files = 'ios/*.{h,m}' - s.dependency 'Adjust', '4.37.2' + s.dependency 'Adjust', '4.38.0' s.dependency 'React-Core' end diff --git a/test/lib/package.json b/test/lib/package.json index 0ea9f5b0..c690f156 100644 --- a/test/lib/package.json +++ b/test/lib/package.json @@ -1,7 +1,7 @@ { "name": "react-native-adjust-test", "description": "Adjust Test Plugin For React Native SDK", - "version": "4.37.2", + "version": "4.38.0", "author": "Adjust", "license": "MIT", "keywords": [ From ecb9b04d6d588f6234df7cbbfc22fdb455f3d0bb Mon Sep 17 00:00:00 2001 From: uerceg Date: Wed, 27 Mar 2024 22:03:05 +0100 Subject: [PATCH 3/5] build: update native dependencies --- android/libs/adjust-android.jar | Bin 283017 -> 283460 bytes example/ios/Podfile.lock | 14 +- example/yarn.lock | 1486 +++++++++-------- ios/Adjust/ADJActivityHandler.m | 6 +- ios/Adjust/ADJAdjustFactory.h | 14 +- ios/Adjust/ADJAdjustFactory.m | 61 +- ios/Adjust/ADJPackageBuilder.h | 14 +- ios/Adjust/ADJPackageBuilder.m | 188 +-- ios/Adjust/ADJPackageHandler.h | 2 +- ios/Adjust/ADJPackageHandler.m | 23 +- ios/Adjust/ADJPurchaseVerificationHandler.h | 2 +- ios/Adjust/ADJPurchaseVerificationHandler.m | 19 +- ios/Adjust/ADJRequestHandler.m | 141 +- ios/Adjust/ADJSdkClickHandler.h | 2 +- ios/Adjust/ADJSdkClickHandler.m | 20 +- ios/Adjust/ADJUrlStrategy.h | 4 +- ios/Adjust/ADJUrlStrategy.m | 146 +- ios/Adjust/ADJUtil.h | 5 + ios/Adjust/ADJUtil.m | 42 +- ios/Adjust/Adjust.h | 9 +- ios/Adjust/Adjust.m | 19 +- ios/Adjust/PrivacyInfo.xcprivacy | 80 + ios/Adjust/include/Adjust.h | 9 +- .../oaid/android/libs/adjust-android-oaid.jar | Bin 9607 -> 9607 bytes test/app/ios/Podfile.lock | 18 +- test/app/yarn.lock | 114 +- test/lib/android/libs/adjust-test-library.jar | Bin 25080 -> 25080 bytes 27 files changed, 1348 insertions(+), 1090 deletions(-) create mode 100644 ios/Adjust/PrivacyInfo.xcprivacy diff --git a/android/libs/adjust-android.jar b/android/libs/adjust-android.jar index 4430d6e9108257775668b0c51046cccf3fb580d0..5ac224c9bef5e00645cab77bf1d260371aa54e85 100644 GIT binary patch delta 35353 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 delta 34662 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 G?f(G2!$A!I diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 14b94319..f6fa6520 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,7 +1,7 @@ PODS: - - Adjust (4.37.2): - - Adjust/Core (= 4.37.2) - - Adjust/Core (4.37.2) + - Adjust (4.38.0): + - Adjust/Core (= 4.38.0) + - Adjust/Core (4.38.0) - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) @@ -287,8 +287,8 @@ PODS: - React-jsinspector (0.69.4) - React-logger (0.69.4): - glog - - react-native-adjust (4.37.2): - - Adjust (= 4.37.2) + - react-native-adjust (4.38.0): + - Adjust (= 4.38.0) - React-Core - React-perflogger (0.69.4) - React-RCTActionSheet (0.69.4): @@ -508,7 +508,7 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - Adjust: a830d963025334aee8a62a7bac87825e297a841e + Adjust: c98d85594a746ff9f2bafe424c5beb6db66cd6a8 boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 @@ -541,7 +541,7 @@ SPEC CHECKSUMS: React-jsiexecutor: a27badbbdbc0ff781813370736a2d1c7261181d4 React-jsinspector: 8a3d3f5dcd23a91e8c80b1bf0e96902cd1dca999 React-logger: 1088859f145b8f6dd0d3ed051a647ef0e3e80fad - react-native-adjust: 9a9d5b7fff8de8209d468ee4bd3fc1bc386d78cd + react-native-adjust: 801fe33f0dc0097b0474f11d08572a89fa6602ce React-perflogger: cb386fd44c97ec7f8199c04c12b22066b0f2e1e0 React-RCTActionSheet: f803a85e46cf5b4066c2ac5e122447f918e9c6e5 React-RCTAnimation: 19c80fa950ccce7f4db76a2a7f2cf79baae07fc7 diff --git a/example/yarn.lock b/example/yarn.lock index 4f24fc60..74ee32fd 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -8,12 +8,12 @@ integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== "@ampproject/remapping@^2.2.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" - integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" + integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw== dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.24" "@babel/code-frame@7.12.11": version "7.12.11" @@ -22,48 +22,48 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2": + version "7.24.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae" + integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ== dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" + "@babel/highlight" "^7.24.2" + picocolors "^1.0.0" "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" - integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.1.tgz#31c1f66435f2a9c329bb5716a6d6186c516c3742" + integrity sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA== "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.7.5": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" - integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== + version "7.24.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.3.tgz#568864247ea10fbd4eff04dda1e05f9e2ea985c3" + integrity sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" + "@babel/code-frame" "^7.24.2" + "@babel/generator" "^7.24.1" "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.9" - "@babel/parser" "^7.23.9" - "@babel/template" "^7.23.9" - "@babel/traverse" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/helpers" "^7.24.1" + "@babel/parser" "^7.24.1" + "@babel/template" "^7.24.0" + "@babel/traverse" "^7.24.1" + "@babel/types" "^7.24.0" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.14.0", "@babel/generator@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" - integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== +"@babel/generator@^7.14.0", "@babel/generator@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.1.tgz#e67e06f68568a4ebf194d1c6014235344f0476d0" + integrity sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A== dependencies: - "@babel/types" "^7.23.6" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" + "@babel/types" "^7.24.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" "@babel/helper-annotate-as-pure@^7.22.5": @@ -80,7 +80,7 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6": +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== @@ -91,17 +91,17 @@ lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.23.6": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.9.tgz#fddfdf51fca28f23d16b9e3935a4732690acfad6" - integrity sha512-B2L9neXTIyPQoXDm+NtovPvG6VOLWnaXu3BIeVDWwdKFgG30oNa6CqVGiJPDWQwIAK49t9gnQI9c6K6RzabiKw== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz#db58bf57137b623b916e24874ab7188d93d7f68f" + integrity sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-member-expression-to-functions" "^7.23.0" "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.20" + "@babel/helper-replace-supers" "^7.24.1" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" semver "^6.3.1" @@ -115,10 +115,10 @@ regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b" - integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q== +"@babel/helper-define-polyfill-provider@^0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd" + integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -146,19 +146,19 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0": +"@babel/helper-member-expression-to-functions@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366" integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA== dependencies: "@babel/types" "^7.23.0" -"@babel/helper-module-imports@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" - integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== +"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.1", "@babel/helper-module-imports@^7.24.3": + version "7.24.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128" + integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg== dependencies: - "@babel/types" "^7.22.15" + "@babel/types" "^7.24.0" "@babel/helper-module-transforms@^7.23.3": version "7.23.3" @@ -178,10 +178,10 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" - integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" + integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== "@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.20": version "7.22.20" @@ -192,13 +192,13 @@ "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-wrap-function" "^7.22.20" -"@babel/helper-replace-supers@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793" - integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw== +"@babel/helper-replace-supers@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz#7085bd19d4a0b7ed8f405c1ed73ccb70f323abc1" + integrity sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ== dependencies: "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-member-expression-to-functions" "^7.22.15" + "@babel/helper-member-expression-to-functions" "^7.23.0" "@babel/helper-optimise-call-expression" "^7.22.5" "@babel/helper-simple-access@^7.22.5": @@ -223,16 +223,16 @@ "@babel/types" "^7.22.5" "@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e" + integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ== "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5": +"@babel/helper-validator-option@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== @@ -246,28 +246,29 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d" - integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ== +"@babel/helpers@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.1.tgz#183e44714b9eba36c3038e442516587b1e0a1a94" + integrity sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg== dependencies: - "@babel/template" "^7.23.9" - "@babel/traverse" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/template" "^7.24.0" + "@babel/traverse" "^7.24.1" + "@babel/types" "^7.24.0" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.24.2": + version "7.24.2" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26" + integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA== dependencies: "@babel/helper-validator-identifier" "^7.22.20" chalk "^2.4.2" js-tokens "^4.0.0" + picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.7.0": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b" - integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA== +"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.7.0": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.1.tgz#1e416d3627393fab1cb5b0f2f1796a100ae9133a" + integrity sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg== "@babel/plugin-proposal-async-generator-functions@^7.0.0": version "7.20.7" @@ -288,12 +289,12 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-proposal-export-default-from@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.23.3.tgz#6f511a676c540ccc8d17a8553dbba9230b0ddac0" - integrity sha512-Q23MpLZfSGZL1kU7fWqV262q65svLSCIP5kZ/JCW/rKTCm/FrLjpvEd2kfUYMVeHh4QhV/xzyoRAHWrAZJrE3Q== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.24.1.tgz#d242019488277c9a5a8035e5b70de54402644b89" + integrity sha512-+0hrgGGV3xyYIjOrD/bUZk/iUwOIGuoANfRfVg1cPhYBxF+TIXSEcc42DqzBICmWsnAQ+SfKedY0bj8QD+LuMg== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-export-default-from" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-export-default-from" "^7.24.1" "@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8": version "7.18.6" @@ -359,19 +360,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-export-default-from@^7.0.0", "@babel/plugin-syntax-export-default-from@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.23.3.tgz#7e6d4bf595d5724230200fb2b7401d4734b15335" - integrity sha512-KeENO5ck1IeZ/l2lFZNy+mpobV3D2Zy5C1YFnWm+YuY5mQiAWc4yAp13dqgguwsBsFVLh4LPCEqCa5qW13N+hw== +"@babel/plugin-syntax-export-default-from@^7.0.0", "@babel/plugin-syntax-export-default-from@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.24.1.tgz#a92852e694910ae4295e6e51e87b83507ed5e6e8" + integrity sha512-cNXSxv9eTkGUtd0PsNMK8Yx5xeScxfpWOUAxE+ZPAXXEcAMOC3fk7LRdXq5fvpra2pLx2p1YtkAhpUbB2SwaRA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" -"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0", "@babel/plugin-syntax-flow@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz#084564e0f3cc21ea6c70c44cff984a1c0509729a" - integrity sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA== +"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0", "@babel/plugin-syntax-flow@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.1.tgz#875c25e3428d7896c87589765fc8b9d32f24bd8d" + integrity sha512-sxi2kLTI5DeW5vDtMUsk4mTPwvlUDbjOnoWayhynCwrw4QXRld4QEYwqzY8JmQXaJUtgUuCIurtSRH5sn4c7mA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -387,12 +388,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473" - integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg== +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.23.3", "@babel/plugin-syntax-jsx@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10" + integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -443,126 +444,126 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f" - integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ== +"@babel/plugin-syntax-typescript@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844" + integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-arrow-functions@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b" - integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27" + integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-async-to-generator@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa" - integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz#0e220703b89f2216800ce7b1c53cb0cf521c37f4" + integrity sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw== dependencies: - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-module-imports" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/helper-remap-async-to-generator" "^7.22.20" "@babel/plugin-transform-block-scoped-functions@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77" - integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz#1c94799e20fcd5c4d4589523bbc57b7692979380" + integrity sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-block-scoping@^7.0.0": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5" - integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.1.tgz#27af183d7f6dad890531256c7a45019df768ac1f" + integrity sha512-h71T2QQvDgM2SmT29UYU6ozjMlAt7s7CSs5Hvy8f8cf/GM/Z4a2zMfN+fjVGaieeCrXR3EdQl6C4gQG+OgmbKw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-classes@^7.0.0": - version "7.23.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92" - integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1" + integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.20" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-replace-supers" "^7.24.1" "@babel/helper-split-export-declaration" "^7.22.6" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474" - integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz#bc7e787f8e021eccfb677af5f13c29a9934ed8a7" + integrity sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/template" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/template" "^7.24.0" "@babel/plugin-transform-destructuring@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311" - integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345" + integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-exponentiation-operator@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18" - integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz#6650ebeb5bd5c012d5f5f90a26613a08162e8ba4" + integrity sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw== dependencies: "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" -"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz#cfa7ca159cc3306fab526fc67091556b51af26ff" - integrity sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q== +"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.1.tgz#fa8d0a146506ea195da1671d38eed459242b2dcc" + integrity sha512-iIYPIWt3dUmUKKE10s3W+jsQ3icFkw0JyRVyY1B7G4yK/nngAOHLVx8xlhA6b/Jzl/Y0nis8gjqhqKtRDQqHWQ== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-flow" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-flow" "^7.24.1" "@babel/plugin-transform-for-of@^7.0.0": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e" - integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz#67448446b67ab6c091360ce3717e7d3a59e202fd" + integrity sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-transform-function-name@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc" - integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz#8cba6f7730626cc4dfe4ca2fa516215a0592b361" + integrity sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA== dependencies: - "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-literals@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4" - integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz#0a1982297af83e6b3c94972686067df588c5c096" + integrity sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-member-expression-literals@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc" - integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz#896d23601c92f437af8b01371ad34beb75df4489" + integrity sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" -"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4" - integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA== +"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz#e71ba1d0d69e049a22bf90b3867e263823d3f1b9" + integrity sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw== dependencies: "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/helper-simple-access" "^7.22.5" "@babel/plugin-transform-named-capturing-groups-regex@^7.0.0": @@ -574,47 +575,47 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-object-super@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd" - integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz#e71d6ab13483cca89ed95a474f542bbfc20a0520" + integrity sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.20" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-replace-supers" "^7.24.1" "@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af" - integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510" + integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-property-literals@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875" - integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz#d6a9aeab96f03749f4eebeb0b6ea8e90ec958825" + integrity sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-react-display-name@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz#70529f034dd1e561045ad3c8152a267f0d7b6200" - integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz#554e3e1a25d181f040cf698b93fd289a03bfdcdb" + integrity sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-react-jsx-self@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz#ed3e7dadde046cce761a8e3cf003a13d1a7972d9" - integrity sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.1.tgz#a21d866d8167e752c6a7c4555dba8afcdfce6268" + integrity sha512-kDJgnPujTmAZ/9q2CN4m2/lRsUUPDvsG3+tSHWUJIzMGTt5U/b/fwWd3RO3n+5mjLrsBrVa5eKFRVSQbi3dF1w== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-react-jsx-source@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz#03527006bdc8775247a78643c51d4e715fe39a3e" - integrity sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.1.tgz#a2dedb12b09532846721b5df99e52ef8dc3351d0" + integrity sha512-1v202n7aUq4uXAieRTKcwPzNyphlCuqHHDcdSNc+vdhoTEZcFMh+L5yZuCmGaIO7bs1nJUNfHB89TZyoL48xNA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-react-jsx@^7.0.0": version "7.23.4" @@ -628,83 +629,83 @@ "@babel/types" "^7.23.4" "@babel/plugin-transform-runtime@^7.0.0": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.9.tgz#2c64d0680fc8e09e1dfe8fd5c646fe72abd82004" - integrity sha512-A7clW3a0aSjm3ONU9o2HAILSegJCYlEZmOhmBRReVtIpY/Z/p7yIZ+wR41Z+UipwdGuqwtID/V/dOdZXjwi9gQ== - dependencies: - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - babel-plugin-polyfill-corejs2 "^0.4.8" - babel-plugin-polyfill-corejs3 "^0.9.0" - babel-plugin-polyfill-regenerator "^0.5.5" + version "7.24.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.3.tgz#dc58ad4a31810a890550365cc922e1ff5acb5d7f" + integrity sha512-J0BuRPNlNqlMTRJ72eVptpt9VcInbxO6iP3jaxr+1NPhC0UkKL+6oeX6VXMEYdADnuqmMmsBspt4d5w8Y/TCbQ== + dependencies: + "@babel/helper-module-imports" "^7.24.3" + "@babel/helper-plugin-utils" "^7.24.0" + babel-plugin-polyfill-corejs2 "^0.4.10" + babel-plugin-polyfill-corejs3 "^0.10.1" + babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" "@babel/plugin-transform-shorthand-properties@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210" - integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55" + integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-spread@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c" - integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz#a1acf9152cbf690e4da0ba10790b3ac7d2b2b391" + integrity sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-transform-sticky-regex@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04" - integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz#f03e672912c6e203ed8d6e0271d9c2113dc031b9" + integrity sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-template-literals@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07" - integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7" + integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" -"@babel/plugin-transform-typescript@^7.23.3", "@babel/plugin-transform-typescript@^7.5.0": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz#aa36a94e5da8d94339ae3a4e22d40ed287feb34c" - integrity sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA== +"@babel/plugin-transform-typescript@^7.24.1", "@babel/plugin-transform-typescript@^7.5.0": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.1.tgz#5c05e28bb76c7dfe7d6c5bed9951324fd2d3ab07" + integrity sha512-liYSESjX2fZ7JyBFkYG78nfvHlMKE6IpNdTVnxmlYUR+j5ZLsitFbaAE+eJSK2zPPkNWNw4mXL51rQ8WrvdK0w== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.23.6" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-typescript" "^7.23.3" + "@babel/helper-create-class-features-plugin" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-syntax-typescript" "^7.24.1" "@babel/plugin-transform-unicode-regex@^7.0.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc" - integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz#57c3c191d68f998ac46b708380c1ce4d13536385" + integrity sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/preset-flow@^7.13.13": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.23.3.tgz#8084e08b9ccec287bd077ab288b286fab96ffab1" - integrity sha512-7yn6hl8RIv+KNk6iIrGZ+D06VhVY35wLVf23Cz/mMu1zOr7u4MMP4j0nZ9tLf8+4ZFpnib8cFYgB/oYg9hfswA== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.24.1.tgz#da7196c20c2d7dd4e98cfd8b192fe53b5eb6f0bb" + integrity sha512-sWCV2G9pcqZf+JHyv/RyqEIpFypxdCSxWIxQjpdaQxenNog7cN1pr76hg8u0Fz8Qgg0H4ETkGcJnXL8d4j0PPA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-transform-flow-strip-types" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-validator-option" "^7.23.5" + "@babel/plugin-transform-flow-strip-types" "^7.24.1" "@babel/preset-typescript@^7.13.0": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz#14534b34ed5b6d435aa05f1ae1c5e7adcc01d913" - integrity sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec" + integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-syntax-jsx" "^7.23.3" - "@babel/plugin-transform-modules-commonjs" "^7.23.3" - "@babel/plugin-transform-typescript" "^7.23.3" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-validator-option" "^7.23.5" + "@babel/plugin-syntax-jsx" "^7.24.1" + "@babel/plugin-transform-modules-commonjs" "^7.24.1" + "@babel/plugin-transform-typescript" "^7.24.1" "@babel/register@^7.13.16": version "7.23.7" @@ -723,41 +724,41 @@ integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" - integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.1.tgz#431f9a794d173b53720e69a6464abc6f0e2a5c57" + integrity sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.0.0", "@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.3.3": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a" - integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA== +"@babel/template@^7.0.0", "@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50" + integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA== dependencies: "@babel/code-frame" "^7.23.5" - "@babel/parser" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/parser" "^7.24.0" + "@babel/types" "^7.24.0" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.23.9", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950" - integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.24.1", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c" + integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ== dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" + "@babel/code-frame" "^7.24.1" + "@babel/generator" "^7.24.1" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.9" - "@babel/types" "^7.23.9" + "@babel/parser" "^7.24.1" + "@babel/types" "^7.24.0" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.3.3", "@babel/types@^7.7.0": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002" - integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf" + integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w== dependencies: "@babel/helper-string-parser" "^7.23.4" "@babel/helper-validator-identifier" "^7.22.20" @@ -1022,34 +1023,34 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" + integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== dependencies: - "@jridgewell/set-array" "^1.0.1" + "@jridgewell/set-array" "^1.2.1" "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/trace-mapping" "^0.3.24" "@jridgewell/resolve-uri@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.22" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c" - integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw== +"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -1369,9 +1370,9 @@ integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/node@*": - version "20.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.10.tgz#6c3de8974d65c362f82ee29db6b5adf4205462f9" - integrity sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg== + version "20.11.30" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.30.tgz#9c33467fc23167a347e73834f788f4b9f399d66f" + integrity sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw== dependencies: undici-types "~5.26.4" @@ -1647,23 +1648,24 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== -array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== +array-buffer-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" + call-bind "^1.0.5" + is-array-buffer "^3.0.4" -array-includes@^3.1.6: - version "3.1.7" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" - integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== +array-includes@^3.1.6, array-includes@^3.1.7: + version "3.1.8" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" + integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.4" is-string "^1.0.7" array-unique@^0.3.2: @@ -1671,6 +1673,18 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== +array.prototype.findlast@^1.2.4: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904" + integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-shim-unscopables "^1.0.2" + array.prototype.flat@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" @@ -1681,7 +1695,7 @@ array.prototype.flat@^1.3.1: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -array.prototype.flatmap@^1.3.1: +array.prototype.flatmap@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== @@ -1691,28 +1705,39 @@ array.prototype.flatmap@^1.3.1: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -array.prototype.tosorted@^1.1.1: +array.prototype.toreversed@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz#620eff7442503d66c799d95503f82b475745cefd" - integrity sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg== + resolved "https://registry.yarnpkg.com/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz#b989a6bf35c4c5051e1dc0325151bf8088954eba" + integrity sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA== dependencies: call-bind "^1.0.2" define-properties "^1.2.0" es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" - get-intrinsic "^1.2.1" -arraybuffer.prototype.slice@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" - integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== +array.prototype.tosorted@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz#c8c89348337e51b8a3c48a9227f9ce93ceedcba8" + integrity sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg== dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-array-buffer "^3.0.2" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.1.0" + es-shim-unscopables "^1.0.2" + +arraybuffer.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== + dependencies: + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" is-shared-array-buffer "^1.0.2" asap@~2.0.6: @@ -1752,13 +1777,6 @@ async@^3.2.2: resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== -asynciterator.prototype@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" - integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg== - dependencies: - has-symbols "^1.0.3" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1769,10 +1787,12 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== +available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" babel-core@^7.0.0-bridge.0: version "7.0.0-bridge.0" @@ -1826,29 +1846,29 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-polyfill-corejs2@^0.4.8: - version "0.4.8" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269" - integrity sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg== +babel-plugin-polyfill-corejs2@^0.4.10: + version "0.4.10" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1" + integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.5.0" + "@babel/helper-define-polyfill-provider" "^0.6.1" semver "^6.3.1" -babel-plugin-polyfill-corejs3@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz#9eea32349d94556c2ad3ab9b82ebb27d4bf04a81" - integrity sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg== +babel-plugin-polyfill-corejs3@^0.10.1: + version "0.10.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz#789ac82405ad664c20476d0233b485281deb9c77" + integrity sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.5.0" - core-js-compat "^3.34.0" + "@babel/helper-define-polyfill-provider" "^0.6.1" + core-js-compat "^3.36.1" -babel-plugin-polyfill-regenerator@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a" - integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg== +babel-plugin-polyfill-regenerator@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz#4f08ef4c62c7a7f66a35ed4c0d75e30506acc6be" + integrity sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g== dependencies: - "@babel/helper-define-polyfill-provider" "^0.5.0" + "@babel/helper-define-polyfill-provider" "^0.6.1" babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" @@ -1982,13 +2002,13 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.22.2: - version "4.22.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6" - integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A== +browserslist@^4.22.2, browserslist@^4.23.0: + version "4.23.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== dependencies: - caniuse-lite "^1.0.30001580" - electron-to-chromium "^1.4.648" + caniuse-lite "^1.0.30001587" + electron-to-chromium "^1.4.668" node-releases "^2.0.14" update-browserslist-db "^1.0.13" @@ -2032,14 +2052,16 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" - integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== +call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.1" - set-function-length "^1.1.1" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" caller-callsite@^2.0.0: version "2.0.0" @@ -2075,10 +2097,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001580: - version "1.0.30001581" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4" - integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ== +caniuse-lite@^1.0.30001587: + version "1.0.30001600" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz#93a3ee17a35aa6a9f0c6ef1b2ab49507d1ab9079" + integrity sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ== capture-exit@^2.0.0: version "2.0.0" @@ -2298,12 +2320,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -core-js-compat@^3.34.0: - version "3.35.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.1.tgz#215247d7edb9e830efa4218ff719beb2803555e2" - integrity sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw== +core-js-compat@^3.36.1: + version "3.36.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.1.tgz#1818695d72c99c25d621dca94e6883e190cea3c8" + integrity sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA== dependencies: - browserslist "^4.22.2" + browserslist "^4.23.0" core-util-is@~1.0.0: version "1.0.3" @@ -2366,6 +2388,33 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" +data-view-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" + integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" + integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" + integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + dayjs@^1.8.15: version "1.11.10" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0" @@ -2422,14 +2471,14 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" -define-data-property@^1.0.1, define-data-property@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== +define-data-property@^1.0.1, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== dependencies: - get-intrinsic "^1.2.1" + es-define-property "^1.0.0" + es-errors "^1.3.0" gopd "^1.0.1" - has-property-descriptors "^1.0.0" define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" @@ -2518,10 +2567,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.648: - version "1.4.650" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.650.tgz#b38ef9de16991b9f7b924246770576ab91ab3d64" - integrity sha512-sYSQhJCJa4aGA1wYol5cMQgekDBlbVfTRavlGZVr3WZpDdOPcp6a6xUnFfrt8TqZhsBYYbDxJZCjGfHuGupCRQ== +electron-to-chromium@^1.4.668: + version "1.4.718" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.718.tgz#b8fa65633d6bcfd4368afa160288d2d0e34bc9a5" + integrity sha512-6FpOapKxHuRNUoNQEP54sAacMod/XX68/Oaau+UoTEC8yxy5lR8jAvTlyrb60oZ9OtuUuAEtKvCQOJm6S4MtBQ== emittery@^0.7.1: version "0.7.2" @@ -2554,9 +2603,9 @@ enquirer@^2.3.5: strip-ansi "^6.0.1" envinfo@^7.7.2: - version "7.11.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f" - integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg== + version "7.11.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.1.tgz#2ffef77591057081b0129a8fd8cf6118da1b94e1" + integrity sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg== error-ex@^1.3.1: version "1.3.2" @@ -2580,81 +2629,107 @@ errorhandler@^1.5.0: accepts "~1.3.7" escape-html "~1.0.3" -es-abstract@^1.22.1: - version "1.22.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" - integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== - dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.2" - available-typed-arrays "^1.0.5" - call-bind "^1.0.5" - es-set-tostringtag "^2.0.1" +es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2: + version "1.23.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.2.tgz#693312f3940f967b8dd3eebacb590b01712622e0" + integrity sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w== + dependencies: + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + data-view-buffer "^1.0.1" + data-view-byte-length "^1.0.1" + data-view-byte-offset "^1.0.0" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-set-tostringtag "^2.0.3" es-to-primitive "^1.2.1" function.prototype.name "^1.1.6" - get-intrinsic "^1.2.2" - get-symbol-description "^1.0.0" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" globalthis "^1.0.3" gopd "^1.0.1" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" has-symbols "^1.0.3" - hasown "^2.0.0" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" + hasown "^2.0.2" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" is-callable "^1.2.7" - is-negative-zero "^2.0.2" + is-data-view "^1.0.1" + is-negative-zero "^2.0.3" is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" + is-shared-array-buffer "^1.0.3" is-string "^1.0.7" - is-typed-array "^1.1.12" + is-typed-array "^1.1.13" is-weakref "^1.0.2" object-inspect "^1.13.1" object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - safe-array-concat "^1.0.1" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.8" - string.prototype.trimend "^1.0.7" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.2" + safe-regex-test "^1.0.3" + string.prototype.trim "^1.2.9" + string.prototype.trimend "^1.0.8" string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.0" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.5" unbox-primitive "^1.0.2" - which-typed-array "^1.1.13" + which-typed-array "^1.1.15" -es-iterator-helpers@^1.0.12: - version "1.0.15" - resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40" - integrity sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g== +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== dependencies: - asynciterator.prototype "^1.0.0" - call-bind "^1.0.2" + get-intrinsic "^1.2.4" + +es-errors@^1.1.0, es-errors@^1.2.1, es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +es-iterator-helpers@^1.0.17: + version "1.0.18" + resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz#4d3424f46b24df38d064af6fbbc89274e29ea69d" + integrity sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA== + dependencies: + call-bind "^1.0.7" define-properties "^1.2.1" - es-abstract "^1.22.1" - es-set-tostringtag "^2.0.1" - function-bind "^1.1.1" - get-intrinsic "^1.2.1" + es-abstract "^1.23.0" + es-errors "^1.3.0" + es-set-tostringtag "^2.0.3" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" globalthis "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" has-symbols "^1.0.3" - internal-slot "^1.0.5" + internal-slot "^1.0.7" iterator.prototype "^1.1.2" - safe-array-concat "^1.0.1" + safe-array-concat "^1.1.2" -es-set-tostringtag@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" - integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== +es-object-atoms@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" + integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== dependencies: - get-intrinsic "^1.2.2" - has-tostringtag "^1.0.0" - hasown "^2.0.0" + es-errors "^1.3.0" + +es-set-tostringtag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== + dependencies: + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" -es-shim-unscopables@^1.0.0: +es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== @@ -2671,9 +2746,9 @@ es-to-primitive@^1.2.1: is-symbol "^1.0.2" escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + version "3.1.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== escape-html@~1.0.3: version "1.0.3" @@ -2759,26 +2834,28 @@ eslint-plugin-react-native@^3.8.1: eslint-plugin-react-native-globals "^0.1.1" eslint-plugin-react@^7.20.0: - version "7.33.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" - integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== - dependencies: - array-includes "^3.1.6" - array.prototype.flatmap "^1.3.1" - array.prototype.tosorted "^1.1.1" + version "7.34.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz#6806b70c97796f5bbfb235a5d3379ece5f4da997" + integrity sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw== + dependencies: + array-includes "^3.1.7" + array.prototype.findlast "^1.2.4" + array.prototype.flatmap "^1.3.2" + array.prototype.toreversed "^1.1.2" + array.prototype.tosorted "^1.1.3" doctrine "^2.1.0" - es-iterator-helpers "^1.0.12" + es-iterator-helpers "^1.0.17" estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.1.2" - object.entries "^1.1.6" - object.fromentries "^2.0.6" - object.hasown "^1.1.2" - object.values "^1.1.6" + object.entries "^1.1.7" + object.fromentries "^2.0.7" + object.hasown "^1.1.3" + object.values "^1.1.7" prop-types "^15.8.1" - resolve "^2.0.0-next.4" + resolve "^2.0.0-next.5" semver "^6.3.1" - string.prototype.matchall "^4.0.8" + string.prototype.matchall "^4.0.10" eslint-scope@^5.0.0, eslint-scope@^5.1.1: version "5.1.1" @@ -3102,14 +3179,14 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" - integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== flow-parser@0.*: - version "0.227.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.227.0.tgz#e50b65be9dc6810438c975e816a68005fbcd5107" - integrity sha512-nOygtGKcX/siZK/lFzpfdHEfOkfGcTW7rNroR1Zsz6T/JxSahPALXVt5qVHq/fgvMJuv096BTKbgxN3PzVBaDA== + version "0.232.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.232.0.tgz#db93a660e7017bd366290944c3328ca506ca7d2b" + integrity sha512-U8vcKyYdM+Kb0tPzfPJ5JyPMU0uXKwHxp0L6BcEc+wBlbTW9qRhOqV5DeGXclgclVvtqQNGEG8Strj/b6c/IxA== flow-parser@^0.121.0: version "0.121.0" @@ -3177,7 +3254,7 @@ fsevents@^2.1.2, fsevents@^2.3.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -function-bind@^1.1.1, function-bind@^1.1.2: +function-bind@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== @@ -3212,11 +3289,12 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" - integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== +get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== dependencies: + es-errors "^1.3.0" function-bind "^1.1.2" has-proto "^1.0.1" has-symbols "^1.0.3" @@ -3246,13 +3324,14 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== +get-symbol-description@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" @@ -3329,29 +3408,29 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" - integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== dependencies: - get-intrinsic "^1.2.2" + es-define-property "^1.0.0" -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-proto@^1.0.1, has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== +has-tostringtag@^1.0.0, has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== dependencies: - has-symbols "^1.0.2" + has-symbols "^1.0.3" has-value@^0.3.1: version "0.3.1" @@ -3384,10 +3463,10 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== +hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== dependencies: function-bind "^1.1.2" @@ -3483,9 +3562,9 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.0.5: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" - integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== + version "5.3.1" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" + integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== image-size@^0.6.0: version "0.6.3" @@ -3534,12 +3613,12 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -internal-slot@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" - integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== +internal-slot@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== dependencies: - get-intrinsic "^1.2.2" + es-errors "^1.3.0" hasown "^2.0.0" side-channel "^1.0.4" @@ -3562,14 +3641,13 @@ is-accessor-descriptor@^1.0.1: dependencies: hasown "^2.0.0" -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" - integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== +is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== dependencies: call-bind "^1.0.2" - get-intrinsic "^1.2.0" - is-typed-array "^1.1.10" + get-intrinsic "^1.2.1" is-arrayish@^0.2.1: version "0.2.1" @@ -3629,6 +3707,13 @@ is-data-descriptor@^1.0.1: dependencies: hasown "^2.0.0" +is-data-view@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" + integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== + dependencies: + is-typed-array "^1.1.13" + is-date-object@^1.0.1, is-date-object@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" @@ -3720,15 +3805,15 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-map@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== +is-map@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" + integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +is-negative-zero@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== is-number-object@^1.0.4: version "1.0.7" @@ -3769,17 +3854,17 @@ is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-set@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== +is-set@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" + integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== +is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" is-stream@^1.1.0: version "1.1.0" @@ -3805,12 +3890,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: - version "1.1.12" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" - integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== +is-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== dependencies: - which-typed-array "^1.1.11" + which-typed-array "^1.1.14" is-typedarray@^1.0.0: version "1.0.0" @@ -3822,10 +3907,10 @@ is-unicode-supported@^0.1.0: resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== +is-weakmap@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" + integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== is-weakref@^1.0.2: version "1.0.2" @@ -3834,13 +3919,13 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== +is-weakset@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" + integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" + call-bind "^1.0.7" + get-intrinsic "^1.2.4" is-windows@^1.0.2: version "1.0.2" @@ -3931,9 +4016,9 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.0.2: - version "3.1.6" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a" - integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg== + version "3.1.7" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b" + integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -4382,9 +4467,9 @@ jetifier@^1.6.2: integrity sha512-3Zi16h6L5tXDRQJTb221cnRoVG9/9OvreLdLU2/ZjRv/GILL+2Cemt0IKvkowwkDpvouAU1DQPOJ7qaiHeIdrw== joi@^17.2.1: - version "17.12.1" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.1.tgz#3347ecf4cd3301962d42191c021b165eef1f395b" - integrity sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ== + version "17.12.2" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.2.tgz#283a664dabb80c7e52943c557aab82faea09f521" + integrity sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw== dependencies: "@hapi/hoek" "^9.3.0" "@hapi/topo" "^5.1.0" @@ -5328,7 +5413,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.13.1, object-inspect@^1.9.0: +object-inspect@^1.13.1: version "1.13.1" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== @@ -5345,7 +5430,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.4: +object.assign@^4.1.4, object.assign@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== @@ -5355,31 +5440,33 @@ object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.entries@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131" - integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA== +object.entries@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41" + integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" -object.fromentries@^2.0.6: - version "2.0.7" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" - integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== +object.fromentries@^2.0.7: + version "2.0.8" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65" + integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" -object.hasown@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae" - integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA== +object.hasown@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc" + integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg== dependencies: - define-properties "^1.2.0" - es-abstract "^1.22.1" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" object.pick@^1.3.0: version "1.3.0" @@ -5388,14 +5475,14 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" - integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== +object.values@^1.1.6, object.values@^1.1.7: + version "1.2.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" + integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" on-finished@2.4.1: version "2.4.1" @@ -5637,6 +5724,11 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -5750,10 +5842,10 @@ react-is@^17.0.1: integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-native-adjust-oaid@../plugins/oaid: - version "4.37.2" + version "4.38.0" react-native-adjust@../temp: - version "4.37.2" + version "4.38.0" react-native-codegen@^0.69.1: version "0.69.2" @@ -5895,14 +5987,15 @@ recast@^0.20.4: tslib "^2.0.1" reflect.getprototypeof@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3" - integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859" + integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.1" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" globalthis "^1.0.3" which-builtin-type "^1.1.3" @@ -5936,14 +6029,15 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" - integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== +regexp.prototype.flags@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" + integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - set-function-name "^2.0.0" + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" regexpp@^3.0.0, regexpp@^3.1.0: version "3.2.0" @@ -6040,7 +6134,7 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^2.0.0-next.4: +resolve@^2.0.0-next.5: version "2.0.0-next.5" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== @@ -6093,13 +6187,13 @@ rsvp@^4.8.4: resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== -safe-array-concat@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" - integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg== +safe-array-concat@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" + integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== dependencies: - call-bind "^1.0.5" - get-intrinsic "^1.2.2" + call-bind "^1.0.7" + get-intrinsic "^1.2.4" has-symbols "^1.0.3" isarray "^2.0.5" @@ -6113,13 +6207,13 @@ safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex-test@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5" - integrity sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ== +safe-regex-test@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== dependencies: - call-bind "^1.0.5" - get-intrinsic "^1.2.2" + call-bind "^1.0.6" + es-errors "^1.3.0" is-regex "^1.1.4" safe-regex@^1.1.0: @@ -6174,9 +6268,9 @@ semver@^6.3.0, semver@^6.3.1: integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.2.1, semver@^7.3.2, semver@^7.5.3: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" @@ -6219,25 +6313,27 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-function-length@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1" - integrity sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w== +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== dependencies: - define-data-property "^1.1.1" + define-data-property "^1.1.4" + es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.2" + get-intrinsic "^1.2.4" gopd "^1.0.1" - has-property-descriptors "^1.0.1" + has-property-descriptors "^1.0.2" -set-function-name@^2.0.0, set-function-name@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" - integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== +set-function-name@^2.0.1, set-function-name@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== dependencies: - define-data-property "^1.0.1" + define-data-property "^1.1.4" + es-errors "^1.3.0" functions-have-names "^1.2.3" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.2" set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" @@ -6295,14 +6391,15 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== +side-channel@^1.0.4, side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.7" @@ -6415,9 +6512,9 @@ spdx-correct@^3.0.0: spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz#c07a4ede25b16e4f78e6707bbd84b15a45c19c1b" - integrity sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw== + version "2.5.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66" + integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w== spdx-expression-parse@^3.0.0: version "3.0.1" @@ -6428,9 +6525,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.16" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" - integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== + version "3.0.17" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c" + integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -6498,47 +6595,51 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.matchall@^4.0.8: - version "4.0.10" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100" - integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ== +string.prototype.matchall@^4.0.10: + version "4.0.11" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a" + integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.4" + gopd "^1.0.1" has-symbols "^1.0.3" - internal-slot "^1.0.5" - regexp.prototype.flags "^1.5.0" - set-function-name "^2.0.0" - side-channel "^1.0.4" + internal-slot "^1.0.7" + regexp.prototype.flags "^1.5.2" + set-function-name "^2.0.2" + side-channel "^1.0.6" -string.prototype.trim@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" - integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== +string.prototype.trim@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" + integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.0" + es-object-atoms "^1.0.0" -string.prototype.trimend@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" - integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== +string.prototype.trimend@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" + integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" string.prototype.trimstart@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" - integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde" + integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" string_decoder@^1.1.1: version "1.3.0" @@ -6633,9 +6734,9 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.9: - version "6.8.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" - integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== + version "6.8.2" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58" + integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA== dependencies: ajv "^8.0.1" lodash.truncate "^4.4.2" @@ -6816,44 +6917,49 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -typed-array-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" - integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== +typed-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - is-typed-array "^1.1.10" + call-bind "^1.0.7" + es-errors "^1.3.0" + is-typed-array "^1.1.13" -typed-array-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" - integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== +typed-array-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" -typed-array-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" - integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== +typed-array-byte-offset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== +typed-array-length@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3" + integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - is-typed-array "^1.1.9" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -7133,30 +7239,30 @@ which-builtin-type@^1.1.3: which-typed-array "^1.1.9" which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0" + integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw== dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" + is-map "^2.0.3" + is-set "^2.0.3" + is-weakmap "^2.0.2" + is-weakset "^2.0.3" which-module@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.11, which-typed-array@^1.1.13, which-typed-array@^1.1.9: - version "1.1.13" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" - integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== +which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9: + version "1.1.15" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" + integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.4" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" for-each "^0.3.3" gopd "^1.0.1" - has-tostringtag "^1.0.0" + has-tostringtag "^1.0.2" which@^1.2.9: version "1.3.1" diff --git a/ios/Adjust/ADJActivityHandler.m b/ios/Adjust/ADJActivityHandler.m index b2492deb..d4c67e51 100644 --- a/ios/Adjust/ADJActivityHandler.m +++ b/ios/Adjust/ADJActivityHandler.m @@ -2625,9 +2625,9 @@ - (void)updatePackagesAttStatusAndIdfaI:(ADJActivityHandler *)selfI { // update activity packages int attStatus = [ADJUtil attStatus]; if (attStatus != 0) { - [selfI.packageHandler updatePackagesWithIdfaAndAttStatus]; - [selfI.sdkClickHandler updatePackagesWithIdfaAndAttStatus]; - [selfI.purchaseVerificationHandler updatePackagesWithIdfaAndAttStatus]; + [selfI.packageHandler updatePackagesWithAttStatus:attStatus]; + [selfI.sdkClickHandler updatePackagesWithAttStatus:attStatus]; + [selfI.purchaseVerificationHandler updatePackagesWithAttStatus:attStatus]; } selfI.internalState.updatePackagesAttData = NO; diff --git a/ios/Adjust/ADJAdjustFactory.h b/ios/Adjust/ADJAdjustFactory.h index 286995dd..bb4de2b3 100644 --- a/ios/Adjust/ADJAdjustFactory.h +++ b/ios/Adjust/ADJAdjustFactory.h @@ -18,6 +18,8 @@ + (double)sessionInterval; + (double)subsessionInterval; + (double)requestTimeout; ++ (NSNumber *)attStatus; ++ (NSString *)idfa; + (NSTimeInterval)timerInterval; + (NSTimeInterval)timerStart; + (ADJBackoffStrategy *)packageHandlerBackoffStrategy; @@ -26,15 +28,14 @@ + (BOOL)testing; + (NSTimeInterval)maxDelayStart; -+ (NSString *)baseUrl; -+ (NSString *)gdprUrl; -+ (NSString *)subscriptionUrl; -+ (NSString *)purchaseVerificationUrl; ++ (NSString *)urlOverwrite; + (BOOL)adServicesFrameworkEnabled; + (void)setLogger:(id)logger; + (void)setSessionInterval:(double)sessionInterval; + (void)setSubsessionInterval:(double)subsessionInterval; ++ (void)setAttStatus:(NSNumber *)attStatus; ++ (void)setIdfa:(NSString *)idfa; + (void)setRequestTimeout:(double)requestTimeout; + (void)setTimerInterval:(NSTimeInterval)timerInterval; + (void)setTimerStart:(NSTimeInterval)timerStart; @@ -43,10 +44,7 @@ + (void)setTesting:(BOOL)testing; + (void)setAdServicesFrameworkEnabled:(BOOL)adServicesFrameworkEnabled; + (void)setMaxDelayStart:(NSTimeInterval)maxDelayStart; -+ (void)setBaseUrl:(NSString *)baseUrl; -+ (void)setGdprUrl:(NSString *)gdprUrl; -+ (void)setSubscriptionUrl:(NSString *)subscriptionUrl; -+ (void)setPurchaseVerificationUrl:(NSString *)purchaseVerificationUrl; ++ (void)setUrlOverwrite:(NSString *)urlOverwrite; + (void)enableSigning; + (void)disableSigning; diff --git a/ios/Adjust/ADJAdjustFactory.m b/ios/Adjust/ADJAdjustFactory.m index b15d5ab9..f0d6c9cf 100644 --- a/ios/Adjust/ADJAdjustFactory.m +++ b/ios/Adjust/ADJAdjustFactory.m @@ -15,6 +15,8 @@ static double internalSessionInterval = -1; static double intervalSubsessionInterval = -1; static double internalRequestTimeout = -1; +static NSNumber * internalAttStatus = nil; +static NSString * internalIdfa = nil; static NSTimeInterval internalTimerInterval = -1; static NSTimeInterval intervalTimerStart = -1; static ADJBackoffStrategy * packageHandlerBackoffStrategy = nil; @@ -24,10 +26,7 @@ static NSTimeInterval internalMaxDelayStart = -1; static BOOL internalAdServicesFrameworkEnabled = YES; -static NSString * internalBaseUrl = nil; -static NSString * internalGdprUrl = nil; -static NSString * internalSubscriptionUrl = nil; -static NSString * internalPurchaseVerificationUrl = nil; +static NSString * internalUrlOverwrite = nil; @implementation ADJAdjustFactory @@ -60,6 +59,14 @@ + (double)requestTimeout { return internalRequestTimeout; } ++ (NSNumber *)attStatus { + return internalAttStatus; +} + ++ (NSString *)idfa { + return internalIdfa; +} + + (NSTimeInterval)timerInterval { if (internalTimerInterval < 0) { return 60; // 1 minute @@ -110,20 +117,8 @@ + (NSTimeInterval)maxDelayStart { return internalMaxDelayStart; } -+ (NSString *)baseUrl { - return internalBaseUrl; -} - -+ (NSString *)gdprUrl { - return internalGdprUrl; -} - -+ (NSString *)subscriptionUrl { - return internalSubscriptionUrl; -} - -+ (NSString *)purchaseVerificationUrl { - return internalPurchaseVerificationUrl; ++ (NSString *)urlOverwrite { + return internalUrlOverwrite; } + (void)setLogger:(id)logger { @@ -137,6 +132,13 @@ + (void)setSessionInterval:(double)sessionInterval { + (void)setSubsessionInterval:(double)subsessionInterval { intervalSubsessionInterval = subsessionInterval; } ++ (void)setAttStatus:(NSNumber *)attStatus { + internalAttStatus = attStatus; +} + ++ (void)setIdfa:(NSString *)idfa { + internalIdfa = idfa; +} + (void)setRequestTimeout:(double)requestTimeout { internalRequestTimeout = requestTimeout; @@ -170,20 +172,8 @@ + (void)setMaxDelayStart:(NSTimeInterval)maxDelayStart { internalMaxDelayStart = maxDelayStart; } -+ (void)setBaseUrl:(NSString *)baseUrl { - internalBaseUrl = baseUrl; -} - -+ (void)setGdprUrl:(NSString *)gdprUrl { - internalGdprUrl = gdprUrl; -} - -+ (void)setSubscriptionUrl:(NSString *)subscriptionUrl { - internalSubscriptionUrl = subscriptionUrl; -} - -+ (void)setPurchaseVerificationUrl:(NSString *)purchaseVerificationUrl { - internalPurchaseVerificationUrl = purchaseVerificationUrl; ++ (void)setUrlOverwrite:(NSString *)urlOverwrite { + internalUrlOverwrite = urlOverwrite; } + (void)enableSigning { @@ -240,15 +230,14 @@ + (void)teardown:(BOOL)deleteState { internalTimerInterval = -1; intervalTimerStart = -1; internalRequestTimeout = -1; + internalAttStatus = nil; + internalIdfa = nil; packageHandlerBackoffStrategy = nil; sdkClickHandlerBackoffStrategy = nil; installSessionBackoffStrategy = nil; internalTesting = NO; internalMaxDelayStart = -1; - internalBaseUrl = nil; - internalGdprUrl = nil; - internalSubscriptionUrl = nil; - internalPurchaseVerificationUrl = nil; + internalUrlOverwrite = nil; internalAdServicesFrameworkEnabled = YES; } @end diff --git a/ios/Adjust/ADJPackageBuilder.h b/ios/Adjust/ADJPackageBuilder.h index bfaf1b9a..f5709130 100644 --- a/ios/Adjust/ADJPackageBuilder.h +++ b/ios/Adjust/ADJPackageBuilder.h @@ -94,10 +94,16 @@ + (BOOL)isAdServicesPackage:(ADJActivityPackage * _Nullable)activityPackage; -+ (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters - withConfig:(ADJConfig * _Nullable)adjConfig - logger:(id _Nullable)logger - packageParams:(ADJPackageParams * _Nullable)packageParams; ++ (void)addConsentDataToParameters:(NSMutableDictionary * _Nullable)parameters + forActivityKind:(ADJActivityKind)activityKind + withAttStatus:(NSString * _Nullable)attStatusString + configuration:(ADJConfig * _Nullable)adjConfig + packageParams:(ADJPackageParams * _Nullable)packageParams; + ++ (void)removeConsentDataFromParameters:(nonnull NSMutableDictionary *)parameters; + ++ (void)updateAttStatusInParameters:(nonnull NSMutableDictionary *)parameters; + @end // TODO change to ADJ... extern NSString * _Nullable const ADJAttributionTokenParameter; diff --git a/ios/Adjust/ADJPackageBuilder.m b/ios/Adjust/ADJPackageBuilder.m index e7804a78..fc67e01f 100644 --- a/ios/Adjust/ADJPackageBuilder.m +++ b/ios/Adjust/ADJPackageBuilder.m @@ -336,8 +336,6 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay { [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -357,9 +355,6 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay { if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setDuration:self.activityState.lastInterval forKey:@"last_interval"]; @@ -380,6 +375,8 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay { [ADJPackageBuilder parameters:parameters setDictionary:[self.sessionParameters.partnerParameters copy] forKey:@"partner_params"]; } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindSession]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -403,8 +400,6 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ [ADJPackageBuilder parameters:parameters setString:event.eventToken forKey:@"event_token"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -432,7 +427,7 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ [ADJPackageBuilder parameters:parameters setString:event.transactionId forKey:@"deduplication_id"]; [ADJPackageBuilder parameters:parameters setString:event.productId forKey:@"product_id"]; [ADJPackageBuilder parameters:parameters setString:[event.receipt adjEncodeBase64] forKey:@"receipt"]; - + if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -444,9 +439,6 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setInt:self.activityState.eventCount forKey:@"event_count"]; @@ -474,6 +466,8 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ [ADJPackageBuilder parameters:parameters setDictionary:mergedPartnerParameters forKey:@"partner_params"]; } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindEvent]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -500,8 +494,6 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source { [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -511,9 +503,9 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source { [ADJPackageBuilder parameters:parameters setDate:self.purchaseTime forKey:@"purchase_time"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.secretId forKey:@"secret_id"]; [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; - [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; [ADJPackageBuilder parameters:parameters setString:source forKey:@"source"]; - + [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; + if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -525,9 +517,6 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source { if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setDuration:self.activityState.lastInterval forKey:@"last_interval"]; @@ -550,6 +539,8 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source { [ADJPackageBuilder parameters:parameters setString:self.attribution.trackerName forKey:@"tracker"]; } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindInfo]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -571,18 +562,16 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osVersion forKey:@"os_version"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.secretId forKey:@"secret_id"]; [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; - [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; [ADJPackageBuilder parameters:parameters setString:source forKey:@"source"]; + [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; [ADJPackageBuilder parameters:parameters setData:payload forKey:@"payload"]; - + if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -594,9 +583,6 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setDuration:self.activityState.lastInterval forKey:@"last_interval"]; @@ -612,6 +598,8 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindAdRevenue]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -633,8 +621,6 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -642,7 +628,7 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.secretId forKey:@"secret_id"]; [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; - + [ADJPackageBuilder parameters:parameters setString:adRevenue.source forKey:@"source"]; [ADJPackageBuilder parameters:parameters setNumberWithoutRounding:adRevenue.revenue forKey:@"revenue"]; [ADJPackageBuilder parameters:parameters setString:adRevenue.currency forKey:@"currency"]; @@ -650,7 +636,7 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe [ADJPackageBuilder parameters:parameters setString:adRevenue.adRevenueNetwork forKey:@"ad_revenue_network"]; [ADJPackageBuilder parameters:parameters setString:adRevenue.adRevenueUnit forKey:@"ad_revenue_unit"]; [ADJPackageBuilder parameters:parameters setString:adRevenue.adRevenuePlacement forKey:@"ad_revenue_placement"]; - + if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -662,9 +648,6 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (!isInDelay) { NSDictionary *mergedCallbackParameters = [ADJUtil mergeParameters:[self.sessionParameters.callbackParameters copy] @@ -692,6 +675,8 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindAdRevenue]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -718,8 +703,6 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source { [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -729,9 +712,9 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source { [ADJPackageBuilder parameters:parameters setDate:self.purchaseTime forKey:@"purchase_time"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.secretId forKey:@"secret_id"]; [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; - [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; [ADJPackageBuilder parameters:parameters setString:source forKey:@"source"]; - + [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; + if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -743,9 +726,6 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source { if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setDuration:self.activityState.lastInterval forKey:@"last_interval"]; @@ -768,6 +748,8 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source { [ADJPackageBuilder parameters:parameters setString:self.attribution.trackerName forKey:@"tracker"]; } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindClick]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -787,8 +769,6 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy { [ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setString:initiatedBy forKey:@"initiated_by"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; @@ -798,13 +778,6 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy { [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; - if (self.adjustConfig.isDeviceKnown) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; - } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } - if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -813,6 +786,13 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy { forKey:@"tracking_enabled"]; } + if (self.adjustConfig.isDeviceKnown) { + [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; + } + if (self.adjustConfig.needsCost) { + [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; + } + if (self.activityState != nil) { if (self.activityState.isPersisted) { [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"]; @@ -821,6 +801,8 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy { } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindAttribution]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -840,8 +822,6 @@ - (NSMutableDictionary *)getGdprParameters { [ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -850,13 +830,6 @@ - (NSMutableDictionary *)getGdprParameters { [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; - if (self.adjustConfig.isDeviceKnown) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; - } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } - if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -865,6 +838,10 @@ - (NSMutableDictionary *)getGdprParameters { forKey:@"tracking_enabled"]; } + if (self.adjustConfig.isDeviceKnown) { + [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; + } + if (self.activityState != nil) { if (self.activityState.isPersisted) { [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"]; @@ -873,6 +850,8 @@ - (NSMutableDictionary *)getGdprParameters { } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindGdpr]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -899,8 +878,6 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters { [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -911,7 +888,7 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters { [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.secretId forKey:@"secret_id"]; [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; - + if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -923,9 +900,6 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters { if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setDuration:self.activityState.lastInterval forKey:@"last_interval"]; @@ -941,6 +915,8 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters { } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindDisableThirdPartySharing]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -967,8 +943,6 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -980,6 +954,14 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; + if ([self.trackingStatusManager canGetAttStatus]) { + [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus + forKey:@"att_status"]; + } else { + [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.trackingEnabled + forKey:@"tracking_enabled"]; + } + // Third Party Sharing if (thirdPartySharing.enabled != nil) { NSString *enableValue = thirdPartySharing.enabled.boolValue ? @"enable" : @"disable"; @@ -992,14 +974,6 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh setDictionaryJson:thirdPartySharing.partnerSharingSettings forKey:@"partner_sharing_settings"]; - if ([self.trackingStatusManager canGetAttStatus]) { - [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus - forKey:@"att_status"]; - } else { - [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.trackingEnabled - forKey:@"tracking_enabled"]; - } - if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } @@ -1018,6 +992,8 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindThirdPartySharing]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -1044,8 +1020,6 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled { [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -1089,6 +1063,8 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled { } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindMeasurementConsent]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -1108,8 +1084,6 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -1117,7 +1091,7 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.secretId forKey:@"secret_id"]; [ADJPackageBuilder parameters:parameters setDate:[ADJUserDefaults getSkadRegisterCallTimestamp] forKey:@"skadn_registered_at"]; [ADJPackageBuilder parameters:parameters setDate1970:(double)self.packageParams.startedAt forKey:@"started_at"]; - + if ([self.trackingStatusManager canGetAttStatus]) { [ADJPackageBuilder parameters:parameters setInt:self.trackingStatusManager.attStatus forKey:@"att_status"]; @@ -1129,9 +1103,6 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setString:self.activityState.deviceToken forKey:@"push_token"]; @@ -1166,6 +1137,8 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti [ADJPackageBuilder parameters:parameters setDate:subscription.transactionDate forKey:@"transaction_date"]; [ADJPackageBuilder parameters:parameters setString:subscription.salesRegion forKey:@"sales_region"]; + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindSubscription]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; @@ -1189,8 +1162,6 @@ - (NSMutableDictionary *)getPurchaseVerificationParameters { [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"]; [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"]; - [self addIdfaIfPossibleToParameters:parameters]; - [self addIdfvIfPossibleToParameters:parameters]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"]; [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"]; [ADJPackageBuilder parameters:parameters setString:self.packageParams.osName forKey:@"os_name"]; @@ -1211,9 +1182,6 @@ - (NSMutableDictionary *)getPurchaseVerificationParameters { if (self.adjustConfig.isDeviceKnown) { [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.isDeviceKnown forKey:@"device_known"]; } - if (self.adjustConfig.needsCost) { - [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.needsCost forKey:@"needs_cost"]; - } if (self.activityState != nil) { [ADJPackageBuilder parameters:parameters setDuration:self.activityState.lastInterval forKey:@"last_interval"]; @@ -1229,18 +1197,13 @@ - (NSMutableDictionary *)getPurchaseVerificationParameters { } } + [self addConsentToParameters:parameters forActivityKind:ADJActivityKindPurchaseVerification]; + [self addIdfvIfPossibleToParameters:parameters]; [self injectFeatureFlagsWithParameters:parameters]; return parameters; } -- (void)addIdfaIfPossibleToParameters:(NSMutableDictionary *)parameters { - [ADJPackageBuilder addIdfaToParameters:parameters - withConfig:self.adjustConfig - logger:[ADJAdjustFactory logger] - packageParams:self.packageParams]; -} - - (void)addIdfvIfPossibleToParameters:(NSMutableDictionary *)parameters { id logger = [ADJAdjustFactory logger]; @@ -1372,16 +1335,26 @@ + (BOOL)isAdServicesPackage:(ADJActivityPackage *)activityPackage { return ([ADJUtil isNotNull:source] && [source isEqualToString:ADJAdServicesPackageKey]); } -+ (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters - withConfig:(ADJConfig * _Nullable)adjConfig - logger:(id _Nullable)logger - packageParams:(ADJPackageParams *)packageParams { +#pragma mark - Consent params + ++ (void)addConsentDataToParameters:(NSMutableDictionary * _Nullable)parameters + forActivityKind:(ADJActivityKind)activityKind + withAttStatus:(NSString * _Nullable)attStatusString + configuration:(ADJConfig * _Nullable)adjConfig + packageParams:(ADJPackageParams * _Nullable)packageParams { + + if (![ADJUtil shouldUseConsentParamsForActivityKind:activityKind + andAttStatus:attStatusString]) { + return; + } + + // idfa if (!adjConfig.allowIdfaReading) { - [logger info:@"Cannot read IDFA because it's forbidden by ADJConfig setting"]; + [[ADJAdjustFactory logger] info:@"Cannot read IDFA because it's forbidden by ADJConfig setting"]; return; } if (adjConfig.coppaCompliantEnabled) { - [logger info:@"Cannot read IDFA with COPPA enabled"]; + [[ADJAdjustFactory logger] info:@"Cannot read IDFA with COPPA enabled"]; return; } @@ -1411,4 +1384,21 @@ + (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters } } ++ (void)removeConsentDataFromParameters:(nonnull NSMutableDictionary *)parameters { + [parameters removeObjectForKey:@"idfa"]; +} + ++ (void)updateAttStatusInParameters:(nonnull NSMutableDictionary *)parameters { + [ADJPackageBuilder parameters:parameters setInt:[ADJUtil attStatus] forKey:@"att_status"]; +} + +- (void)addConsentToParameters:(NSMutableDictionary *)parameters + forActivityKind:(ADJActivityKind)activityKind { + [ADJPackageBuilder addConsentDataToParameters:parameters + forActivityKind:activityKind + withAttStatus:[parameters objectForKey:@"att_status"] + configuration:self.adjustConfig + packageParams:self.packageParams]; +} + @end diff --git a/ios/Adjust/ADJPackageHandler.h b/ios/Adjust/ADJPackageHandler.h index 6916afc4..a32ea8db 100644 --- a/ios/Adjust/ADJPackageHandler.h +++ b/ios/Adjust/ADJPackageHandler.h @@ -28,7 +28,7 @@ - (void)pauseSending; - (void)resumeSending; - (void)updatePackagesWithSessionParams:(ADJSessionParameters *)sessionParameters; -- (void)updatePackagesWithIdfaAndAttStatus; +- (void)updatePackagesWithAttStatus:(int)attStatus; - (void)flush; - (void)teardown; diff --git a/ios/Adjust/ADJPackageHandler.m b/ios/Adjust/ADJPackageHandler.m index 366ce240..80918f18 100644 --- a/ios/Adjust/ADJPackageHandler.m +++ b/ios/Adjust/ADJPackageHandler.m @@ -111,9 +111,9 @@ - (void)sendNextPackage:(ADJResponseData *)responseData { [self.activityHandler finishedTracking:responseData]; } -- (void)closeFirstPackage:(ADJResponseData *)responseData -{ +- (void)closeFirstPackage:(ADJResponseData *)responseData { responseData.willRetry = YES; + [self.activityHandler finishedTracking:responseData]; self.lastPackageRetriesCount++; @@ -153,11 +153,12 @@ - (void)updatePackagesWithSessionParams:(ADJSessionParameters *)sessionParameter }]; } -- (void)updatePackagesWithIdfaAndAttStatus { +- (void)updatePackagesWithAttStatus:(int)attStatus { [ADJUtil launchInQueue:self.internalQueue selfInject:self block:^(ADJPackageHandler* selfI) { - [selfI updatePackagesWithIdfaAndAttStatusI:selfI]; + [selfI updatePackagesTrackingI:selfI + attStatus:attStatus]; }]; } @@ -299,18 +300,20 @@ - (void)updatePackagesI:(ADJPackageHandler *)selfI [selfI writePackageQueueS:selfI]; } -- (void)updatePackagesWithIdfaAndAttStatusI:(ADJPackageHandler *)selfI { - int attStatus = [ADJUtil attStatus]; +- (void)updatePackagesTrackingI:(ADJPackageHandler *)selfI + attStatus:(int)attStatus { [selfI.logger debug:@"Updating package queue with idfa and att_status: %d", (long)attStatus]; // create package queue copy for new state of array NSMutableArray *packageQueueCopy = [NSMutableArray array]; for (ADJActivityPackage *activityPackage in selfI.packageQueue) { [ADJPackageBuilder parameters:activityPackage.parameters setInt:attStatus forKey:@"att_status"]; - [ADJPackageBuilder addIdfaToParameters:activityPackage.parameters - withConfig:self.activityHandler.adjustConfig - logger:[ADJAdjustFactory logger] - packageParams:self.activityHandler.packageParams]; + + [ADJPackageBuilder addConsentDataToParameters:activityPackage.parameters + forActivityKind:activityPackage.activityKind + withAttStatus:[activityPackage.parameters objectForKey:@"att_status"] + configuration:selfI.activityHandler.adjustConfig + packageParams:selfI.activityHandler.packageParams]; // add to copy queue [packageQueueCopy addObject:activityPackage]; } diff --git a/ios/Adjust/ADJPurchaseVerificationHandler.h b/ios/Adjust/ADJPurchaseVerificationHandler.h index 64a28856..2e8fd4e3 100644 --- a/ios/Adjust/ADJPurchaseVerificationHandler.h +++ b/ios/Adjust/ADJPurchaseVerificationHandler.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)pauseSending; - (void)resumeSending; - (void)sendPurchaseVerificationPackage:(ADJActivityPackage *)purchaseVerificationPackage; -- (void)updatePackagesWithIdfaAndAttStatus; +- (void)updatePackagesWithAttStatus:(int)attStatus; - (void)teardown; @end diff --git a/ios/Adjust/ADJPurchaseVerificationHandler.m b/ios/Adjust/ADJPurchaseVerificationHandler.m index 08e997df..49ebdbfe 100644 --- a/ios/Adjust/ADJPurchaseVerificationHandler.m +++ b/ios/Adjust/ADJPurchaseVerificationHandler.m @@ -87,11 +87,12 @@ - (void)sendNextPurchaseVerificationPackage { }]; } -- (void)updatePackagesWithIdfaAndAttStatus { +- (void)updatePackagesWithAttStatus:(int)attStatus { [ADJUtil launchInQueue:self.internalQueue selfInject:self block:^(ADJPurchaseVerificationHandler *selfI) { - [selfI updatePackagesWithIdfaAndAttStatusI:selfI]; + [selfI updatePackagesTrackingI:selfI + attStatus:attStatus]; }]; } @@ -172,17 +173,19 @@ - (void)sendNextPurchaseVerificationPackageI:(ADJPurchaseVerificationHandler *)s dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(waitTime * NSEC_PER_SEC)), self.internalQueue, work); } -- (void)updatePackagesWithIdfaAndAttStatusI:(ADJPurchaseVerificationHandler *)selfI { - int attStatus = [ADJUtil attStatus]; +- (void)updatePackagesTrackingI:(ADJPurchaseVerificationHandler *)selfI + attStatus:(int)attStatus { [selfI.logger debug:@"Updating purchase_verification queue with idfa and att_status: %d", attStatus]; for (ADJActivityPackage *activityPackage in selfI.packageQueue) { [ADJPackageBuilder parameters:activityPackage.parameters setInt:attStatus forKey:@"att_status"]; - [ADJPackageBuilder addIdfaToParameters:activityPackage.parameters - withConfig:self.activityHandler.adjustConfig - logger:[ADJAdjustFactory logger] - packageParams:self.activityHandler.packageParams]; + + [ADJPackageBuilder addConsentDataToParameters:activityPackage.parameters + forActivityKind:activityPackage.activityKind + withAttStatus:[activityPackage.parameters objectForKey:@"att_status"] + configuration:selfI.activityHandler.adjustConfig + packageParams:selfI.activityHandler.packageParams]; } } diff --git a/ios/Adjust/ADJRequestHandler.m b/ios/Adjust/ADJRequestHandler.m index ed5891e9..1b526e24 100644 --- a/ios/Adjust/ADJRequestHandler.m +++ b/ios/Adjust/ADJRequestHandler.m @@ -70,30 +70,39 @@ - (id)initWithResponseCallback:(id)responseCallback - (void)sendPackageByPOST:(ADJActivityPackage *)activityPackage sendingParameters:(NSDictionary *)sendingParameters { - [self signWithSigV2Plugin:activityPackage]; - NSDictionary *parameters = [[NSDictionary alloc] - initWithDictionary:activityPackage.parameters - copyItems:YES]; + NSMutableDictionary *parameters = [[NSMutableDictionary alloc] + initWithDictionary:activityPackage.parameters + copyItems:YES]; NSString *path = [activityPackage.path copy]; NSString *clientSdk = [activityPackage.clientSdk copy]; ADJActivityKind activityKind = activityPackage.activityKind; ADJResponseData *responseData = [ADJResponseData buildResponseData:activityPackage]; - responseData.sendingParameters = [[NSDictionary alloc] - initWithDictionary:sendingParameters - copyItems:YES]; - NSString * authorizationHeader = [self buildAuthorizationHeader:parameters activityKind:activityKind]; + NSString *urlHostString = [self urlWithParams:parameters + sendingParams:sendingParameters + responseData:responseData]; + + NSMutableDictionary *parametersCopy = [[NSMutableDictionary alloc] + initWithDictionary:parameters]; + [parametersCopy addEntriesFromDictionary:responseData.sendingParameters]; - NSString *urlHostString = [self.urlStrategy getUrlHostStringByPackageKind: - activityPackage.activityKind]; - NSMutableURLRequest *urlRequest = - [self requestForPostPackage:path - clientSdk:clientSdk - parameters:parameters - urlHostString:urlHostString - sendingParameters:sendingParameters]; + NSString * appSecret = [parametersCopy objectForKey:@"app_secret"]; + [parametersCopy removeObjectForKey:@"app_secret"]; + + [self signWithSigV2PluginWithParams:parametersCopy + activityKind:activityKind + clientSdk:clientSdk]; + NSString * authorizationHeader = [self buildAuthorizationHeader:parametersCopy + activityKind:activityKind + appSecret:appSecret]; + + NSMutableURLRequest *urlRequest = [self requestForPostPackage:path + clientSdk:clientSdk + parameters:parameters + urlHostString:urlHostString + sendingParameters:responseData.sendingParameters]; [self sendRequest:urlRequest authorizationHeader:authorizationHeader @@ -103,45 +112,83 @@ - (void)sendPackageByPOST:(ADJActivityPackage *)activityPackage - (void)sendPackageByGET:(ADJActivityPackage *)activityPackage sendingParameters:(NSDictionary *)sendingParameters { - [self signWithSigV2Plugin:activityPackage]; - NSDictionary *parameters = [[NSDictionary alloc] - initWithDictionary:activityPackage.parameters - copyItems:YES]; + NSMutableDictionary *parameters = [[NSMutableDictionary alloc] + initWithDictionary:activityPackage.parameters + copyItems:YES]; NSString *path = [activityPackage.path copy]; NSString *clientSdk = [activityPackage.clientSdk copy]; ADJActivityKind activityKind = activityPackage.activityKind; ADJResponseData *responseData = [ADJResponseData buildResponseData:activityPackage]; - responseData.sendingParameters = [[NSDictionary alloc] - initWithDictionary:sendingParameters - copyItems:YES]; - NSString * authorizationHeader = [self buildAuthorizationHeader:parameters - activityKind:activityKind]; + NSString *urlHostString = [self urlWithParams:parameters + sendingParams:sendingParameters + responseData:responseData]; + + NSMutableDictionary *parametersCopy = [[NSMutableDictionary alloc] + initWithDictionary:parameters]; + [parametersCopy addEntriesFromDictionary:responseData.sendingParameters]; + + NSString *appSecret = [parametersCopy objectForKey:@"app_secret"]; + [parametersCopy removeObjectForKey:@"app_secret"]; - NSString *urlHostString = [self.urlStrategy - getUrlHostStringByPackageKind:activityPackage.activityKind]; + [self signWithSigV2PluginWithParams:parametersCopy + activityKind:activityKind + clientSdk:clientSdk]; + NSString * authorizationHeader = [self buildAuthorizationHeader:parametersCopy + activityKind:activityKind + appSecret:appSecret]; - NSMutableURLRequest *urlRequest = - [self requestForGetPackage:path - clientSdk:clientSdk - parameters:parameters - urlHostString:urlHostString - sendingParameters:sendingParameters]; + NSMutableURLRequest *urlRequest = [self requestForGetPackage:path + clientSdk:clientSdk + parameters:parameters + urlHostString:urlHostString + sendingParameters:responseData.sendingParameters]; [self sendRequest:urlRequest - authorizationHeader:authorizationHeader + authorizationHeader:authorizationHeader responseData:responseData methodTypeInfo:ADJMethodGET]; } #pragma mark Internal methods +- (nonnull NSString *)urlWithParams:(nonnull NSMutableDictionary *)params + sendingParams:(NSDictionary *)sendingParams + responseData:(nonnull ADJResponseData *)responseData { + NSMutableDictionary * sendingParamsCopy = [NSMutableDictionary dictionaryWithDictionary:sendingParams]; + + NSString *attStatusString = [responseData.sdkPackage.parameters objectForKey:@"att_status"]; + BOOL wasConsentWhenCreated = [ADJUtil shouldUseConsentParamsForActivityKind:responseData.activityKind + andAttStatus:attStatusString]; + BOOL isConsentWhenSending = [ADJUtil shouldUseConsentParamsForActivityKind:responseData.activityKind]; + BOOL doesConsentDataExist = wasConsentWhenCreated && isConsentWhenSending; + + if (!doesConsentDataExist) { + [ADJPackageBuilder removeConsentDataFromParameters:params]; + } + + // if att_status was part of the payload at all + // make sure to have up to date value before sending + if (attStatusString != nil) { + [ADJPackageBuilder updateAttStatusInParameters:params]; + } + + NSString *urlHostString = [self.urlStrategy urlForActivityKind:responseData.activityKind + isConsentGiven:isConsentWhenSending + withSendingParams:sendingParamsCopy]; + + responseData.sendingParameters = [[NSDictionary alloc] + initWithDictionary:sendingParamsCopy + copyItems:YES]; + + return urlHostString; +} + - (void)sendRequest:(NSMutableURLRequest *)request authorizationHeader:(NSString *)authorizationHeader responseData:(ADJResponseData *)responseData methodTypeInfo:(NSString *)methodTypeInfo - { if (authorizationHeader != nil) { [ADJAdjustFactory.logger debug:@"Authorization header content: %@", authorizationHeader]; @@ -432,6 +479,7 @@ - (void)handleResponseWithData:(NSData *)data #pragma mark - Authorization Header - (NSString *)buildAuthorizationHeader:(NSDictionary *)parameters activityKind:(ADJActivityKind)activityKind + appSecret:(NSString *)appSecret { NSString *adjSigningId = [parameters objectForKey:@"adj_signing_id"]; NSString *signature = [parameters objectForKey:@"signature"]; @@ -457,7 +505,6 @@ - (NSString *)buildAuthorizationHeader:(NSDictionary *)parameters return authorizationHeaderWithSecretId; } - NSString * appSecret = [parameters objectForKey:@"app_secret"]; return [self buildAuthorizationHeaderV1:appSecret secretId:secretId parameters:parameters @@ -648,7 +695,10 @@ - (NSDictionary *)buildJsonDict:(NSData *)jsonData return jsonDict; } -- (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage { +- (void)signWithSigV2PluginWithParams:(NSMutableDictionary *)params + activityKind:(ADJActivityKind)activityKind + clientSdk:(NSString *)clientSdk +{ Class signerClass = NSClassFromString(@"ADJSigner"); if (signerClass == nil) { return; @@ -658,21 +708,18 @@ - (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage { return; } - [activityPackage.parameters removeObjectForKey:@"app_secret"]; - [activityPackage.parameters removeObjectForKey:@"secret_id"]; - NSMutableDictionary *parameters = activityPackage.parameters; - const char *activityKindChar = [[ADJActivityKindUtil activityKindToString:activityPackage.activityKind] UTF8String]; - const char *sdkVersionChar = [activityPackage.clientSdk UTF8String]; + const char *activityKindChar = [[ADJActivityKindUtil activityKindToString:activityKind] UTF8String]; + const char *sdkVersionChar = [clientSdk UTF8String]; // Stack allocated strings to ensure their lifetime stays until the next iteration - static char activityKind[64], sdkVersion[64]; - strncpy(activityKind, activityKindChar, strlen(activityKindChar) + 1); + static char packageActivityKind[64], sdkVersion[64]; + strncpy(packageActivityKind, activityKindChar, strlen(activityKindChar) + 1); strncpy(sdkVersion, sdkVersionChar, strlen(sdkVersionChar) + 1); // NSInvocation setArgument requires lvalue references with exact matching types to the executed function signature. // With this usage we ensure that the lifetime of the object remains until the next iteration, as it points to the // stack allocated string where we copied the buffer. - const char *lvalActivityKind = activityKind; + const char *lvalActivityKind = packageActivityKind; const char *lvalSdkVersion = sdkVersion; /* @@ -686,7 +733,7 @@ - (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage { [signInvocation setSelector:signSEL]; [signInvocation setTarget:signerClass]; - [signInvocation setArgument:¶meters atIndex:2]; + [signInvocation setArgument:¶ms atIndex:2]; [signInvocation setArgument:&lvalActivityKind atIndex:3]; [signInvocation setArgument:&lvalSdkVersion atIndex:4]; @@ -710,7 +757,7 @@ - (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage { } NSString *signerVersionString = (NSString *)signerVersion; - [ADJPackageBuilder parameters:parameters + [ADJPackageBuilder parameters:params setString:signerVersionString forKey:@"native_version"]; } diff --git a/ios/Adjust/ADJSdkClickHandler.h b/ios/Adjust/ADJSdkClickHandler.h index b298918f..2ccf63e0 100644 --- a/ios/Adjust/ADJSdkClickHandler.h +++ b/ios/Adjust/ADJSdkClickHandler.h @@ -21,7 +21,7 @@ - (void)pauseSending; - (void)resumeSending; - (void)sendSdkClick:(ADJActivityPackage *)sdkClickPackage; -- (void)updatePackagesWithIdfaAndAttStatus; +- (void)updatePackagesWithAttStatus:(int)attStatus; - (void)teardown; @end diff --git a/ios/Adjust/ADJSdkClickHandler.m b/ios/Adjust/ADJSdkClickHandler.m index a35c5ac9..0bbdb873 100644 --- a/ios/Adjust/ADJSdkClickHandler.m +++ b/ios/Adjust/ADJSdkClickHandler.m @@ -91,11 +91,12 @@ - (void)sendNextSdkClick { }]; } -- (void)updatePackagesWithIdfaAndAttStatus { +- (void)updatePackagesWithAttStatus:(int)attStatus { [ADJUtil launchInQueue:self.internalQueue selfInject:self block:^(ADJSdkClickHandler *selfI) { - [selfI updatePackagesWithIdfaAndAttStatusI:selfI]; + [selfI updatePackagesTrackingI:selfI + attStatus:attStatus]; }]; } @@ -194,21 +195,22 @@ - (void)sendNextSdkClickI:(ADJSdkClickHandler *)selfI { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(waitTime * NSEC_PER_SEC)), self.internalQueue, work); } -- (void)updatePackagesWithIdfaAndAttStatusI:(ADJSdkClickHandler *)selfI { - int attStatus = [ADJUtil attStatus]; +- (void)updatePackagesTrackingI:(ADJSdkClickHandler *)selfI + attStatus:(int)attStatus { [selfI.logger debug:@"Updating sdk_click queue with idfa and att_status: %d", attStatus]; for (ADJActivityPackage *activityPackage in selfI.packageQueue) { [ADJPackageBuilder parameters:activityPackage.parameters setInt:attStatus forKey:@"att_status"]; - [ADJPackageBuilder addIdfaToParameters:activityPackage.parameters - withConfig:self.activityHandler.adjustConfig - logger:[ADJAdjustFactory logger] - packageParams:self.activityHandler.packageParams]; + + [ADJPackageBuilder addConsentDataToParameters:activityPackage.parameters + forActivityKind:activityPackage.activityKind + withAttStatus:[activityPackage.parameters objectForKey:@"att_status"] + configuration:selfI.activityHandler.adjustConfig + packageParams:selfI.activityHandler.packageParams]; } } - - (void)responseCallback:(ADJResponseData *)responseData { if (responseData.jsonResponse) { [self.logger debug: diff --git a/ios/Adjust/ADJUrlStrategy.h b/ios/Adjust/ADJUrlStrategy.h index 771297a5..08942faa 100644 --- a/ios/Adjust/ADJUrlStrategy.h +++ b/ios/Adjust/ADJUrlStrategy.h @@ -16,7 +16,9 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo extraPath:(NSString *)extraPath; -- (NSString *)getUrlHostStringByPackageKind:(ADJActivityKind)activityKind; +- (nonnull NSString *)urlForActivityKind:(ADJActivityKind)activityKind + isConsentGiven:(BOOL)isConsentGiven + withSendingParams:(NSMutableDictionary *)sendingParams; - (void)resetAfterSuccess; - (BOOL)shouldRetryAfterFailure:(ADJActivityKind)activityKind; diff --git a/ios/Adjust/ADJUrlStrategy.m b/ios/Adjust/ADJUrlStrategy.m index 7c7f4340..eef16f68 100644 --- a/ios/Adjust/ADJUrlStrategy.m +++ b/ios/Adjust/ADJUrlStrategy.m @@ -4,58 +4,68 @@ // // Created by Pedro S. on 11.08.20. // Copyright © 2020 adjust GmbH. All rights reserved. -// +//analytics.adjust.com + #import "ADJUrlStrategy.h" #import "Adjust.h" #import "ADJAdjustFactory.h" -static NSString * const baseUrl = @"https://app.adjust.com"; +static NSString * const baseUrlAnalytics = @"https://analytics.adjust.com"; +static NSString * const baseUrlConsent = @"https://consent.adjust.com"; static NSString * const gdprUrl = @"https://gdpr.adjust.com"; static NSString * const subscriptionUrl = @"https://subscription.adjust.com"; static NSString * const purchaseVerificationUrl = @"https://ssrv.adjust.com"; -static NSString * const baseUrlIndia = @"https://app.adjust.net.in"; +static NSString * const baseUrlIndiaAnalytics = @"https://analytics.adjust.net.in"; +static NSString * const baseUrlIndiaConsent = @"https://consent.adjust.net.in"; static NSString * const gdprUrlIndia = @"https://gdpr.adjust.net.in"; static NSString * const subscriptionUrlIndia = @"https://subscription.adjust.net.in"; static NSString * const purchaseVerificationUrlIndia = @"https://ssrv.adjust.net.in"; -static NSString * const baseUrlChina = @"https://app.adjust.world"; +static NSString * const baseUrlChinaAnalytics = @"https://analytics.adjust.world"; +static NSString * const baseUrlChinaConsent = @"https://consent.adjust.world"; static NSString * const gdprUrlChina = @"https://gdpr.adjust.world"; static NSString * const subscriptionUrlChina = @"https://subscription.adjust.world"; static NSString * const purchaseVerificationUrlChina = @"https://ssrv.adjust.world"; -static NSString * const baseUrlCn = @"https://app.adjust.cn"; +static NSString * const baseUrlCnAnalytics = @"https://analytics.adjust.cn"; +static NSString * const baseUrlCnConsent = @"https://consent.adjust.cn"; static NSString * const gdprUrlCn = @"https://gdpr.adjust.cn"; static NSString * const subscriptionUrlCn = @"https://subscription.adjust.cn"; static NSString * const purchaseVerificationUrlCn = @"https://ssrv.adjust.cn"; -static NSString * const baseUrlEU = @"https://app.eu.adjust.com"; +static NSString * const baseUrlEUAnalytics = @"https://analytics.eu.adjust.com"; +static NSString * const baseUrlEUConsent = @"https://consent.eu.adjust.com"; static NSString * const gdprUrlEU = @"https://gdpr.eu.adjust.com"; static NSString * const subscriptionUrlEU = @"https://subscription.eu.adjust.com"; static NSString * const purchaseVerificationUrlEU = @"https://ssrv.eu.adjust.com"; -static NSString * const baseUrlTR = @"https://app.tr.adjust.com"; +static NSString * const baseUrlTRAnalytics = @"https://analytics.tr.adjust.com"; +static NSString * const baseUrlTRConsent = @"https://consent.tr.adjust.com"; static NSString * const gdprUrlTR = @"https://gdpr.tr.adjust.com"; static NSString * const subscriptionUrlTR = @"https://subscription.tr.adjust.com"; static NSString * const purchaseVerificationUrlTR = @"https://ssrv.tr.adjust.com"; -static NSString * const baseUrlUS = @"https://app.us.adjust.com"; +static NSString * const baseUrlUSAnalytics = @"https://analytics.us.adjust.com"; +static NSString * const baseUrlUSConsent = @"https://consent.us.adjust.com"; static NSString * const gdprUrlUS = @"https://gdpr.us.adjust.com"; static NSString * const subscriptionUrlUS = @"https://subscription.us.adjust.com"; static NSString * const purchaseVerificationUrlUS = @"https://ssrv.us.adjust.com"; +static NSString *const testServerCustomEndPointKey = @"test_server_custom_end_point"; +static NSString *const testServerAdjustEndPointKey = @"test_server_adjust_end_point"; + + @interface ADJUrlStrategy () -@property (nonatomic, copy) NSArray *baseUrlChoicesArray; +@property (nonatomic, copy) NSArray *baseUrlAnalyticsChoicesArray; +@property (nonatomic, copy) NSArray *baseUrlConsentChoicesArray; @property (nonatomic, copy) NSArray *gdprUrlChoicesArray; @property (nonatomic, copy) NSArray *subscriptionUrlChoicesArray; @property (nonatomic, copy) NSArray *purchaseVerificationUrlChoicesArray; -@property (nonatomic, copy) NSString *overridenBaseUrl; -@property (nonatomic, copy) NSString *overridenGdprUrl; -@property (nonatomic, copy) NSString *overridenSubscriptionUrl; -@property (nonatomic, copy) NSString *overridenPurchaseVerificationUrl; +@property (nonatomic, copy) NSString *urlOverwrite; @property (nonatomic, assign) BOOL wasLastAttemptSuccess; @@ -72,17 +82,15 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo _extraPath = extraPath ?: @""; - _baseUrlChoicesArray = [ADJUrlStrategy baseUrlChoicesWithUrlStrategyInfo:urlStrategyInfo]; + _baseUrlAnalyticsChoicesArray = [ADJUrlStrategy baseUrlAnalyticsChoicesWithUrlStrategyInfo:urlStrategyInfo]; + _baseUrlConsentChoicesArray = [ADJUrlStrategy baseUrlConsentChoicesWithUrlStrategyInfo:urlStrategyInfo]; _gdprUrlChoicesArray = [ADJUrlStrategy gdprUrlChoicesWithUrlStrategyInfo:urlStrategyInfo]; _subscriptionUrlChoicesArray = [ADJUrlStrategy subscriptionUrlChoicesWithUrlStrategyInfo:urlStrategyInfo]; _purchaseVerificationUrlChoicesArray = [ADJUrlStrategy purchaseVerificationUrlChoicesWithUrlStrategyInfo:urlStrategyInfo]; - _overridenBaseUrl = [ADJAdjustFactory baseUrl]; - _overridenGdprUrl = [ADJAdjustFactory gdprUrl]; - _overridenSubscriptionUrl = [ADJAdjustFactory subscriptionUrl]; - _overridenPurchaseVerificationUrl = [ADJAdjustFactory purchaseVerificationUrl]; + _urlOverwrite = [ADJAdjustFactory urlOverwrite]; _wasLastAttemptSuccess = NO; _choiceIndex = 0; @@ -91,23 +99,43 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo return self; } -+ (NSArray *)baseUrlChoicesWithUrlStrategyInfo:(NSString *)urlStrategyInfo { ++ (NSArray *)baseUrlAnalyticsChoicesWithUrlStrategyInfo:(NSString *)urlStrategyInfo { + if ([urlStrategyInfo isEqualToString:ADJUrlStrategyIndia]) { + return @[baseUrlIndiaAnalytics, baseUrlAnalytics]; + } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyChina]) { + return @[baseUrlChinaAnalytics, baseUrlAnalytics]; + } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) { + return @[baseUrlCnAnalytics, baseUrlAnalytics]; + } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCnOnly]) { + return @[baseUrlCnAnalytics]; + } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) { + return @[baseUrlEUAnalytics]; + } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) { + return @[baseUrlTRAnalytics]; + } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyUS]) { + return @[baseUrlUSAnalytics]; + } else { + return @[baseUrlAnalytics, baseUrlIndiaAnalytics, baseUrlChinaAnalytics]; + } +} + ++ (NSArray *)baseUrlConsentChoicesWithUrlStrategyInfo:(NSString *)urlStrategyInfo { if ([urlStrategyInfo isEqualToString:ADJUrlStrategyIndia]) { - return @[baseUrlIndia, baseUrl]; + return @[baseUrlIndiaConsent, baseUrlConsent]; } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyChina]) { - return @[baseUrlChina, baseUrl]; + return @[baseUrlChinaConsent, baseUrlConsent]; } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) { - return @[baseUrlCn, baseUrl]; + return @[baseUrlCnConsent, baseUrlConsent]; } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCnOnly]) { - return @[baseUrlCn]; + return @[baseUrlCnConsent]; } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) { - return @[baseUrlEU]; + return @[baseUrlEUConsent]; } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) { - return @[baseUrlTR]; + return @[baseUrlTRConsent]; } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyUS]) { - return @[baseUrlUS]; + return @[baseUrlUSConsent]; } else { - return @[baseUrl, baseUrlIndia, baseUrlChina]; + return @[baseUrlConsent, baseUrlIndiaConsent, baseUrlChinaConsent]; } } @@ -171,31 +199,40 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo } } -- (NSString *)getUrlHostStringByPackageKind:(ADJActivityKind)activityKind { +- (nonnull NSString *)urlForActivityKind:(ADJActivityKind)activityKind + isConsentGiven:(BOOL)isConsentGiven + withSendingParams:(NSMutableDictionary *)sendingParams { + NSString *_Nonnull urlByActivityKind = [self urlForActivityKind:activityKind + isConsentGiven:isConsentGiven]; + + if (self.urlOverwrite != nil) { + [sendingParams setObject:urlByActivityKind + forKey:testServerAdjustEndPointKey]; + + return self.urlOverwrite; + } + + return urlByActivityKind; +} + +- (nonnull NSString *)urlForActivityKind:(ADJActivityKind)activityKind + isConsentGiven:(BOOL)isConsentGiven { if (activityKind == ADJActivityKindGdpr) { - if (self.overridenGdprUrl != nil) { - return self.overridenGdprUrl; - } else { - return [self.gdprUrlChoicesArray objectAtIndex:self.choiceIndex]; - } - } else if (activityKind == ADJActivityKindSubscription) { - if (self.overridenSubscriptionUrl != nil) { - return self.overridenSubscriptionUrl; - } else { - return [self.subscriptionUrlChoicesArray objectAtIndex:self.choiceIndex]; - } - } else if (activityKind == ADJActivityKindPurchaseVerification) { - if (self.overridenPurchaseVerificationUrl != nil) { - return self.overridenPurchaseVerificationUrl; - } else { - return [self.purchaseVerificationUrlChoicesArray objectAtIndex:self.choiceIndex]; - } + return [self.gdprUrlChoicesArray objectAtIndex:self.choiceIndex]; + } + + if (activityKind == ADJActivityKindSubscription) { + return [self.subscriptionUrlChoicesArray objectAtIndex:self.choiceIndex]; + } + + if (activityKind == ADJActivityKindPurchaseVerification) { + return [self.purchaseVerificationUrlChoicesArray objectAtIndex:self.choiceIndex]; + } + + if (isConsentGiven) { + return [self.baseUrlConsentChoicesArray objectAtIndex:self.choiceIndex]; } else { - if (self.overridenBaseUrl != nil) { - return self.overridenBaseUrl; - } else { - return [self.baseUrlChoicesArray objectAtIndex:self.choiceIndex]; - } + return [self.baseUrlAnalyticsChoicesArray objectAtIndex:self.choiceIndex]; } } @@ -209,13 +246,14 @@ - (BOOL)shouldRetryAfterFailure:(ADJActivityKind)activityKind { NSUInteger choiceListSize; if (activityKind == ADJActivityKindGdpr) { - choiceListSize = [_gdprUrlChoicesArray count]; + choiceListSize = [self.gdprUrlChoicesArray count]; } else if (activityKind == ADJActivityKindSubscription) { - choiceListSize = [_subscriptionUrlChoicesArray count]; + choiceListSize = [self.subscriptionUrlChoicesArray count]; } else if (activityKind == ADJActivityKindPurchaseVerification) { - choiceListSize = [_purchaseVerificationUrlChoicesArray count]; + choiceListSize = [self.purchaseVerificationUrlChoicesArray count]; } else { - choiceListSize = [_baseUrlChoicesArray count]; + // baseUrlConsentChoicesArray or baseUrlAnalyticsChoicesArray should be of equal size + choiceListSize = [self.baseUrlConsentChoicesArray count]; } NSUInteger nextChoiceIndex = (self.choiceIndex + 1) % choiceListSize; diff --git a/ios/Adjust/ADJUtil.h b/ios/Adjust/ADJUtil.h index 733d6134..5b3ed899 100644 --- a/ios/Adjust/ADJUtil.h +++ b/ios/Adjust/ADJUtil.h @@ -141,4 +141,9 @@ typedef void (^isInactiveInjected)(BOOL); + (NSMutableDictionary *)deepCopyOfDictionary:(NSDictionary *)dictionary; ++ (BOOL)shouldUseConsentParamsForActivityKind:(ADJActivityKind)activityKind; + ++ (BOOL)shouldUseConsentParamsForActivityKind:(ADJActivityKind)activityKind + andAttStatus:(nullable NSString *)attStatusString; + @end diff --git a/ios/Adjust/ADJUtil.m b/ios/Adjust/ADJUtil.m index b0a3646b..239ef445 100644 --- a/ios/Adjust/ADJUtil.m +++ b/ios/Adjust/ADJUtil.m @@ -35,7 +35,7 @@ static NSRegularExpression *shortUniversalLinkRegex = nil; static NSRegularExpression *excludedDeeplinkRegex = nil; -static NSString * const kClientSdk = @"ios4.37.2"; +static NSString * const kClientSdk = @"ios4.38.0"; static NSString * const kDeeplinkParam = @"deep_link="; static NSString * const kSchemeDelimiter = @"://"; static NSString * const kDefaultScheme = @"AdjustUniversalScheme"; @@ -1033,6 +1033,10 @@ + (BOOL)trackingEnabled { } + (NSString *)idfa { + if (ADJAdjustFactory.idfa != nil) { + return ADJAdjustFactory.idfa; + } + #if ADJUST_NO_IDFA return @""; #else @@ -1183,6 +1187,10 @@ + (NSUInteger)startedAt { } + (int)attStatus { + if (ADJAdjustFactory.attStatus != nil) { + return ADJAdjustFactory.attStatus.intValue; + } + Class appTrackingClass = [self appTrackingManager]; if (appTrackingClass != nil) { NSString *keyAuthorization = [NSString adjJoin:@"tracking", @"authorization", @"status", nil]; @@ -1438,4 +1446,36 @@ + (NSMutableDictionary *)deepCopyOfDictionary:(NSMutableDictionary *)dictionary return deepCopy; } ++ (BOOL)shouldUseConsentParamsForActivityKind:(ADJActivityKind)activityKind { + if (@available(iOS 14.0, tvOS 14.0, *)) { + if (activityKind == ADJActivityKindGdpr || + activityKind == ADJActivityKindSubscription || + activityKind == ADJActivityKindPurchaseVerification) { + return NO; + } + + int attStatus = [ADJUtil attStatus]; + return attStatus == 3; + } else { + // if iOS lower than 14 can assume consent + return YES; + } +} + ++ (BOOL)shouldUseConsentParamsForActivityKind:(ADJActivityKind)activityKind + andAttStatus:(nullable NSString *)attStatusString { + if (@available(iOS 14.0, tvOS 14.0, *)) { + if (activityKind == ADJActivityKindGdpr || + activityKind == ADJActivityKindSubscription || + activityKind == ADJActivityKindPurchaseVerification) { + return NO; + } + + return [@"3" isEqualToString:attStatusString]; + } else { + // if iOS lower than 14 can assume consent + return YES; + } +} + @end diff --git a/ios/Adjust/Adjust.h b/ios/Adjust/Adjust.h index 6c6ec0bd..47517abb 100644 --- a/ios/Adjust/Adjust.h +++ b/ios/Adjust/Adjust.h @@ -2,7 +2,7 @@ // Adjust.h // Adjust SDK // -// V4.37.2 +// V4.38.0 // Created by Christian Wellenbrock (@wellle) on 23rd July 2013. // Copyright (c) 2012-2021 Adjust GmbH. All rights reserved. // @@ -21,15 +21,14 @@ typedef void(^AdjustResolvedDeeplinkBlock)(NSString * _Nonnull resolvedLink); @interface AdjustTestOptions : NSObject -@property (nonatomic, copy, nullable) NSString *baseUrl; -@property (nonatomic, copy, nullable) NSString *gdprUrl; -@property (nonatomic, copy, nullable) NSString *subscriptionUrl; -@property (nonatomic, copy, nullable) NSString *purchaseVerificationUrl; +@property (nonatomic, copy, nullable) NSString *urlOverwrite; @property (nonatomic, copy, nullable) NSString *extraPath; @property (nonatomic, copy, nullable) NSNumber *timerIntervalInMilliseconds; @property (nonatomic, copy, nullable) NSNumber *timerStartInMilliseconds; @property (nonatomic, copy, nullable) NSNumber *sessionIntervalInMilliseconds; @property (nonatomic, copy, nullable) NSNumber *subsessionIntervalInMilliseconds; +@property (nonatomic, copy, nullable) NSNumber *attStatusInt; +@property (nonatomic, copy, nullable) NSString *idfa; @property (nonatomic, assign) BOOL teardown; @property (nonatomic, assign) BOOL deleteState; @property (nonatomic, assign) BOOL noBackoffWait; diff --git a/ios/Adjust/Adjust.m b/ios/Adjust/Adjust.m index 24472d61..fb3e52de 100644 --- a/ios/Adjust/Adjust.m +++ b/ios/Adjust/Adjust.m @@ -728,17 +728,8 @@ - (void)setTestOptions:(AdjustTestOptions *)testOptions { if (testOptions.extraPath != nil) { self.savedPreLaunch.extraPath = testOptions.extraPath; } - if (testOptions.baseUrl != nil) { - [ADJAdjustFactory setBaseUrl:testOptions.baseUrl]; - } - if (testOptions.gdprUrl != nil) { - [ADJAdjustFactory setGdprUrl:testOptions.gdprUrl]; - } - if (testOptions.subscriptionUrl != nil) { - [ADJAdjustFactory setSubscriptionUrl:testOptions.subscriptionUrl]; - } - if (testOptions.purchaseVerificationUrl != nil) { - [ADJAdjustFactory setPurchaseVerificationUrl:testOptions.purchaseVerificationUrl]; + if (testOptions.urlOverwrite != nil) { + [ADJAdjustFactory setUrlOverwrite:testOptions.urlOverwrite]; } if (testOptions.timerIntervalInMilliseconds != nil) { NSTimeInterval timerIntervalInSeconds = [testOptions.timerIntervalInMilliseconds intValue] / 1000.0; @@ -756,6 +747,12 @@ - (void)setTestOptions:(AdjustTestOptions *)testOptions { NSTimeInterval subsessionIntervalInSeconds = [testOptions.subsessionIntervalInMilliseconds intValue] / 1000.0; [ADJAdjustFactory setSubsessionInterval:subsessionIntervalInSeconds]; } + if (testOptions.attStatusInt != nil) { + [ADJAdjustFactory setAttStatus:testOptions.attStatusInt]; + } + if (testOptions.idfa != nil) { + [ADJAdjustFactory setIdfa:testOptions.idfa]; + } if (testOptions.noBackoffWait) { [ADJAdjustFactory setSdkClickHandlerBackoffStrategy:[ADJBackoffStrategy backoffStrategyWithType:ADJNoWait]]; [ADJAdjustFactory setPackageHandlerBackoffStrategy:[ADJBackoffStrategy backoffStrategyWithType:ADJNoWait]]; diff --git a/ios/Adjust/PrivacyInfo.xcprivacy b/ios/Adjust/PrivacyInfo.xcprivacy new file mode 100644 index 00000000..710a42d1 --- /dev/null +++ b/ios/Adjust/PrivacyInfo.xcprivacy @@ -0,0 +1,80 @@ + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + https://consent.adjust.com + https://consent.adjust.net.in + https://consent.adjust.world + https://consent.adjust.cn + https://consent.eu.adjust.com + https://consent.tr.adjust.com + https://consent.us.adjust.com + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryFileTimestamp + NSPrivacyAccessedAPITypeReasons + + C617.1 + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + NSPrivacyCollectedDataTypeDeviceID + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + NSPrivacyCollectedDataTypePurposeAnalytics + NSPrivacyCollectedDataTypePurposeAppFunctionality + + + + NSPrivacyCollectedDataType + NSPrivacyCollectedDataTypeAdvertisingData + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + NSPrivacyCollectedDataTypePurposeThirdPartyAdvertising + NSPrivacyCollectedDataTypePurposeDeveloperAdvertising + + + + NSPrivacyCollectedDataType + NSPrivacyCollectedDataTypeProductInteraction + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + NSPrivacyCollectedDataTypePurposeAnalytics + NSPrivacyCollectedDataTypePurposeAppFunctionality + NSPrivacyCollectedDataTypePurposeProductPersonalization + + + + + diff --git a/ios/Adjust/include/Adjust.h b/ios/Adjust/include/Adjust.h index 6c6ec0bd..47517abb 100644 --- a/ios/Adjust/include/Adjust.h +++ b/ios/Adjust/include/Adjust.h @@ -2,7 +2,7 @@ // Adjust.h // Adjust SDK // -// V4.37.2 +// V4.38.0 // Created by Christian Wellenbrock (@wellle) on 23rd July 2013. // Copyright (c) 2012-2021 Adjust GmbH. All rights reserved. // @@ -21,15 +21,14 @@ typedef void(^AdjustResolvedDeeplinkBlock)(NSString * _Nonnull resolvedLink); @interface AdjustTestOptions : NSObject -@property (nonatomic, copy, nullable) NSString *baseUrl; -@property (nonatomic, copy, nullable) NSString *gdprUrl; -@property (nonatomic, copy, nullable) NSString *subscriptionUrl; -@property (nonatomic, copy, nullable) NSString *purchaseVerificationUrl; +@property (nonatomic, copy, nullable) NSString *urlOverwrite; @property (nonatomic, copy, nullable) NSString *extraPath; @property (nonatomic, copy, nullable) NSNumber *timerIntervalInMilliseconds; @property (nonatomic, copy, nullable) NSNumber *timerStartInMilliseconds; @property (nonatomic, copy, nullable) NSNumber *sessionIntervalInMilliseconds; @property (nonatomic, copy, nullable) NSNumber *subsessionIntervalInMilliseconds; +@property (nonatomic, copy, nullable) NSNumber *attStatusInt; +@property (nonatomic, copy, nullable) NSString *idfa; @property (nonatomic, assign) BOOL teardown; @property (nonatomic, assign) BOOL deleteState; @property (nonatomic, assign) BOOL noBackoffWait; diff --git a/plugins/oaid/android/libs/adjust-android-oaid.jar b/plugins/oaid/android/libs/adjust-android-oaid.jar index 961f376376b9ae0b8db118e0a499ed3ffccf3230..9c0e57711b4a0076258f7e17162e0892116e858c 100644 GIT binary patch delta 241 zcmZqoZujO5@MdNaVPN3kV8~csJ&{+98AO?RfvILiFtuC*OkL6eQIi=N4MFr~Q^w_t zV8(r>K4vhZfNdv)p~KY+k=nzZ&jFUw6X9V2Gi)W2A!-&&KVk)mOzu!L0n_^x?ZGso zl0KL=Rx$(AIZ9SwdZiLX{z$j E01;AG_y7O^ delta 241 zcmZqoZujO5@MdNaVPN3kU}$eHoye=k45G}uz*Ms$m|Cs@rY`A#sL70sh9G*gDdTcR zFylT`A2XOyz_t^@(BbNZNbTXy=KxFTiSV$18MYG15H*XXAF+Z&CU+>Bfa(2;_F$S( zNgqrbE17}m93?9-y;2Dx|60ix%(qtd2h+XE!C?BaasZe%Q}G1TO)3!a8!CZdzK&`% E03%3MAxmMRs2UBLhPRP?&1ZGU0 zrg0A}Q?6;w3|6{P=QdcNUw4-{Sir~C04z}N>I*UTyn6=N)Xi2tSDC>6m2bKFteBmF zp_!k7K_Bd!1+H9^4H88+2l>~sgH5>XG(f1(}ihV0w0> z8JNBjX$_`@qJqG5dK5UMCvS=J1M^v7WFNIm;3t=6_F! O0*i+vI)mw1iE#jSimSt4v`3%C}s7R?N=8 z(9F-kpbz%V0#~ld28p7ZgZyjR!KPdaGX(;vwpG$J>GVf8v9|bWj4soMj0R^S>uV OfyF}-ox$|1#5e%h49my> From 749f3d80f22925b0642fbee214f3721e90bb5a42 Mon Sep 17 00:00:00 2001 From: uerceg Date: Wed, 27 Mar 2024 23:30:01 +0100 Subject: [PATCH 4/5] test: update testing flow --- android/libs/adjust-android.jar | Bin 283460 -> 283460 bytes ios/AdjustSdk.m | 36 ++++------ .../oaid/android/libs/adjust-android-oaid.jar | Bin 9607 -> 9607 bytes test/app/App.js | 20 ++---- test/app/command_executor.js | 64 ++++++++---------- test/lib/android/libs/adjust-test-library.jar | Bin 25080 -> 25080 bytes 6 files changed, 48 insertions(+), 72 deletions(-) diff --git a/android/libs/adjust-android.jar b/android/libs/adjust-android.jar index 5ac224c9bef5e00645cab77bf1d260371aa54e85..26b847567fe62525ff75add24ab704df44972e76 100644 GIT binary patch delta 4007 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 delta 4007 zcmXX}cU)Ch5`L#pM7r>hB8XCzjtEG#Pz0%hD0Z`o#-ECX-F59~(6~`Sl&h|Vth?BL ziiqL5wl(-HSk@AaU81p|D2T=qP2%2}dH=jQ^UcgR<;*>(p~lWoV`rJ2E~JA_XKt=5 zs;#i}<=SsVI{cRQfZrN__`MRS{T^WETod&c!V6`HNe;Izs+~7{RNU6m7OvCfnkXFy zxn8lbk^1^0X0Oq!*5U@r6;@SF5Z&Fo8|n$Z&L|80=XV19W>_!-*{RP4#JBeiK>bRj z9qNyw_kpZj7yA+1%Hw`O^TY&uJJ9E5-$8v?ZUM^Lp+RPVHy6%8nLS~y73k+@bK4{-|p~4i)37enS^{!UVOen`k8PiRg*H8W72}7gX!6h~?G~>|9j??cfu;-o+ukUN{9BQHAMmx5!<5nH!D7?#2j=3Ku@m{?~)Q!5R`M=>xhnMiFH$1#g z{A1gmZ@aA-CL)ni>mkkR?>&0NFv`s7W$6ZO8&+uB;3d54e|fSSX{(?8fs?5IH4ybn zpW;#4{DG5MZ(tGHM85mPjsdJ57VIh>R-3XUs8hXe#{3ZZ+=&fCq@Xi1u>jK;M;3<2 zT0Q$2Hdg&hBAbuM+x~2o1Y}t<`;97$Ir}VcmbUYqgO$q$rdNt{rIlKj%1YrT)riro zH>`v*;S2T#fPz1@`uwSFo5JE+q^+Rky#gE6CseH@3_Kkdnph--x&^Wu0MtRsWT&K;U>M zgbv@ghCVi6QJYq=YVcL2ma`Uc&9Bg0;jnKV!<|%Gt5_QVcNF#vX-{urIe2j1!mi?Q zUVh6?B68qg3_lDtWhcu+nk{?SOl-||FH45OsKe`74w!cAX>w8Jb5{r+*34Z_2N%T*nHGyR!Fy(@n+Y%joQv1rjJ3f zijrpPMaH+&ClQ)P|YHjRQRPj%!Dns+|__BX~2X%lJf$3;ddg<6*+zc{R;% z;l=FWY1(C6pu18dR`W&Z(ooLZa0hGF^T9aujt%@Kc65FdUkpF-{Bn_yl)HW|NaV41Jj;G3r`YZVWmoT3*Z0h8=(6AZ_* z=Z$y_LCV^<;sdyR^G=LKmY45E1AXC+=BX+Dw56J;Tq)zO>iLf%9Y~a}zYBcv%>NL{ z0DPA%>75Sd(w_Fwt?AR9_a-`Bz9sCjw>n2kb9~(vTF77|skM~w7fE?yDHB2ZS;-KP zg;o+?cBRrv#(=zRC38V~S<7)C%dAPiZInSaawy`5b#$$2v6@RXM=vC zC(TFiCBFo{)Qjf$&`XX5eW1520J+(l?)S4d%_rMOrU1UthxkAFP+i%+#6c1 zINy)x8vH2S%wHx!c&5J`2C~LqP6lb)i_*;QMP)Vhl7)bK_m=SCE30}FPg`&DA09yV zg8`(w2U0nU1F6kBfrKXoQCVAqh{rUT+ME91Qk=P|}x% zQeC$~sm|Cix`y&F>hrNtj}9k&bvX6g98T*K+lTUQ?n6AU`_OtPMv(vd2+H#!Lgtyn zzucd$v9eU!Q>9)R)0e(nr7vyB^S*Qg;gKZgM^dVbkwn!aiu_8VsKllyIUHK)8BL@A zGMYx;7%fKw?%9vNu$ld6ROk8;k4Fsg%!;AXnqmldkEJiBIF?3zK9)uj6h|AsAddX5 z#!-Hsc&c+oJn=QgQ$G6y@+(Rpzat4WBG*L1ixcUJ{+B4>zjlgifAX8rpX`SI#OE}C z@Tmi2G5Fmx>Y)S4uWTUs-5MxUaSnrI3CK-@D6VY~%`YK|@^4Eb|JO+rpOQ@dZcHY< zEt%~7Q>eaeDb!DU3fTvxl7Cey`8`V|Jbp0g6@y8CGMM@bPow);l}2&RX;fEuI?c5z zo%~zV2~QY8^_CBz`L_-+;u++(E`#zs%^<$$Ou|=Z(tW?or2FWbMfdep7WMr&OMU@! mNz10V&Dj*!kxl;na;V=8ImF+ZL-xd6(kpYRj;FbD^#1{%d8?=Z diff --git a/ios/AdjustSdk.m b/ios/AdjustSdk.m index 0577c3ec..aa80c919 100644 --- a/ios/AdjustSdk.m +++ b/ios/AdjustSdk.m @@ -766,28 +766,10 @@ @implementation AdjustSdk testOptions.deleteState = [value boolValue]; } } - if ([dict objectForKey:@"baseUrl"]) { - NSString *value = dict[@"baseUrl"]; + if ([dict objectForKey:@"urlOverwrite"]) { + NSString *value = dict[@"urlOverwrite"]; if ([self isFieldValid:value]) { - testOptions.baseUrl = value; - } - } - if ([dict objectForKey:@"gdprUrl"]) { - NSString *value = dict[@"gdprUrl"]; - if ([self isFieldValid:value]) { - testOptions.gdprUrl = value; - } - } - if ([dict objectForKey:@"subscriptionUrl"]) { - NSString *value = dict[@"subscriptionUrl"]; - if ([self isFieldValid:value]) { - testOptions.subscriptionUrl = value; - } - } - if ([dict objectForKey:@"purchaseVerificationUrl"]) { - NSString *value = dict[@"purchaseVerificationUrl"]; - if ([self isFieldValid:value]) { - testOptions.purchaseVerificationUrl = value; + testOptions.urlOverwrite = value; } } if ([dict objectForKey:@"extraPath"]) { @@ -838,6 +820,18 @@ @implementation AdjustSdk testOptions.adServicesFrameworkEnabled = [value boolValue]; } } + if ([dict objectForKey:@"attStatus"]) { + NSString *value = dict[@"attStatus"]; + if ([self isFieldValid:value]) { + testOptions.attStatusInt = [NSNumber numberWithInt:[value intValue]]; + } + } + if ([dict objectForKey:@"idfa"]) { + NSString *value = dict[@"idfa"]; + if ([self isFieldValid:value]) { + testOptions.idfa = value; + } + } [Adjust setTestOptions:testOptions]; } diff --git a/plugins/oaid/android/libs/adjust-android-oaid.jar b/plugins/oaid/android/libs/adjust-android-oaid.jar index 9c0e57711b4a0076258f7e17162e0892116e858c..ee51b4b419cba580c1158a6050998633c655fb87 100644 GIT binary patch delta 211 zcmZqoZujO1@MdNaVPN3kV3@LDB9A%~kTmrMkxfbH#CoviU$;~E=D;Poa zJ*IwU5S`Dq3ruTs^?}8Aa~E)c#C1h@SwOUnL<(4bk@RC$Ab)bZqA7^lr|1BrCMg+! zI7Uk5ASzqQ8bqy70!dANrQ`>qtds*lRF859hkfuttCQt|^)R>}b&sz*5lL_Jat1W~3cULdMb1uS@7B?!dRR*eAw DnN3P& diff --git a/test/app/App.js b/test/app/App.js index bc865bb6..8db4e9a4 100644 --- a/test/app/App.js +++ b/test/app/App.js @@ -47,30 +47,22 @@ const App: () => React$Node = () => { AdjustSdkTestEmitter = new NativeEventEmitter(NativeModules.ASTEventEmitter); } - var baseUrl = ""; - var gdprUrl = ""; - var subscriptionUrl = ""; - var ipAddress = "192.168.8.64"; + var urlOverwrite = ""; + var ipAddress = "192.168.86.53"; if (Platform.OS === "android") { - baseUrl = "https://" + ipAddress + ":8443"; - gdprUrl = "https://" + ipAddress + ":8443"; - subscriptionUrl = "https://" + ipAddress + ":8443"; - purchaseVerificationUrl = "https://" + ipAddress + ":8443"; + urlOverwrite = "https://" + ipAddress + ":8443"; } else if (Platform.OS === "ios") { - baseUrl = "http://" + ipAddress + ":8080"; - gdprUrl = "http://" + ipAddress + ":8080"; - subscriptionUrl = "http://" + ipAddress + ":8080"; - purchaseVerificationUrl = "http://" + ipAddress + ":8080"; + urlOverwrite = "http://" + ipAddress + ":8080"; } var controlUrl = "ws://" + ipAddress + ":1987"; // AdjustSdkTest.addTestDirectory("purchase-verification"); // AdjustSdkTest.addTest("Test_AdRevenue_ad_revenue_v2"); Adjust.getSdkVersion(function(sdkVersion) { - AdjustSdkTest.startTestSession(baseUrl, controlUrl, sdkVersion); + AdjustSdkTest.startTestSession(urlOverwrite, controlUrl, sdkVersion); }); - const commandExecutor = new CommandExecutor(baseUrl, gdprUrl, subscriptionUrl, purchaseVerificationUrl); + const commandExecutor = new CommandExecutor(urlOverwrite); emitterSubscription = AdjustSdkTestEmitter.addListener('command', (json) => { const className = json["className"]; const functionName = json["functionName"]; diff --git a/test/app/command_executor.js b/test/app/command_executor.js index ac562485..97cb027b 100644 --- a/test/app/command_executor.js +++ b/test/app/command_executor.js @@ -45,8 +45,8 @@ function AdjustCommand(functionName, params, order) { this.order = order; }; -export function CommandExecutor(baseUrl, gdprUrl, subscriptionUrl, purchaseVerificationUrl) { - this.adjustCommandExecutor = new AdjustCommandExecutor(baseUrl, gdprUrl, subscriptionUrl, purchaseVerificationUrl); +export function CommandExecutor(urlOverwrite) { + this.adjustCommandExecutor = new AdjustCommandExecutor(urlOverwrite); }; CommandExecutor.prototype.scheduleCommand = function(className, functionName, params, order) { @@ -58,16 +58,9 @@ CommandExecutor.prototype.scheduleCommand = function(className, functionName, pa } }; -function AdjustCommandExecutor(baseUrl, gdprUrl, subscriptionUrl, purchaseVerificationUrl) { - this.baseUrl = baseUrl; - this.gdprUrl = gdprUrl; - this.subscriptionUrl = subscriptionUrl; - this.purchaseVerificationUrl = purchaseVerificationUrl; +function AdjustCommandExecutor(urlOverwrite) { + this.urlOverwrite = urlOverwrite; this.extraPath = null; - this.basePath = null; - this.gdprPath = null; - this.subscriptionPath = null; - this.purchaseVerificationPath = null; this.savedEvents = {}; this.savedConfigs = {}; this.savedCommands = []; @@ -155,17 +148,10 @@ AdjustCommandExecutor.prototype.executeCommand = function(command, idx) { AdjustCommandExecutor.prototype.testOptions = function(params) { var testOptions = new AdjustTestOptions(); - testOptions.baseUrl = this.baseUrl; - testOptions.gdprUrl = this.gdprUrl; - testOptions.subscriptionUrl = this.subscriptionUrl; - testOptions.purchaseVerificationUrl = this.purchaseVerificationUrl; + testOptions.urlOverwrite = this.urlOverwrite; if ('basePath' in params) { this.extraPath = getFirstParameterValue(params, 'basePath'); - this.basePath = getFirstParameterValue(params, 'basePath'); - this.gdprPath = getFirstParameterValue(params, 'basePath'); - this.subscriptionPath = getFirstParameterValue(params, 'basePath'); - this.purchaseVerificationPath = getFirstParameterValue(params, 'basePath'); } if ('timerInterval' in params) { testOptions.timerIntervalInMilliseconds = getFirstParameterValue(params, 'timerInterval').toString(); @@ -185,6 +171,12 @@ AdjustCommandExecutor.prototype.testOptions = function(params) { if ('adServicesFrameworkEnabled' in params) { testOptions.adServicesFrameworkEnabled = getFirstParameterValue(params, 'adServicesFrameworkEnabled').toString() === 'true'; } + if ('attStatus' in params) { + testOptions.attStatus = getFirstParameterValue(params, 'attStatus').toString(); + } + if ('idfa' in params) { + testOptions.idfa = getFirstParameterValue(params, 'idfa').toString(); + } var useTestConnectionOptions = false; if ('teardown' in params) { var teardownOptions = getValueFromKey(params, 'teardown'); @@ -194,10 +186,6 @@ AdjustCommandExecutor.prototype.testOptions = function(params) { if ('resetSdk' === option) { testOptions.teardown = true; testOptions.extraPath = this.extraPath; - testOptions.basePath = this.basePath; - testOptions.gdprPath = this.gdprPath; - testOptions.subscriptionPath = this.subscriptionPath; - testOptions.purchaseVerificationPath = this.purchaseVerificationPath; testOptions.useTestConnectionOptions = true; useTestConnectionOptions = true; Adjust.teardown('test'); @@ -218,10 +206,6 @@ AdjustCommandExecutor.prototype.testOptions = function(params) { if ('sdk' === option) { testOptions.teardown = true; testOptions.extraPath = null; - testOptions.basePath = null; - testOptions.gdprPath = null; - testOptions.subscriptionPath = null; - testOptions.purchaseVerificationPath = null; testOptions.useTestConnectionOptions = false; Adjust.teardown('test'); } @@ -398,6 +382,12 @@ AdjustCommandExecutor.prototype.config = function(params) { } } + if ('attConsentWaitingSeconds' in params) { + var attConsentWaitingSecondsS = getFirstParameterValue(params, 'attConsentWaitingSeconds'); + var attConsentWaitingSeconds = parseFloat(attConsentWaitingSecondsS); + adjustConfig.setAttConsentWaitingInterval(attConsentWaitingSeconds); + } + if ('userAgent' in params) { var userAgent = getFirstParameterValue(params, 'userAgent'); adjustConfig.setUserAgent(userAgent); @@ -419,7 +409,7 @@ AdjustCommandExecutor.prototype.config = function(params) { AdjustSdkTest.addInfoToSend("costCurrency", attribution.costCurrency); AdjustSdkTest.addInfoToSend("fbInstallReferrer", attribution.fbInstallReferrer); - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } @@ -433,7 +423,7 @@ AdjustCommandExecutor.prototype.config = function(params) { AdjustSdkTest.addInfoToSend("jsonResponse", sessionSuccess.jsonResponse.toString()); } - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } @@ -448,7 +438,7 @@ AdjustCommandExecutor.prototype.config = function(params) { AdjustSdkTest.addInfoToSend("jsonResponse", sessionFailed.jsonResponse.toString()); } - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } @@ -464,7 +454,7 @@ AdjustCommandExecutor.prototype.config = function(params) { AdjustSdkTest.addInfoToSend("jsonResponse", eventSuccess.jsonResponse.toString()); } - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } @@ -481,7 +471,7 @@ AdjustCommandExecutor.prototype.config = function(params) { AdjustSdkTest.addInfoToSend("jsonResponse", eventFailed.jsonResponse.toString()); } - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } @@ -492,7 +482,7 @@ AdjustCommandExecutor.prototype.config = function(params) { adjustConfig.setShouldLaunchDeeplink(launchDeferredDeeplink); adjustConfig.setDeferredDeeplinkCallbackListener(function(deeplink) { AdjustSdkTest.addInfoToSend("deeplink", deeplink.uri); - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } }; @@ -923,7 +913,7 @@ AdjustCommandExecutor.prototype.getLastDeeplink = function(params) { var _this = this; Adjust.getLastDeeplink(function(lastDeeplink) { AdjustSdkTest.addInfoToSend('last_deeplink', lastDeeplink); - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } }; @@ -939,7 +929,7 @@ AdjustCommandExecutor.prototype.verifyPurchase = function(params) { AdjustSdkTest.addInfoToSend('verification_status', verificationInfo.verificationStatus); AdjustSdkTest.addInfoToSend('code', verificationInfo.code); AdjustSdkTest.addInfoToSend('message', verificationInfo.message); - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } else if (Platform.OS === "android") { var productId = getFirstParameterValue(params, 'productId'); @@ -950,7 +940,7 @@ AdjustCommandExecutor.prototype.verifyPurchase = function(params) { AdjustSdkTest.addInfoToSend('verification_status', verificationInfo.verificationStatus); AdjustSdkTest.addInfoToSend('code', verificationInfo.code); AdjustSdkTest.addInfoToSend('message', verificationInfo.message); - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); } }; @@ -960,7 +950,7 @@ AdjustCommandExecutor.prototype.processDeeplink = function(params) { var _this = this; Adjust.processDeeplink(deeplink, function(resolvedLink) { AdjustSdkTest.addInfoToSend('resolved_link', resolvedLink); - AdjustSdkTest.sendInfoToServer(_this.basePath); + AdjustSdkTest.sendInfoToServer(_this.extraPath); }); }; diff --git a/test/lib/android/libs/adjust-test-library.jar b/test/lib/android/libs/adjust-test-library.jar index 0e374a84bea784281b530532b645a3216dbfbab5..a6e9c998664b00b6e5cc7dc4170c2e510dc12a95 100644 GIT binary patch delta 435 zcmexynDNJ9MxFp~W)=|!1`ZB}NgF2es51dcQ*RL2qy!?DX@ba$dO&hBBjaI45Pgj4 zKbStwGLZ?yk7BEa>Rgn(J^2R8)CqMjIqfeC26riAZk~vFNordO94^&agiYE wRGd4A5{?f8QQ7feCA;G7LA>AbAs{L+0jzy#0@%!N3DF?I;6xV?H8U|D0RNb;jQ{`u delta 435 zcmexynDNJ9MxFp~W)=|!1`ZAe!}Sw+)R};!sW+4U`iV_SAaa=|h`gu=BsViM9%cm5 z$C&EkRDnLzv~_Pb!dC8xLmh#w@$4icXnExixKm6izrE6bH*0n^0_Q&>RKoT`67 z((G#KVBH1k${>33RE_%};WAANW)OFS&K(f9Pj|OCi0kcY2;$bc`hm?l=bi~NYqO=# zH85Y$e;+$Y*~Kt3kT7TX6GotqCclp`1yO2|4j{>lNCOZxE7BZ9U5>N?QG!vyASx{i zOLQEFN{J2xQQM=zf*dhmUUUpt!-g2JAY*JYNJ(035Qy3p>kFbd<5ECW zeq1DoIu+**qJ-naKvZ@-Sjnz Date: Wed, 27 Mar 2024 23:41:23 +0100 Subject: [PATCH 5/5] docs: update changelog --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29afd70c..d4680fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +### Version 4.38.0 (27th March 2024) +#### Added +- Added iOS Privacy Manifest for the Adjust SDK. +- Added new domains and corresponding payload restrictions for the Adjust SDK to direct the iOS traffic to: + - https://consent.adjust.com - for consented users + - https://analytics.adjust.com - for non-consented users + +#### Native SDKs +- [iOS@v4.38.0][ios_sdk_v4.38.0] +- [Android@v4.38.3][android_sdk_v4.38.3] + +--- + ### Version 4.37.2 (21st March 2024) #### Fixed - Fixed occasional crashes caused by not synchronized access to cached IDFA value (https://github.com/adjust/ios_sdk/issues/696). @@ -631,6 +644,7 @@ [ios_sdk_v4.35.2]: https://github.com/adjust/ios_sdk/tree/v4.35.2 [ios_sdk_v4.37.0]: https://github.com/adjust/ios_sdk/tree/v4.37.0 [ios_sdk_v4.37.2]: https://github.com/adjust/ios_sdk/tree/v4.37.2 +[ios_sdk_v4.38.0]: https://github.com/adjust/ios_sdk/tree/v4.38.0 [android_sdk_v4.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4 [android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0 @@ -667,3 +681,4 @@ [android_sdk_v4.35.1]: https://github.com/adjust/android_sdk/tree/v4.35.1 [android_sdk_v4.38.1]: https://github.com/adjust/android_sdk/tree/v4.38.1 [android_sdk_v4.38.2]: https://github.com/adjust/android_sdk/tree/v4.38.2 +[android_sdk_v4.38.3]: https://github.com/adjust/android_sdk/tree/v4.38.3