From 08d77ec6ced6886506554ec1387fc9c09b8dd80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nicolo.ribaudo@gmail.com>
Date: Thu, 7 Jan 2021 16:55:09 +0100
Subject: [PATCH] Move path normalization from preset-env to the test runner

---
 .../src/index.js                              | 19 ++++++++++++++++---
 packages/babel-preset-env/src/debug.js        |  4 ----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.js b/packages/babel-helper-transform-fixture-test-runner/src/index.js
index 8cd92948d44a..66a74569287c 100644
--- a/packages/babel-helper-transform-fixture-test-runner/src/index.js
+++ b/packages/babel-helper-transform-fixture-test-runner/src/index.js
@@ -280,8 +280,16 @@ function run(task) {
     }
 
     if (validateLogs) {
-      validateFile(normalizeOutput(actualLogs.stdout), stdout.loc, stdout.code);
-      validateFile(normalizeOutput(actualLogs.stderr), stderr.loc, stderr.code);
+      validateFile(
+        normalizeOutput(actualLogs.stdout, /* normalizePathSeparator */ true),
+        stdout.loc,
+        stdout.code,
+      );
+      validateFile(
+        normalizeOutput(actualLogs.stderr, /* normalizePathSeparator */ true),
+        stderr.loc,
+        stderr.code,
+      );
     }
   }
 
@@ -319,7 +327,7 @@ function validateFile(actualCode, expectedLoc, expectedCode) {
   }
 }
 
-function normalizeOutput(code) {
+function normalizeOutput(code, normalizePathSeparator) {
   const projectRoot = path.resolve(__dirname, "../../../");
   const cwdSymbol = "<CWD>";
   let result = code
@@ -339,6 +347,11 @@ function normalizeOutput(code) {
         new RegExp(escapeRegExp(projectRoot.replace(/\\/g, "\\\\")), "g"),
         cwdSymbol,
       );
+    if (normalizePathSeparator) {
+      result = result.replace(/<CWD>[\w\\/-.]+/g, path =>
+        path.replace(/\\\\?/g, "/"),
+      );
+    }
   }
   return result;
 }
diff --git a/packages/babel-preset-env/src/debug.js b/packages/babel-preset-env/src/debug.js
index b91499e72275..eb7bf04f4cb4 100644
--- a/packages/babel-preset-env/src/debug.js
+++ b/packages/babel-preset-env/src/debug.js
@@ -34,10 +34,6 @@ export const logEntryPolyfills = (
   polyfillTargets: Targets,
   allBuiltInsList: { [key: string]: Targets },
 ) => {
-  // normalize filename to generate consistent preset-env test fixtures
-  if (process.env.BABEL_ENV === "test") {
-    filename = filename.replace(/\\/g, "/");
-  }
   if (!importPolyfillIncluded) {
     console.log(`\n[${filename}] Import of ${polyfillName} was not found.`);
     return;