Ensure build trace handles mixed modules

packages/next/build/webpack/plugins/next-trace-entrypoints-plugin.ts

@@ -253,6 +253,7 @@ export class TraceEntryPointsPlugin implements webpack.Plugin {
                 readlink,
                 stat,
                 ignore: [...TRACE_IGNORES, ...this.excludeFiles],
+                mixedModules: true,
               })
 
               const tracedDeps: string[] = []

test/integration/build-trace-extra-entries/app/lib/fetch-data.js

@@ -0,0 +1,5 @@
+const getCmsData = require('some-cms')
+
+export function fetchData() {
+  return getCmsData()
+}

test/integration/build-trace-extra-entries/next.config.js → test/integration/build-trace-extra-entries/app/next.config.js

@@ -13,7 +13,7 @@ module.exports = {
       if (isServer) {
         const curEntry = origEntries['pages/_app']
         origEntries['pages/_app'] = [
-          path.resolve('lib/get-data.js'),
+          path.join(__dirname, 'lib/get-data.js'),
           ...curEntry,
         ]
         console.log(origEntries)

test/integration/build-trace-extra-entries/app/pages/index.js

@@ -0,0 +1,13 @@
+import { fetchData } from '../lib/fetch-data'
+
+export default function Page() {
+  return 'index page'
+}
+
+export function getStaticProps() {
+  fetchData()
+
+  return {
+    props: {},
+  }
+}

test/integration/build-trace-extra-entries/test/index.test.js

@@ -6,7 +6,7 @@ import { nextBuild } from 'next-test-utils'
 
 jest.setTimeout(1000 * 60)
 
-const appDir = join(__dirname, '..')
+const appDir = join(__dirname, '../app')
 
 describe('build trace with extra entries', () => {
   it('should build and trace correctly', async () => {
@@ -28,5 +28,8 @@ describe('build trace with extra entries', () => {
     expect(
       indexTrace.files.some((file) => file.endsWith('hello.json'))
     ).toBeFalsy()
+    expect(
+      indexTrace.files.some((file) => file.includes('some-cms/index.js'))
+    ).toBe(true)
   })
 })