Make the watched filename that triggers webpack compilation be relati…

…ve to project directory
vercel · Dec 7, 2023 · 2a7b0e9 · 2a7b0e9
1 parent 1a429b6
commit 2a7b0e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -1720,7 +1720,7 @@ export default async function getBaseWebpackConfig(
           exportRuntime: true,
           appDirEnabled: hasAppDir,
         }),
-      new ProfilingPlugin({ runWebpackSpan }),
+      new ProfilingPlugin({ runWebpackSpan, rootDir: dir }),
       config.optimizeFonts &&
         !dev &&
         isNodeServer &&

diff --git a/packages/next/src/build/webpack/plugins/profiling-plugin.ts b/packages/next/src/build/webpack/plugins/profiling-plugin.ts
@@ -1,6 +1,7 @@
 import { NormalModule } from 'next/dist/compiled/webpack/webpack'
 import type { Span } from '../../../trace'
 import type { webpack } from 'next/dist/compiled/webpack/webpack'
+import path from 'path'
 
 const pluginName = 'ProfilingPlugin'
 export const spans = new WeakMap<webpack.Compilation | webpack.Compiler, Span>()
@@ -27,9 +28,17 @@ function inTraceLabelsSeal(label: string) {
 export class ProfilingPlugin {
   compiler: any
   runWebpackSpan: Span
+  rootDir: string
 
-  constructor({ runWebpackSpan }: { runWebpackSpan: Span }) {
+  constructor({
+    runWebpackSpan,
+    rootDir,
+  }: {
+    runWebpackSpan: Span
+    rootDir: string
+  }) {
     this.runWebpackSpan = runWebpackSpan
+    this.rootDir = rootDir
   }
   apply(compiler: any) {
     this.traceTopLevelHooks(compiler)
@@ -105,7 +114,9 @@ export class ProfilingPlugin {
           onStart: (span) => webpackInvalidSpans.set(compiler, span),
           onStop: () => webpackInvalidSpans.delete(compiler),
           attrs: (fileName: any) => ({
-            trigger: fileName || 'manual',
+            trigger: fileName
+              ? path.relative(this.rootDir, fileName).replaceAll(path.sep, '/')
+              : 'manual',
           }),
         }
       )