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

This commit is contained in:
Nicolò Ribaudo 2021-11-25 16:19:07 +01:00 committed by GitHub
parent 55f020e02d
commit 473f145b27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 15 additions and 18 deletions

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const dependency = defineHelper(__dirname, "dependency", ` const dependency = defineHelper(__dirname, "dependency", `
export default function fn() {} export default function fn() {}

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const dependencyDeep = defineHelper(__dirname, "dependencyDeep", ` const dependencyDeep = defineHelper(__dirname, "dependencyDeep", `
export default function fn() {} export default function fn() {}

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const main = defineHelper(__dirname, "main", ` const main = defineHelper(__dirname, "main", `
import dep from "(!!!)%-..a,4892 missing"; import dep from "(!!!)%-..a,4892 missing";

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const dependency1 = defineHelper(__dirname, "dependency1", ` const dependency1 = defineHelper(__dirname, "dependency1", `
export default function fn() { 0; } export default function fn() { 0; }

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const dependency = defineHelper(__dirname, "dependency", ` const dependency = defineHelper(__dirname, "dependency", `
let foo = "dependency"; let foo = "dependency";

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const dependency = defineHelper(__dirname, "dependency", ` const dependency = defineHelper(__dirname, "dependency", `
export default function fn() { export default function fn() {

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const dependency = defineHelper(__dirname, "dependency", ` const dependency = defineHelper(__dirname, "dependency", `
export default function fn() { 0; } export default function fn() { 0; }

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const dependency = defineHelper(__dirname, "dependency", ` const dependency = defineHelper(__dirname, "dependency", `
export default function fn() {} export default function fn() {}

View File

@ -1,4 +1,4 @@
const defineHelper = require("../../../helpers/define-helper").default; const defineHelper = require("../../../helpers/define-helper.cjs");
const main = defineHelper(__dirname, "main", ` const main = defineHelper(__dirname, "main", `
export default function helper() {} export default function helper() {}

View File

@ -1,17 +1,14 @@
import path from "path"; const path = require("path");
import template from "@babel/template"; // eslint-disable-next-line import/no-extraneous-dependencies
import helpers from "../../lib/helpers.js"; const template = require("@babel/template").default;
const helpers = require("../../lib/helpers.js").default;
function getHelperId(dir, name) { function getHelperId(dir, name) {
const testName = path.basename(dir); const testName = path.basename(dir);
return `_$_${testName}_${name}`; return `_$_${testName}_${name}`;
} }
export default function defineHelper( module.exports = function defineHelper(dir, name, code) {
dir: string,
name: string,
code: string,
): string {
const id = getHelperId(dir, name); const id = getHelperId(dir, name);
if (id in helpers) { if (id in helpers) {
throw new Error(`The ${id} helper is already defined.`); throw new Error(`The ${id} helper is already defined.`);
@ -23,4 +20,4 @@ export default function defineHelper(
}, },
}); });
return id; return id;
} };