Commit 00e7d5a3 authored by Grant's avatar Grant
Browse files

Merge branch 'fix-eslint' into 'main' 

Fix eslint

See merge request !59
parents 667dc85b 168b20d5

.eslintrc.json

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{

  "root": true,

  "ignorePatterns": ["node_modules", "packages/**/dist"],

  "plugins": ["simple-import-sort"],

  "rules": {

    "simple-import-sort/imports": "error",

    "simple-import-sort/exports": "error"

  }

}

.gitlab-ci.yml

+16 −0
Original line number Diff line number Diff line 
stages:

  - test

  - build

  - deploy



eslint server:

  stage: test

  rules:

    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

      changes:

        - packages/server/src/**/*

  image: node:23-alpine

  script:

    - npm i --include=dev

    - npm -w packages/server run lint



build wiki:

  stage: build

  trigger:

package-lock.json

+39 −21
Original line number Diff line number Diff line
@@ -37,9 +37,10 @@ 
        "@vitejs/plugin-react": "^4.3.4",

        "autoprefixer": "^10.4.20",

        "dotenv": "^16.4.7",

        "eslint": "^8.57.1",

        "eslint": "^8.57.0",

        "eslint-config-react-app": "^7.0.1",

        "eslint-plugin-react-hooks": "^5.1.0",

        "eslint-plugin-simple-import-sort": "^12.1.1",

        "nodemon": "^3.1.9",

        "prettier": "^3.4.2",

        "tailwindcss": "^3.4.17",
@@ -2509,10 +2510,11 @@ 
      }

    },

    "node_modules/@eslint-community/regexpp": {

      "version": "4.10.0",

      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",

      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",

      "version": "4.12.1",

      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",

      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",

      "dev": true,

      "license": "MIT",

      "engines": {

        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"

      }
@@ -2591,10 +2593,11 @@ 
      }

    },

    "node_modules/@eslint/js": {

      "version": "8.57.1",

      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",

      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",

      "version": "8.57.0",

      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",

      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",

      "dev": true,

      "license": "MIT",

      "engines": {

        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"

      }
@@ -2699,13 +2702,14 @@ 
      }

    },

    "node_modules/@humanwhocodes/config-array": {

      "version": "0.13.0",

      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",

      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",

      "version": "0.11.14",

      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",

      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",

      "deprecated": "Use @eslint/config-array instead",

      "dev": true,

      "license": "Apache-2.0",

      "dependencies": {

        "@humanwhocodes/object-schema": "^2.0.3",

        "@humanwhocodes/object-schema": "^2.0.2",

        "debug": "^4.3.1",

        "minimatch": "^3.0.5"

      },
@@ -2718,6 +2722,7 @@ 
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",

      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",

      "dev": true,

      "license": "MIT",

      "dependencies": {

        "ms": "^2.1.3"

      },
@@ -2734,7 +2739,8 @@ 
      "version": "2.1.3",

      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",

      "dev": true

      "dev": true,

      "license": "MIT"

    },

    "node_modules/@humanwhocodes/module-importer": {

      "version": "1.0.1",
@@ -2754,7 +2760,8 @@ 
      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",

      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",

      "deprecated": "Use @eslint/object-schema instead",

      "dev": true

      "dev": true,

      "license": "BSD-3-Clause"

    },

    "node_modules/@icons-pack/react-simple-icons": {

      "version": "10.2.0",
@@ -8559,9 +8566,10 @@ 
      }

    },

    "node_modules/acorn": {

      "version": "8.11.3",

      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",

      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",

      "version": "8.14.0",

      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",

      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",

      "license": "MIT",

      "bin": {

        "acorn": "bin/acorn"

      },
@@ -10147,17 +10155,18 @@ 
      }

    },

    "node_modules/eslint": {

      "version": "8.57.1",

      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",

      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",

      "version": "8.57.0",

      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",

      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",

      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",

      "dev": true,

      "license": "MIT",

      "dependencies": {

        "@eslint-community/eslint-utils": "^4.2.0",

        "@eslint-community/regexpp": "^4.6.1",

        "@eslint/eslintrc": "^2.1.4",

        "@eslint/js": "8.57.1",

        "@humanwhocodes/config-array": "^0.13.0",

        "@eslint/js": "8.57.0",

        "@humanwhocodes/config-array": "^0.11.14",

        "@humanwhocodes/module-importer": "^1.0.1",

        "@nodelib/fs.walk": "^1.2.8",

        "@ungap/structured-clone": "^1.2.0",
@@ -10764,6 +10773,15 @@ 
        "semver": "bin/semver.js"

      }

    },

    "node_modules/eslint-plugin-simple-import-sort": {

      "version": "12.1.1",

      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz",

      "integrity": "sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==",

      "dev": true,

      "peerDependencies": {

        "eslint": ">=5.0.0"

      }

    },

    "node_modules/eslint-plugin-testing-library": {

      "version": "5.11.1",

      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz",

package.json

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
  ],

  "main": "src/index.ts",

  "scripts": {

    "lint": "eslint",

    "dev:client": "npm run dev -w packages/client",

    "dev:server": "npm run dev -w packages/server",

    "prisma:studio": "npm run prisma:studio -w packages/server",
@@ -35,9 +36,10 @@ 
    "@vitejs/plugin-react": "^4.3.4",

    "autoprefixer": "^10.4.20",

    "dotenv": "^16.4.7",

    "eslint": "^8.57.1",

    "eslint": "^8.57.0",

    "eslint-config-react-app": "^7.0.1",

    "eslint-plugin-react-hooks": "^5.1.0",

    "eslint-plugin-simple-import-sort": "^12.1.1",

    "nodemon": "^3.1.9",

    "prettier": "^3.4.2",

    "tailwindcss": "^3.4.17",

packages/server/.eslintrc.json

+13 −1
Original line number Diff line number Diff line
@@ -23,7 +23,19 @@ 
  "plugins": ["@typescript-eslint"],

  "rules": {

    "no-console": "error",

    "no-unused-vars": "off",

    "@typescript-eslint/no-namespace": "off",

    "@typescript-eslint/no-explicit-any": "off"

    "@typescript-eslint/no-explicit-any": "off",

    "@typescript-eslint/no-unused-vars": [

      "error",

      {

        "argsIgnorePattern": "^_",

        "caughtErrors": "all",

        "caughtErrorsIgnorePattern": "^_",

        "destructuredArrayIgnorePattern": "^_",

        "varsIgnorePattern": "^_",

        "ignoreRestSiblings": true

      }

    ]

  }

}