diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js index d9fa61b08448..f4020ca78a7e 100644 --- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js +++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js @@ -14542,6 +14542,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) { }); spawnedProcess.on('close', (code) => { if (code !== 0) { + console.log('code: ', code); return reject(new Error(`${stderr}`)); } resolve(stdout); @@ -15368,9 +15369,9 @@ module.exports = require("zlib"); /***/ 3286: /***/ ((module) => { -function _interopRequireDefault(obj) { - return obj && obj.__esModule ? obj : { - "default": obj +function _interopRequireDefault(e) { + return e && e.__esModule ? e : { + "default": e }; } module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports; diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js index 3173dd2358eb..d2637a073c37 100644 --- a/.github/actions/javascript/getDeployPullRequestList/index.js +++ b/.github/actions/javascript/getDeployPullRequestList/index.js @@ -11825,6 +11825,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) { }); spawnedProcess.on('close', (code) => { if (code !== 0) { + console.log('code: ', code); return reject(new Error(`${stderr}`)); } resolve(stdout); diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js index aff2a13da163..2b4abda1d031 100644 --- a/.github/actions/javascript/getPreviousVersion/index.js +++ b/.github/actions/javascript/getPreviousVersion/index.js @@ -2958,6 +2958,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) { }); spawnedProcess.on('close', (code) => { if (code !== 0) { + console.log('code: ', code); return reject(new Error(`${stderr}`)); } resolve(stdout); diff --git a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts index d843caf61518..7e5cfd0bd9f9 100644 --- a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts +++ b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts @@ -1,5 +1,5 @@ import * as core from '@actions/core'; -import type {CompareResult, PerformanceEntry} from '@callstack/reassure-compare/src/types'; +import type {CompareResult, MeasureEntry} from '@callstack/reassure-compare'; import fs from 'fs'; const run = (): boolean => { @@ -16,8 +16,8 @@ const run = (): boolean => { for (let i = 0; i < regressionOutput.countChanged.length; i++) { const measurement = regressionOutput.countChanged[i]; - const baseline: PerformanceEntry = measurement.baseline; - const current: PerformanceEntry = measurement.current; + const baseline: MeasureEntry = measurement.baseline; + const current: MeasureEntry = measurement.current; console.log(`Processing measurement ${i + 1}: ${measurement.name}`); diff --git a/.github/libs/GitUtils.ts b/.github/libs/GitUtils.ts index ab4a81f96adf..89950613bc2e 100644 --- a/.github/libs/GitUtils.ts +++ b/.github/libs/GitUtils.ts @@ -135,6 +135,7 @@ function getCommitHistoryAsJSON(fromTag: string, toTag: string): Promise { if (code !== 0) { + console.log('code: ', code); return reject(new Error(`${stderr}`)); } diff --git a/.github/scripts/removeInvalidJson.rb b/.github/scripts/removeInvalidJson.rb new file mode 100755 index 000000000000..4cf2a40d4cc3 --- /dev/null +++ b/.github/scripts/removeInvalidJson.rb @@ -0,0 +1,15 @@ +#!/usr/bin/env ruby +require 'json' + +# List of JSON strings +json_strings = ARGV + +# Parse each JSON string and remove any that couldn't be parsed +valid_jsons = json_strings.select do |json_string| + begin + JSON.parse(json_string) + true + rescue JSON::ParserError + false + end +end diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh index 2c9a7dee672a..9be3f2e80205 100755 --- a/.github/scripts/verifyPodfile.sh +++ b/.github/scripts/verifyPodfile.sh @@ -68,9 +68,11 @@ if ! read_lines_into_array PODSPEC_PATHS < <(npx react-native config | jq --raw- cleanupAndExit 1 fi +PODSPECS=$(./.github/scripts/printPodspec.rb "${PODSPEC_PATHS[@]}") + # Format a list of Pods based on the output of the config command if ! FORMATTED_PODS=$( \ - jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$(./.github/scripts/printPodspec.rb "${PODSPEC_PATHS[@]}")" \ + jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$(./.github/scripts/removeInvalidJson.rb "${PODSPECS}")" \ ); then error "Error: could not parse podspecs at paths parsed from react-native config" cleanupAndExit 1 diff --git a/.gitignore b/.gitignore index aa6aad4cc429..92880fed8a5b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ DerivedData *.p12 *.mobileprovision ios-fastlane-json-key.json -ios/.xcode.env.local +**/.xcode.env.local # Android/IntelliJ # @@ -78,7 +78,7 @@ android/app/android-fastlane-json-key.json *.jsbundle # Ruby / CocoaPods -/ios/Pods/ +**/Pods/ /vendor/bundle/ # Local DEV config @@ -131,5 +131,13 @@ config/webpack/*.pem dist/ web-build/ +# Yarn +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions + # Storage location for downloaded app source maps (see scripts/symbolicate-profile.ts) .sourcemaps/ diff --git a/Gemfile b/Gemfile index d774392dbcb7..a3c25e46c4ec 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" ruby ">= 2.6.10" gem "cocoapods", "= 1.15.2" -gem "activesupport", ">= 6.1.7.3", "< 7.1.0" +gem "activesupport", ">= 6.1.7.5", "< 7.1.0" gem "fastlane", "~> 2", ">= 2.222.0" gem "xcpretty", "~> 0" diff --git a/Gemfile.lock b/Gemfile.lock index 12cae5d0eb21..022e0071a012 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,7 +292,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - activesupport (>= 6.1.7.3, < 7.1.0) + activesupport (>= 6.1.7.5, < 7.1.0) cocoapods (= 1.15.2) fastlane (~> 2, >= 2.222.0) fastlane-plugin-aws_s3 diff --git a/__mocks__/react-native-document-picker.ts b/__mocks__/react-native-document-picker.ts index 6d26a0227fc3..07e7e6d5eadb 100644 --- a/__mocks__/react-native-document-picker.ts +++ b/__mocks__/react-native-document-picker.ts @@ -26,6 +26,7 @@ const reactNativeDocumentPickerMock: ReactNativeDocumentPickerMock = { xls: 'com.microsoft.excel.xls', xlsx: 'org.openxmlformats.spreadsheetml.sheet', zip: 'public.zip-archive', + json: 'public.json', }), }; diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml index 73b37e4d9963..fd2f6544048e 100644 --- a/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -17,8 +17,8 @@ android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material" android:insetRight="@dimen/abc_edit_text_inset_horizontal_material" android:insetTop="@dimen/abc_edit_text_inset_top_material" - android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"> - + android:insetBottom="@dimen/abc_edit_text_inset_bottom_material" + >