Disable experimental.optimizeServer by default (#69788)

vercel · Sep 6, 2024 · bf48448 · bf48448
1 parent 86547db
commit bf48448
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 1 deletion.
diff --git a/packages/next/src/server/config-shared.ts b/packages/next/src/server/config-shared.ts
@@ -939,7 +939,7 @@ export const defaultConfig: NextConfig = {
         : false,
     webpackBuildWorker: undefined,
     missingSuspenseWithCSRBailout: true,
-    optimizeServerReact: true,
+    optimizeServerReact: false,
     useEarlyImport: false,
     staleTimes: {
       dynamic: 30,

diff --git a/test/production/app-dir/actions-tree-shaking/_testing/utils.ts b/test/production/app-dir/actions-tree-shaking/_testing/utils.ts
@@ -1,3 +1,4 @@
+// @ts-ignore avoid ts errors during manual testing
 import { type NextInstance } from 'e2e-utils'
 
 async function getActionsMappingByRuntime(

diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/tsconfig.json b/test/production/app-dir/actions-tree-shaking/shared-module-actions/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "noEmit": true,
+    "incremental": true,
+    "module": "esnext",
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
+  },
+  "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"]
+}
diff --git a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/layout.js b/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/layout.js
@@ -0,0 +1,7 @@
+export default function Layout({ children }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/actions.ts b/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/actions.ts
@@ -0,0 +1,11 @@
+'use server'
+
+export async function action1() {
+  return { hello: 'world' }
+}
+export async function action2() {
+  return { hello: 'action2' }
+}
+export async function action3() {
+  return { hello: 'action3' }
+}
diff --git a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/my-component.tsx b/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/my-component.tsx
@@ -0,0 +1,9 @@
+import { action3 } from './actions'
+
+export default function MyComponent() {
+  // to prevent tree-shaking
+  if (globalThis.DO_NOT_TREE_SHAKE) {
+    console.log('MyComponent imported action3', action3)
+  }
+  return <span>i'm MyComponent</span>
+}
diff --git a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/page.tsx b/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/page.tsx
@@ -0,0 +1,23 @@
+'use client'
+
+import React, { useEffect } from 'react'
+import { action1, action2 } from './actions'
+import MyComponent from './my-component'
+
+export default function Page() {
+  // to prevent tree-shaking
+  if (globalThis.DO_NOT_TREE_SHAKE) {
+    console.log('Page imported action2', action2)
+  }
+
+  // calling action1 fails!!
+  useEffect(() => {
+    if (globalThis.DO_NOT_TREE_SHAKE) {
+      action1().then((obj) => {
+        console.log('action1 returned:', obj)
+      })
+    }
+  }, [])
+
+  return <MyComponent />
+}
diff --git a/test/production/app-dir/actions-tree-shaking/use-effect-actions/tsconfig.json b/test/production/app-dir/actions-tree-shaking/use-effect-actions/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "noEmit": true,
+    "incremental": true,
+    "module": "esnext",
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
+  },
+  "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"]
+}
diff --git a/...roduction/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts b/...roduction/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts
@@ -0,0 +1,3 @@
+process.env.TEST_EDGE = '1'
+
+require('./use-effect-actions.test')
diff --git a/test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions.test.ts b/test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions.test.ts
@@ -0,0 +1,25 @@
+import { nextTestSetup } from 'e2e-utils'
+import {
+  getActionsRoutesStateByRuntime,
+  markLayoutAsEdge,
+} from '../_testing/utils'
+
+describe('actions-tree-shaking - use-effect-actions', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  if (process.env.TEST_EDGE) {
+    markLayoutAsEdge(next)
+  }
+
+  it('should not tree shake the used action under useEffect', async () => {
+    const actionsRoutesState = await getActionsRoutesStateByRuntime(next)
+
+    expect(actionsRoutesState).toMatchObject({
+      'app/mixed/page': {
+        'action-browser': 3,
+      },
+    })
+  })
+})
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
@@ -15600,6 +15600,24 @@
       "pending": [],
       "flakey": [],
       "runtimeError": false
+    },
+    "test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts": {
+      "passed": [],
+      "failed": [
+        "actions-tree-shaking - use-effect-actions should not tree shake the used action under useEffect"
+      ],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
+    "test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions.test.ts": {
+      "passed": [],
+      "failed": [
+        "actions-tree-shaking - use-effect-actions should not tree shake the used action under useEffect"
+      ],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
     }
   },
   "rules": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		process.env.TEST_EDGE = '1'

		require('./use-effect-actions.test')