Fix missing trace items and migrate required files test (#29649)

vercel · Oct 5, 2021 · ebc1b0e · ebc1b0e
1 parent dffcfe8
commit ebc1b0e
Show file tree

Hide file tree

Showing 22 changed files with 109 additions and 178 deletions.
diff --git a/packages/next/build/webpack/plugins/next-trace-entrypoints-plugin.ts b/packages/next/build/webpack/plugins/next-trace-entrypoints-plugin.ts
@@ -307,12 +307,6 @@ export class TraceEntryPointsPlugin implements webpack.Plugin {
                     continue
                   }
                   const filepath = nodePath.join(root, file)
-
-                  // don't include transpiled files as they are included
-                  // in the webpack output (e.g. chunks or the entry itself)
-                  if (depModMap.get(filepath)?.originalSource?.()) {
-                    continue
-                  }
                   tracedDeps.push(filepath)
                 }
 

diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
@@ -118,6 +118,8 @@ describe('Production Usage', () => {
             /node_modules\/react\/index\.js/,
             /node_modules\/react\/package\.json/,
             /node_modules\/react\/cjs\/react\.production\.min\.js/,
+            /next\/link\.js/,
+            /next\/dist\/client\/link\.js/,
           ],
           notTests: [/node_modules\/react\/cjs\/react\.development\.js/],
         },
@@ -129,6 +131,8 @@ describe('Production Usage', () => {
             /node_modules\/react\/index\.js/,
             /node_modules\/react\/package\.json/,
             /node_modules\/react\/cjs\/react\.production\.min\.js/,
+            /next\/router\.js/,
+            /next\/dist\/client\/router\.js/,
           ],
           notTests: [/node_modules\/react\/cjs\/react\.development\.js/],
         },

diff --git a/test/integration/required-server-files/app/next.config.js b/test/integration/required-server-files/app/next.config.js
diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts
@@ -16,7 +16,7 @@ export class NextInstance {
   protected nextConfig?: NextConfig
   protected dependencies?: { [name: string]: string }
   protected events: { [eventName: string]: Set<any> }
-  protected testDir: string
+  public testDir: string
   protected isStopping: boolean
   protected isDestroyed: boolean
   protected childProcess: ChildProcess
@@ -156,7 +156,10 @@ export class NextInstance {
     this.isDestroyed = true
     this.emit('destroy', [])
     await this.stop()
-    await fs.remove(this.testDir)
+
+    if (!process.env.NEXT_TEST_SKIP_CLEANUP) {
+      await fs.remove(this.testDir)
+    }
   }
 
   public get url() {