Merge branch 'canary' into inline/amp-runtime

package.json

@@ -35,6 +35,7 @@
     "lint-staged": "lint-staged",
     "next": "node --trace-deprecation packages/next/dist/bin/next",
     "trace": "node --trace-deprecation -r ./bench/instrument.js packages/next/dist/bin/next",
+    "trace-debug": "node --inspect --trace-deprecation -r ./bench/instrument.js packages/next/dist/bin/next",
     "debug": "node --inspect packages/next/dist/bin/next"
   },
   "pre-commit": "lint-staged",

packages/next/build/webpack/plugins/profiling-plugin.ts

@@ -85,14 +85,24 @@ export class ProfilingPlugin {
       compiler.hooks.environment,
       compiler.hooks.afterEnvironment
     )
-    this.traceHookPair(
-      'webpack-invalidated',
-      compiler.hooks.invalid,
-      compiler.hooks.done
-    )
+    if (compiler.options.mode === 'development') {
+      this.traceHookPair(
+        'webpack-invalidated',
+        compiler.hooks.invalid,
+        compiler.hooks.done
+      )
+    }
   }
 
   traceCompilationHooks(compiler: any) {
+    if (isWebpack5) {
+      this.traceHookPair(
+        'webpack-compilation',
+        compiler.hooks.beforeCompile,
+        compiler.hooks.afterCompile
+      )
+    }
+
     compiler.hooks.compilation.tap(pluginName, (compilation: any) => {
       compilation.hooks.buildModule.tap(pluginName, (module: any) => {
         const compilerSpan = spans.get(compiler)
@@ -118,14 +128,6 @@ export class ProfilingPlugin {
         spans.get(module).end()
       })
 
-      if (isWebpack5) {
-        this.traceHookPair(
-          'webpack-compilation',
-          compilation.hooks.beforeCompile,
-          compilation.hooks.afterCompile
-        )
-      }
-
       this.traceHookPair(
         'webpack-compilation-chunk-graph',
         compilation.hooks.beforeChunks,