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

Jump to bottom

Expose all timeout options (custom message, customTimers) #24

Merged
merged 11 commits into from
Jul 29, 2022
Merged

Expose all timeout options (custom message, customTimers) #24

merged 11 commits into from
Jul 29, 2022

Conversation

jopemachine
Copy link
Contributor

Fixes #20.

Relevant documentation are copy-pasted from p-timeout's documentation.

sindresorhus
sindresorhus requested changes Apr 20, 2022
View reviewed changes
index.d.ts Outdated Show resolved Hide resolved
index.d.ts Outdated Show resolved Hide resolved
readme.md Show resolved Hide resolved
readme.md Outdated Show resolved Hide resolved
readme.md Outdated Show resolved Hide resolved
test.js Outdated Show resolved Hide resolved
readme.md Outdated Show resolved Hide resolved
@sindresorhus
Copy link
Owner

// @fregante

fregante
fregante approved these changes Apr 20, 2022
View reviewed changes
index.js Outdated Show resolved Hide resolved
index.d.ts Outdated Show resolved Hide resolved
index.d.ts Outdated Show resolved Hide resolved
index.d.ts Outdated Show resolved Hide resolved
index.d.ts Outdated Show resolved Hide resolved
index.js Outdated Show resolved Hide resolved
index.js Outdated Show resolved Hide resolved
sindresorhus
sindresorhus reviewed Apr 23, 2022
View reviewed changes
index.d.ts Outdated Show resolved Hide resolved
@sindresorhus
Copy link
Owner

Can you fix the merge conflict?

@jopemachine jopemachine mentioned this pull request Jul 24, 2022
Merged
@sindresorhus
Copy link
Owner

@fregante LGTY?

fregante
fregante suggested changes Jul 28, 2022
View reviewed changes
Copy link

@fregante fregante left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a quick review, without much context, it doesn’t look right

index.js Outdated Show resolved Hide resolved
index.js Outdated Show resolved Hide resolved
index.js Outdated Show resolved Hide resolved
index.js Outdated Show resolved Hide resolved
fregante
fregante reviewed Jul 28, 2022
View reviewed changes
index.js Outdated Show resolved Hide resolved
@jopemachine
Copy link
Contributor Author

jopemachine commented Jul 28, 2022 •
edited

@fregante

I appreciate you pointing them out.
I agree with all the points you made.
I should have been looking into the code after the p-timeout API change.

@sindresorhus sindresorhus merged commit 1f5d760 into sindresorhus:main Jul 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sindresorhus sindresorhus sindresorhus approved these changes

@fregante fregante fregante approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Expose all timeout options (custom message, customTimers)
3 participants
@jopemachine @sindresorhus @fregante