Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

converted FatalErrorBoundary to typescript #1273

Merged
merged 5 commits into from
Oct 10, 2020
Merged

converted FatalErrorBoundary to typescript #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a280bed
converted app/src/components/FatalErrorBoundary to typescript
shzmr Oct 5, 2020
752ea7a
Merged identical prop type definitions
shzmr Oct 5, 2020
5250c25
Removed @ts-expect-error from web/src/index.ts
shzmr Oct 5, 2020
8c9b3d2
Merge branch 'main' into FatalErrorBoundary-typescript
shzmr Oct 5, 2020
cfd183e
Merge branch 'main' into FatalErrorBoundary-typescript
peterp Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions .../web/src/components/FatalErrorBoundary.js → ...web/src/components/FatalErrorBoundary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
class InfallibleErrorBoundary extends React.Component {
type PropsInfallibleErrorBoundary = Partial<{
children: React.ReactNode
}>

type State = {
hasError: boolean
}

class InfallibleErrorBoundary extends React.Component<
PropsInfallibleErrorBoundary,
State
> {
state = { hasError: false }

static getDerivedStateFromError() {
Expand All @@ -14,7 +25,15 @@ class InfallibleErrorBoundary extends React.Component {
}
}

class FatalErrorBoundary extends React.Component {
type PropsFatalErrorBoundary = {
children?: React.ReactNode
page: React.ComponentType
shzmr marked this conversation as resolved.
Show resolved Hide resolved
}

class FatalErrorBoundary extends React.Component<
PropsFatalErrorBoundary,
State
> {
state = { hasError: false }

static getDerivedStateFromError() {
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export { useQuery } from '@apollo/client/react/hooks/useQuery'
export { useMutation } from '@apollo/client/react/hooks/useMutation'
export { useApolloClient } from '@apollo/client/react/hooks/useApolloClient'

// @ts-expect-error - no defs
export { default as FatalErrorBoundary } from 'src/components/FatalErrorBoundary'
// @ts-expect-error - no defs
export { default as RedwoodProvider } from 'src/components/RedwoodProvider'
Expand Down