Revert "Apply react-server transform and valication to middleware (#5… (

#57504)

…7448)"

This reverts commit 17bd232.

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

-->

packages/next/src/build/webpack-config.ts

@@ -455,12 +455,20 @@ export default async function getBaseWebpackConfig(
     : []
 
   const swcLoaderForMiddlewareLayer = useSWCLoader
-    ? swcServerLayerLoader
+    ? getSwcLoader({
+        serverComponents: false,
+        isReactServerLayer: false,
+      })
     : // When using Babel, we will have to use SWC to do the optimization
       // for middleware to tree shake the unused default optimized imports like "next/server".
       // This will cause some performance overhead but
       // acceptable as Babel will not be recommended.
-      [swcServerLayerLoader, babelLoader]
+      [
+        getSwcLoader({
+          serverComponents: false,
+          isReactServerLayer: false,
+        }),
+      ]
 
   // client components layers: SSR + browser
   const swcLoaderForClientLayer = [

packages/next/src/lib/constants.ts

@@ -154,9 +154,12 @@ const WEBPACK_LAYERS = {
       WEBPACK_LAYERS_NAMES.actionBrowser,
       WEBPACK_LAYERS_NAMES.appMetadataRoute,
       WEBPACK_LAYERS_NAMES.appRouteHandler,
+    ],
+    nonClientServerTarget: [
+      // plus middleware and pages api
       WEBPACK_LAYERS_NAMES.middleware,
+      WEBPACK_LAYERS_NAMES.api,
     ],
-    nonClientServerTarget: [WEBPACK_LAYERS_NAMES.api],
     app: [
       WEBPACK_LAYERS_NAMES.reactServerComponents,
       WEBPACK_LAYERS_NAMES.actionBrowser,

test/e2e/module-layer/index.test.ts

@@ -1,12 +1,11 @@
 import { createNextDescribe } from 'e2e-utils'
-import { getRedboxSource, hasRedbox } from 'next-test-utils'
 
 createNextDescribe(
   'module layer',
   {
     files: __dirname,
   },
-  ({ next, isNextStart, isNextDev }) => {
+  ({ next, isNextStart }) => {
     function runTests() {
       it('should render routes marked with restriction marks without errors', async () => {
         const routes = [
@@ -61,60 +60,45 @@ createNextDescribe(
       }
     }
 
-    describe('with server-only in server targets', () => {
-      runTests()
-    })
+    describe('no server-only in server targets', () => {
+      const middlewareFile = 'middleware.js'
+      // const pagesApiFile = 'pages/api/hello.js'
+      let middlewareContent = ''
+      // let pagesApiContent = ''
 
-    // Should error for using mixed (with client-only) in server targets
-    if (isNextDev) {
-      describe('no server-only in server targets', () => {
-        const middlewareFile = 'middleware.js'
-        // const pagesApiFile = 'pages/api/hello.js'
-        let middlewareContent = ''
-        // let pagesApiContent = ''
+      beforeAll(async () => {
+        await next.stop()
 
-        beforeAll(async () => {
-          await next.stop()
+        middlewareContent = await next.readFile(middlewareFile)
+        // pagesApiContent = await next.readFile(pagesApiFile)
 
-          middlewareContent = await next.readFile(middlewareFile)
-          // pagesApiContent = await next.readFile(pagesApiFile)
-
-          await next.patchFile(
-            middlewareFile,
-            middlewareContent
-              // .replace("import 'server-only'", "// import 'server-only'")
-              .replace(
-                "// import './lib/mixed-lib'",
-                "import './lib/mixed-lib'"
-              )
-          )
-
-          // await next.patchFile(
-          //   pagesApiFile,
-          //   pagesApiContent
-          //     .replace("import 'server-only'", "// import 'server-only'")
-          //     .replace(
-          //       "// import '../../lib/mixed-lib'",
-          //       "import '../../lib/mixed-lib'"
-          //     )
-          // )
-
-          await next.start()
-        })
-        afterAll(async () => {
-          await next.patchFile(middlewareFile, middlewareContent)
-          // await next.patchFile(pagesApiFile, pagesApiContent)
-        })
+        await next.patchFile(
+          middlewareFile,
+          middlewareContent
+            .replace("import 'server-only'", "// import 'server-only'")
+            .replace("// import './lib/mixed-lib'", "import './lib/mixed-lib'")
+        )
 
-        it('should error when import client-only in middleware', async () => {
-          const browser = await next.browser('/')
+        // await next.patchFile(
+        //   pagesApiFile,
+        //   pagesApiContent
+        //     .replace("import 'server-only'", "// import 'server-only'")
+        //     .replace(
+        //       "// import '../../lib/mixed-lib'",
+        //       "import '../../lib/mixed-lib'"
+        //     )
+        // )
 
-          expect(await hasRedbox(browser, true)).toBe(true)
-          expect(await getRedboxSource(browser)).toContain(
-            `You're importing a component that imports client-only. It only works in a Client Component but none of its parents are marked with "use client", so they're Server Components by default.`
-          )
-        })
+        await next.start()
       })
-    }
+      afterAll(async () => {
+        await next.patchFile(middlewareFile, middlewareContent)
+        // await next.patchFile(pagesApiFile, pagesApiContent)
+      })
+      runTests()
+    })
+    describe('with server-only in server targets', () => {
+      runTests()
+    })
   }
 )