Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
thehobbit85 committed Jul 22, 2021
2 parents 8f68f35 + 5398cbe commit 418a2c0
Show file tree
Hide file tree
Showing 180 changed files with 3,018 additions and 3,448 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**/scratch.*
/android/
/flow-typed/
/flow-typed/npm/
/ios/
/src/util/bridge/injectThisInWebView.js
/src/util/bridge/rolledUp.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ jobs:
steps:
- uses: actions/[email protected]
- name: Block WIP PR
uses: samholmes/[email protected].0
uses: samholmes/[email protected].1
114 changes: 0 additions & 114 deletions flow-typed/npm/react-redux_v5.x.x.js

This file was deleted.

2 changes: 0 additions & 2 deletions flow-typed/react-native-material-textfield.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// @flow

import * as React from 'react'

declare module 'react-native-material-textfield' {
declare export type ContentInset = {|
top?: number,
Expand Down
25 changes: 25 additions & 0 deletions flow-typed/react-redux.js.flow
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// @flow

import * as React from 'react'
import { type Store } from 'redux'

declare module 'react-redux' {
declare type ProviderProps = {
store: Store<any, any>,
children?: React.Node
}
declare function Provider(props: ProviderProps): React.Node

// See ../src/util/react-redux.js for wrapped versions of:
// connect
// useDispatch
// useState

declare type DontUse = {
useTheEdgeWrapperInstead: true
}

declare function connect(useTheEdgeWrapperInstead: DontUse): void
declare function useDispatch(useTheEdgeWrapperInstead: DontUse): void
declare function useState(useTheEdgeWrapperInstead: DontUse): void
}
Loading

0 comments on commit 418a2c0

Please sign in to comment.