Move path normalization from preset-env to the test runner

babel · Jan 7, 2021 · ac7553f · ac7553f
1 parent 241508d
commit ac7553f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 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
@@ -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
@@ -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;