8000 Merge branch 'vercel:canary' into docs · vercel/next.js@885258b · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 885258b

Browse files
oduntaneoduntane
authored
Merge branch 'vercel:canary' into docs
2 parents 1313eab + 2b7a259 commit 885258b

File tree

167 files changed

+4597
-3823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+4597
-3823
lines changed

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contributing/core/developing.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ see **[Developing Using Your Local Version of Next.js](./developing-using-local-
5656
Since Turbopack doesn't support symlinks when pointing outside of the workspace directory, it can be difficult to develop against a local Next.js version. Neither `pnpm link` nor `file:` imports quite cut it. An alternative is to pack the Next.js version you want to test into a tarball and add it to the pnpm overrides of your test application. The following script will do it for you:
5757

5858
```bash
59-
pnpm pack-next --release && pnpm unpack-next path/to/project
59+
pnpm pack-next --tar && pnpm unpack-next path/to/project
6060
```
6161

6262
Or without running the build:
6363

6464
```bash
65-
pnpm pack-next --no-build --release && pnpm unpack-next path/to/project
65+
pnpm pack-next --no-js-build --tar && pnpm unpack-next path/to/project
6666
```
6767

6868
Without going through a tarball (only works if you've added the overrides from `pack-next`):
@@ -74,21 +74,19 @@ pnpm patch-next path/to/project
7474
Supports the same arguments:
7575

7676
```bash
77-
pnpm patch-next --no-build --release path/to/project
77+
pnpm patch-next --no-js-build path/to/project
7878
```
7979

8080
### Explanation of the scripts
8181

8282
```bash
8383
# Generate a tarball of the Next.js version you want to test
84-
$ pnpm pack-next
84+
$ pnpm pack-next --tar
8585

86-
# If you need to build in release mode:
87-
$ pnpm pack-next --release
8886
# You can also pass any cargo argument to the script
8987

9088
# To skip the `pnpm i` and `pnpm build` steps in next.js (e. g. if you are running `pnpm dev`)
91-
$ pnpm pack-next --no-build
89+
$ pnpm pack-next --no-js-build
9290
```
9391

9492
Afterwards, you'll need to unpack the tarball into your test project. You can either manually edit the `package.json` to point to the new tarballs (see the stdout from `pack-next` script), or you can automatically unpack it with:

‎docs/01-app/05-api-reference/03-file-conventions/route-segment-config.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const dynamic = 'auto'
6161
- Setting the option of every `fetch()` request in a layout or page to `{ cache: 'force-cache' }`.
6262
- Setting the segment config to `fetchCache = 'only-cache', dynamicParams = false`.
6363
- `dynamic = 'error'` changes the default of `dynamicParams` from `true` to `false`. You can opt back into dynamically rendering pages for dynamic params not generated by `generateStaticParams` by manually setting `dynamicParams = true`.
64-
- **`'force-static'`**: Force static rendering and cache the data of a layout or page by forcing [`cookies`](/docs/app/api-reference/functions/cookies), [`headers()`](/docs/app/api-reference/functions/headers) and [`useSearchParams()`](/docs/app/api-reference/functions/use-search-params) to return empty values.
64+
- **`'force-static'`**: Force static rendering and cache the data of a layout or page by forcing [`cookies`](/docs/app/api-reference/functions/cookies), [`headers()`](/docs/app/api-reference/functions/headers) and [`useSearchParams()`](/docs/app/api-reference/functions/use-search-params) to return empty values. It is possible to [`revalidate`](#revalidate), [`revalidatePath`](/docs/app/api-reference/functions/revalidatePath), or [`revalidateTag`](/docs/app/api-reference/functions/revalidateTag), in pages or layouts rendered with `force-static`.
6565

6666
> **Good to know**:
6767
>

‎examples/with-supabase/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
npm-debug.log*
2929
yarn-debug.log*
3030
yarn-error.log*
31+
.pnpm-debug.log*
3132

32-
# loca 97AE l env files
33+
# env files (can opt-in for committing if needed)
3334
.env*.local
3435
.env
3536

‎examples/with-supabase/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
- Server
2828
- It just works!
2929
- supabase-ssr. A package to configure Supabase Auth to use cookies
30+
- Password-based authentication block installed via the [Supabase UI Library](https://supabase.com/ui/docs/nextjs/password-based-auth)
3031
- Styling with [Tailwind CSS](https://tailwindcss.com)
3132
- Components with [shadcn/ui](https://ui.shadcn.com/)
3233
- Optional deployment with [Supabase Vercel Integration and Vercel deploy](#deploy-your-own)
@@ -79,7 +80,7 @@ If you wish to just develop locally and not deploy to Vercel, [follow the steps
7980
NEXT_PUBLIC_SUPABASE_ANON_KEY=[INSERT SUPABASE PROJECT API ANON KEY]
8081
```
8182

82-
Both `NEXT_PUBLIC_SUPABASE_URL` and `NEXT_PUBLIC_SUPABASE_ANON_KEY` can be found in [your Supabase project's API settings](https://app.supabase.com/project/_/settings/api)
83+
Both `NEXT_PUBLIC_SUPABASE_URL` and `NEXT_PUBLIC_SUPABASE_ANON_KEY` can be found in [your Supabase project's API settings](https://supabase.com/dashboard/project/_?showConnect=true)
8384

8485
5. You can now run the Next.js local development server:
8586

‎examples/with-supabase/app/(auth-pages)/forgot-password/page.tsx

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎examples/with-supabase/app/(auth-pages)/layout.tsx

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎examples/with-supabase/app/(auth-pages)/sign-in/page.tsx

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎examples/with-supabase/app/(auth-pages)/sign-up/page.tsx

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎examples/with-supabase/app/(auth-pages)/smtp-message.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0