Merge branch 'master' into develop

cypress-io · Sep 24, 2021 · 1785016 · 1785016 · cypress-bot · Sep 24, 2021
2 parents 6e0c2c1 + db6f909
commit 1785016
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/npm/react/plugins/next/findNextWebpackConfig.js b/npm/react/plugins/next/findNextWebpackConfig.js
@@ -3,6 +3,7 @@
 const debug = require('debug')('@cypress/react')
 const getNextJsBaseWebpackConfig = require('next/dist/build/webpack-config').default
 const { findPagesDir } = require('../../dist/next/findPagesDir')
+const { getRunWebpackSpan } = require('../../dist/next/getRunWebpackSpan')
 
 async function getNextWebpackConfig (config) {
   let loadConfig
@@ -20,6 +21,7 @@ async function getNextWebpackConfig (config) {
     }
   }
   const nextConfig = await loadConfig('development', config.projectRoot)
+  const runWebpackSpan = await getRunWebpackSpan()
   const nextWebpackConfig = await getNextJsBaseWebpackConfig(
     config.projectRoot,
     {
@@ -30,6 +32,7 @@ async function getNextWebpackConfig (config) {
       pagesDir: findPagesDir(config.projectRoot),
       entrypoints: {},
       rewrites: { fallback: [], afterFiles: [], beforeFiles: [] },
+      ...runWebpackSpan,
     },
   )
 

diff --git a/npm/react/plugins/next/getRunWebpackSpan.ts b/npm/react/plugins/next/getRunWebpackSpan.ts
@@ -0,0 +1,16 @@
+import type { Span } from 'next/dist/telemetry/trace/trace'
+
+// Starting with v11.1.1, a trace is required.
+// 'next/dist/telemetry/trace/trace' only exists since v10.0.9
+// and our peerDeps support back to v8 so try-catch this import
+export async function getRunWebpackSpan (): Promise<{ runWebpackSpan?: Span }> {
+  let trace: (name: string) => Span
+
+  try {
+    trace = await import('next/dist/telemetry/trace/trace').then((m) => m.trace)
+
+    return { runWebpackSpan: trace('cypress') }
+  } catch (_) {
+    return {}
+  }
+}