From 355fc1ab7f49d68192d27a323de4d388eb45e7ad Mon Sep 17 00:00:00 2001 From: Michael McQuade Date: Fri, 5 Feb 2021 22:15:54 -0600 Subject: [PATCH 1/5] Update documentation referencing @zeit/fetch --- examples/with-zeit-fetch/README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/with-zeit-fetch/README.md b/examples/with-zeit-fetch/README.md index 647b7222eb688..2f38afb502c77 100644 --- a/examples/with-zeit-fetch/README.md +++ b/examples/with-zeit-fetch/README.md @@ -1,21 +1,19 @@ -# @zeit/fetch example +# @vercel/fetch example -This example shows how to use [`@zeit/fetch`](https://npmjs.com/package/@zeit/fetch) in a Next.js application. +This example shows how to use [`@vercel/fetch`](https://www.npmjs.com/package/@zeit/fetch) in a Next.js application. ## Deploy your own Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example): -[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/with-zeit-fetch&project-name=with-zeit-fetch&repository-name=with-zeit-fetch) +[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/with-vercel-fetch&project-name=with-vercel-fetch&repository-name=with-vercel-fetch) ## How to use Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init) or [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) to bootstrap the example: ```bash -npx create-next-app --example with-zeit-fetch with-zeit-fetch-app +npx create-next-app --example with-vercel-fetch with-vercel-fetch-app # or -yarn create next-app --example with-zeit-fetch with-zeit-fetch-app +yarn create next-app --example with-vercel-fetch with-vercel-fetch-app ``` - -Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)). From 23f2d1ebd0c7c8b159964e5dc7362089fa7802d2 Mon Sep 17 00:00:00 2001 From: Michael McQuade Date: Fri, 5 Feb 2021 22:23:05 -0600 Subject: [PATCH 2/5] Use @vercel/fetch - Switch @zeit/fetch to @vercel/fetch - Fix browser to actually use @vercel/fetch, it was only using unfetch --- examples/with-zeit-fetch/README.md | 2 +- examples/with-zeit-fetch/fetch/browser.js | 5 +++-- examples/with-zeit-fetch/fetch/server.js | 5 +++-- examples/with-zeit-fetch/package.json | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/with-zeit-fetch/README.md b/examples/with-zeit-fetch/README.md index 2f38afb502c77..101bd66f0c3a0 100644 --- a/examples/with-zeit-fetch/README.md +++ b/examples/with-zeit-fetch/README.md @@ -1,6 +1,6 @@ # @vercel/fetch example -This example shows how to use [`@vercel/fetch`](https://www.npmjs.com/package/@zeit/fetch) in a Next.js application. +This example shows how to use [`@vercel/fetch`](https://www.npmjs.com/package/@vercel/fetch) in a Next.js application. ## Deploy your own diff --git a/examples/with-zeit-fetch/fetch/browser.js b/examples/with-zeit-fetch/fetch/browser.js index 808452912c7b8..a71f46393a557 100644 --- a/examples/with-zeit-fetch/fetch/browser.js +++ b/examples/with-zeit-fetch/fetch/browser.js @@ -1,3 +1,4 @@ -import fetch from 'unfetch' +import createFetch from '@vercel/fetch' +import unfetch from 'unfetch' -export default fetch +export default createFetch(unfetch) diff --git a/examples/with-zeit-fetch/fetch/server.js b/examples/with-zeit-fetch/fetch/server.js index 618baba1f3566..fbeb2051e3e7e 100644 --- a/examples/with-zeit-fetch/fetch/server.js +++ b/examples/with-zeit-fetch/fetch/server.js @@ -1,3 +1,4 @@ -import zeitFetch from '@zeit/fetch' +import createFetch from '@vercel/fetch' -export default zeitFetch() +// since we aren't providing createFetch a fetcher it will use node-fetch as the fetcher +export default createFetch() diff --git a/examples/with-zeit-fetch/package.json b/examples/with-zeit-fetch/package.json index cb48ad4d81368..f0ee6626bba19 100644 --- a/examples/with-zeit-fetch/package.json +++ b/examples/with-zeit-fetch/package.json @@ -7,7 +7,7 @@ "start": "next start" }, "dependencies": { - "@zeit/fetch": "5.1.1", + "@vercel/fetch": "6.1.0", "next": "latest", "node-fetch": "2.6.1", "react": "^16.8.4", From f8e820a737a72d999ae57a2e5641af6123ec9884 Mon Sep 17 00:00:00 2001 From: Michael McQuade Date: Fri, 5 Feb 2021 22:23:53 -0600 Subject: [PATCH 3/5] Update React and unfetch - Get rid of message about Next 11 --- examples/with-zeit-fetch/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/with-zeit-fetch/package.json b/examples/with-zeit-fetch/package.json index f0ee6626bba19..040df8b5e5e78 100644 --- a/examples/with-zeit-fetch/package.json +++ b/examples/with-zeit-fetch/package.json @@ -10,9 +10,9 @@ "@vercel/fetch": "6.1.0", "next": "latest", "node-fetch": "2.6.1", - "react": "^16.8.4", - "react-dom": "^16.8.4", - "unfetch": "4.1.0" + "react": "17.0.1", + "react-dom": "17.0.1", + "unfetch": "4.2.0" }, "license": "MIT" } From 274b62535bb1de37768c1e72058cbf17f20e4f12 Mon Sep 17 00:00:00 2001 From: Michael McQuade Date: Fri, 5 Feb 2021 22:41:14 -0600 Subject: [PATCH 4/5] Update package name --- examples/{with-zeit-fetch => with-vercel-fetch}/.gitignore | 0 examples/{with-zeit-fetch => with-vercel-fetch}/README.md | 0 .../{with-zeit-fetch => with-vercel-fetch}/fetch/browser.js | 0 .../{with-zeit-fetch => with-vercel-fetch}/fetch/package.json | 0 examples/{with-zeit-fetch => with-vercel-fetch}/fetch/server.js | 0 examples/{with-zeit-fetch => with-vercel-fetch}/package.json | 2 +- examples/{with-zeit-fetch => with-vercel-fetch}/pages/index.js | 0 examples/{with-zeit-fetch => with-vercel-fetch}/pages/preact.js | 0 8 files changed, 1 insertion(+), 1 deletion(-) rename examples/{with-zeit-fetch => with-vercel-fetch}/.gitignore (100%) rename examples/{with-zeit-fetch => with-vercel-fetch}/README.md (100%) rename examples/{with-zeit-fetch => with-vercel-fetch}/fetch/browser.js (100%) rename examples/{with-zeit-fetch => with-vercel-fetch}/fetch/package.json (100%) rename examples/{with-zeit-fetch => with-vercel-fetch}/fetch/server.js (100%) rename examples/{with-zeit-fetch => with-vercel-fetch}/package.json (91%) rename examples/{with-zeit-fetch => with-vercel-fetch}/pages/index.js (100%) rename examples/{with-zeit-fetch => with-vercel-fetch}/pages/preact.js (100%) diff --git a/examples/with-zeit-fetch/.gitignore b/examples/with-vercel-fetch/.gitignore similarity index 100% rename from examples/with-zeit-fetch/.gitignore rename to examples/with-vercel-fetch/.gitignore diff --git a/examples/with-zeit-fetch/README.md b/examples/with-vercel-fetch/README.md similarity index 100% rename from examples/with-zeit-fetch/README.md rename to examples/with-vercel-fetch/README.md diff --git a/examples/with-zeit-fetch/fetch/browser.js b/examples/with-vercel-fetch/fetch/browser.js similarity index 100% rename from examples/with-zeit-fetch/fetch/browser.js rename to examples/with-vercel-fetch/fetch/browser.js diff --git a/examples/with-zeit-fetch/fetch/package.json b/examples/with-vercel-fetch/fetch/package.json similarity index 100% rename from examples/with-zeit-fetch/fetch/package.json rename to examples/with-vercel-fetch/fetch/package.json diff --git a/examples/with-zeit-fetch/fetch/server.js b/examples/with-vercel-fetch/fetch/server.js similarity index 100% rename from examples/with-zeit-fetch/fetch/server.js rename to examples/with-vercel-fetch/fetch/server.js diff --git a/examples/with-zeit-fetch/package.json b/examples/with-vercel-fetch/package.json similarity index 91% rename from examples/with-zeit-fetch/package.json rename to examples/with-vercel-fetch/package.json index 040df8b5e5e78..656fdc428862b 100644 --- a/examples/with-zeit-fetch/package.json +++ b/examples/with-vercel-fetch/package.json @@ -1,5 +1,5 @@ { - "name": "with-zeit-fetch", + "name": "with-vercel-fetch", "version": "1.0.0", "scripts": { "dev": "next", diff --git a/examples/with-zeit-fetch/pages/index.js b/examples/with-vercel-fetch/pages/index.js similarity index 100% rename from examples/with-zeit-fetch/pages/index.js rename to examples/with-vercel-fetch/pages/index.js diff --git a/examples/with-zeit-fetch/pages/preact.js b/examples/with-vercel-fetch/pages/preact.js similarity index 100% rename from examples/with-zeit-fetch/pages/preact.js rename to examples/with-vercel-fetch/pages/preact.js From 1db4da776018552ffdc4d437d128480a32a117cf Mon Sep 17 00:00:00 2001 From: Michael McQuade Date: Fri, 5 Feb 2021 22:57:56 -0600 Subject: [PATCH 5/5] Revert changes to browser --- examples/with-vercel-fetch/fetch/browser.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/with-vercel-fetch/fetch/browser.js b/examples/with-vercel-fetch/fetch/browser.js index a71f46393a557..808452912c7b8 100644 --- a/examples/with-vercel-fetch/fetch/browser.js +++ b/examples/with-vercel-fetch/fetch/browser.js @@ -1,4 +1,3 @@ -import createFetch from '@vercel/fetch' -import unfetch from 'unfetch' +import fetch from 'unfetch' -export default createFetch(unfetch) +export default fetch