diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33c391bf3acf661..da56c8d77fc24d5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,14 +10,14 @@ trigger: - docs - errors - examples - # Do not run Azure on `canary`, `master`, or release tags. This unnecessarily + # Do not run Azure on `canary`, `main`, or release tags. This unnecessarily # increases the backlog, and the change was already tested on the PR. branches: include: - '*' exclude: - canary - - master + - main - refs/tags/* pr: diff --git a/docs/api-reference/create-next-app.md b/docs/api-reference/create-next-app.md index 3a00e008ac08622..f463840b88b91f4 100644 --- a/docs/api-reference/create-next-app.md +++ b/docs/api-reference/create-next-app.md @@ -25,7 +25,7 @@ yarn create next-app --typescript `create-next-app` comes with the following options: - **--ts, --typescript** - Initialize as a TypeScript project. -- **-e, --example [name]|[github-url]** - An example to bootstrap the app with. You can use an example name from the [Next.js repo](https://github.com/vercel/next.js/tree/master/examples) or a GitHub URL. The URL can use any branch and/or subdirectory. +- **-e, --example [name]|[github-url]** - An example to bootstrap the app with. You can use an example name from the [Next.js repo](https://github.com/vercel/next.js/tree/canary/examples) or a GitHub URL. The URL can use any branch and/or subdirectory. - **--example-path [path-to-example]** - In a rare case, your GitHub URL might contain a branch name with a slash (e.g. bug/fix-1) and the path to the example (e.g. foo/bar). In this case, you must specify the path to the example separately: `--example-path foo/bar` - **--use-npm** - Explicitly tell the CLI to bootstrap the app using npm. To bootstrap using yarn we recommend running `yarn create next-app` diff --git a/examples/analyze-bundles/README.md b/examples/analyze-bundles/README.md index 8aec1e56c79c435..02e1673ccd3b8f7 100644 --- a/examples/analyze-bundles/README.md +++ b/examples/analyze-bundles/README.md @@ -1,6 +1,6 @@ # Analyzer Bundles example -This example shows how to analyze the output bundles using [@next/bundle-analyzer](https://github.com/vercel/next.js/tree/master/packages/next-bundle-analyzer) +This example shows how to analyze the output bundles using [@next/bundle-analyzer](https://github.com/vercel/next.js/tree/canary/packages/next-bundle-analyzer) ## Preview diff --git a/examples/gh-pages/README.md b/examples/gh-pages/README.md index e9a37206c2bcb92..fbd34532847cfaa 100644 --- a/examples/gh-pages/README.md +++ b/examples/gh-pages/README.md @@ -20,7 +20,7 @@ Edit `next.config.js` and replace `'Next-gh-page-example'` by your project name. 1. Create repository. 2. Link it to your github account. -3. Publish your master branch. +3. Publish your default branch, e.g. `main`. ```bash npm run deploy diff --git a/examples/progressive-web-app/pages/index.js b/examples/progressive-web-app/pages/index.js index dea04e8ac7ec382..c7aef703d4d6b01 100644 --- a/examples/progressive-web-app/pages/index.js +++ b/examples/progressive-web-app/pages/index.js @@ -25,7 +25,7 @@ export default function Home() {

Examples →

