@open-turo/eslint-config-typescript 18.1.0-pr-440.292.1.1 → 18.1.0-pr-440.294.1.1

package/index.cjs

@@ -3,6 +3,7 @@
 /** @import { ConfigWithExtends } from "typescript-eslint" */
 const eslint = require("@eslint/js");
 const tsParser = require("@typescript-eslint/parser");
+const vitestPlugin = require("@vitest/eslint-plugin");
 const importPlugin = require("eslint-plugin-import");
 const jestPlugin = require("eslint-plugin-jest");
 const jsonPlugin = require("eslint-plugin-json");
@@ -11,7 +12,7 @@ const perfectionistPlugin = require("eslint-plugin-perfectionist");
 const prettierPluginRecommended = require("eslint-plugin-prettier/recommended");
 const sonarjsPlugin = require("eslint-plugin-sonarjs");
 const unicornPlugin = require("eslint-plugin-unicorn");
-const vitestPlugin = require("@vitest/eslint-plugin");
+const eslintConfig = require("eslint/config");
 const tseslint = require("typescript-eslint");
 
 const FILES_JS = "**/*.?([cm])js";
@@ -40,7 +41,7 @@ const typescriptLanguageOptions = () => ({
  * @param {EcmaVersion} [ecmaVersion]
  */
 const javascriptConfig = (ecmaVersion = "latest") =>
-  tseslint.config(eslint.configs.recommended, {
+  eslintConfig.defineConfig(eslint.configs.recommended, {
     files: [FILES_JS],
     languageOptions: {
       parserOptions: {
@@ -60,7 +61,7 @@ const getImportPluginFlatConfigs = () => {
 };
 
 const importConfig = () =>
-  tseslint.config({
+  eslintConfig.defineConfig({
     extends: [getImportPluginFlatConfigs().recommended],
     rules: {
       "import/default": "off",
@@ -83,7 +84,7 @@ const importConfig = () =>
   });
 
 const nPluginConfig = (allowModules = ["@jest/globals", "nock"]) =>
-  tseslint.config({
+  eslintConfig.defineConfig({
     extends: [
       nPlugin.configs["flat/recommended"],
       nPlugin.configs["flat/mixed-esm-and-cjs"],
@@ -101,7 +102,7 @@ const nPluginConfig = (allowModules = ["@jest/globals", "nock"]) =>
   });
 
 const sonarJsConfig = () =>
-  tseslint.config({
+  eslintConfig.defineConfig({
     extends: [sonarjsPlugin.configs.recommended],
     rules: {
       // Noisy rule - we may have helpers/methods that we mark as @deprecated but aren't planning to remove in the near future. This rule also significantly adds to eslint running time, which slows down both local development and CI.
@@ -128,7 +129,7 @@ const sonarJsConfig = () =>
   });
 
 const typescriptConfig = () =>
-  tseslint.config({
+  eslintConfig.defineConfig({
     extends: [
       tseslint.configs.recommendedTypeChecked,
       // @ts-expect-error -- We are inferring the types of this import from runtime, but the rule values are inferred as `string` instead of `RuleEntry` ("off" | "warn" | "error")
@@ -191,7 +192,7 @@ const jestTestConfig = (options) => {
         "jest/unbound-method": "error",
       })
     : {};
-  return tseslint.config({
+  return eslintConfig.defineConfig({
     extends: [jestPlugin.configs["flat/recommended"]],
     files: FILES_TEST,
     languageOptions: {
@@ -202,22 +203,18 @@ const jestTestConfig = (options) => {
     rules: {
       ...jestPlugin.configs["flat/recommended"].rules,
       ...typescriptRules,
-      "import/no-extraneous-dependencies": [
-        "error",
-        { devDependencies: FILES_TEST },
-      ],
       "jest/no-jest-import": "off",
     },
   });
 };
 
 /**
- *
+ * Creates Vitest-specific test configuration
  * @param {object} options Configuration options
  * @param {boolean} options.typescript Whether to include typescript rules
  */
 const vitestTestConfig = (options) => {
-  return tseslint.config({
+  return eslintConfig.defineConfig({
     extends: [vitestPlugin.configs.recommended],
     files: FILES_TEST,
     languageOptions: {
@@ -225,12 +222,6 @@ const vitestTestConfig = (options) => {
       ...(options.typescript ? typescriptLanguageOptions() : {}),
     },
     plugins: { vitest: vitestPlugin },
-    rules: {
-      "import/no-extraneous-dependencies": [
-        "error",
-        { devDependencies: FILES_TEST },
-      ],
-    },
   });
 };
 
@@ -241,17 +232,27 @@ const vitestTestConfig = (options) => {
  * @param {"jest" | "vitest"} options.testFramework Test framework to use
  */
 const testConfig = (options) => {
-  if (options.testFramework === "vitest") {
-    return vitestTestConfig(options);
-  }
-  return jestTestConfig(options);
+  const frameworkConfig =
+    options.testFramework === "vitest"
+      ? vitestTestConfig(options)
+      : jestTestConfig(options);
+
+  return eslintConfig.defineConfig(...frameworkConfig, {
+    files: FILES_TEST,
+    rules: {
+      "import/no-extraneous-dependencies": [
+        "error",
+        { devDependencies: FILES_TEST },
+      ],
+    },
+  });
 };
 
 /**
  * @param {string[]} ignores
  */
 const ignoresConfig = (ignores = []) =>
-  tseslint.config({
+  eslintConfig.defineConfig({
     ignores: ["**/.yalc", "**/dist", ...ignores],
   });
 
@@ -279,7 +280,7 @@ module.exports = function config(options = {}) {
     testFramework === "vitest" ? ["nock"] : ["@jest/globals", "nock"];
   const allowModules = options.allowModules || defaultAllowModules;
 
-  return tseslint.config(
+  return eslintConfig.defineConfig(
     javascriptConfig(options.ecmaVersion),
     importConfig(),
     nPluginConfig(allowModules),

package/package.json

@@ -56,6 +56,6 @@
     "access": "public"
   },
   "repository": "https://github.com/open-turo/eslint-config-typescript",
-  "version": "18.1.0-pr-440.292.1.1",
+  "version": "18.1.0-pr-440.294.1.1",
   "packageManager": "npm@11.6.1"
 }