@solvro/config 1.0.5 → 1.1.0

package/dist/eslint-config/index.js

@@ -136,7 +136,7 @@ async function disables() {
       rules: {
         "antfu/no-top-level-await": "off",
         "no-console": "off",
-        "ts/explicit-function-return-type": "off"
+        "@typescript-eslint/explicit-function-return-type": "off"
       }
     },
     {
@@ -160,7 +160,7 @@ async function disables() {
       name: "solvro/disables/dts",
       rules: {
         "eslint-comments/no-unlimited-disable": "off",
-        "import/no-duplicates": "off",
+        "import-x/no-duplicates": "off",
         "no-restricted-syntax": "off",
         "unused-imports/no-unused-vars": "off"
       }
@@ -169,7 +169,7 @@ async function disables() {
       files: ["**/*.js", "**/*.cjs"],
       name: "solvro/disables/cjs",
       rules: {
-        "ts/no-require-imports": "off"
+        "@typescript-eslint/no-require-imports": "off"
       }
     },
     {
@@ -178,7 +178,7 @@ async function disables() {
       rules: {
         "antfu/no-top-level-await": "off",
         "no-console": "off",
-        "ts/explicit-function-return-type": "off"
+        "@typescript-eslint/explicit-function-return-type": "off"
       }
     }
   ];
@@ -186,8 +186,78 @@ async function disables() {
 
 // eslint-config/configs/formatters.ts
 init_esm_shims();
+
+// eslint-config/utils.ts
+init_esm_shims();
+import { isPackageExists } from "local-pkg";
+import process from "node:process";
+import { fileURLToPath } from "node:url";
+var scopeUrl = fileURLToPath(new URL(".", import.meta.url));
+var isCwdInScope = isPackageExists("@solvro/config");
+var parserPlain = {
+  meta: {
+    name: "parser-plain"
+  },
+  parseForESLint: (code) => ({
+    ast: {
+      body: [],
+      comments: [],
+      loc: { end: code.length, start: 0 },
+      range: [0, code.length],
+      tokens: [],
+      type: "Program"
+    },
+    scopeManager: null,
+    services: { isPlain: true },
+    visitorKeys: {
+      Program: []
+    }
+  })
+};
+async function combine(...configs2) {
+  const resolved = await Promise.all(configs2);
+  return resolved.flat();
+}
+function toArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+async function interopDefault(m) {
+  const resolved = await m;
+  return resolved.default || resolved;
+}
+function isPackageInScope(name) {
+  return isPackageExists(name, { paths: [scopeUrl] });
+}
+async function ensurePackages(packages) {
+  if (process.env.CI || process.stdout.isTTY === false || isCwdInScope === false)
+    return;
+  const nonExistingPackages = packages.filter(
+    (i) => i && !isPackageInScope(i)
+  );
+  if (nonExistingPackages.length === 0) return;
+  const p = await import("@clack/prompts");
+  const result = await p.confirm({
+    message: `${nonExistingPackages.length === 1 ? "Package is" : "Packages are"} required for this config: ${nonExistingPackages.join(", ")}. Do you want to install them?`
+  });
+  if (result)
+    await import("@antfu/install-pkg").then(
+      (i) => i.installPackage(nonExistingPackages, { dev: true })
+    );
+}
+function isInEditorEnv() {
+  if (process.env.CI) return false;
+  if (isInGitHooksOrLintStaged()) return false;
+  return !!(process.env.VSCODE_PID || process.env.VSCODE_CWD || process.env.JETBRAINS_IDE || process.env.VIM || process.env.NVIM);
+}
+function isInGitHooksOrLintStaged() {
+  return !!(process.env.GIT_PARAMS || process.env.VSCODE_GIT_COMMAND || process.env.npm_lifecycle_script?.startsWith("lint-staged"));
+}
+
+// eslint-config/configs/formatters.ts
 async function formatters() {
-  return [];
+  await ensurePackages(["eslint-plugin-prettier"]);
+  const prettierConfig = await interopDefault(import("../eslint-config-prettier-ZT22JTBW.js"));
+  return [prettierConfig];
 }
 
 // eslint-config/configs/ignores.ts
@@ -209,18 +279,18 @@ async function imports() {
       name: "solvro/imports/rules",
       plugins: {
         antfu: default3,
-        import: pluginImport
+        "import-x": pluginImport
       },
       rules: {
         "antfu/import-dedupe": "error",
         "antfu/no-import-dist": "error",
         "antfu/no-import-node-modules-by-path": "error",
-        "import/first": "error",
-        "import/no-duplicates": "error",
-        "import/no-mutable-exports": "error",
-        "import/no-named-default": "error",
-        "import/no-self-import": "error",
-        "import/no-webpack-loader-syntax": "error"
+        "import-x/first": "error",
+        "import-x/no-duplicates": "error",
+        "import-x/no-mutable-exports": "error",
+        "import-x/no-named-default": "error",
+        "import-x/no-self-import": "error",
+        "import-x/no-webpack-loader-syntax": "error"
       }
     }
   ];
@@ -465,100 +535,6 @@ async function javascript(options = {}) {
 
 // eslint-config/configs/jsdoc.ts
 init_esm_shims();
-
-// eslint-config/utils.ts
-init_esm_shims();
-import { isPackageExists } from "local-pkg";
-import process from "node:process";
-import { fileURLToPath } from "node:url";
-var scopeUrl = fileURLToPath(new URL(".", import.meta.url));
-var isCwdInScope = isPackageExists("@solvro/config");
-var parserPlain = {
-  meta: {
-    name: "parser-plain"
-  },
-  parseForESLint: (code) => ({
-    ast: {
-      body: [],
-      comments: [],
-      loc: { end: code.length, start: 0 },
-      range: [0, code.length],
-      tokens: [],
-      type: "Program"
-    },
-    scopeManager: null,
-    services: { isPlain: true },
-    visitorKeys: {
-      Program: []
-    }
-  })
-};
-async function combine(...configs2) {
-  const resolved = await Promise.all(configs2);
-  return resolved.flat();
-}
-function renameRules(rules, map) {
-  return Object.fromEntries(
-    Object.entries(rules).map(([key, value]) => {
-      for (const [from, to] of Object.entries(map)) {
-        if (key.startsWith(`${from}/`))
-          return [to + key.slice(from.length), value];
-      }
-      return [key, value];
-    })
-  );
-}
-function renamePluginInConfigs(configs2, map) {
-  return configs2.map((i) => {
-    const clone = { ...i };
-    if (clone.rules) clone.rules = renameRules(clone.rules, map);
-    if (clone.plugins) {
-      clone.plugins = Object.fromEntries(
-        Object.entries(clone.plugins).map(([key, value]) => {
-          if (key in map) return [map[key], value];
-          return [key, value];
-        })
-      );
-    }
-    return clone;
-  });
-}
-function toArray(value) {
-  return Array.isArray(value) ? value : [value];
-}
-async function interopDefault(m) {
-  const resolved = await m;
-  return resolved.default || resolved;
-}
-function isPackageInScope(name) {
-  return isPackageExists(name, { paths: [scopeUrl] });
-}
-async function ensurePackages(packages) {
-  if (process.env.CI || process.stdout.isTTY === false || isCwdInScope === false)
-    return;
-  const nonExistingPackages = packages.filter(
-    (i) => i && !isPackageInScope(i)
-  );
-  if (nonExistingPackages.length === 0) return;
-  const p = await import("@clack/prompts");
-  const result = await p.confirm({
-    message: `${nonExistingPackages.length === 1 ? "Package is" : "Packages are"} required for this config: ${nonExistingPackages.join(", ")}. Do you want to install them?`
-  });
-  if (result)
-    await import("@antfu/install-pkg").then(
-      (i) => i.installPackage(nonExistingPackages, { dev: true })
-    );
-}
-function isInEditorEnv() {
-  if (process.env.CI) return false;
-  if (isInGitHooksOrLintStaged()) return false;
-  return !!(process.env.VSCODE_PID || process.env.VSCODE_CWD || process.env.JETBRAINS_IDE || process.env.VIM || process.env.NVIM);
-}
-function isInGitHooksOrLintStaged() {
-  return !!(process.env.GIT_PARAMS || process.env.VSCODE_GIT_COMMAND || process.env.npm_lifecycle_script?.startsWith("lint-staged"));
-}
-
-// eslint-config/configs/jsdoc.ts
 async function jsdoc() {
   return [
     {
@@ -656,7 +632,6 @@ async function markdown(options = {}) {
       name: "solvro/markdown/disables",
       rules: {
         "antfu/no-top-level-await": "off",
-        "import/newline-after-import": "off",
         "no-alert": "off",
         "no-console": "off",
         "no-labels": "off",
@@ -667,16 +642,14 @@ async function markdown(options = {}) {
         "no-unused-labels": "off",
         "no-unused-vars": "off",
         "node/prefer-global/process": "off",
-        "style/comma-dangle": "off",
-        "style/eol-last": "off",
-        "ts/consistent-type-imports": "off",
-        "ts/explicit-function-return-type": "off",
-        "ts/no-namespace": "off",
-        "ts/no-redeclare": "off",
-        "ts/no-require-imports": "off",
-        "ts/no-unused-expressions": "off",
-        "ts/no-unused-vars": "off",
-        "ts/no-use-before-define": "off",
+        "@typescript-eslint/consistent-type-imports": "off",
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/no-namespace": "off",
+        "@typescript-eslint/no-redeclare": "off",
+        "@typescript-eslint/no-require-imports": "off",
+        "@typescript-eslint/no-unused-expressions": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-use-before-define": "off",
         "unicode-bom": "off",
         "unused-imports/no-unused-imports": "off",
         "unused-imports/no-unused-vars": "off",
@@ -723,17 +696,17 @@ async function react(options = {}) {
     tsconfigPath
   } = options;
   await ensurePackages([
-    "@eslint-react/eslint-plugin",
+    "eslint-plugin-react",
     "eslint-plugin-react-hooks",
     "eslint-plugin-react-refresh"
   ]);
   const isTypeAware = !!tsconfigPath;
   const typeAwareRules = {
-    "react/no-leaked-conditional-rendering": "warn"
+    "react/jsx-no-leaked-render": "warn"
   };
   const [pluginReact, pluginReactHooks, pluginReactRefresh] = await Promise.all(
     [
-      interopDefault(import("@eslint-react/eslint-plugin")),
+      interopDefault(import("eslint-plugin-react")),
       interopDefault(import("eslint-plugin-react-hooks")),
       interopDefault(import("eslint-plugin-react-refresh"))
     ]
@@ -742,19 +715,28 @@ async function react(options = {}) {
     (i) => isPackageExists2(i)
   );
   const isUsingNext = NextJsPackages.some((i) => isPackageExists2(i));
-  const plugins = pluginReact.configs.all.plugins;
+  const nextjsConfig = [];
+  if (isUsingNext) {
+    await ensurePackages(["@next/eslint-plugin-next"]);
+    const nextPlugin = await interopDefault(import("@next/eslint-plugin-next"));
+    nextjsConfig.push({
+      name: "solvro/next/setup",
+      plugins: {
+        "@next/next": nextPlugin
+      },
+      rules: nextPlugin.configs.recommended.rules
+    });
+  }
   return [
     {
       name: "solvro/react/setup",
       plugins: {
-        react: plugins["@eslint-react"],
-        "react-dom": plugins["@eslint-react/dom"],
+        react: pluginReact,
         "react-hooks": pluginReactHooks,
-        "react-hooks-extra": plugins["@eslint-react/hooks-extra"],
-        "react-naming-convention": plugins["@eslint-react/naming-convention"],
         "react-refresh": pluginReactRefresh
       }
     },
+    ...nextjsConfig,
     {
       files,
       languageOptions: {
@@ -765,23 +747,20 @@ async function react(options = {}) {
         },
         sourceType: "module"
       },
+      settings: {
+        react: {
+          version: "detect"
+        }
+      },
       name: "solvro/react/rules",
       rules: {
-        // recommended rules from @eslint-react/dom
-        "react-dom/no-children-in-void-dom-elements": "warn",
-        "react-dom/no-dangerously-set-innerhtml": "warn",
-        "react-dom/no-dangerously-set-innerhtml-with-children": "error",
-        "react-dom/no-find-dom-node": "error",
-        "react-dom/no-missing-button-type": "warn",
-        "react-dom/no-missing-iframe-sandbox": "warn",
-        "react-dom/no-namespace": "error",
-        "react-dom/no-render-return-value": "error",
-        "react-dom/no-script-url": "warn",
-        "react-dom/no-unsafe-iframe-sandbox": "warn",
-        "react-dom/no-unsafe-target-blank": "warn",
+        ...pluginReact.configs.flat?.recommended.rules,
+        ...pluginReact.configs.flat?.["jsx-runtime"].rules,
         // recommended rules react-hooks
         "react-hooks/exhaustive-deps": "warn",
         "react-hooks/rules-of-hooks": "error",
+        "react/jsx-no-useless-fragment": "error",
+        "react/jsx-no-leaked-render": "warn",
         // react refresh
         "react-refresh/only-export-components": [
           "warn",
@@ -806,43 +785,6 @@ async function react(options = {}) {
             ]
           }
         ],
-        // recommended rules from @eslint-react
-        "react/ensure-forward-ref-using-ref": "warn",
-        "react/no-access-state-in-setstate": "error",
-        "react/no-array-index-key": "warn",
-        "react/no-children-count": "warn",
-        "react/no-children-for-each": "warn",
-        "react/no-children-map": "warn",
-        "react/no-children-only": "warn",
-        "react/no-children-prop": "warn",
-        "react/no-children-to-array": "warn",
-        "react/no-clone-element": "warn",
-        "react/no-comment-textnodes": "warn",
-        "react/no-component-will-mount": "error",
-        "react/no-component-will-receive-props": "error",
-        "react/no-component-will-update": "error",
-        "react/no-create-ref": "error",
-        "react/no-direct-mutation-state": "error",
-        "react/no-duplicate-key": "error",
-        "react/no-implicit-key": "error",
-        "react/no-missing-key": "error",
-        "react/no-nested-components": "warn",
-        "react/no-redundant-should-component-update": "error",
-        "react/no-set-state-in-component-did-mount": "warn",
-        "react/no-set-state-in-component-did-update": "warn",
-        "react/no-set-state-in-component-will-update": "warn",
-        "react/no-string-refs": "error",
-        "react/no-unsafe-component-will-mount": "warn",
-        "react/no-unsafe-component-will-receive-props": "warn",
-        "react/no-unsafe-component-will-update": "warn",
-        "react/no-unstable-context-value": "error",
-        "react/no-unstable-default-props": "error",
-        "react/no-unused-class-component-members": "warn",
-        "react/no-unused-state": "warn",
-        "react/no-useless-fragment": "warn",
-        "react/prefer-destructuring-assignment": "warn",
-        "react/prefer-shorthand-boolean": "warn",
-        "react/prefer-shorthand-fragment": "warn",
         // overrides
         ...overrides
       }
@@ -907,28 +849,28 @@ async function test(options = {}) {
     {
       name: "solvro/test/setup",
       plugins: {
-        test: _pluginTest
+        "no-only-tests": _pluginTest
       }
     },
     {
       files,
       name: "solvro/test/rules",
       rules: {
-        "test/consistent-test-it": [
+        "no-only-tests/consistent-test-it": [
           "error",
           { fn: "it", withinDescribe: "it" }
         ],
-        "test/no-identical-title": "error",
-        "test/no-import-node-test": "error",
-        "test/no-only-tests": isInEditor ? "off" : "error",
-        "test/prefer-hooks-in-order": "error",
-        "test/prefer-lowercase-title": "error",
+        "no-only-tests/no-identical-title": "error",
+        "no-only-tests/no-import-node-test": "error",
+        "no-only-tests/no-only-tests": isInEditor ? "off" : "error",
+        "no-only-tests/prefer-hooks-in-order": "error",
+        "no-only-tests/prefer-lowercase-title": "error",
         // Disables
         ...{
           "antfu/no-top-level-await": "off",
           "no-unused-expressions": "off",
           "node/prefer-global/process": "off",
-          "ts/explicit-function-return-type": "off"
+          "@typescript-eslint/explicit-function-return-type": "off"
         },
         ...overrides
       }
@@ -959,28 +901,28 @@ async function typescript(options = {}) {
   const typeAwareRules = {
     "dot-notation": "off",
     "no-implied-eval": "off",
-    "ts/await-thenable": "error",
-    "ts/dot-notation": ["error", { allowKeywords: true }],
-    "ts/no-floating-promises": "error",
-    "ts/no-for-in-array": "error",
-    "ts/no-implied-eval": "error",
-    "ts/no-misused-promises": "error",
-    "ts/no-unnecessary-type-assertion": "error",
-    "ts/no-unsafe-argument": "error",
-    "ts/no-unsafe-assignment": "error",
-    "ts/no-unsafe-call": "error",
-    "ts/no-unsafe-member-access": "error",
-    "ts/no-unsafe-return": "error",
-    "ts/promise-function-async": "error",
-    "ts/restrict-plus-operands": "error",
-    "ts/restrict-template-expressions": "error",
-    "ts/return-await": ["error", "in-try-catch"],
-    "ts/strict-boolean-expressions": [
+    "@typescript-eslint/await-thenable": "error",
+    "@typescript-eslint/dot-notation": ["error", { allowKeywords: true }],
+    "@typescript-eslint/no-floating-promises": "error",
+    "@typescript-eslint/no-for-in-array": "error",
+    "@typescript-eslint/no-implied-eval": "error",
+    "@typescript-eslint/no-misused-promises": "error",
+    "@typescript-eslint/no-unnecessary-type-assertion": "error",
+    "@typescript-eslint/no-unsafe-argument": "error",
+    "@typescript-eslint/no-unsafe-assignment": "error",
+    "@typescript-eslint/no-unsafe-call": "error",
+    "@typescript-eslint/no-unsafe-member-access": "error",
+    "@typescript-eslint/no-unsafe-return": "error",
+    "@typescript-eslint/promise-function-async": "error",
+    "@typescript-eslint/restrict-plus-operands": "error",
+    "@typescript-eslint/restrict-template-expressions": "error",
+    "@typescript-eslint/return-await": ["error", "in-try-catch"],
+    "@typescript-eslint/strict-boolean-expressions": [
       "error",
       { allowNullableBoolean: true, allowNullableObject: true }
     ],
-    "ts/switch-exhaustiveness-check": "error",
-    "ts/unbound-method": "error"
+    "@typescript-eslint/switch-exhaustiveness-check": "error",
+    "@typescript-eslint/unbound-method": "error"
   };
   const [pluginTs, parserTs] = await Promise.all([
     interopDefault(import("@typescript-eslint/eslint-plugin")),
@@ -1014,7 +956,7 @@ async function typescript(options = {}) {
       name: "solvro/typescript/setup",
       plugins: {
         antfu: default3,
-        ts: pluginTs
+        "@typescript-eslint": pluginTs
       }
     },
     // assign type-aware parser for type-aware files and type-unaware parser for the rest
@@ -1026,42 +968,43 @@ async function typescript(options = {}) {
       files,
       name: "solvro/typescript/rules",
       rules: {
-        ...renameRules(
-          pluginTs.configs["eslint-recommended"].overrides[0].rules,
-          { "@typescript-eslint": "ts" }
-        ),
-        ...renameRules(pluginTs.configs.strict.rules, {
-          "@typescript-eslint": "ts"
-        }),
+        ...pluginTs.configs["eslint-recommended"].overrides[0].rules,
+        ...pluginTs.configs.strict.rules,
         "no-dupe-class-members": "off",
         "no-redeclare": "off",
         "no-use-before-define": "off",
         "no-useless-constructor": "off",
-        "ts/ban-ts-comment": [
+        "@typescript-eslint/ban-ts-comment": [
           "error",
           { "ts-expect-error": "allow-with-description" }
         ],
-        "ts/consistent-type-definitions": ["error", "interface"],
-        "ts/consistent-type-imports": [
+        "@typescript-eslint/consistent-type-definitions": [
+          "error",
+          "interface"
+        ],
+        "@typescript-eslint/consistent-type-imports": [
           "error",
           {
             disallowTypeAnnotations: false,
             prefer: "type-imports"
           }
         ],
-        "ts/method-signature-style": ["error", "property"],
+        "@typescript-eslint/method-signature-style": ["error", "property"],
         // https://www.totaltypescript.com/method-shorthand-syntax-considered-harmful
-        "ts/no-dupe-class-members": "error",
-        "ts/no-dynamic-delete": "off",
-        "ts/no-empty-object-type": ["error", { allowInterfaces: "always" }],
-        "ts/no-explicit-any": "off",
-        "ts/no-extraneous-class": "off",
-        "ts/no-import-type-side-effects": "error",
-        "ts/no-invalid-void-type": "off",
-        "ts/no-non-null-assertion": "off",
-        "ts/no-redeclare": ["error", { builtinGlobals: false }],
-        "ts/no-require-imports": "error",
-        "ts/no-unused-expressions": [
+        "@typescript-eslint/no-dupe-class-members": "error",
+        "@typescript-eslint/no-dynamic-delete": "off",
+        "@typescript-eslint/no-empty-object-type": [
+          "error",
+          { allowInterfaces: "always" }
+        ],
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-extraneous-class": "off",
+        "@typescript-eslint/no-import-type-side-effects": "error",
+        "@typescript-eslint/no-invalid-void-type": "off",
+        "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/no-redeclare": ["error", { builtinGlobals: false }],
+        "@typescript-eslint/no-require-imports": "error",
+        "@typescript-eslint/no-unused-expressions": [
           "error",
           {
             allowShortCircuit: true,
@@ -1069,17 +1012,17 @@ async function typescript(options = {}) {
             allowTernary: true
           }
         ],
-        "ts/no-unused-vars": "off",
-        "ts/no-use-before-define": [
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-use-before-define": [
           "error",
           { classes: false, functions: false, variables: true }
         ],
-        "ts/no-useless-constructor": "off",
-        "ts/no-wrapper-object-types": "error",
-        "ts/triple-slash-reference": "off",
-        "ts/unified-signatures": "off",
+        "@typescript-eslint/no-useless-constructor": "off",
+        "@typescript-eslint/no-wrapper-object-types": "error",
+        "@typescript-eslint/triple-slash-reference": "off",
+        "@typescript-eslint/unified-signatures": "off",
         ...type === "lib" ? {
-          "ts/explicit-function-return-type": [
+          "@typescript-eslint/explicit-function-return-type": [
             "error",
             {
               allowExpressions: true,
@@ -1147,20 +1090,8 @@ var flatConfigProps = [
   "rules",
   "settings"
 ];
-var defaultPluginRenaming = {
-  "@eslint-react": "react",
-  "@eslint-react/dom": "react-dom",
-  "@eslint-react/hooks-extra": "react-hooks-extra",
-  "@eslint-react/naming-convention": "react-naming-convention",
-  "@typescript-eslint": "ts",
-  "import-x": "import",
-  n: "node",
-  vitest: "test",
-  yml: "yaml"
-};
 function solvro(options = {}, ...userConfigs) {
   const {
-    autoRenamePlugins = true,
     componentExts = [],
     gitignore: enableGitignore = true,
     jsx: enableJsx = true,
@@ -1273,9 +1204,6 @@ function solvro(options = {}, ...userConfigs) {
   if (Object.keys(fusedConfig).length) configs2.push([fusedConfig]);
   let composer = new FlatConfigComposer();
   composer = composer.append(...configs2, ...userConfigs);
-  if (autoRenamePlugins) {
-    composer = composer.renamePlugins(defaultPluginRenaming);
-  }
   return composer;
 }
 function resolveSubOptions(options, key) {
@@ -1318,7 +1246,6 @@ export {
   command,
   comments,
   eslint_config_default as default,
-  defaultPluginRenaming,
   disables,
   ensurePackages,
   formatters,
@@ -1337,8 +1264,6 @@ export {
   parserPlain,
   react,
   regexp,
-  renamePluginInConfigs,
-  renameRules,
   resolveSubOptions,
   solvro,
   test,