forked from bluesky-social/social-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'bluesky-social:main' into main
- Loading branch information
Showing
28 changed files
with
397 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Lockfile | ||
|
|
||
| on: | ||
| pull_request: | ||
| concurrency: | ||
| group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}' | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| verify-yarn-lock: | ||
| name: No manual yarn.lock edits | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check out PR HEAD | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Fetch base branch | ||
| run: git fetch origin ${{ github.base_ref }} --depth=1 | ||
|
|
||
| - name: Install node | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version-file: .nvmrc | ||
|
|
||
| - name: Reset yarn.lock to base | ||
| run: git show "origin/${{ github.base_ref }}:yarn.lock" > yarn.lock | ||
|
|
||
| - name: Yarn install | ||
| uses: Wandalen/wretry.action@master | ||
| with: | ||
| # Fine to skip scripts since we don't run any code | ||
| command: yarn install --ignore-scripts | ||
| attempt_limit: 3 | ||
| attempt_delay: 2000 | ||
|
|
||
| - name: Verify yarn.lock | ||
| run: | | ||
| git diff --quiet --exit-code || { | ||
| echo '::error::`yarn.lock` does not match what Yarn would generate given the base `yarn.lock` and the head `package.json`.' | ||
| echo '::error:: - If this is intentional, you can ignore this check.' | ||
| echo '::error:: - If this is unintentional, apply the following diff:' | ||
| git --no-pager diff | ||
| exit 1 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| diff --git a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt | ||
| index b928b8f..7175cf6 100644 | ||
| --- a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt | ||
| +++ b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt | ||
| @@ -99,12 +99,12 @@ class MediaLibraryModule : Module() { | ||
| } | ||
|
|
||
| AsyncFunction("createAssetAsync") { localUri: String, promise: Promise -> | ||
| - throwUnlessPermissionsGranted { | ||
| + //throwUnlessPermissionsGranted { | ||
| withModuleScope(promise) { | ||
| CreateAsset(context, localUri, promise) | ||
| .execute() | ||
| } | ||
| - } | ||
| + //} | ||
| } | ||
|
|
||
| AsyncFunction("addAssetsToAlbumAsync") { assetsId: List<String>, albumId: String, copyToAlbum: Boolean, promise: Promise -> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m | ||
| index 9f20973..68d4766 100644 | ||
| --- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m | ||
| +++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m | ||
| @@ -126,7 +126,8 @@ - (void) setConfiguration:(NSDictionary *)options | ||
|
|
||
| - (UIViewController*) getRootVC { | ||
| UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController]; | ||
| - while (root.presentedViewController != nil) { | ||
| + while (root.presentedViewController != nil && | ||
| + !root.presentedViewController.isBeingDismissed) { | ||
| root = root.presentedViewController; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| const {withProjectBuildGradle} = require('@expo/config-plugins') | ||
|
|
||
| const jitpackRepository = "maven { url 'https://www.jitpack.io' }" | ||
|
|
||
| module.exports = function withAndroidNoJitpackPlugin(config) { | ||
| return withProjectBuildGradle(config, config => { | ||
| if (!config.modResults.contents.includes(jitpackRepository)) { | ||
| throw Error( | ||
| 'Expected to find the jitpack string in the config. ' + | ||
| 'You MUST verify whether it was actually removed upstream, ' + | ||
| 'or if the format has changed and this plugin no longer recognizes it.', | ||
| ) | ||
| } | ||
| config.modResults.contents = config.modResults.contents.replaceAll( | ||
| jitpackRepository, | ||
| '', | ||
| ) | ||
| return config | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,27 @@ | ||
| import {init} from '@bitdrift/react-native' | ||
| import {Statsig} from 'statsig-react-native-expo' | ||
| export {debug, error, info, warn} from '@bitdrift/react-native' | ||
| // import {init} from '@bitdrift/react-native' | ||
| // import {Statsig} from 'statsig-react-native-expo' | ||
| // export {debug, error, info, warn} from '@bitdrift/react-native' | ||
|
|
||
| import {initPromise} from './statsig/statsig' | ||
| // import {initPromise} from './statsig/statsig' | ||
|
|
||
| const BITDRIFT_API_KEY = process.env.BITDRIFT_API_KEY | ||
| // const BITDRIFT_API_KEY = process.env.BITDRIFT_API_KEY | ||
|
|
||
| initPromise.then(() => { | ||
| let isEnabled = false | ||
| try { | ||
| if (Statsig.checkGate('enable_bitdrift')) { | ||
| isEnabled = true | ||
| } | ||
| } catch (e) { | ||
| // Statsig may complain about it being called too early. | ||
| } | ||
| if (isEnabled && BITDRIFT_API_KEY) { | ||
| init(BITDRIFT_API_KEY, {url: 'https://api-bsky.bitdrift.io'}) | ||
| } | ||
| }) | ||
| // initPromise.then(() => { | ||
| // let isEnabled = false | ||
| // try { | ||
| // if (Statsig.checkGate('enable_bitdrift')) { | ||
| // isEnabled = true | ||
| // } | ||
| // } catch (e) { | ||
| // // Statsig may complain about it being called too early. | ||
| // } | ||
| // if (isEnabled && BITDRIFT_API_KEY) { | ||
| // init(BITDRIFT_API_KEY, {url: 'https://api-bsky.bitdrift.io'}) | ||
| // } | ||
| // }) | ||
|
|
||
| // TODO: Reenable when the build issue is fixed. | ||
| export function debug(_message: string) {} | ||
| export function error(_message: string) {} | ||
| export function info(_message: string) {} | ||
| export function warn(_message: string) {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.