Unverified Commit 466d199d authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Fix runtime:edge with large next.config.js (#50396)

## What?

Fixes a bug reported on the vercel.com app where `runtime: 'edge'` would
get stuck compiling.

## How?

Ensures we base64 the config when passing it to the loader, instead of
just JSON.stringifying it.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation or adding/fixing Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md



## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
parent b9939491
...@@ -354,7 +354,9 @@ export function getEdgeServerEntry(opts: { ...@@ -354,7 +354,9 @@ export function getEdgeServerEntry(opts: {
dev: opts.isDev, dev: opts.isDev,
isServerComponent: opts.isServerComponent, isServerComponent: opts.isServerComponent,
page: opts.page, page: opts.page,
stringifiedConfig: JSON.stringify(opts.config), stringifiedConfig: Buffer.from(JSON.stringify(opts.config)).toString(
'base64'
),
pagesType: opts.pagesType, pagesType: opts.pagesType,
appDirLoader: Buffer.from(opts.appDirLoader || '').toString('base64'), appDirLoader: Buffer.from(opts.appDirLoader || '').toString('base64'),
sriEnabled: !opts.isDev && !!opts.config.experimental.sri?.algorithm, sriEnabled: !opts.isDev && !!opts.config.experimental.sri?.algorithm,
......
...@@ -45,7 +45,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> = ...@@ -45,7 +45,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
absolute500Path, absolute500Path,
absoluteErrorPath, absoluteErrorPath,
isServerComponent, isServerComponent,
stringifiedConfig, stringifiedConfig: stringifiedConfigBase64,
appDirLoader: appDirLoaderBase64, appDirLoader: appDirLoaderBase64,
pagesType, pagesType,
sriEnabled, sriEnabled,
...@@ -53,6 +53,10 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> = ...@@ -53,6 +53,10 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
preferredRegion, preferredRegion,
} = this.getOptions() } = this.getOptions()
const stringifiedConfig = Buffer.from(
stringifiedConfigBase64 || '',
'base64'
).toString()
const appDirLoader = Buffer.from( const appDirLoader = Buffer.from(
appDirLoaderBase64 || '', appDirLoaderBase64 || '',
'base64' 'base64'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment