From 31528e3a2fc35f733b1f2bfeb37ebdc7d7c950d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Wed, 17 Nov 2021 16:36:30 +0100 Subject: [PATCH] Don't use ESM for `require`d files in `@babel/helpers` tests --- .../test/fixtures/dependencies/basic/plugin.js | 2 +- .../test/fixtures/dependencies/deep/plugin.js | 2 +- .../test/fixtures/dependencies/missing/plugin.js | 2 +- .../test/fixtures/dependencies/multiple/plugin.js | 2 +- .../dependencies/rename-binding-equal/plugin.js | 2 +- .../dependencies/rename-deep-global/plugin.js | 2 +- .../dependencies/reuse-dependency/plugin.js | 2 +- .../variable-same-name-dependency/plugin.js | 2 +- .../test/fixtures/regression/9496/plugin.js | 2 +- .../{define-helper.js => define-helper.cjs} | 15 ++++++--------- 10 files changed, 15 insertions(+), 18 deletions(-) rename packages/babel-helpers/test/helpers/{define-helper.js => define-helper.cjs} (59%) diff --git a/packages/babel-helpers/test/fixtures/dependencies/basic/plugin.js b/packages/babel-helpers/test/fixtures/dependencies/basic/plugin.js index bdb49749ceb5..38a74880bfbe 100644 --- 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 index d377b1e47d2e..33a5629fb5df 100644 --- 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 index e0bec01b2d85..14d33a376c9b 100644 --- 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 index b74542b4f553..6d8f0dabba3b 100644 --- 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 index 0a48f0532a15..48c8808d41d3 100644 --- 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 index adfe64c39571..1f4c30142662 100644 --- 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 index c8a843c57afd..8dd43a6c5c1e 100644 --- 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 index ec87ede48eae..bdf1562ce51a 100644 --- 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 index 4c25ad746fc6..6ca1b152857f 100644 --- 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.js b/packages/babel-helpers/test/helpers/define-helper.cjs similarity index 59% rename from packages/babel-helpers/test/helpers/define-helper.js rename to packages/babel-helpers/test/helpers/define-helper.cjs index b32193ae40d9..4b70746f835d 100644 --- a/packages/babel-helpers/test/helpers/define-helper.js +++ 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; -} +};