gate conflicting error

ijjk · ijjk · commit 133f36a63ae3 · 2022-11-03T11:51:13.000-07:00
diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
@@ -429,7 +429,7 @@ export default class DevServer extends Server {
             fileName
           )
 
-          if (pageNameSet.has(pageName)) {
+          if (this.appDir && pageNameSet.has(pageName)) {
             conflictingAppPagePaths.add(pageName)
           } else {
             pageNameSet.add(pageName)

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ export default class DevServer extends Server {`
`429`	`429`	`fileName`
`430`	`430`	`)`
`431`	`431`
`432`		`- if (pageNameSet.has(pageName)) {`
	`432`	`+ if (this.appDir && pageNameSet.has(pageName)) {`
`433`	`433`	`conflictingAppPagePaths.add(pageName)`
`434`	`434`	`} else {`
`435`	`435`	`pageNameSet.add(pageName)`