Skip to content

Commit 2d989a9

Browse files
Run tests in a native Node.js ESM environment (#13966)
1 parent 578ab22 commit 2d989a9

File tree

159 files changed

+1283
-611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+1283
-611
lines changed

.eslintrc.cjs

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,22 @@ const path = require("path");
44

55
const cjsGlobals = ["__dirname", "__filename", "require", "module", "exports"];
66

7+
const testFiles = [
8+
"packages/*/test/**/*.js",
9+
"codemods/*/test/**/*.js",
10+
"eslint/*/test/**/*.js",
11+
];
12+
const sourceFiles = exts => [
13+
`packages/*/src/**/*.{${exts}}`,
14+
`codemods/*/src/**/*.{${exts}}`,
15+
`eslint/*/src/**/*.{${exts}}`,
16+
];
17+
718
module.exports = {
819
root: true,
920
plugins: [
1021
"import",
22+
"node",
1123
"jest",
1224
"prettier",
1325
"@babel/development",
@@ -36,11 +48,7 @@ module.exports = {
3648
},
3749
},
3850
{
39-
files: [
40-
"packages/*/src/**/*.{js,ts,cjs}",
41-
"codemods/*/src/**/*.{js,ts,cjs}",
42-
"eslint/*/src/**/*.{js,ts,cjs}",
43-
],
51+
files: sourceFiles("js,ts,cjs,mjs"),
4452
rules: {
4553
"@babel/development/no-undefined-identifier": "error",
4654
"@babel/development/no-deprecated-clone": "error",
@@ -51,9 +59,7 @@ module.exports = {
5159
},
5260
{
5361
files: [
54-
"packages/*/test/**/*.js",
55-
"codemods/*/test/**/*.js",
56-
"eslint/*/test/**/*.js",
62+
...testFiles,
5763
"packages/babel-helper-transform-fixture-test-runner/src/helpers.{ts,js}",
5864
"test/**/*.js",
5965
],
@@ -68,20 +74,21 @@ module.exports = {
6874
"jest/no-test-callback": "off",
6975
"jest/valid-describe": "off",
7076
"import/extensions": ["error", "always"],
77+
"import/no-extraneous-dependencies": "off",
7178
"no-restricted-imports": ["error", { patterns: ["**/src/**"] }],
7279
},
7380
},
7481
{
75-
files: [
76-
"packages/*/src/**/*.{js,ts}",
77-
"codemods/*/src/**/*.{js,ts}",
78-
"eslint/*/src/**/*.{js,ts}",
79-
"packages/*/test/**/*.js",
80-
"codemods/*/test/**/*.js",
81-
"eslint/*/test/**/*.js",
82-
"packages/babel-helper-transform-fixture-test-runner/src/helpers.{ts,js}",
83-
"test/**/*.js",
84-
],
82+
files: testFiles,
83+
rules: {
84+
"node/no-unsupported-features": [
85+
"error",
86+
{ version: "12.17.0", ignores: ["modules"] },
87+
],
88+
},
89+
},
90+
{
91+
files: [...sourceFiles("js,ts,mjs"), ...testFiles, "test/**/*.js"],
8592
excludedFiles: [
8693
// @babel/register is the require() hook, so it will always be CJS-based
8794
"packages/babel-register/**/*.{js,ts}",

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ package-lock.json
5252
/packages/babel-runtime-corejs3/core-js/**/*.js
5353
/packages/babel-runtime-corejs3/core-js-stable/**/*.js
5454

55-
/packages/babel-register/test/.babel
55+
/packages/babel-register/test/.cache.babel
56+
/packages/babel-register/test/.index.babel
5657
/packages/babel-cli/test/tmp
5758
/packages/babel-node/test/tmp
5859
/packages/*/lib
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "type": "module" }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "type": "module" }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "type": "module" }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "type": "module" }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "type": "module" }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "type": "module" }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "type": "commonjs" }

eslint/babel-eslint-tests/test/helpers/verifyAndAssertMessages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function verifyAndAssertMessages(
3131
"../../../babel-eslint-shared-fixtures/config/babel.config.js",
3232
),
3333
},
34-
...overrideConfig?.parserOptions,
34+
...(overrideConfig && overrideConfig.parserOptions),
3535
},
3636
});
3737

0 commit comments

Comments
 (0)