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.

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

Merge main into integration/v2 #1544

Merged
merged 25 commits into from
Jan 11, 2024

Conversation

lawrence-forooghian
Copy link
Collaborator

@lawrence-forooghian lawrence-forooghian commented Dec 11, 2023

I’ve worked around the attw error that this introduces because I wasn’t able to solve it quickly; have created #1546 for doing so.

lawrence-forooghian and others added 22 commits November 3, 2023 13:30
Enable 'derived' options in 'useChannel' hook
The import paths here only worked before by accident - tsc would compile
then to `from '../../../ably'` which in most cases would resolve to
`node_modules/ably` however in certain environments (pnpm) this would
not be the case and therefore the types would not be imported correctly.
I've updated the tsconfig compilerOptions.paths field so that these are
resolved correctly for development, and when consumed as a library these
will just import directly from the 'ably' module.
fix: use 'ably' as import path from react-hooks
ci: check if the types are wrong
It is meant to return `null` (per TG4 and our documentation comments),
but was returning `undefined`.

Resolves #1542.
[SDK-3990] Fix `PaginatedResult.next()` behaviour when no next page
@github-actions github-actions bot temporarily deployed to staging/pull/1544/features December 11, 2023 18:50 Inactive
@github-actions github-actions bot temporarily deployed to staging/pull/1544/typedoc December 11, 2023 18:51 Inactive
@lawrence-forooghian lawrence-forooghian force-pushed the 2023-12-11-merge-main-into-v2 branch from 694babc to 105d1cf Compare December 11, 2023 18:57
@github-actions github-actions bot temporarily deployed to staging/pull/1544/features December 11, 2023 18:59 Inactive
@github-actions github-actions bot temporarily deployed to staging/pull/1544/bundle-report December 11, 2023 19:00 Inactive
@github-actions github-actions bot temporarily deployed to staging/pull/1544/typedoc December 11, 2023 19:00 Inactive
@lawrence-forooghian lawrence-forooghian force-pushed the 2023-12-11-merge-main-into-v2 branch from 105d1cf to 5a43ef6 Compare December 12, 2023 14:43
@github-actions github-actions bot temporarily deployed to staging/pull/1544/features December 12, 2023 14:44 Inactive
@github-actions github-actions bot temporarily deployed to staging/pull/1544/bundle-report December 12, 2023 14:44 Inactive
@github-actions github-actions bot temporarily deployed to staging/pull/1544/typedoc December 12, 2023 14:44 Inactive
@lawrence-forooghian lawrence-forooghian marked this pull request as ready for review December 13, 2023 12:07
@github-actions github-actions bot temporarily deployed to staging/pull/1544/features January 9, 2024 14:34 Inactive
@github-actions github-actions bot temporarily deployed to staging/pull/1544/bundle-report January 9, 2024 14:34 Inactive
@github-actions github-actions bot temporarily deployed to staging/pull/1544/typedoc January 9, 2024 14:34 Inactive
It was incorrectly using the headers from the response that triggered
the re-auth, instead of the request headers provided by the user. This
regression was introduced in 601ebfe.

Resolves #1566.
Copy link
Contributor

@VeskeR VeskeR left a comment

Choose a reason for hiding this comment

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

There seems to be couple more merge conflicts with integration/v2 due to changes in react-hooks.

Other than that, LGTM! Can merge once comments are resolved.

Temporary fix for attw error will work for now. Will fix it for good in #1546.

ably-1.2.48.tgz Outdated Show resolved Hide resolved
@lawrence-forooghian lawrence-forooghian merged commit 80709a9 into integration/v2 Jan 11, 2024
12 checks passed
@lawrence-forooghian lawrence-forooghian deleted the 2023-12-11-merge-main-into-v2 branch January 11, 2024 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants