Don't use ESM for required files in @babel/helpers tests (#13996)

nicolo-ribaudo · web-flow · commit 473f145b2768 · 2021-11-25T16:19:07.000+01:00
diff --git a/packages/babel-helpers/test/fixtures/dependencies/basic/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/basic/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const dependency = defineHelper(__dirname, "dependency", `
   export default function fn() {}
diff --git a/packages/babel-helpers/test/fixtures/dependencies/deep/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/deep/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const dependencyDeep = defineHelper(__dirname, "dependencyDeep", `
   export default function fn() {}
diff --git a/packages/babel-helpers/test/fixtures/dependencies/missing/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/missing/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const main = defineHelper(__dirname, "main", `
   import dep from "(!!!)%-..a,4892 missing";
diff --git a/packages/babel-helpers/test/fixtures/dependencies/multiple/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/multiple/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const dependency1 = defineHelper(__dirname, "dependency1", `
   export default function fn() { 0; }
diff --git a/packages/babel-helpers/test/fixtures/dependencies/rename-binding-equal/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/rename-binding-equal/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const dependency = defineHelper(__dirname, "dependency", `
   let foo = "dependency";
diff --git a/packages/babel-helpers/test/fixtures/dependencies/rename-deep-global/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/rename-deep-global/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const dependency = defineHelper(__dirname, "dependency", `
   export default function fn() {
diff --git a/packages/babel-helpers/test/fixtures/dependencies/reuse-dependency/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/reuse-dependency/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const dependency = defineHelper(__dirname, "dependency", `
   export default function fn() { 0; }
diff --git a/packages/babel-helpers/test/fixtures/dependencies/variable-same-name-dependency/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/variable-same-name-dependency/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const dependency = defineHelper(__dirname, "dependency", `
   export default function fn() {}
diff --git a/packages/babel-helpers/test/fixtures/regression/9496/plugin.js b/packages/babel-helpers/test/fixtures/regression/9496/plugin.js
@@ -1,4 +1,4 @@
-const defineHelper = require("../../../helpers/define-helper").default;
+const defineHelper = require("../../../helpers/define-helper.cjs");
 
 const main = defineHelper(__dirname, "main", `
   export default function helper() {}
diff --git a/packages/babel-helpers/test/helpers/define-helper.cjs b/packages/babel-helpers/test/helpers/define-helper.cjs
@@ -1,17 +1,14 @@
-import path from "path";
-import template from "@babel/template";
-import helpers from "../../lib/helpers.js";
+const path = require("path");
+// eslint-disable-next-line import/no-extraneous-dependencies
+const template = require("@babel/template").default;
+const helpers = require("../../lib/helpers.js").default;
 
 function getHelperId(dir, name) {
   const testName = path.basename(dir);
   return `_$_${testName}_${name}`;
 }
 
-export default function defineHelper(
-  dir: string,
-  name: string,
-  code: string,
-): string {
+module.exports = function defineHelper(dir, name, code) {
   const id = getHelperId(dir, name);
   if (id in helpers) {
     throw new Error(`The ${id} helper is already defined.`);
@@ -23,4 +20,4 @@ export default function defineHelper(
     },
   });
   return id;
-}
+};

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const defineHelper = require("../../../helpers/define-helper").default;`
	`1`	`+const defineHelper = require("../../../helpers/define-helper.cjs");`
`2`	`2`
`3`	`3`	const dependency = defineHelper(__dirname, "dependency", `
`4`	`4`	`export default function fn() {}`