Skip to content

Commit

Permalink
Increase Rust stack size (vercel#61809)
Browse files Browse the repository at this point in the history
## What?

Follow-up to vercel#61781. That change doesn't apply so the packages we tested
still crashed the process. This ensures the environment variable is set
if it's not already set.

<!-- 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

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating 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 #

-->


Closes NEXT-2400
  • Loading branch information
timneutkens authored Feb 8, 2024
1 parent 50ef635 commit b387842
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 14 deletions.
16 changes: 2 additions & 14 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@ rustdocflags = []

[target.x86_64-pc-windows-msvc]
linker = "rust-lld"
rustflags = [
"-C", "target-feature=+crt-static",
"-C", "link-args=-Wl,-zstack-size=4194304",
]
rustflags = ["-C", "target-feature=+crt-static"]
[target.i686-pc-windows-msvc]
rustflags = [
"-C", "target-feature=+crt-static",
"-C", "link-args=-Wl,-zstack-size=4194304",
]
rustflags = ["-C", "target-feature=+crt-static"]

[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
Expand All @@ -26,7 +20,6 @@ rustflags = [
"--cfg",
"tokio_unstable",
"-Zshare-generics=y",
"-C", "link-args=-Wl,-zstack-size=4194304",
"-Csymbol-mangling-version=v0",
"-Ctarget-feature=-crt-static",
"-Clink-arg=-lgcc",
Expand All @@ -35,11 +28,6 @@ rustflags = [
[target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc"

[target.'any(not(target.wasm32-unknown-unknown), not(wasm32-wasi-preview1-threads))']
rustflags = [
"-C", "link-args=-Wl,-zstack-size=4194304",
]

[target.'cfg(all())']
rustflags = [
"--cfg",
Expand Down
5 changes: 5 additions & 0 deletions packages/next/src/build/swc/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@ export interface Binding {
export async function loadBindings(
useWasmBinary: boolean = false
): Promise<Binding> {
// Increase Rust stack size as some npm packages being compiled need more than the default.
if (!process.env.RUST_MIN_STACK) {
process.env.RUST_MIN_STACK = '8388608'
}

if (pendingBindings) {
return pendingBindings
}
Expand Down
7 changes: 7 additions & 0 deletions test/e2e/app-dir/syntax-highlighter-crash/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default function Root({ children }: { children: React.ReactNode }) {
return (
<html>
<body>{children}</body>
</html>
)
}
7 changes: 7 additions & 0 deletions test/e2e/app-dir/syntax-highlighter-crash/app/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use client'
import * as syntaxhighlighter from 'react-syntax-highlighter'
console.log({ syntaxhighlighter })

export default function Page() {
return <p>hello world</p>
}
6 changes: 6 additions & 0 deletions test/e2e/app-dir/syntax-highlighter-crash/next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {}

module.exports = nextConfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { createNextDescribe } from 'e2e-utils'

createNextDescribe(
'syntax-highlighter-crash',
{
files: __dirname,
dependencies: {
'react-syntax-highlighter': '15.5.0',
},
},
({ next }) => {
it('should render the page', async () => {
const $ = await next.render$('/')
expect($('p').text()).toBe('hello world')
})
}
)

0 comments on commit b387842

Please sign in to comment.