-
Notifications
You must be signed in to change notification settings - Fork 12
fix: support edge/serverless runtimes via axios adapter fallback (#31) #107
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
Open
CedricConday
wants to merge
1
commit into
mailerlite:main
Choose a base branch
from
CedricConday:fix/edge-runtime-fetch-adapter
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+44
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import { describe, it, expect, vi, beforeEach } from "vitest"; | ||
|
|
||
| // `vi.mock` is hoisted to the top of the file, so the mock fn has to be | ||
| // created with `vi.hoisted` to be available inside the factory. | ||
| const axiosMock = vi.hoisted(() => vi.fn(() => Promise.resolve({ data: {} }))); | ||
| vi.mock("axios", () => ({ default: axiosMock })); | ||
|
|
||
| import request from "./fetch"; | ||
| import { Config } from "./types"; | ||
|
|
||
| const config: Config = { | ||
| api_key: "test-key", | ||
| basePath: "https://connect.mailerlite.com", | ||
| }; | ||
|
|
||
| describe("request adapter selection", () => { | ||
| beforeEach(() => { | ||
| axiosMock.mockClear(); | ||
| }); | ||
|
|
||
| it("asks axios to fall back through http -> xhr -> fetch", async () => { | ||
| await request("/api/subscribers", { method: "GET" }, config); | ||
|
|
||
| expect(axiosMock).toHaveBeenCalledTimes(1); | ||
| const passedConfig = axiosMock.mock.calls[0][0] as { adapter: unknown }; | ||
| // Ordering matters: Node/browser keep their existing adapter, while | ||
| // edge/serverless runtimes fall back to `fetch`. See issue #31. | ||
| expect(passedConfig.adapter).toEqual(["http", "xhr", "fetch"]); | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -25,7 +25,12 @@ export default function request(endpoint: string = "", options: Options, config: | |||||||||||
| "Content-type": "application/json", | ||||||||||||
| "accept-encoding": "null" // needed for axios | ||||||||||||
| }, | ||||||||||||
| data: body && JSON.stringify(body) | ||||||||||||
| data: body && JSON.stringify(body), | ||||||||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||
| // Let axios pick the first adapter supported by the current runtime. | ||||||||||||
| // Node keeps using `http` and browsers keep using `xhr` (no behaviour | ||||||||||||
| // change), while edge/serverless runtimes (Vercel Edge, Cloudflare | ||||||||||||
| // Workers, Deno, Next.js edge) that ship neither fall back to `fetch`. | ||||||||||||
| adapter: ["http", "xhr", "fetch"] | ||||||||||||
| }) | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
|
|
||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Worth adding one more test along with the fix: