Only add edge entries when there are other edge entries

packages/next/src/build/entries.ts

@@ -718,12 +718,15 @@ export async function createEntrypoints(
         onEdgeServer: () => {
           let appDirLoader: string = ''
           if (isInstrumentation) {
-            edgeServer[serverBundlePath.replace('src/', '')] =
-              getInstrumentationEntry({
-                absolutePagePath,
-                isEdgeServer: true,
-                isDev: false,
-              })
+            // Add instrumentation edge server entry when there's other edge server entries
+            if (Object.keys(edgeServer).length > 0) {
+              edgeServer[serverBundlePath.replace('src/', '')] =
+                getInstrumentationEntry({
+                  absolutePagePath,
+                  isEdgeServer: true,
+                  isDev: false,
+                })
+            }
           } else {
             if (pagesType === 'app') {
               const matchedAppPaths = appPathsPerRoute[normalizeAppPath(page)]
@@ -788,7 +791,8 @@ export async function createEntrypoints(
 
   // Optimization: If there's only one instrumentation hook in edge compiler, which means there's no edge server entry.
   // We remove the edge instrumentation entry from edge compiler as it can be pure server side.
-  if (edgeServer.instrumentation && Object.keys(edgeServer).length === 1) {
+  const edgeServerEntriesCount = Object.keys(edgeServer).length
+  if (edgeServer.instrumentation && edgeServerEntriesCount <= 1) {
     delete edgeServer.instrumentation
   }
 

packages/next/src/server/dev/hot-reloader-webpack.ts

@@ -895,17 +895,20 @@ export default class HotReloaderWebpack implements NextJsHotReloaderInterface {
 
                 if (isInstrumentation) {
                   const normalizedBundlePath = bundlePath.replace('src/', '')
-                  entrypoints[normalizedBundlePath] = finalizeEntrypoint({
-                    compilerType: COMPILER_NAMES.edgeServer,
-                    name: normalizedBundlePath,
-                    value: getInstrumentationEntry({
-                      absolutePagePath: entryData.absolutePagePath,
-                      isEdgeServer: true,
-                      isDev: true,
-                    }),
-                    isServerComponent: true,
-                    hasAppDir,
-                  })
+                  // Add instrumentation edge server entry when there's other edge server entries
+                  if (Object.keys(entrypoints).length > 0) {
+                    entrypoints[normalizedBundlePath] = finalizeEntrypoint({
+                      compilerType: COMPILER_NAMES.edgeServer,
+                      name: normalizedBundlePath,
+                      value: getInstrumentationEntry({
+                        absolutePagePath: entryData.absolutePagePath,
+                        isEdgeServer: true,
+                        isDev: true,
+                      }),
+                      isServerComponent: true,
+                      hasAppDir,
+                    })
+                  }
                   return
                 }
                 const appDirLoader = isAppPath

test/e2e/on-request-error/isr/isr.test.ts

@@ -15,8 +15,9 @@ describe('on-request-error - isr', () => {
   }
 
   if (isNextDev) {
-    it('should skip in development mode', () => {
-      // This ISR test is only applicable for production mode
+    it('should not have module not found error', async () => {
+      await next.fetch('/')
+      expect(next.cliOutput).not.toContain('Module not found')
     })
     return
   }