diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ed71c00..44d866bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: echo "${{ secrets.DEV_KEYSTORE }}" > keystore.keystore.asc gpg -d --passphrase "${{ secrets.DEV_KEYSTORE_PASSPHRASE }}" --batch keystore.keystore.asc > android/app/keystore.keystore - name: Install dependencies - run: yarn install --ignore-engines + run: yarn install - name: fastlane uses: maierj/fastlane-action@v1.4.0 env: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4609ef93..490001d8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,6 +9,6 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Install dependencies - run: yarn install --ignore-engines + run: yarn install - name: Lint code run: yarn lint diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 8e8595cd..200c119d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -320,14 +320,14 @@ PODS: - React-Core - RNFS (2.16.6): - React - - RNGestureHandler (1.8.0): - - React + - RNGestureHandler (1.9.0): + - React-Core - RNKeychain (4.0.5): - React - RNPrivacySnapshot (1.0.0): - React-Core - - RNReanimated (1.13.1): - - React + - RNReanimated (1.13.2): + - React-Core - RNScreens (2.12.0): - React-Core - RNSearchBar (3.5.1): @@ -571,10 +571,10 @@ SPEC CHECKSUMS: RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f RNFileViewer: 83cc066ad795b1f986791d03b56fe0ee14b6a69f RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df - RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39 + RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b RNKeychain: 840f8e6f13be0576202aefcdffd26a4f54bfe7b5 RNPrivacySnapshot: 8eaf571478a353f2e5184f5c803164f22428b023 - RNReanimated: dd8c286ab5dd4ba36d3a7fef8bff7e08711b5476 + RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad RNScreens: 4b488fdf9537bbce829e2910c8cce1d17f6d9be8 RNSearchBar: 5ed8e13ba8a6c701fbd2afdfe4164493d24b2aee RNStoreReview: 62d6afd7c37db711a594bbffca6b0ea3a812b7a8 diff --git a/package.json b/package.json index ecb74cc3..f785f240 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "ios-dev": "react-native run-ios --scheme StandardNotesDev", "ios-prod": "react-native run-ios --scheme StandardNotes", "clear-cache": "watchman watch-del-all && rm -rf $TMPDIR/react-native-packager-cache-* && rm -rf $TMPDIR/metro-bundler-cache-*", - "init": "yarn cache clean snjs && yarn --ignore-engines && npx pod-install ios", + "init": "yarn cache clean snjs && yarn && npx pod-install ios", "lint": "npm-run-all --parallel lint:*", "lint:eslint": "yarn eslint . --ext .ts,.tsx --fix", "lint:ts": "tsc --noEmit", @@ -37,7 +37,7 @@ "react-native-fingerprint-scanner": "standardnotes/react-native-fingerprint-scanner#8f3b2df05d88350f1f704417c8b90981cec87301", "react-native-flag-secure-android": "standardnotes/react-native-flag-secure-android#cb08e74", "react-native-fs": "^2.16.6", - "react-native-gesture-handler": "^1.8.0", + "react-native-gesture-handler": "^1.9.0", "react-native-keychain": "^4.0.5", "react-native-mail": "standardnotes/react-native-mail#f7f74be", "react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904", @@ -55,7 +55,7 @@ "react-navigation-header-buttons": "^6.0.0", "sn-textview": "standardnotes/sn-textview#440dbd60eedef4397b6272735e68d4579bb41ac8", "@standardnotes/sncrypto-common": "1.2.9", - "@standardnotes/snjs": "2.0.7", + "@standardnotes/snjs": "2.0.13", "standard-notes-rn": "standardnotes/standard-notes-rn#996b016", "styled-components": "^5.2.1" }, diff --git a/yarn.lock b/yarn.lock index beb9294d..4b2044a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1366,10 +1366,10 @@ dependencies: deep-assign "^3.0.0" -"@react-native-community/cli-debugger-ui@^4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.9.0.tgz#4177764ba69243c97aa26829d59d9501acb2bd71" - integrity sha512-fBFGamHm4VUrDqkBGnsrwQL8OC6Om7K6EBQb4xj0nWekpXt1HSa3ScylYHTTWwYcpRf9htGMRGiv4dQDY/odAw== +"@react-native-community/cli-debugger-ui@^4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.13.1.tgz#07de6d4dab80ec49231de1f1fbf658b4ad39b32c" + integrity sha512-UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg== dependencies: serve-static "^1.13.1" @@ -1413,16 +1413,17 @@ plist "^3.0.1" xcode "^2.0.0" -"@react-native-community/cli-server-api@^4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.13.0.tgz#ef0e53fe0edc7356d62bca725ca47cb368f748a5" - integrity sha512-ER138ChLc1YYX7j9yE6fDm4DdNdsHThr+pla/B6iZoKje1r7TwymDdKaUvOsYalG7sWG9glW3bofcCq+Yh0Dvw== +"@react-native-community/cli-server-api@^4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.13.1.tgz#bee7ee9702afce848e9d6ca3dcd5669b99b125bd" + integrity sha512-vQzsFKD9CjHthA2ehTQX8c7uIzlI9A7ejaIow1I9RlEnLraPH2QqVDmzIdbdh5Od47UPbRzamCgAP8Bnqv3qwQ== dependencies: - "@react-native-community/cli-debugger-ui" "^4.9.0" + "@react-native-community/cli-debugger-ui" "^4.13.1" "@react-native-community/cli-tools" "^4.13.0" compression "^1.7.1" connect "^3.6.5" errorhandler "^1.5.0" + nocache "^2.1.0" pretty-format "^25.1.0" serve-static "^1.13.1" ws "^1.1.0" @@ -1445,14 +1446,14 @@ integrity sha512-ael2f1onoPF3vF7YqHGWy7NnafzGu+yp88BbFbP0ydoCP2xGSUzmZVw0zakPTC040Id+JQ9WeFczujMkDy6jYQ== "@react-native-community/cli@^4.5.1": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.13.0.tgz#04d5032f9b2b423c61ceef6be83b1bcc8a37db75" - integrity sha512-R+1VehIQ6VTLf+e7YOwzJk0F9tstfeSC4xy7oT6GSgB3FnXbTJGHFUp4siyO68Ae/gzGqt8SiUO145teWkP+ZA== + version "4.13.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.13.1.tgz#60148723e77cafe3ae260317d6bffe91853a2d20" + integrity sha512-+/TeRVToADpQPSprsPkwi9KY8x64YcuJpjzMBVISwWP+aWzsIDuWJmyMXTADlCg2EBMJqJR7bn1W/IkfzVRCWA== dependencies: "@hapi/joi" "^15.0.3" - "@react-native-community/cli-debugger-ui" "^4.9.0" + "@react-native-community/cli-debugger-ui" "^4.13.1" "@react-native-community/cli-hermes" "^4.13.0" - "@react-native-community/cli-server-api" "^4.13.0" + "@react-native-community/cli-server-api" "^4.13.1" "@react-native-community/cli-tools" "^4.13.0" "@react-native-community/cli-types" "^4.10.1" chalk "^3.0.0" @@ -1573,10 +1574,10 @@ resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.2.9.tgz#5212a959e4ec563584e42480bfd39ef129c3cbdf" integrity sha512-xJ5IUGOZztjSgNP/6XL+Ut5+q9UgSTv6xMtKkcQC5aJxCOkJy9u6RamPLdF00WQgwibxx2tu0e43bKUjTgzMig== -"@standardnotes/snjs@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.0.7.tgz#7a5fe2e6f183e1e2c695b6b7284a4ee6ae2ca893" - integrity sha512-S9h+ryQ225ekvCDwX4wFk7duic+j6644indtSLCiODo1SMflk8EQa7Q6Ier5lvBdUZJNxvZsN51iAgmIbT5BCQ== +"@standardnotes/snjs@2.0.13": + version "2.0.13" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.0.13.tgz#12efe0a1635f3cea3adbd79616262a2bea17ef14" + integrity sha512-yu97v5o25xPfdhvBhNGBhavEEO/hlVeQFcLb8cy6OVoTQrtUBpAmgcB+8DF1AMY/DJo/SDGM/DXcd/+jhjwOsw== dependencies: "@standardnotes/sncrypto-common" "^1.2.9" @@ -2863,6 +2864,13 @@ create-react-class@^15.6.3: loose-envify "^1.3.1" object-assign "^4.1.1" +cross-fetch@^3.0.4: + version "3.0.6" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c" + integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ== + dependencies: + node-fetch "2.6.1" + cross-spawn@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" @@ -3752,6 +3760,19 @@ fbjs@^1.0.0: setimmediate "^1.0.5" ua-parser-js "^0.7.18" +fbjs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165" + integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== + dependencies: + cross-fetch "^3.0.4" + fbjs-css-vars "^1.0.0" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -6369,6 +6390,16 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +nocache@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f" + integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q== + +node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -6377,11 +6408,6 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.2.0, node-fetch@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -7156,12 +7182,13 @@ react-native-fs@^2.16.6: base-64 "^0.1.0" utf8 "^3.0.0" -react-native-gesture-handler@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.8.0.tgz#18f61f51da50320f938957b0ee79bc58f47449dc" - integrity sha512-E2FZa0qZ5Bi0Z8Jg4n9DaFomHvedSjwbO2DPmUUHYRy1lH2yxXUpSrqJd6yymu+Efzmjg2+JZzsjFYA2Iq8VEQ== +react-native-gesture-handler@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.9.0.tgz#e441b1c0277c3fd4ca3e5c58fdd681e2f0ceddf0" + integrity sha512-fkkNeWDBzDdwDxDcxtYbrb9T1g0PLgT1AxBs2iO/p7uEbDbC6mIoL/NzuOnKNEBHcd0lpLoJuNmIfdmucEON5g== dependencies: "@egjs/hammerjs" "^2.0.17" + fbjs "^3.0.0" hoist-non-react-statics "^3.3.0" invariant "^2.2.4" prop-types "^15.7.2"