fix

Author: huozhi

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

@@ -926,13 +926,13 @@ export default async function getBaseWebpackConfig(
     : []
 
   const swcLoaderForMiddlewareLayer = useSWCLoader
-    ? getSwcLoader({ hasServerComponents: false, bundleTarget: 'server' })
+    ? getSwcLoader({ hasServerComponents: false, bundleTarget: 'default' })
     : // 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.
       [
-        getSwcLoader({ hasServerComponents: false, bundleTarget: 'server' }),
+        getSwcLoader({ hasServerComponents: false, bundleTarget: 'default' }),
         getBabelLoader(),
       ]
 
@@ -980,7 +980,7 @@ export default async function getBaseWebpackConfig(
           loader: 'next-swc-loader',
           options: {
             ...getSwcLoader().options,
-            bundleTarget: 'server',
+            bundleTarget: 'default',
             hasServerComponents: false,
           },
         }
@@ -1965,6 +1965,7 @@ export default async function getBaseWebpackConfig(
         'next-flight-action-entry-loader',
         'next-flight-client-module-loader',
         'noop-loader',
+        'empty-loader',
         'next-middleware-loader',
         'next-edge-function-loader',
         'next-edge-app-route-loader',
@@ -2117,7 +2118,7 @@ export default async function getBaseWebpackConfig(
             /^client-only$/,
             /next[\\/]dist[\\/]compiled[\\/]client-only[\\/]error/,
           ],
-          loader: 'noop-loader',
+          loader: 'empty-loader',
           issuerLayer: {
             or: WEBPACK_LAYERS.GROUP.nonClientServerTarget,
           },

packages/next/src/build/webpack/loaders/empty-loader.ts

@@ -0,0 +1,4 @@
+import type { webpack } from 'next/dist/compiled/webpack/webpack'
+
+const EmptyLoader: webpack.LoaderDefinitionFunction = () => 'export default {}'
+export default EmptyLoader

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

@@ -5,7 +5,7 @@ createNextDescribe(
   {
     files: __dirname,
   },
-  ({ next, isNextDev, isNextStart }) => {
+  ({ next, isNextStart }) => {
     function runTests() {
       it('should render routes marked with restriction marks without errors', async () => {
         const routes = [
@@ -21,6 +21,7 @@ createNextDescribe(
           // pages/api
           '/api/hello',
           '/api/hello-edge',
+          '/api/mixed',
         ]
 
         for (const route of routes) {
@@ -61,39 +62,38 @@ createNextDescribe(
 
     describe('no server-only in server targets', () => {
       const middlewareFile = 'middleware.js'
-      const pagesApiFile = 'pages/api/hello.js'
+      // const pagesApiFile = 'pages/api/hello.js'
       let middlewareContent = ''
-      let pagesApiContent = ''
+      // let pagesApiContent = ''
 
       beforeAll(async () => {
         await next.stop()
 
         middlewareContent = await next.readFile(middlewareFile)
+        // pagesApiContent = await next.readFile(pagesApiFile)
+
         await next.patchFile(
           middlewareFile,
           middlewareContent
             .replace("import 'server-only'", "// import 'server-only'")
-            .replace(
-              "// import { sharedComponentValue } from './lib/mixed-lib'",
-              "import { sharedComponentValue } from './lib/mixed-lib'"
-            )
-        )
-        pagesApiContent = await next.readFile(pagesApiFile)
-        await next.patchFile(
-          pagesApiFile,
-          pagesApiContent
-            .replace("import 'server-only'", "// import 'server-only'")
-            .replace(
-              "// import { sharedComponentValue } from '../../lib/mixed-lib'",
-              "import { sharedComponentValue } from '../../lib/mixed-lib'"
-            )
+            .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(pagesApiFile, pagesApiContent)
       })
       runTests()
     })

test/e2e/module-layer/middleware.js

@@ -1,12 +1,7 @@
 import 'server-only'
 import { NextResponse } from 'next/server'
-// import { sharedComponentValue } from './lib/mixed-lib'
+// import './lib/mixed-lib'
 
 export function middleware(request) {
-  // Just make sure variable `sharedComponentValue` won't be eliminated
-  if (request.pathname === 'this-is-a-path-that-wont-trigger') {
-    return NextResponse.redirect('/' + sharedComponentValue)
-  }
-
   return NextResponse.next()
 }

test/e2e/module-layer/pages/api/hello-edge.js

@@ -1,7 +1,7 @@
 import 'server-only'
 
 export default function handler() {
-  return new Response('api/hello-edge.js:' + sharedComponentValue)
+  return new Response('pages/api/hello-edge.js:')
 }
 
 export const runtime = 'edge'

test/e2e/module-layer/pages/api/hello.js

@@ -1,6 +1,5 @@
 import 'server-only'
-// import { sharedComponentValue } from '../../lib/mixed-lib'
 
 export default function handler(req, res) {
-  return res.send('api/hello.js:' + sharedComponentValue)
+  return res.send('pages/api/hello.js:')
 }

test/e2e/module-layer/pages/api/mixed.js

@@ -0,0 +1,5 @@
+import '../../lib/mixed-lib'
+
+export default function handler(req, res) {
+  return res.send('pages/api/mixed.js:')
+}