Merge branch 'canary' of github.com:vercel/next.js into canary

vercel · Sep 15, 2021 · 807beac · 807beac
2 parents 4b41b48 + dd4215b
commit 807beac
Show file tree

Hide file tree

Showing 55 changed files with 27 additions and 971 deletions.
diff --git a/examples/with-redux-code-splitting/.gitignore b/examples/with-redux-code-splitting/.gitignore
diff --git a/examples/with-redux-code-splitting/README.md b/examples/with-redux-code-splitting/README.md
diff --git a/examples/with-redux-code-splitting/config/redux.js b/examples/with-redux-code-splitting/config/redux.js
diff --git a/examples/with-redux-code-splitting/containers/about.js b/examples/with-redux-code-splitting/containers/about.js
diff --git a/examples/with-redux-code-splitting/containers/homepage.js b/examples/with-redux-code-splitting/containers/homepage.js
diff --git a/examples/with-redux-code-splitting/package.json b/examples/with-redux-code-splitting/package.json
diff --git a/examples/with-redux-code-splitting/pages/about.js b/examples/with-redux-code-splitting/pages/about.js
diff --git a/examples/with-redux-code-splitting/pages/index.js b/examples/with-redux-code-splitting/pages/index.js
diff --git a/examples/with-redux-toolkit-typescript/.gitignore b/examples/with-redux-toolkit-typescript/.gitignore
diff --git a/examples/with-redux-toolkit-typescript/README.md b/examples/with-redux-toolkit-typescript/README.md
@@ -1,23 +1 @@
-# Redux Toolkit TypeScript Example
-
-This example shows how to integrate Next.js with [Redux Toolkit](https://redux-toolkit.js.org).
-
-The **Redux Toolkit** is a standardized way to write Redux logic (create actions and reducers, setup the store with some default middlewares like redux devtools extension). This example demonstrates each of these features with Next.js
-
-## 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-redux-toolkit-typescript&project-name=with-redux-toolkit&repository-name=with-redux-toolkit)
-
-## 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-redux-toolkit-typescript with-redux-toolkit-app
-# or
-yarn create next-app --example with-redux-toolkit-typescript with-redux-toolkit-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)).
+This example has been moved to [with-redux](https://github.com/vercel/next.js/tree/canary/examples/with-redux).
diff --git a/examples/with-redux-toolkit-typescript/package.json b/examples/with-redux-toolkit-typescript/package.json
diff --git a/examples/with-redux-toolkit/.gitignore b/examples/with-redux-toolkit/.gitignore
diff --git a/examples/with-redux-toolkit/README.md b/examples/with-redux-toolkit/README.md
@@ -1,29 +1 @@
-# Redux Toolkit example
-
-This example shows how to integrate Next.js with [Redux Toolkit](https://redux-toolkit.js.org).
-
-The **Redux Toolkit** is intended to be the standard way to write Redux logic (create actions and reducers, setup the store with some default middlewares like redux devtools extension). This example demonstrates each of these features with Next.js
-
-## 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-redux-toolkit&project-name=with-redux-toolkit&repository-name=with-redux-toolkit)
-
-## 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-redux-toolkit with-redux-toolkit-app
-# or
-yarn create next-app --example with-redux-toolkit with-redux-toolkit-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)).
-
-### TypeScript Setup (optional)
-
-If you haven't already added [TypeScript](https://www.typescriptlang.org/) to your project, follow the [steps in the Next.js documentation](https://nextjs.org/docs/basic-features/typescript). If you are new to TypeScript, go through the Next.js [learning lesson on TypeScript](https://nextjs.org/learn/excel/TypeScript).
-
-Once TypeScript is added, follow the instructions given on the Redux Toolkit [documentation](https://redux-toolkit.js.org/tutorials/TypeScript) to set up and use Redux Toolkit and React-Redux with TypeScript
+This example has been moved to [with-redux](https://github.com/vercel/next.js/tree/canary/examples/with-redux).
diff --git a/examples/with-redux-toolkit/package.json b/examples/with-redux-toolkit/package.json
diff --git a/examples/with-redux-toolkit/public/favicon.ico b/examples/with-redux-toolkit/public/favicon.ico
diff --git a/examples/with-redux-toolkit/public/logo.svg b/examples/with-redux-toolkit/public/logo.svg
diff --git a/examples/with-redux-toolkit/src/app/store.js b/examples/with-redux-toolkit/src/app/store.js