From 5f30f835c1ec8328c0228b157b613e05c9a6de91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Wed, 19 Jan 2022 19:08:53 +0100 Subject: [PATCH] Convert `@babel/eslint-plugin-development-internal` to CJS --- .../src/index.cjs | 12 ++++++++++++ .../src/index.ts | 9 --------- ...{dry-error-messages.ts => dry-error-messages.cjs} | 4 ++-- ...age-format.ts => report-error-message-format.cjs} | 2 +- .../test/rules/dry-error-messages.js | 4 ++-- .../test/rules/report-error-message-formtat.js | 4 ++-- tsconfig.json | 4 ---- 7 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 eslint/babel-eslint-plugin-development-internal/src/index.cjs delete mode 100644 eslint/babel-eslint-plugin-development-internal/src/index.ts rename eslint/babel-eslint-plugin-development-internal/src/rules/{dry-error-messages.ts => dry-error-messages.cjs} (98%) rename eslint/babel-eslint-plugin-development-internal/src/rules/{report-error-message-format.ts => report-error-message-format.cjs} (97%) diff --git a/eslint/babel-eslint-plugin-development-internal/src/index.cjs b/eslint/babel-eslint-plugin-development-internal/src/index.cjs new file mode 100644 index 000000000000..107f4696ae5f --- /dev/null +++ b/eslint/babel-eslint-plugin-development-internal/src/index.cjs @@ -0,0 +1,12 @@ +const dryErrorMessages = require("./rules/dry-error-messages.cjs"); +const reportErrorMessageFormat = require("./rules/report-error-message-format.cjs"); + +const rules = { + "dry-error-messages": dryErrorMessages, + "report-error-message-format": reportErrorMessageFormat, +}; + +exports.rules = rules; +if (!process.env.BABEL_8_BREAKING) { + exports.default = { rules }; +} diff --git a/eslint/babel-eslint-plugin-development-internal/src/index.ts b/eslint/babel-eslint-plugin-development-internal/src/index.ts deleted file mode 100644 index b64e280d2378..000000000000 --- a/eslint/babel-eslint-plugin-development-internal/src/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import dryErrorMessages from "./rules/dry-error-messages"; -import reportErrorMessageFormat from "./rules/report-error-message-format"; - -export const rules = { - "dry-error-messages": dryErrorMessages, - "report-error-message-format": reportErrorMessageFormat, -}; - -export default { rules }; diff --git a/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.ts b/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.cjs similarity index 98% rename from eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.ts rename to eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.cjs index d6e2226e2e76..336bee1d200d 100644 --- a/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.ts +++ b/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.cjs @@ -1,4 +1,4 @@ -import path from "path"; +const path = require("path"); const REL_PATH_REGEX = /^\.{1,2}/; @@ -99,7 +99,7 @@ function referencesImportedBinding(node, scope, bindings) { return false; } -export default { +module.exports = { meta: { type: "suggestion", docs: { diff --git a/eslint/babel-eslint-plugin-development-internal/src/rules/report-error-message-format.ts b/eslint/babel-eslint-plugin-development-internal/src/rules/report-error-message-format.cjs similarity index 97% rename from eslint/babel-eslint-plugin-development-internal/src/rules/report-error-message-format.ts rename to eslint/babel-eslint-plugin-development-internal/src/rules/report-error-message-format.cjs index 344c8f1e11d7..cfbf833ff769 100644 --- a/eslint/babel-eslint-plugin-development-internal/src/rules/report-error-message-format.ts +++ b/eslint/babel-eslint-plugin-development-internal/src/rules/report-error-message-format.cjs @@ -2,7 +2,7 @@ const messageId = "mustMatchPattern"; const pattern = /(('.*')|(`.*`)|[A-Z]).*(\.|\?)$/s; -export default { +module.exports = { meta: { type: "suggestion", docs: { diff --git a/eslint/babel-eslint-plugin-development-internal/test/rules/dry-error-messages.js b/eslint/babel-eslint-plugin-development-internal/test/rules/dry-error-messages.js index ebf21288950e..7272807e1e27 100644 --- a/eslint/babel-eslint-plugin-development-internal/test/rules/dry-error-messages.js +++ b/eslint/babel-eslint-plugin-development-internal/test/rules/dry-error-messages.js @@ -1,5 +1,5 @@ import path from "path"; -import rule from "../../lib/rules/dry-error-messages.js"; +import rule from "../../lib/rules/dry-error-messages.cjs"; import RuleTester from "../../../babel-eslint-shared-fixtures/utils/RuleTester.js"; import { fileURLToPath } from "url"; @@ -12,7 +12,7 @@ const MODULE_PARENT_DIR = path.resolve(dirname, "test/errorsModule.js"); const ruleTester = new RuleTester(); -ruleTester.run("dry-error-messages", rule.default, { +ruleTester.run("dry-error-messages", rule, { valid: [ // Ignores malformed `this.raise` invocations. { diff --git a/eslint/babel-eslint-plugin-development-internal/test/rules/report-error-message-formtat.js b/eslint/babel-eslint-plugin-development-internal/test/rules/report-error-message-formtat.js index f69824599882..88c2f8c1dde6 100644 --- a/eslint/babel-eslint-plugin-development-internal/test/rules/report-error-message-formtat.js +++ b/eslint/babel-eslint-plugin-development-internal/test/rules/report-error-message-formtat.js @@ -1,9 +1,9 @@ import RuleTester from "../../../babel-eslint-shared-fixtures/utils/RuleTester.js"; -import rule from "../../lib/rules/report-error-message-format.js"; +import rule from "../../lib/rules/report-error-message-format.cjs"; const ruleTester = new RuleTester(); -ruleTester.run("report-error-message-format", rule.default, { +ruleTester.run("report-error-message-format", rule, { valid: [ "makeErrorTemplates({});", 'makeErrorTemplates({ ThisIsAnError: "This is an error." });', diff --git a/tsconfig.json b/tsconfig.json index de0a9d335b04..2a8860cce3c7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -140,7 +140,6 @@ "./packages/babel-template/src/**/*.ts", "./packages/babel-traverse/src/**/*.ts", "./packages/babel-types/src/**/*.ts", - "./eslint/babel-eslint-plugin-development-internal/src/**/*.ts", "./codemods/babel-plugin-codemod-object-assign-to-object-spread/src/**/*.ts", "./codemods/babel-plugin-codemod-optional-catch-binding/src/**/*.ts" ], @@ -560,9 +559,6 @@ "@babel/types": [ "./packages/babel-types/src" ], - "@babel/eslint-plugin-development-internal": [ - "./eslint/babel-eslint-plugin-development-internal/src" - ], "@babel/plugin-codemod-object-assign-to-object-spread": [ "./codemods/babel-plugin-codemod-object-assign-to-object-spread/src" ],