refactor: add createLogger to makeChainWalker

babel · Jun 15, 2020 · 56516c5 · 56516c5
1 parent a35a59e
commit 56516c5
Show file tree

Hide file tree

Showing 4 changed files with 216 additions and 131 deletions.
diff --git a/packages/babel-cli/test/fixtures/babel/--show-config/stdout.txt b/packages/babel-cli/test/fixtures/babel/--show-config/stdout.txt
@@ -1,77 +1,45 @@
 programmatic options from @babel/cli
-[
-  {
-    "sourceFileName": "stdin",
-    "presets": [
-      "/Users/jh/code/babel/packages/babel-preset-react"
-    ],
-    "plugins": [
-      "/Users/jh/code/babel/packages/babel-plugin-transform-arrow-functions",
-      "/Users/jh/code/babel/packages/babel-plugin-transform-strict-mode",
-      "/Users/jh/code/babel/packages/babel-plugin-transform-modules-commonjs"
-    ],
-    "configFile": "./my-config.js",
-    "showConfig": true,
-    "caller": {
-      "name": "@babel/cli"
-    },
-    "filename": "./src/index.js"
-  }
-]
+{
+  "sourceFileName": "stdin",
+  "presets": [
+    "<ROOTDIR>/packages/babel-preset-react"
+  ],
+  "plugins": [
+    "<ROOTDIR>/packages/babel-plugin-transform-arrow-functions",
+    "<ROOTDIR>/packages/babel-plugin-transform-strict-mode",
+    "<ROOTDIR>/packages/babel-plugin-transform-modules-commonjs"
+  ],
+  "configFile": "./my-config.js",
+  "showConfig": true,
+  "caller": {
+    "name": "@babel/cli"
+  },
+  "filename": "./src/index.js"
+}
 
 config <CWD>/my-config.js
-[
-  {
-    "babelrc": false,
-    "plugins": [
-      null
-    ],
-    "overrides": [
-      {
-        "test": "src/index.js",
-        "plugins": [
-          "@foo/babel-plugin-2",
-          {
-            "noDocumentAll": true
-          }
-        ]
-      }
-    ],
-    "env": {
-      "test": {
-        "plugins": [
-          [
-            "@foo/babel-plugin-3",
-            {
-              "noDocumentAll": true
-            }
-          ]
-        ]
-      },
-      "development": {
-        "plugins": [
-          "@foo/babel-plugin-4"
-        ]
-      }
+{
+  "babelrc": false,
+  "plugins": [
+    null
+  ]
+}
+
+config <CWD>/my-config.js .env["test"]
+{
+  "babelrc": false,
+  "plugins": [
+    null
+  ]
+}
+
+config <CWD>/my-config.js .overrides[0]
+{
+  "test": "src/index.js",
+  "plugins": [
+    "@foo/babel-plugin-2",
+    {
+      "noDocumentAll": true
     }
-  },
-  {
-    "plugins": [
-      [
-        "@foo/babel-plugin-3",
-        {
-          "noDocumentAll": true
-        }
-      ]
-    ]
-  },
-  {
-    "test": "src/index.js",
-    "plugins": [
-      "@foo/babel-plugin-2",
-      {
-        "noDocumentAll": true
-      }
-    ]
-  }
-]
+  ]
+}
diff --git a/packages/babel-cli/test/index.js b/packages/babel-cli/test/index.js
@@ -9,6 +9,7 @@ const fs = require("fs");
 
 const fixtureLoc = path.join(__dirname, "fixtures");
 const tmpLoc = path.join(__dirname, "tmp");
+const rootDir = path.resolve(__dirname, "../../..");
 
 const fileFilter = function (x) {
   return x !== ".DS_Store";
@@ -19,12 +20,12 @@ const outputFileSync = function (filePath, data) {
   fs.writeFileSync(filePath, data);
 };
 
-const presetLocs = [path.join(__dirname, "../../babel-preset-react")];
+const presetLocs = [path.join(rootDir, "./packages/babel-preset-react")];
 
 const pluginLocs = [
-  path.join(__dirname, "/../../babel-plugin-transform-arrow-functions"),
-  path.join(__dirname, "/../../babel-plugin-transform-strict-mode"),
-  path.join(__dirname, "/../../babel-plugin-transform-modules-commonjs"),
+  path.join(rootDir, "./packages/babel-plugin-transform-arrow-functions"),
+  path.join(rootDir, "./packages/babel-plugin-transform-strict-mode"),
+  path.join(rootDir, "./packages/babel-plugin-transform-modules-commonjs"),
 ].join(",");
 
 const readDir = function (loc, filter) {
@@ -49,19 +50,19 @@ const saveInFiles = function (files) {
   });
 };
 
-const normalizeOutput = function (str, cwd) {
+const normalizeOutput = function (str, cwd, root) {
   let prev;
   do {
     prev = str;
-    str = str.replace(cwd, "<CWD>");
+    str = str.replace(cwd, "<CWD>").replace(root, "<ROOTDIR>");
   } while (str !== prev);
 
   return str.replace(/\(\d+ms\)/g, "(123ms)");
 };
 
 const assertTest = function (stdout, stderr, opts, cwd) {
-  stdout = normalizeOutput(stdout, cwd);
-  stderr = normalizeOutput(stderr, cwd);
+  stdout = normalizeOutput(stdout, cwd, rootDir);
+  stderr = normalizeOutput(stderr, cwd, rootDir);
 
   const expectStderr = opts.stderr.trim();
   stderr = stderr.trim();