Skip to content

Commit

Permalink
Don't use ESM for required files in @babel/helpers tests (#13996)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolo-ribaudo committed Nov 25, 2021
1 parent 55f020e commit 473f145
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 18 deletions.
@@ -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() {}
Expand Down
@@ -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() {}
Expand Down
@@ -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";
Expand Down
@@ -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; }
Expand Down
@@ -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";
Expand Down
@@ -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() {
Expand Down
@@ -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; }
Expand Down
@@ -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() {}
Expand Down
@@ -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() {}
Expand Down
@@ -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.`);
Expand All @@ -23,4 +20,4 @@ export default function defineHelper(
},
});
return id;
}
};

0 comments on commit 473f145

Please sign in to comment.