@labeg/code-style 3.1.1 → 4.0.2

package/.eslintrc.js

@@ -6,7 +6,18 @@
  */
 
 const jsAndTsRules = {
+    // Eslint rules
     "sort-imports": "off", // Need found sorter
+    "sort-keys": "off", // More nice
+    "one-var": ["error", "never"], // More nice
+    "no-ternary": "off", // More nice
+    "no-void": "off", // Strange rule
+    "no-bitwise": "off", // Used in many projects
+    "no-inline-comments": "off", // Maybe later?
+    "line-comment-position": "off", // Maybe later?
+
+
+    // Eslint moved to Stylistic, but now to buggy for js. Remove after fix bugs in new versions Stylistic
     "max-len": [
         "error", {
             code: 140,
@@ -22,27 +33,40 @@ const jsAndTsRules = {
     ], // More nice
     "function-call-argument-newline": ["error", "consistent"], // More nice
     "quote-props": ["error", "as-needed"], // More nice
-    "sort-keys": "off", // More nice
-    "class-methods-use-this": "off", // False positives
-    "one-var": ["error", "never"], // More nice
-    "no-ternary": "off", // More nice
     "multiline-ternary": ["error", "always-multiline"], // More nice
     "array-element-newline": ["error", "consistent"], // More nice
     "operator-linebreak": ["error", "after"], // More nice
-    "no-void": "off", // Strange rule
-    "max-params": ["error", {max: 4}], // Maybe later?
-    "no-bitwise": "off", // Used in many projects
-    "prefer-named-capture-group": "off", // Maybe later?
-    "dot-location": ["error", "property"], // More nice
-    "no-inline-comments": "off", // Maybe later?
-    "line-comment-position": "off", // Maybe later?
 
-    "no-duplicate-imports": "off" // Bug, remove later
+
+    // Stylistic rules
+    "@stylistic/max-len": [
+        "error", {
+            code: 140,
+            comments: 140
+        }
+    ], // More nice, for modern screens
+    "@stylistic/padded-blocks": [
+        "error", {
+            classes: "always",
+            blocks: "never",
+            switches: "never"
+        }
+    ], // More nice
+    "@stylistic/function-call-argument-newline": ["error", "consistent"], // More nice
+    "@stylistic/quote-props": ["error", "as-needed"], // More nice
+    "@stylistic/multiline-ternary": ["error", "always-multiline"], // More nice
+    "@stylistic/array-element-newline": ["error", "consistent"], // More nice
+    "@stylistic/operator-linebreak": ["error", "after"], // More nice
+    "@stylistic/no-extra-parens": "off"
 };
 
 module.exports = {
     extends: [
-        "eslint:all" // There is no React because they are used strictly with Typescript.
+        "eslint:all", // There is no React because they are used strictly with Typescript.
+        // "plugin:@stylistic/all-extends" // Bug, begin incorrect formatting, check in new versions
+    ],
+    plugins: [
+        "@stylistic/migrate"
     ],
     root: true,
     env: {
@@ -51,11 +75,6 @@ module.exports = {
         node: true
     },
     ignorePatterns: ["node_modules/*"],
-    settings: {
-        react: {
-            version: "detect"
-        }
-    },
     rules: {
         ...jsAndTsRules
     },
@@ -63,19 +82,21 @@ module.exports = {
         {
             files: ["**/*.{ts,tsx}"],
             settings: {
+                react: {
+                    version: "detect"
+                },
                 "import/parsers": {
                     "@typescript-eslint/parser": [".ts", ".tsx"]
                 },
                 "import/resolver": {
                     typescript: {
-                        project: "./tsconfig.json"
+                        project: "tsconfig.json"
                     }
                 }
             },
             parser: "@typescript-eslint/parser",
             parserOptions: {
                 project: "tsconfig.json",
-                tsconfigRootDir: __dirname,
                 sourceType: "module",
                 ecmaVersion: "latest",
                 ecmaFeatures: {
@@ -84,6 +105,7 @@ module.exports = {
             },
             extends: [
                 "eslint:all",
+                "plugin:@stylistic/all-extends",
                 "plugin:@typescript-eslint/all",
                 "plugin:react/all",
                 "plugin:react-hooks/recommended",
@@ -102,9 +124,6 @@ module.exports = {
                 "@typescript-eslint/no-confusing-void-expression": "off", // More nice
                 "@typescript-eslint/member-ordering": "off", // Need correct priority
 
-                "@typescript-eslint/keyword-spacing": "off", // Bug, remove later
-                "@typescript-eslint/no-import-type-side-effects": "off", // Bug, remove later
-
                 "react/jsx-filename-extension": ["error", {extensions: [".tsx"]}], // Added typescript file extension
                 "react/jsx-no-literals": "off", // Broken rule, not work with ??
                 "react/jsx-max-depth": ["error", {max: 10}], // To small by default
@@ -112,7 +131,6 @@ module.exports = {
                 "react/forbid-component-props": "off", // Conflict with styled-components
                 "react/jsx-uses-react": "off", // https://ru.reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html
                 "react/react-in-jsx-scope": "off", // https://ru.reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html
-                "react/sort-comp": "off" // Need write priority
             }
         }
     ]

package/.prettierrc

@@ -0,0 +1,12 @@
+{
+    "printWidth": 80,
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": false,
+    "trailingComma": "none",
+    "bracketSpacing": true,
+    "jsxBracketSameLine": true,
+    "arrowParens": "always",
+    "proseWrap": "always"
+}

package/README.md

@@ -15,9 +15,19 @@ npm i -D @labeg/code-style
 Далее в вашь файл eslint config необходимо добавить следующую строчку:
 ```Javascript
 module.exports = {
-    extends: ["@labeg/code-style"],
+    extends: ["./node_modules/@labeg/code-style/.eslintrc.js"],
     rules:{
-        // override here
+        // Override here
+    }
+};
+```
+
+Версия для NextJS:
+```Javascript
+module.exports = {
+    extends: ["next/core-web-vitals", "./node_modules/@labeg/code-style/.eslintrc.js"],
+    rules: {
+        // Override here
     }
 };
 ```

package/package.json

@@ -1,7 +1,6 @@
 {
     "name": "@labeg/code-style",
-    "version": "3.1.1",
-    "main": ".eslintrc.js",
+    "version": "4.0.2",
     "scripts": {
         "prepublishOnly": "npm version patch"
     },
@@ -21,6 +20,8 @@
         "eslint": "^8.55.0",
         "eslint-plugin-jsx-a11y": "^6.8.0",
         "eslint-plugin-react": "^7.33.2",
-        "eslint-plugin-react-hooks": "^4.6.0"
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "@stylistic/eslint-plugin": "^1.4.1",
+        "@stylistic/eslint-plugin-migrate": "^1.4.1"
     }
 }