From 99de0573009208e584d10a810ed84c4b6cf9b4fe Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Tue, 10 Sep 2024 21:27:56 +0200
Subject: [PATCH] Revert server action optimization (#69925)

---
 .../plugins/flight-client-entry-plugin.ts     | 211 ++----------------
 packages/next/src/server/config-shared.ts     |   2 +-
 .../actions-tree-shaking/_testing/utils.ts    |  79 -------
 .../actions-tree-shaking/basic/app/actions.js |  13 --
 .../basic/app/client/page.js                  |  21 --
 .../basic/app/inline/page.js                  |  13 --
 .../actions-tree-shaking/basic/app/layout.js  |   7 -
 .../basic/app/server/page.js                  |  10 -
 .../basic/basic-edge.test.ts                  |   3 -
 .../actions-tree-shaking/basic/basic.test.ts  |  33 ---
 .../mixed-module-actions/app/layout.js        |   7 -
 .../app/mixed-module/cjs/actions.js           |  13 --
 .../app/mixed-module/cjs/page.js              |  13 --
 .../app/mixed-module/esm/actions.js           |  13 --
 .../app/mixed-module/esm/page.js              |  13 --
 .../mixed-module-actions-edge.test.ts         |   3 -
 .../mixed-module-actions.test.ts              |  29 ---
 .../reexport/app/layout.js                    |   7 -
 .../app/named-reexport/client/actions.js      |  13 --
 .../app/named-reexport/client/page.js         |  21 --
 .../named-reexport/client/reexport-action.js  |   5 -
 .../app/named-reexport/server/actions.js      |  13 --
 .../app/named-reexport/server/page.js         |  12 -
 .../named-reexport/server/reexport-action.js  |   5 -
 .../app/namespace-reexport/client/actions.js  |  13 --
 .../app/namespace-reexport/client/page.js     |  21 --
 .../app/namespace-reexport/server/actions.js  |  13 --
 .../app/namespace-reexport/server/page.js     |  12 -
 .../reexport/reexport-edge.test.ts            |   3 -
 .../reexport/reexport.test.ts                 |  35 ---
 .../app/client/actions.js                     |  13 --
 .../app/client/one/page.js                    |  22 --
 .../app/client/two/page.js                    |  22 --
 .../shared-module-actions/app/layout.js       |   7 -
 .../app/server/actions.js                     |  13 --
 .../app/server/one/page.js                    |  13 --
 .../app/server/two/page.js                    |  13 --
 .../shared-module-actions-edge.test.ts        |   3 -
 .../shared-module-actions.test.ts             |  34 ---
 .../shared-module-actions/tsconfig.json       |  24 --
 .../use-effect-actions/app/layout.js          |   7 -
 .../use-effect-actions/app/mixed/actions.ts   |  11 -
 .../app/mixed/my-component.tsx                |   9 -
 .../use-effect-actions/app/mixed/page.tsx     |  23 --
 .../use-effect-actions/tsconfig.json          |  24 --
 .../use-effect-actions-edge.test.ts           |   3 -
 .../use-effect-actions.test.ts                |  25 ---
 test/turbopack-build-tests-manifest.json      |  90 --------
 48 files changed, 25 insertions(+), 987 deletions(-)
 delete mode 100644 test/production/app-dir/actions-tree-shaking/_testing/utils.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/basic/app/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/basic/app/client/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/basic/app/inline/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/basic/app/layout.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/basic/app/server/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/basic/basic-edge.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/basic/basic.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/layout.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions-edge.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/layout.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/reexport-action.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/reexport-action.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/reexport-edge.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/reexport/reexport.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/one/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/two/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/app/layout.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/actions.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/one/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/two/page.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions-edge.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/shared-module-actions/tsconfig.json
 delete mode 100644 test/production/app-dir/actions-tree-shaking/use-effect-actions/app/layout.js
 delete mode 100644 test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/actions.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/my-component.tsx
 delete mode 100644 test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/page.tsx
 delete mode 100644 test/production/app-dir/actions-tree-shaking/use-effect-actions/tsconfig.json
 delete mode 100644 test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts
 delete mode 100644 test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions.test.ts

diff --git a/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts b/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts
index 051ffddada6d3..c539db3baf206 100644
--- a/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts
+++ b/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts
@@ -30,7 +30,6 @@ import {
   isClientComponentEntryModule,
   isCSSMod,
   regexCSS,
-  isActionServerLayerEntryModule,
 } from '../loaders/utils'
 import {
   traverseModules,
@@ -78,11 +77,6 @@ const pluginState = getProxiedPluginState({
   serverActions: {} as ActionManifest['node'],
   edgeServerActions: {} as ActionManifest['edge'],
 
-  usedActions: {
-    node: {} as Record<string, Set<string>>,
-    edge: {} as Record<string, Set<string>>,
-  },
-
   actionModServerId: {} as Record<
     string,
     {
@@ -171,25 +165,12 @@ function deduplicateCSSImportsForEntry(mergedCSSimports: CssImports) {
   return dedupedCSSImports
 }
 
-// Collection of action module path and action names per runtime.
-type UsedActionMap = {
-  node: Record<string, Set<string>>
-  edge: Record<string, Set<string>>
-}
-type UsedActionPerEntry = {
-  [entryName: string]: UsedActionMap
-}
-
 export class FlightClientEntryPlugin {
   dev: boolean
   appDir: string
   encryptionKey: string
   isEdgeServer: boolean
   assetPrefix: string
-  webpackRuntime: string
-
-  // Collect the used actions based on the entry name and runtime.
-  usedActions: UsedActionPerEntry
 
   constructor(options: Options) {
     this.dev = options.dev
@@ -197,43 +178,6 @@ export class FlightClientEntryPlugin {
     this.isEdgeServer = options.isEdgeServer
     this.assetPrefix = !this.dev && !this.isEdgeServer ? '../' : ''
     this.encryptionKey = options.encryptionKey
-    this.webpackRuntime = this.isEdgeServer
-      ? EDGE_RUNTIME_WEBPACK
-      : DEFAULT_RUNTIME_WEBPACK
-
-    this.usedActions = {}
-  }
-
-  getUsedActionsInEntry(
-    entryName: string,
-    modResource: string
-  ): Set<string> | undefined {
-    const runtime = this.isEdgeServer ? 'edge' : 'node'
-    const actionsRuntimeMap = this.usedActions[entryName]
-    const actionMap = actionsRuntimeMap ? actionsRuntimeMap[runtime] : undefined
-    return actionMap ? actionMap[modResource] : undefined
-  }
-
-  setUsedActionsInEntry(
-    entryName: string,
-    modResource: string,
-    actionNames: string[]
-  ) {
-    const runtime = this.isEdgeServer ? 'edge' : 'node'
-    if (!this.usedActions[entryName]) {
-      this.usedActions[entryName] = {
-        node: {},
-        edge: {},
-      }
-    }
-    if (!this.usedActions[entryName][runtime]) {
-      this.usedActions[entryName][runtime] = {}
-    }
-    const actionsMap = this.usedActions[entryName][runtime]
-    if (!actionsMap[modResource]) {
-      actionsMap[modResource] = new Set()
-    }
-    actionNames.forEach((name) => actionsMap[modResource].add(name))
   }
 
   apply(compiler: webpack.Compiler) {
@@ -355,7 +299,6 @@ export class FlightClientEntryPlugin {
 
         const { clientComponentImports, actionImports, cssImports } =
           this.collectComponentInfoFromServerEntryDependency({
-            entryName: name,
             entryRequest,
             compilation,
             resolvedModule: connection.resolvedModule,
@@ -471,6 +414,11 @@ export class FlightClientEntryPlugin {
     for (const [name, actionEntryImports] of Object.entries(
       actionMapsPerEntry
     )) {
+      for (const [dep, actionNames] of actionEntryImports) {
+        for (const actionName of actionNames) {
+          createdActions.add(name + '@' + dep + '@' + actionName)
+        }
+      }
       addActionEntryList.push(
         this.injectActionEntry({
           compiler,
@@ -478,7 +426,6 @@ export class FlightClientEntryPlugin {
           actions: actionEntryImports,
           entryName: name,
           bundlePath: name,
-          createdActions,
         })
       )
     }
@@ -518,7 +465,6 @@ export class FlightClientEntryPlugin {
       // Collect from all entries, e.g. layout.js, page.js, loading.js, ...
       // add aggregate them.
       const actionEntryImports = this.collectClientActionsFromDependencies({
-        entryName: name,
         compilation,
         dependencies: ssrEntryDependencies,
       })
@@ -566,7 +512,6 @@ export class FlightClientEntryPlugin {
             entryName: name,
             bundlePath: name,
             fromClient: true,
-            createdActions,
           })
         )
       }
@@ -576,11 +521,9 @@ export class FlightClientEntryPlugin {
   }
 
   collectClientActionsFromDependencies({
-    entryName,
     compilation,
     dependencies,
   }: {
-    entryName: string
     compilation: webpack.Compilation
     dependencies: ReturnType<typeof webpack.EntryPlugin.createDependency>[]
   }) {
@@ -598,45 +541,23 @@ export class FlightClientEntryPlugin {
       entryRequest: string
       resolvedModule: any
     }) => {
-      const collectActionsInDep = (
-        mod: webpack.NormalModule,
-        ids: string[]
-      ): void => {
+      const collectActionsInDep = (mod: webpack.NormalModule): void => {
         if (!mod) return
 
         const modResource = getModuleResource(mod)
 
-        if (!modResource) return
-
-        const actions = getActionsFromBuildInfo(mod)
-
-        // Collect used exported actions.
-        if (visitedModule.has(modResource) && actions) {
-          this.setUsedActionsInEntry(entryName, modResource, ids)
-        }
-
-        if (visitedModule.has(modResource)) return
-
+        if (!modResource || visitedModule.has(modResource)) return
         visitedModule.add(modResource)
 
+        const actions = getActionsFromBuildInfo(mod)
         if (actions) {
           collectedActions.set(modResource, actions)
         }
 
-        // Collect used exported actions transversely.
         getModuleReferencesInOrder(mod, compilation.moduleGraph).forEach(
-          (connection: any) => {
-            let dependencyIds: string[] = []
-            const depModule = connection.dependency
-            if (depModule?.ids) {
-              dependencyIds.push(...depModule.ids)
-            } else {
-              dependencyIds = depModule.category === 'esm' ? [] : ['*']
-            }
-
+          (connection) => {
             collectActionsInDep(
-              connection.resolvedModule as webpack.NormalModule,
-              dependencyIds
+              connection.resolvedModule as webpack.NormalModule
             )
           }
         )
@@ -648,7 +569,7 @@ export class FlightClientEntryPlugin {
         !entryRequest.includes('next-flight-action-entry-loader')
       ) {
         // Traverse the module graph to find all client components.
-        collectActionsInDep(resolvedModule, [])
+        collectActionsInDep(resolvedModule)
       }
     }
 
@@ -678,12 +599,10 @@ export class FlightClientEntryPlugin {
   }
 
   collectComponentInfoFromServerEntryDependency({
-    entryName,
     entryRequest,
     compilation,
     resolvedModule,
   }: {
-    entryName: string
     entryRequest: string
     compilation: webpack.Compilation
     resolvedModule: any /* Dependency */
@@ -693,8 +612,7 @@ export class FlightClientEntryPlugin {
     actionImports: [string, string[]][]
   } {
     // Keep track of checked modules to avoid infinite loops with recursive imports.
-    const visitedOfClientComponentsTraverse = new Set()
-    const visitedOfActionTraverse = new Set()
+    const visited = new Set()
 
     // Info to collect.
     const clientComponentImports: ClientComponentImports = {}
@@ -707,10 +625,11 @@ export class FlightClientEntryPlugin {
     ): void => {
       if (!mod) return
 
+      const isCSS = isCSSMod(mod)
       const modResource = getModuleResource(mod)
 
       if (!modResource) return
-      if (visitedOfClientComponentsTraverse.has(modResource)) {
+      if (visited.has(modResource)) {
         if (clientComponentImports[modResource]) {
           addClientImport(
             mod,
@@ -722,21 +641,25 @@ export class FlightClientEntryPlugin {
         }
         return
       }
-      visitedOfClientComponentsTraverse.add(modResource)
+      visited.add(modResource)
 
       const actions = getActionsFromBuildInfo(mod)
       if (actions) {
         actionImports.push([modResource, actions])
       }
 
-      if (isCSSMod(mod)) {
+      const webpackRuntime = this.isEdgeServer
+        ? EDGE_RUNTIME_WEBPACK
+        : DEFAULT_RUNTIME_WEBPACK
+
+      if (isCSS) {
         const sideEffectFree =
           mod.factoryMeta && (mod.factoryMeta as any).sideEffectFree
 
         if (sideEffectFree) {
           const unused = !compilation.moduleGraph
             .getExportsInfo(mod)
-            .isModuleUsed(this.webpackRuntime)
+            .isModuleUsed(webpackRuntime)
 
           if (unused) return
         }
@@ -774,56 +697,9 @@ export class FlightClientEntryPlugin {
       )
     }
 
-    const filterUsedActions = (
-      mod: webpack.NormalModule,
-      importedIdentifiers: string[]
-    ): void => {
-      if (!mod) return
-
-      const modResource = getModuleResource(mod)
-
-      if (!modResource) return
-      if (visitedOfActionTraverse.has(modResource)) {
-        if (this.getUsedActionsInEntry(entryName, modResource)) {
-          this.setUsedActionsInEntry(
-            entryName,
-            modResource,
-            importedIdentifiers
-          )
-        }
-        return
-      }
-      visitedOfActionTraverse.add(modResource)
-
-      if (isActionServerLayerEntryModule(mod)) {
-        // `ids` are the identifiers that are imported from the dependency,
-        // if it's present, it's an array of strings.
-        this.setUsedActionsInEntry(entryName, modResource, importedIdentifiers)
-
-        return
-      }
-
-      getModuleReferencesInOrder(mod, compilation.moduleGraph).forEach(
-        (connection: any) => {
-          let dependencyIds: string[] = []
-          const depModule = connection.dependency
-          if (depModule?.ids) {
-            dependencyIds.push(...depModule.ids)
-          } else {
-            dependencyIds = depModule.category === 'esm' ? [] : ['*']
-          }
-
-          filterUsedActions(connection.resolvedModule, dependencyIds)
-        }
-      )
-    }
-
     // Traverse the module graph to find all client components.
     filterClientComponents(resolvedModule, [])
 
-    // Traverse the module graph to find all used actions.
-    filterUsedActions(resolvedModule, [])
-
     return {
       clientComponentImports,
       cssImports: CSSImports.size
@@ -966,49 +842,16 @@ export class FlightClientEntryPlugin {
     entryName,
     bundlePath,
     fromClient,
-    createdActions,
   }: {
     compiler: webpack.Compiler
     compilation: webpack.Compilation
     actions: Map<string, string[]>
     entryName: string
     bundlePath: string
-    createdActions: Set<string>
     fromClient?: boolean
   }) {
-    // Filter out the unused actions before create action entry.
-    for (const [filePath, names] of actions.entries()) {
-      const usedActionNames = this.getUsedActionsInEntry(entryName, filePath)
-      if (!usedActionNames) continue
-      const containsAll = usedActionNames.has('*')
-      if (usedActionNames && !containsAll) {
-        const filteredNames = names.filter(
-          (name) => usedActionNames.has(name) || isInlineActionIdentifier(name)
-        )
-        actions.set(filePath, filteredNames)
-      } else if (!containsAll) {
-        // If we didn't collect the used, we erase them from the collected actions
-        // to avoid creating the action entry.
-        if (
-          names.filter((name) => !isInlineActionIdentifier(name)).length === 0
-        ) {
-          actions.delete(filePath)
-        }
-      }
-    }
-
     const actionsArray = Array.from(actions.entries())
 
-    for (const [dep, actionNames] of actions) {
-      for (const actionName of actionNames) {
-        createdActions.add(entryName + '@' + dep + '@' + actionName)
-      }
-    }
-
-    if (actionsArray.length === 0) {
-      return Promise.resolve()
-    }
-
     const actionLoader = `next-flight-action-entry-loader?${stringify({
       actions: JSON.stringify(actionsArray),
       __client_imported__: fromClient,
@@ -1017,10 +860,9 @@ export class FlightClientEntryPlugin {
     const currentCompilerServerActions = this.isEdgeServer
       ? pluginState.edgeServerActions
       : pluginState.serverActions
-
-    for (const [actionFilePath, actionNames] of actionsArray) {
-      for (const name of actionNames) {
-        const id = generateActionId(actionFilePath, name)
+    for (const [p, names] of actionsArray) {
+      for (const name of names) {
+        const id = generateActionId(p, name)
         if (typeof currentCompilerServerActions[id] === 'undefined') {
           currentCompilerServerActions[id] = {
             workers: {},
@@ -1232,8 +1074,3 @@ function getModuleResource(mod: webpack.NormalModule): string {
   }
   return modResource
 }
-
-// x-ref crates/next-custom-transforms/src/transforms/server_actions.rs `gen_ident` funcition
-function isInlineActionIdentifier(name: string) {
-  return name.startsWith('$$ACTION_')
-}
diff --git a/packages/next/src/server/config-shared.ts b/packages/next/src/server/config-shared.ts
index d14a0d0587178..36fd339a6d7ef 100644
--- 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: false,
+    optimizeServerReact: true,
     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
deleted file mode 100644
index 56f6fd7a49d98..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/_testing/utils.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-// @ts-ignore avoid ts errors during manual testing
-import { type NextInstance } from 'e2e-utils'
-
-async function getActionsMappingByRuntime(
-  next: NextInstance,
-  runtime: 'node' | 'edge'
-) {
-  const manifest = JSON.parse(
-    await next.readFile('.next/server/server-reference-manifest.json')
-  )
-
-  return manifest[runtime]
-}
-
-export function markLayoutAsEdge(next: NextInstance) {
-  beforeAll(async () => {
-    await next.stop()
-    const layoutContent = await next.readFile('app/layout.js')
-    await next.patchFile(
-      'app/layout.js',
-      layoutContent + `\nexport const runtime = 'edge'`
-    )
-    await next.start()
-  })
-}
-
-/* 
-{ 
-  [route path]: { [layer]: Set<workerId> ]
-}
-*/
-type ActionsMappingOfRuntime = {
-  [actionId: string]: {
-    workers: {
-      [route: string]: string
-    }
-    layer: {
-      [route: string]: string
-    }
-  }
-}
-type ActionState = {
-  [route: string]: {
-    [layer: string]: number
-  }
-}
-
-function getActionsRoutesState(
-  actionsMappingOfRuntime: ActionsMappingOfRuntime
-): ActionState {
-  const state: ActionState = {}
-  Object.keys(actionsMappingOfRuntime).forEach((actionId) => {
-    const action = actionsMappingOfRuntime[actionId]
-    const routePaths = Object.keys(action.workers)
-
-    routePaths.forEach((routePath) => {
-      if (!state[routePath]) {
-        state[routePath] = {}
-      }
-      const layer = action.layer[routePath]
-
-      if (!state[routePath][layer]) {
-        state[routePath][layer] = 0
-      }
-
-      state[routePath][layer]++
-    })
-  })
-
-  return state
-}
-
-export async function getActionsRoutesStateByRuntime(next: NextInstance) {
-  const actionsMappingOfRuntime = await getActionsMappingByRuntime(
-    next,
-    process.env.TEST_EDGE ? 'edge' : 'node'
-  )
-  return getActionsRoutesState(actionsMappingOfRuntime)
-}
diff --git a/test/production/app-dir/actions-tree-shaking/basic/app/actions.js b/test/production/app-dir/actions-tree-shaking/basic/app/actions.js
deleted file mode 100644
index baab9fc1592e2..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/basic/app/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function serverComponentAction() {
-  return 'server-action'
-}
-
-export async function clientComponentAction() {
-  return 'client-action'
-}
-
-export async function unusedExportedAction() {
-  return 'unused-exported-action'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/basic/app/client/page.js b/test/production/app-dir/actions-tree-shaking/basic/app/client/page.js
deleted file mode 100644
index acb21285408f0..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/basic/app/client/page.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { clientComponentAction } from '../actions'
-
-export default function Page() {
-  const [text, setText] = useState('initial')
-  return (
-    <div>
-      <button
-        id="action-1"
-        onClick={async () => {
-          setText(await clientComponentAction())
-        }}
-      >
-        Action 1
-      </button>
-      <span>{text}</span>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/basic/app/inline/page.js b/test/production/app-dir/actions-tree-shaking/basic/app/inline/page.js
deleted file mode 100644
index 2af62bdd5b516..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/basic/app/inline/page.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export default function Page() {
-  // Inline Server Action
-  async function inlineServerAction() {
-    'use server'
-    return 'inline-server-action'
-  }
-
-  return (
-    <form action={inlineServerAction}>
-      <button type="submit">Submit</button>
-    </form>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/basic/app/layout.js b/test/production/app-dir/actions-tree-shaking/basic/app/layout.js
deleted file mode 100644
index 750eb927b1980..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/basic/app/layout.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Layout({ children }) {
-  return (
-    <html>
-      <body>{children}</body>
-    </html>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/basic/app/server/page.js b/test/production/app-dir/actions-tree-shaking/basic/app/server/page.js
deleted file mode 100644
index 0c45f46e3d3cc..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/basic/app/server/page.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { serverComponentAction } from '../actions'
-
-export default function Page() {
-  return (
-    <form>
-      <input type="text" placeholder="input" />
-      <button formAction={serverComponentAction}>submit</button>
-    </form>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/basic/basic-edge.test.ts b/test/production/app-dir/actions-tree-shaking/basic/basic-edge.test.ts
deleted file mode 100644
index 8b3a400e43107..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/basic/basic-edge.test.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-process.env.TEST_EDGE = '1'
-
-require('./basic.test')
diff --git a/test/production/app-dir/actions-tree-shaking/basic/basic.test.ts b/test/production/app-dir/actions-tree-shaking/basic/basic.test.ts
deleted file mode 100644
index 8562000a161f8..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/basic/basic.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { nextTestSetup } from 'e2e-utils'
-import {
-  getActionsRoutesStateByRuntime,
-  markLayoutAsEdge,
-} from '../_testing/utils'
-
-describe('actions-tree-shaking - basic', () => {
-  const { next } = nextTestSetup({
-    files: __dirname,
-  })
-
-  if (process.env.TEST_EDGE) {
-    markLayoutAsEdge(next)
-  }
-
-  it('should not have the unused action in the manifest', async () => {
-    const actionsRoutesState = await getActionsRoutesStateByRuntime(next)
-
-    expect(actionsRoutesState).toMatchObject({
-      // only one server layer action
-      'app/server/page': {
-        rsc: 1,
-      },
-      // only one browser layer action
-      'app/client/page': {
-        'action-browser': 1,
-      },
-      'app/inline/page': {
-        rsc: 1,
-      },
-    })
-  })
-})
diff --git a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/layout.js b/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/layout.js
deleted file mode 100644
index 750eb927b1980..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/layout.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Layout({ children }) {
-  return (
-    <html>
-      <body>{children}</body>
-    </html>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/actions.js b/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/actions.js
deleted file mode 100644
index 5363b9bc3cf58..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function esmModuleTypeAction() {
-  return 'esm-module-type-action'
-}
-
-export async function cjsModuleTypeAction() {
-  return 'cjs-module-type-action'
-}
-
-export async function unusedModuleTypeAction1() {
-  return 'unused-module-type-action-1'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/page.js b/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/page.js
deleted file mode 100644
index db9cde5fc60a8..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/page.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const { cjsModuleTypeAction } = require('./actions')
-
-export default function Page() {
-  return (
-    <div>
-      <h3>One</h3>
-      <form>
-        <input type="text" placeholder="input" />
-        <button formAction={cjsModuleTypeAction}>submit</button>
-      </form>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/actions.js b/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/actions.js
deleted file mode 100644
index 5363b9bc3cf58..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function esmModuleTypeAction() {
-  return 'esm-module-type-action'
-}
-
-export async function cjsModuleTypeAction() {
-  return 'cjs-module-type-action'
-}
-
-export async function unusedModuleTypeAction1() {
-  return 'unused-module-type-action-1'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/page.js b/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/page.js
deleted file mode 100644
index c4a6b7efc43fa..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/page.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { esmModuleTypeAction } from './actions'
-
-export default function Page() {
-  return (
-    <div>
-      <h3>One</h3>
-      <form>
-        <input type="text" placeholder="input" />
-        <button formAction={esmModuleTypeAction}>submit</button>
-      </form>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions-edge.test.ts b/test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions-edge.test.ts
deleted file mode 100644
index 3aea19702e51c..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions-edge.test.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-process.env.TEST_EDGE = '1'
-
-require('./mixed-module-actions.test')
diff --git a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions.test.ts b/test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions.test.ts
deleted file mode 100644
index c1db8543579fe..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { nextTestSetup } from 'e2e-utils'
-import {
-  getActionsRoutesStateByRuntime,
-  markLayoutAsEdge,
-} from '../_testing/utils'
-
-describe('actions-tree-shaking - mixed-module-actions', () => {
-  const { next } = nextTestSetup({
-    files: __dirname,
-  })
-
-  if (process.env.TEST_EDGE) {
-    markLayoutAsEdge(next)
-  }
-
-  it('should not do tree shake for cjs module when import server actions', async () => {
-    const actionsRoutesState = await getActionsRoutesStateByRuntime(next)
-
-    expect(actionsRoutesState).toMatchObject({
-      'app/mixed-module/esm/page': {
-        rsc: 1,
-      },
-      // CJS import is not able to tree shake, so it will include all actions
-      'app/mixed-module/cjs/page': {
-        rsc: 3,
-      },
-    })
-  })
-})
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/layout.js b/test/production/app-dir/actions-tree-shaking/reexport/app/layout.js
deleted file mode 100644
index 750eb927b1980..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/layout.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Layout({ children }) {
-  return (
-    <html>
-      <body>{children}</body>
-    </html>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/actions.js b/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/actions.js
deleted file mode 100644
index a8ac4706d0637..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function sharedClientLayerAction() {
-  return 'shared-client-layer-action'
-}
-
-export async function unusedClientLayerAction1() {
-  return 'unused-client-layer-action-1'
-}
-
-export async function unusedClientLayerAction2() {
-  return 'unused-client-layer-action-2'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/page.js b/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/page.js
deleted file mode 100644
index 255bec56559d6..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/page.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { sharedClientLayerAction } from './reexport-action'
-
-export default function Page() {
-  const [text, setText] = useState('initial')
-  return (
-    <div>
-      <button
-        id="action-1"
-        onClick={async () => {
-          setText(await sharedClientLayerAction())
-        }}
-      >
-        Action 1
-      </button>
-      <span>{text}</span>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/reexport-action.js b/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/reexport-action.js
deleted file mode 100644
index fa2dbb7fe37ac..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/reexport-action.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
-  sharedClientLayerAction,
-  unusedClientLayerAction1,
-  unusedClientLayerAction2,
-} from './actions'
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/actions.js b/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/actions.js
deleted file mode 100644
index da6609602621d..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function sharedServerLayerAction() {
-  return 'shared-server-layer-action'
-}
-
-export async function unusedServerLayerAction1() {
-  return 'unused-server-layer-action-1'
-}
-
-export async function unusedServerLayerAction2() {
-  return 'unused-server-layer-action-2'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/page.js b/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/page.js
deleted file mode 100644
index aacdbe6dfd179..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/page.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { sharedServerLayerAction } from './reexport-action'
-
-export default function Page() {
-  return (
-    <div>
-      <form>
-        <input type="text" placeholder="input" />
-        <button formAction={sharedServerLayerAction}>submit</button>
-      </form>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/reexport-action.js b/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/reexport-action.js
deleted file mode 100644
index e2688239bd066..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/reexport-action.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
-  sharedServerLayerAction,
-  unusedServerLayerAction1,
-  unusedServerLayerAction2,
-} from './actions'
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/actions.js b/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/actions.js
deleted file mode 100644
index a8ac4706d0637..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function sharedClientLayerAction() {
-  return 'shared-client-layer-action'
-}
-
-export async function unusedClientLayerAction1() {
-  return 'unused-client-layer-action-1'
-}
-
-export async function unusedClientLayerAction2() {
-  return 'unused-client-layer-action-2'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/page.js b/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/page.js
deleted file mode 100644
index 8ebbc07c51115..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/page.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import * as actionMod from './actions'
-
-export default function Page() {
-  const [text, setText] = useState('initial')
-  return (
-    <div>
-      <button
-        id="action-1"
-        onClick={async () => {
-          setText(await actionMod.sharedClientLayerAction())
-        }}
-      >
-        Action 1
-      </button>
-      <span>{text}</span>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/actions.js b/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/actions.js
deleted file mode 100644
index da6609602621d..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function sharedServerLayerAction() {
-  return 'shared-server-layer-action'
-}
-
-export async function unusedServerLayerAction1() {
-  return 'unused-server-layer-action-1'
-}
-
-export async function unusedServerLayerAction2() {
-  return 'unused-server-layer-action-2'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/page.js b/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/page.js
deleted file mode 100644
index 0284f35c64f16..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/page.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as actionMod from './actions'
-
-export default function Page() {
-  return (
-    <div>
-      <form>
-        <input type="text" placeholder="input" />
-        <button formAction={actionMod.sharedServerLayerAction}>submit</button>
-      </form>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/reexport-edge.test.ts b/test/production/app-dir/actions-tree-shaking/reexport/reexport-edge.test.ts
deleted file mode 100644
index 5634ba4646912..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/reexport-edge.test.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-process.env.TEST_EDGE = '1'
-
-require('./reexport.test')
diff --git a/test/production/app-dir/actions-tree-shaking/reexport/reexport.test.ts b/test/production/app-dir/actions-tree-shaking/reexport/reexport.test.ts
deleted file mode 100644
index d452ad5a4e9cd..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/reexport/reexport.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { nextTestSetup } from 'e2e-utils'
-import {
-  getActionsRoutesStateByRuntime,
-  markLayoutAsEdge,
-} from '../_testing/utils'
-
-describe('actions-tree-shaking - reexport', () => {
-  const { next } = nextTestSetup({
-    files: __dirname,
-  })
-
-  if (process.env.TEST_EDGE) {
-    markLayoutAsEdge(next)
-  }
-
-  it('should not have the unused action in the manifest', async () => {
-    const actionsRoutesState = await getActionsRoutesStateByRuntime(next)
-
-    expect(actionsRoutesState).toMatchObject({
-      'app/namespace-reexport/server/page': {
-        rsc: 1,
-      },
-      'app/namespace-reexport/client/page': {
-        'action-browser': 1,
-      },
-      // We're not able to tree-shake these re-exports here
-      'app/named-reexport/server/page': {
-        rsc: 3,
-      },
-      'app/named-reexport/client/page': {
-        'action-browser': 3,
-      },
-    })
-  })
-})
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/actions.js b/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/actions.js
deleted file mode 100644
index a8ac4706d0637..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function sharedClientLayerAction() {
-  return 'shared-client-layer-action'
-}
-
-export async function unusedClientLayerAction1() {
-  return 'unused-client-layer-action-1'
-}
-
-export async function unusedClientLayerAction2() {
-  return 'unused-client-layer-action-2'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/one/page.js b/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/one/page.js
deleted file mode 100644
index 2403399025b94..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/one/page.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { sharedClientLayerAction } from '../actions'
-
-export default function Page() {
-  const [text, setText] = useState('initial')
-  return (
-    <div>
-      <h1>One</h1>
-      <button
-        id="action-1"
-        onClick={async () => {
-          setText(await sharedClientLayerAction())
-        }}
-      >
-        Action 1
-      </button>
-      <span>{text}</span>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/two/page.js b/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/two/page.js
deleted file mode 100644
index 8fce3d15570d3..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/two/page.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { sharedClientLayerAction } from '../actions'
-
-export default function Page() {
-  const [text, setText] = useState('initial')
-  return (
-    <div>
-      <h1>Two</h1>
-      <button
-        id="action-1"
-        onClick={async () => {
-          setText(await sharedClientLayerAction())
-        }}
-      >
-        Action 1
-      </button>
-      <span>{text}</span>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/layout.js b/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/layout.js
deleted file mode 100644
index 750eb927b1980..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/layout.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Layout({ children }) {
-  return (
-    <html>
-      <body>{children}</body>
-    </html>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/actions.js b/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/actions.js
deleted file mode 100644
index da6609602621d..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/actions.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use server'
-
-export async function sharedServerLayerAction() {
-  return 'shared-server-layer-action'
-}
-
-export async function unusedServerLayerAction1() {
-  return 'unused-server-layer-action-1'
-}
-
-export async function unusedServerLayerAction2() {
-  return 'unused-server-layer-action-2'
-}
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/one/page.js b/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/one/page.js
deleted file mode 100644
index d9390291722dc..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/one/page.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { sharedServerLayerAction } from '../actions'
-
-export default function Page() {
-  return (
-    <div>
-      <h3>One</h3>
-      <form>
-        <input type="text" placeholder="input" />
-        <button formAction={sharedServerLayerAction}>submit</button>
-      </form>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/two/page.js b/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/two/page.js
deleted file mode 100644
index d9390291722dc..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/two/page.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { sharedServerLayerAction } from '../actions'
-
-export default function Page() {
-  return (
-    <div>
-      <h3>One</h3>
-      <form>
-        <input type="text" placeholder="input" />
-        <button formAction={sharedServerLayerAction}>submit</button>
-      </form>
-    </div>
-  )
-}
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions-edge.test.ts b/test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions-edge.test.ts
deleted file mode 100644
index 403c93484f8a2..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions-edge.test.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-process.env.TEST_EDGE = '1'
-
-require('./shared-module-actions.test')
diff --git a/test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions.test.ts b/test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions.test.ts
deleted file mode 100644
index c9c90a99ccb27..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { nextTestSetup } from 'e2e-utils'
-import {
-  getActionsRoutesStateByRuntime,
-  markLayoutAsEdge,
-} from '../_testing/utils'
-
-describe('actions-tree-shaking - shared-module-actions', () => {
-  const { next } = nextTestSetup({
-    files: __dirname,
-  })
-
-  if (process.env.TEST_EDGE) {
-    markLayoutAsEdge(next)
-  }
-
-  it('should not have the unused action in the manifest', async () => {
-    const actionsRoutesState = await getActionsRoutesStateByRuntime(next)
-
-    expect(actionsRoutesState).toMatchObject({
-      'app/server/one/page': {
-        rsc: 1,
-      },
-      'app/server/two/page': {
-        rsc: 1,
-      },
-      'app/client/one/page': {
-        'action-browser': 1,
-      },
-      'app/client/two/page': {
-        'action-browser': 1,
-      },
-    })
-  })
-})
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
deleted file mode 100644
index 1d4f624eff7d9..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/shared-module-actions/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "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
deleted file mode 100644
index 750eb927b1980..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/layout.js
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 3622a51da99da..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/actions.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-'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
deleted file mode 100644
index 28504be705b95..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/my-component.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index e0656de1b90ac..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/page.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-'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
deleted file mode 100644
index 1d4f624eff7d9..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/use-effect-actions/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "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/use-effect-actions-edge.test.ts b/test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts
deleted file mode 100644
index aacfeb06a08de..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 9bf34ef7b669d..0000000000000
--- a/test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-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
index 956dfbd55ca77..5ce14b64b4976 100644
--- a/test/turbopack-build-tests-manifest.json
+++ b/test/turbopack-build-tests-manifest.json
@@ -15529,96 +15529,6 @@
       "pending": [],
       "flakey": [],
       "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/basic/basic.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - basic should not have the unused action in the manifest"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - mixed-module-actions should not do tree shake for cjs module when import server actions"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/reexport/reexport.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - reexport should not have the unused action in the manifest"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - shared-module-actions should not have the unused action in the manifest"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/basic/basic-edge.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - basic should not have the unused action in the manifest"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions-edge.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - mixed-module-actions should not do tree shake for cjs module when import server actions"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/reexport/reexport-edge.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - reexport should not have the unused action in the manifest"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
-    "test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions-edge.test.ts": {
-      "passed": [],
-      "failed": [
-        "actions-tree-shaking - shared-module-actions should not have the unused action in the manifest"
-      ],
-      "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": {