diff --git a/examples/with-apollo-and-redux/README.md b/examples/with-apollo-and-redux/README.md index 765de3d3d0dd274..f1f55be5d1b981d 100644 --- a/examples/with-apollo-and-redux/README.md +++ b/examples/with-apollo-and-redux/README.md @@ -2,7 +2,7 @@ This example serves as a conduit if you were using Apollo 1.X with Redux, and are migrating to Apollo 3.x, however, you have chosen not to manage your entire application state within Apollo (`apollo-link-state`). -In 3.0.0, Apollo serves out-of-the-box support for redux in favor of Apollo's state management. This example aims to be an amalgamation of the [`with-apollo`](https://github.com/vercel/next.js/tree/master/examples/with-apollo) and [`with-redux`](https://github.com/vercel/next.js/tree/master/examples/with-redux) examples. +In 3.0.0, Apollo serves out-of-the-box support for redux in favor of Apollo's state management. This example aims to be an amalgamation of the [`with-apollo`](https://github.com/vercel/next.js/tree/canary/examples/with-apollo) and [`with-redux`](https://github.com/vercel/next.js/tree/canary/examples/with-redux) examples. To inspect the GraphQL API, use its [web IDE](https://nextjs-graphql-with-prisma-simple-foo.vercel.app/api). diff --git a/examples/with-cypress/pages/index.js b/examples/with-cypress/pages/index.js index 7af20bc61f52635..36b3381bad61168 100644 --- a/examples/with-cypress/pages/index.js +++ b/examples/with-cypress/pages/index.js @@ -41,7 +41,7 @@ export default function Home() {

Examples →

diff --git a/examples/with-docker/pages/index.js b/examples/with-docker/pages/index.js index 16d683b56c08406..0a6884b38582b0f 100644 --- a/examples/with-docker/pages/index.js +++ b/examples/with-docker/pages/index.js @@ -31,7 +31,7 @@ export default function Home() {

Examples →

diff --git a/examples/with-elasticsearch/pages/index.js b/examples/with-elasticsearch/pages/index.js index 2a4a49573b13bea..0d2c6e3563e1b72 100644 --- a/examples/with-elasticsearch/pages/index.js +++ b/examples/with-elasticsearch/pages/index.js @@ -43,7 +43,7 @@ export default function Home({ isConnected }) {

Examples →

diff --git a/examples/with-jest-babel/__tests__/__snapshots__/snapshot.tsx.snap b/examples/with-jest-babel/__tests__/__snapshots__/snapshot.tsx.snap index c5e6e3478c575be..f00d4ea78fd45b8 100644 --- a/examples/with-jest-babel/__tests__/__snapshots__/snapshot.tsx.snap +++ b/examples/with-jest-babel/__tests__/__snapshots__/snapshot.tsx.snap @@ -9,7 +9,7 @@ exports[`renders homepage unchanged 1`] = `

- Welcome to + Welcome to @@ -19,7 +19,7 @@ exports[`renders homepage unchanged 1`] = `

- Get started by editing + Get started by editing pages/index.js @@ -51,7 +51,7 @@ exports[`renders homepage unchanged 1`] = `

Examples → @@ -82,7 +82,7 @@ exports[`renders homepage unchanged 1`] = ` target="_blank" > Powered by - +

Examples →

diff --git a/examples/with-jest/__tests__/__snapshots__/snapshot.tsx.snap b/examples/with-jest/__tests__/__snapshots__/snapshot.tsx.snap index c5e6e3478c575be..f00d4ea78fd45b8 100644 --- a/examples/with-jest/__tests__/__snapshots__/snapshot.tsx.snap +++ b/examples/with-jest/__tests__/__snapshots__/snapshot.tsx.snap @@ -9,7 +9,7 @@ exports[`renders homepage unchanged 1`] = `

- Welcome to + Welcome to @@ -19,7 +19,7 @@ exports[`renders homepage unchanged 1`] = `

- Get started by editing + Get started by editing pages/index.js @@ -51,7 +51,7 @@ exports[`renders homepage unchanged 1`] = `

Examples → @@ -82,7 +82,7 @@ exports[`renders homepage unchanged 1`] = ` target="_blank" > Powered by - +

Examples →

diff --git a/examples/with-knex/pages/index.js b/examples/with-knex/pages/index.js index a1378001c887b8e..15b08938f116d98 100644 --- a/examples/with-knex/pages/index.js +++ b/examples/with-knex/pages/index.js @@ -51,7 +51,7 @@ export default function Home() {

Examples →

diff --git a/examples/with-mdbreact/pages/index.js b/examples/with-mdbreact/pages/index.js index 2e579d4f1fb67ee..3b38fae094bac62 100644 --- a/examples/with-mdbreact/pages/index.js +++ b/examples/with-mdbreact/pages/index.js @@ -75,7 +75,7 @@ export default function Home() { color="primary" size="sm" className="text-capitalize" - href="https://github.com/vercel/next.js/tree/master/examples" + href="https://github.com/vercel/next.js/tree/canary/examples" > More → diff --git a/examples/with-mongodb/pages/index.js b/examples/with-mongodb/pages/index.js index a57dfe93bfb970d..865be76596990de 100644 --- a/examples/with-mongodb/pages/index.js +++ b/examples/with-mongodb/pages/index.js @@ -39,7 +39,7 @@ export default function Home({ isConnected }) {

Examples →

diff --git a/examples/with-playwright/pages/index.js b/examples/with-playwright/pages/index.js index 25a4a79171782b8..07b0717dcf93642 100644 --- a/examples/with-playwright/pages/index.js +++ b/examples/with-playwright/pages/index.js @@ -41,7 +41,7 @@ export default function Home() {

Examples →

diff --git a/examples/with-rbx-bulma-pro/pages/index.js b/examples/with-rbx-bulma-pro/pages/index.js index f44638bb9498575..a8993e08fabff09 100644 --- a/examples/with-rbx-bulma-pro/pages/index.js +++ b/examples/with-rbx-bulma-pro/pages/index.js @@ -20,7 +20,7 @@ const Home = () => ( - + Examples →

diff --git a/examples/with-react-bootstrap/pages/index.jsx b/examples/with-react-bootstrap/pages/index.jsx index d6cfa992d061403..81073f07b253187 100644 --- a/examples/with-react-bootstrap/pages/index.jsx +++ b/examples/with-react-bootstrap/pages/index.jsx @@ -49,7 +49,7 @@ export default function Home() { diff --git a/examples/with-react-with-styles/README.md b/examples/with-react-with-styles/README.md index 92af40b7ac1eaab..7eb93c482bfade8 100644 --- a/examples/with-react-with-styles/README.md +++ b/examples/with-react-with-styles/README.md @@ -6,7 +6,7 @@ In this case we are using [react-with-styles](https://github.com/airbnb/react-wi For this purpose we are extending the `` and injecting the server side rendered styles into the ``. -We are using `pages/_index.js` from this example [with-aphrodite](https://github.com/vercel/next.js/tree/master/examples/with-aphrodite). +We are using `pages/_index.js` from this example [with-aphrodite](https://github.com/vercel/next.js/tree/canary/examples/with-aphrodite). ## Preview diff --git a/examples/with-reactstrap/pages/index.jsx b/examples/with-reactstrap/pages/index.jsx index 511632185ffa52a..bfe5a5daf9e770b 100644 --- a/examples/with-reactstrap/pages/index.jsx +++ b/examples/with-reactstrap/pages/index.jsx @@ -63,7 +63,7 @@ export default function Home() { diff --git a/examples/with-redux-persist/README.md b/examples/with-redux-persist/README.md index 80caf652424b708..de187cb94ea1d2d 100644 --- a/examples/with-redux-persist/README.md +++ b/examples/with-redux-persist/README.md @@ -30,7 +30,7 @@ Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&ut ## Notes -In this example, we are going to use the Next.js example [with-redux](https://github.com/vercel/next.js/tree/master/examples/with-redux-persist) to see how you can add a layer of persistence for one of the state from global redux state. To know more about how to create a Next.js project with Redux, you can browse the example project [with-redux](https://github.com/vercel/next.js/tree/master/examples/with-redux) to know more about its implementation. +In this example, we are going to use the Next.js example [with-redux](https://github.com/vercel/next.js/tree/canary/examples/with-redux-persist) to see how you can add a layer of persistence for one of the state from global redux state. To know more about how to create a Next.js project with Redux, you can browse the example project [with-redux](https://github.com/vercel/next.js/tree/canary/examples/with-redux) to know more about its implementation. The Redux Persist has been initialized in `store.js`. You can modify the `redux-persist` configuration (In this example, we are persisting only one state termed `exampleData` which is added in the `persist configuration`) if you need something more with `redux-persist` by following their [docs](https://github.com/rt2zz/redux-persist/blob/master/README.md). To wrap out our component in the `Persist Gate` which rehydrates the global state with combining the persisted values and global state values, we'll have to make some modifications in the implementation of Redux in `pages/_app.js`. diff --git a/examples/with-redux-saga/README.md b/examples/with-redux-saga/README.md index 3450a62b3c83532..72e28b37c73d3e6 100644 --- a/examples/with-redux-saga/README.md +++ b/examples/with-redux-saga/README.md @@ -2,7 +2,7 @@ Usually splitting your app state into `pages` feels natural, but sometimes you'll want to have global state for your app. This is an example using `redux` and `redux-saga` that works with universal rendering. This is just one way it can be done. If you have any suggestions or feedback please submit an issue or PR. -> This example and documentation is based on the [with-redux](https://github.com/vercel/next.js/tree/master/examples/with-redux) example. +> This example and documentation is based on the [with-redux](https://github.com/vercel/next.js/tree/canary/examples/with-redux) example. ## Preview diff --git a/examples/with-rematch/README.md b/examples/with-rematch/README.md index e037ef1ea89487c..937efa89cf1c958 100644 --- a/examples/with-rematch/README.md +++ b/examples/with-rematch/README.md @@ -2,7 +2,7 @@ This example has two pages. The first page has a counter which can be incremented synchronously or asynchronously. The second page is a page which shows a list of github users. It fetches data from the github api using this [endpoint](api.github.com/users). -Since rematch is utility which uses redux under the hood, some elements like `store.js` and `withRematch` are very similar to the `with-redux` example. Please go through the [`with-redux` example](https://github.com/vercel/next.js/tree/master/examples/with-redux) before reading further if you are not familiar with how redux is integrated with Next.js. Rematch is just an extension for Redux so a lot of elements are the same. +Since rematch is utility which uses redux under the hood, some elements like `store.js` and `withRematch` are very similar to the `with-redux` example. Please go through the [`with-redux` example](https://github.com/vercel/next.js/tree/canary/examples/with-redux) before reading further if you are not familiar with how redux is integrated with Next.js. Rematch is just an extension for Redux so a lot of elements are the same. ## Preview diff --git a/examples/with-sitemap/pages/index.js b/examples/with-sitemap/pages/index.js index 9567794ecd851ac..801b3091192275b 100644 --- a/examples/with-sitemap/pages/index.js +++ b/examples/with-sitemap/pages/index.js @@ -29,7 +29,7 @@ export default function Home() {

Examples →

diff --git a/examples/with-styled-jsx-postcss/README.md b/examples/with-styled-jsx-postcss/README.md index 5ef4bfd8b34eb74..a7afad09a484955 100644 --- a/examples/with-styled-jsx-postcss/README.md +++ b/examples/with-styled-jsx-postcss/README.md @@ -1 +1 @@ -This examples was moved to [https://github.com/vercel/next.js/tree/master/examples/with-styled-jsx-plugins](https://github.com/vercel/next.js/tree/master/examples/with-styled-jsx-plugins) +This examples was moved to [https://github.com/vercel/next.js/tree/canary/examples/with-styled-jsx-plugins](https://github.com/vercel/next.js/tree/canary/examples/with-styled-jsx-plugins) diff --git a/examples/with-supertokens/pages/index.js b/examples/with-supertokens/pages/index.js index 0629fa410da25bb..0599974ed0faf14 100644 --- a/examples/with-supertokens/pages/index.js +++ b/examples/with-supertokens/pages/index.js @@ -141,7 +141,7 @@ function ProtectedPage({ userId }) {

Examples →

diff --git a/examples/with-tailwindcss/pages/index.tsx b/examples/with-tailwindcss/pages/index.tsx index 828dd6012730d42..890e0279e0aec5d 100644 --- a/examples/with-tailwindcss/pages/index.tsx +++ b/examples/with-tailwindcss/pages/index.tsx @@ -45,7 +45,7 @@ export default function Home() {

Examples →

diff --git a/examples/with-typestyle/README.md b/examples/with-typestyle/README.md index 0491bedc5ee0ff6..659f51cb767baf4 100644 --- a/examples/with-typestyle/README.md +++ b/examples/with-typestyle/README.md @@ -2,7 +2,7 @@ This example features how you use a different styling solution than [styled-jsx](https://github.com/vercel/styled-jsx) that also supports universal styles. That means we can serve the required styles for the first render within the HTML and then load the rest in the client. In this case we are using [typestyle](https://github.com/typestyle/typestyle). -For this purpose we are extending the `` and injecting the server side rendered styles into the ``. Refer to [with-typescript](https://github.com/vercel/next.js/tree/master/examples/with-typescript) to use this with typescript. +For this purpose we are extending the `` and injecting the server side rendered styles into the ``. Refer to [with-typescript](https://github.com/vercel/next.js/tree/canary/examples/with-typescript) to use this with typescript. ## Preview diff --git a/lerna.json b/lerna.json index 3ca1cb71f6c9561..c87688c20ca0684 100644 --- a/lerna.json +++ b/lerna.json @@ -11,7 +11,6 @@ "publish": { "npmClient": "npm", "allowBranch": [ - "master", "canary" ], "registry": "https://registry.npmjs.org/" diff --git a/packages/create-next-app/README.md b/packages/create-next-app/README.md index 8cf5e7f8c8c3eb7..16b1687fc885ed1 100644 --- a/packages/create-next-app/README.md +++ b/packages/create-next-app/README.md @@ -23,7 +23,7 @@ npx create-next-app blog-app `create-next-app` comes with the following options: - **--ts, --typescript** - Initialize as a TypeScript project. -- **-e, --example [name]|[github-url]** - An example to bootstrap the app with. You can use an example name from the [Next.js repo](https://github.com/vercel/next.js/tree/master/examples) or a GitHub URL. The URL can use any branch and/or subdirectory. +- **-e, --example [name]|[github-url]** - An example to bootstrap the app with. You can use an example name from the [Next.js repo](https://github.com/vercel/next.js/tree/canary/examples) or a GitHub URL. The URL can use any branch and/or subdirectory. - **--example-path <path-to-example>** - In a rare case, your GitHub URL might contain a branch name with a slash (e.g. bug/fix-1) and the path to the example (e.g. foo/bar). In this case, you must specify the path to the example separately: `--example-path foo/bar` - **--use-npm** - Explicitly tell the CLI to bootstrap the app using npm. To bootstrap using yarn we recommend to run `yarn create next-app` diff --git a/packages/create-next-app/templates/default/pages/index.js b/packages/create-next-app/templates/default/pages/index.js index 08145bba9a5780a..dc4b64035213fbc 100644 --- a/packages/create-next-app/templates/default/pages/index.js +++ b/packages/create-next-app/templates/default/pages/index.js @@ -33,7 +33,7 @@ export default function Home() {

Examples →

diff --git a/packages/create-next-app/templates/typescript/pages/index.tsx b/packages/create-next-app/templates/typescript/pages/index.tsx index 72a4a59053d70f6..86b5b3b5bf3fdf0 100644 --- a/packages/create-next-app/templates/typescript/pages/index.tsx +++ b/packages/create-next-app/templates/typescript/pages/index.tsx @@ -34,7 +34,7 @@ const Home: NextPage = () => {

Examples →

diff --git a/test/development/basic/tailwind-jit/pages/index.js b/test/development/basic/tailwind-jit/pages/index.js index a3db6063016262d..f84ca7fd835f763 100644 --- a/test/development/basic/tailwind-jit/pages/index.js +++ b/test/development/basic/tailwind-jit/pages/index.js @@ -38,7 +38,7 @@ export default function Home() {

Examples →