diff --git a/packages/nocodb/.eslintrc.json b/packages/nocodb/.eslintrc.json index 46215df452..4cd8421f81 100644 --- a/packages/nocodb/.eslintrc.json +++ b/packages/nocodb/.eslintrc.json @@ -24,8 +24,7 @@ "plugin:eslint-comments/recommended", "plugin:@typescript-eslint/recommended", "plugin:import/typescript", - "prettier", - "prettier/@typescript-eslint" + "plugin:prettier/recommended" ], "globals": { "BigInt": true, diff --git a/packages/nocodb/.prettierrc.js b/packages/nocodb/.prettierrc.js new file mode 100644 index 0000000000..1de116cae7 --- /dev/null +++ b/packages/nocodb/.prettierrc.js @@ -0,0 +1,6 @@ +module.exports = { + semi: true, + trailingComma: "all", + singleQuote: true, + tabWidth: 2 +}; diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index ded579f21b..a0d35bca39 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.11.41", + "version": "0.11.42", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6986,6 +6986,14 @@ } } }, + "eslint-plugin-prettier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -7542,8 +7550,7 @@ "fast-diff": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==" }, "fast-glob": { "version": "3.2.7", @@ -12288,9 +12295,9 @@ "integrity": "sha512-3AryS9uwa5NfISLxMciUonrH7YfXp+nlahB9T7girXIsLQrmwX4MdnuKs32akduCOGpKmjTJSWmATULbuMkbfw==" }, "nc-help": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.14.tgz", - "integrity": "sha512-av7IMh0FMwHyFl5CIKY48wyXwEJ3+lRLJn4N8mLVaOg0HS15BtcQp04Cia5B3M/iTT3Gx02zENBjekw6WccT1A==", + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.16.tgz", + "integrity": "sha512-s2ZTsUzGy9v6l1Kg0Wc/t4ixuxXCWB3SDPo0P2ODDUEPBKhB/HBOG0RMOzwxmlEh0SWX2xsTas9YA2I++M2x0Q==", "requires": { "axios": "^0.21.1", "boxen": "^4.2.0", @@ -14393,6 +14400,14 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, + "prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "requires": { + "fast-diff": "^1.1.2" + } + }, "pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 0ad5823ab1..5dcdff386b 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -146,7 +146,7 @@ "mysql2": "^2.2.5", "nanoid": "^3.1.20", "nc-common": "0.0.6", - "nc-help": "^0.2.14", + "nc-help": "^0.2.16", "nc-lib-gui": "0.2.64", "nc-plugin": "^0.1.1", "ncp": "^2.0.0", @@ -196,7 +196,8 @@ "copyfiles": "^2.3.0", "cz-conventional-changelog": "^2.1.0", "eslint": "^7.8.0", - "eslint-config-prettier": "^6.11.0", + "eslint-config-prettier": "^6.15.0", + "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-functional": "^3.0.2", "eslint-plugin-import": "^2.22.0", @@ -206,7 +207,7 @@ "npm-run-all": "^4.1.5", "nyc": "^14.1.1", "open-cli": "^5.0.0", - "prettier": "^1.18.2", + "prettier": "^1.19.1", "raw-body": "^2.4.1", "standard-version": "^8.0.1", "supertest": "^4.0.2",