From 449c8a77dd1b01fb989c257a03f514eb6df35720 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Thu, 22 Jul 2021 20:29:36 +0200
Subject: [PATCH] chore: disable source-map reference in JS for production
 builds (#7622)

---
 src/utils/stackTrace.ts | 18 +++++++++++++++---
 utils/build/build.js    |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/utils/stackTrace.ts b/src/utils/stackTrace.ts
index dd8bbffb27..5b9c66f3ee 100644
--- a/src/utils/stackTrace.ts
+++ b/src/utils/stackTrace.ts
@@ -39,9 +39,14 @@ const PW_LIB_DIRS = [
   path.join('@playwright', 'test'),
 ].map(packageName => path.sep + packageName);
 
-const runnerLib = path.join('@playwright', 'test', 'lib', 'test');
+const runnerNpmPkgLib = path.join('@playwright', 'test', 'lib', 'test');
+const runnerLib = path.join('lib', 'test');
 const runnerSrc = path.join('src', 'test');
 
+function includesFileInPlaywrightSubDir(subDir: string, fileName: string) {
+  return PW_LIB_DIRS.map(p => path.join(p, subDir)).some(libDir => fileName.includes(libDir));
+}
+
 export type ParsedStackTrace = {
   frames: StackFrame[];
   frameTexts: string[];
@@ -59,7 +64,7 @@ export function captureStackTrace(): ParsedStackTrace {
   const lines = stack.split('\n').reverse();
   let apiName = '';
 
-  const isTesting = process.env.PWTEST_CLI_ALLOW_TEST_COMMAND || isUnderTest();
+  const isTesting = !!process.env.PWTEST_CLI_ALLOW_TEST_COMMAND || isUnderTest();
 
   for (const line of lines) {
     const frame = stackUtils.parseLine(line);
@@ -70,7 +75,7 @@ export function captureStackTrace(): ParsedStackTrace {
     const fileName = path.resolve(process.cwd(), frame.file);
     if (isTesting && fileName.includes(path.join('playwright', 'tests', 'config', 'coverage.js')))
       continue;
-    if (!fileName.includes(runnerLib) && !(isTesting && fileName.includes(runnerSrc)) && PW_LIB_DIRS.map(p => path.join(p, isTesting ? 'src' : 'lib')).some(libDir => fileName.includes(libDir))) {
+    if (isFilePartOfPlaywright(isTesting, fileName)) {
       apiName = frame.function ? frame.function[0].toLowerCase() + frame.function.slice(1) : '';
       break;
     }
@@ -87,6 +92,13 @@ export function captureStackTrace(): ParsedStackTrace {
   return { frames, frameTexts, apiName };
 }
 
+function isFilePartOfPlaywright(isTesting: boolean, fileName: string): boolean {
+  const isPlaywrightTest = fileName.includes(runnerNpmPkgLib);
+  const isLocalPlaywright = isTesting && (fileName.includes(runnerSrc) || fileName.includes(runnerLib));
+  const isInPlaywright = (includesFileInPlaywrightSubDir('src', fileName) || includesFileInPlaywrightSubDir('lib', fileName));
+  return !isPlaywrightTest && !isLocalPlaywright && isInPlaywright;
+}
+
 export function splitErrorMessage(message: string): { name: string, message: string } {
   const separationIdx = message.indexOf(':');
   return {
diff --git a/utils/build/build.js b/utils/build/build.js
index 885b41873d..1eadff7883 100644
--- a/utils/build/build.js
+++ b/utils/build/build.js
@@ -109,7 +109,7 @@ for (const file of webPackFiles) {
 // Run Babel.
 steps.push({
   command: 'npx',
-  args: ['babel', ...(watchMode ? ['-w'] : []), '-s', '--extensions', '.ts', '--out-dir', filePath('./lib/'), filePath('./src/')],
+  args: ['babel', ...(watchMode ? ['-w', '--source-maps'] : []), '--extensions', '.ts', '--out-dir', filePath('./lib/'), filePath('./src/')],
   shell: true,
 });