Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow disabling Strict mode in app #41894

Merged
merged 10 commits into from Oct 28, 2022
Merged

Allow disabling Strict mode in app #41894

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78270ac
Allow disabling Strict mode in app
timneutkens Oct 26, 2022
8cc4437
Use simpler component
timneutkens Oct 26, 2022
3f108cd
Remove unused import
timneutkens Oct 26, 2022
6f598f9
Merge branch 'canary' into add/allow-disabling-strictmode-in-app2
ijjk Oct 27, 2022
11a6fd7
Merge branch 'canary' into add/allow-disabling-strictmode-in-app2
kodiakhq[bot] Oct 27, 2022
a58ba30
Enable strict mode by default for app dir
timneutkens Oct 27, 2022
7c11431
Merge branch 'canary' into add/allow-disabling-strictmode-in-app2
kodiakhq[bot] Oct 27, 2022
2e5267e
Merge branch 'canary' into add/allow-disabling-strictmode-in-app2
kodiakhq[bot] Oct 27, 2022
cf67ec9
Merge branch 'canary' into add/allow-disabling-strictmode-in-app2
kodiakhq[bot] Oct 27, 2022
2661204
Merge branch 'canary' into add/allow-disabling-strictmode-in-app2
kodiakhq[bot] Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/next/build/webpack-config.ts
View file
Open in desktop
Expand Up @@ -244,7 +244,17 @@ export function getDefineEnv({
'process.env.__NEXT_BUILD_INDICATOR_POSITION': JSON.stringify(
config.devIndicators.buildActivityPosition
),
'process.env.__NEXT_STRICT_MODE': JSON.stringify(config.reactStrictMode),
'process.env.__NEXT_STRICT_MODE': JSON.stringify(
config.reactStrictMode === null ? false : config.reactStrictMode
),
'process.env.__NEXT_STRICT_MODE_APP': JSON.stringify(
// When next.config.js does not have reactStrictMode enabling appDir will enable it.
config.reactStrictMode === null
? config.experimental.appDir
? true
: false
: config.reactStrictMode
),
'process.env.__NEXT_REACT_ROOT': JSON.stringify(hasReactRoot),
'process.env.__NEXT_OPTIMIZE_FONTS': JSON.stringify(
!dev && config.optimizeFonts
Expand Down
8 changes: 6 additions & 2 deletions packages/next/client/app-index.tsx
View file
Open in desktop
Expand Up @@ -149,6 +149,10 @@ function ServerRoot({ cacheKey }: { cacheKey: string }): JSX.Element {
return root
}

const StrictModeIfEnabled = process.env.__NEXT_STRICT_MODE_APP
? React.StrictMode
: React.Fragment

function Root({ children }: React.PropsWithChildren<{}>): React.ReactElement {
React.useEffect(() => {
measureWebVitals()
Expand Down Expand Up @@ -213,7 +217,7 @@ export function hydrate() {
}

const reactEl = (
<React.StrictMode>
<StrictModeIfEnabled>
timneutkens marked this conversation as resolved.
Show resolved Hide resolved
<HeadManagerContext.Provider
value={{
appDir: true,
Expand All @@ -223,7 +227,7 @@ export function hydrate() {
<RSCComponent />
</Root>
</HeadManagerContext.Provider>
</React.StrictMode>
</StrictModeIfEnabled>
)

const isError = document.documentElement.id === '__next_error__'
Expand Down
4 changes: 2 additions & 2 deletions packages/next/server/config-shared.ts
View file
Open in desktop
Expand Up @@ -391,7 +391,7 @@ export interface NextConfig extends Record<string, any> {
*
* @see [React Strict Mode](https://nextjs.org/docs/api-reference/next.config.js/react-strict-mode)
*/
reactStrictMode?: boolean
reactStrictMode?: boolean | null

/**
* Add public (in browser) runtime configuration to your app
Expand Down Expand Up @@ -545,7 +545,7 @@ export const defaultConfig: NextConfig = {
excludeDefaultMomentLocales: true,
serverRuntimeConfig: {},
publicRuntimeConfig: {},
reactStrictMode: false,
reactStrictMode: null,
httpAgentOptions: {
keepAlive: true,
},
Expand Down