Skip to content

fix: correct some forthcoming eslint errors #490

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

Merged
merged 2 commits into from
Nov 16, 2021
Merged

fix: correct some forthcoming eslint errors #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08309bc
fix: correct some eslint errors
chambo-e Nov 12, 2021
966feb4
Merge branch 'master' into fix/eslint_errors
chambo-e Nov 16, 2021
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
6 changes: 3 additions & 3 deletions packages/use-dataloader/src/__tests__/DataLoaderProvider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { KEY_IS_NOT_STRING_ERROR, StatusEnum } from '../constants'
const TEST_KEY = 'test'
const PROMISE_TIMEOUT = 5
const fakePromise = () =>
new Promise(resolve => setTimeout(() => resolve(true), PROMISE_TIMEOUT))
new Promise(resolve => { setTimeout(() => resolve(true), PROMISE_TIMEOUT) })

const fakeNullPromise = () =>
new Promise(resolve => setTimeout(() => resolve(null), PROMISE_TIMEOUT))
new Promise(resolve => { setTimeout(() => resolve(null), PROMISE_TIMEOUT) })

const wrapper = ({ children }: { children: ReactNode }) => (
<DataLoaderProvider>{children}</DataLoaderProvider>
Expand Down Expand Up @@ -180,7 +180,7 @@ describe('DataLoaderProvider', () => {

test('should delay max concurrent request', async () => {
const method = jest.fn(
() => new Promise(resolve => setTimeout(() => resolve(true), 100)),
() => new Promise(resolve => { setTimeout(() => resolve(true), 100) }),
)
const { result, waitFor } = renderHook(useDataLoaderContext, {
wrapper: wrapperWith2ConcurrentRequests,
Expand Down
38 changes: 19 additions & 19 deletions packages/use-dataloader/src/__tests__/dataloader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ describe('Dataloader class', () => {
expect(notify).toBeCalledTimes(0)
expect(method).toBeCalledTimes(1)
await instance.cancel()
await new Promise(resolve =>
await new Promise(resolve => {
setTimeout(() => {
expect(notify).toBeCalledTimes(1)
resolve(true)
}, PROMISE_TIMEOUT),
)
}, PROMISE_TIMEOUT)
})
expect(instance.getData()).toBe(undefined)
instance.clearData()
})
Expand All @@ -73,12 +73,12 @@ describe('Dataloader class', () => {
expect(instance.status).toBe(StatusEnum.LOADING)
expect(notify).toBeCalledTimes(0)
expect(method).toBeCalledTimes(1)
await new Promise(resolve =>
await new Promise(resolve => {
setTimeout(() => {
expect(notify).toBeCalledTimes(1)
resolve(true)
}, PROMISE_TIMEOUT),
)
}, PROMISE_TIMEOUT)
})
expect(instance.getData()).toBe(true)
instance.getObserversCount()
instance.removeObserver(notify)
Expand All @@ -95,11 +95,11 @@ describe('Dataloader class', () => {
})
expect(instance.status).toBe(StatusEnum.LOADING)
expect(method).toBeCalledTimes(1)
await new Promise(resolve =>
await new Promise(resolve => {
setTimeout(() => {
resolve(true)
}, PROMISE_TIMEOUT),
)
}, PROMISE_TIMEOUT)
})
expect(instance.getData()).toBe(undefined)
})
test('should create instance enabled with undefined data', async () => {
Expand All @@ -111,11 +111,11 @@ describe('Dataloader class', () => {
})
expect(instance.status).toBe(StatusEnum.LOADING)
expect(method).toBeCalledTimes(1)
await new Promise(resolve =>
await new Promise(resolve => {
setTimeout(() => {
resolve(true)
}, PROMISE_TIMEOUT),
)
}, PROMISE_TIMEOUT)
})
expect(instance.getData()).toBe(undefined)
})

Expand Down Expand Up @@ -193,18 +193,18 @@ describe('Dataloader class', () => {
})
await instance.load()
expect(method).toBeCalledTimes(1)
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 3))
await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT * 3) })
expect(method).toBeCalledTimes(2)
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 3))
await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT * 3) })
expect(method).toBeCalledTimes(3)
await instance.load()
await instance.load()
await new Promise(resolve => setTimeout(resolve))
await new Promise(resolve => { setTimeout(resolve) })
expect(method).toBeCalledTimes(4)
await instance.load()
await instance.load()
await instance.load(true)
await new Promise(resolve => setTimeout(resolve))
await new Promise(resolve => { setTimeout(resolve) })
expect(method).toBeCalledTimes(6)
instance.setPollingInterval(PROMISE_TIMEOUT * 4)
instance.destroy()
Expand All @@ -222,12 +222,12 @@ describe('Dataloader class', () => {
instance.addOnSuccessListener(onSuccess)
expect(instance.status).toBe(StatusEnum.LOADING)
expect(method).toBeCalledTimes(1)
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT))
await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT) })
expect(onSuccess).toBeCalledTimes(1)
await instance.load()
expect(method).toBeCalledTimes(1)
expect(onSuccess).toBeCalledTimes(1)
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 2))
await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT * 2) })
await instance.load()
expect(method).toBeCalledTimes(2)
expect(onSuccess).toBeCalledTimes(2)
Expand All @@ -245,7 +245,7 @@ describe('Dataloader class', () => {
expect(instance.status).toBe(StatusEnum.LOADING)
}
// Because wait for setTimeout tryLaunch in dataloader.ts
await new Promise(resolve => setTimeout(resolve))
await new Promise(resolve => { setTimeout(resolve) })
expect(method).toBeCalledTimes(2)
})
})
6 changes: 3 additions & 3 deletions packages/use-dataloader/src/__tests__/useDataLoader.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ describe('useDataLoader', () => {
...initialProps,
key: 'test-3',
method: () =>
new Promise(resolve =>
setTimeout(() => resolve(null), PROMISE_TIMEOUT),
),
new Promise(resolve => {
setTimeout(() => resolve(null), PROMISE_TIMEOUT)
})
},
wrapper,
})
Expand Down
5 changes: 4 additions & 1 deletion packages/use-i18n/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
export { default } from './usei18n'
import usei18n from './usei18n'

export * from './usei18n'

export default usei18n
2 changes: 1 addition & 1 deletion packages/use-i18n/src/usei18n.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const useI18n = (): Context => {
return context
}

export const useTranslation = (namespaces: string[] = [], load?: LoadTranslationsFn): Context & { isLoaded: boolean } => {
export const useTranslation = (namespaces: string[] = [], load: LoadTranslationsFn | undefined = undefined): Context & { isLoaded: boolean } => {
const context = useContext(I18nContext)
if (context === undefined) {
throw new Error('useTranslation must be used within a I18nProvider')
Expand Down