From 0777f6ead65b169cc046e6ec0c72fe56f8406777 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Sat, 3 Sep 2022 01:09:07 +0200 Subject: [PATCH 1/2] install prettier --- .eslintrc.js | 9 ++++----- .prettierignore | 17 +++++++++++++++++ .prettierrc.json | 4 ++++ package-lock.json | 42 ++++++++++++++++++++++++++++++++++++++++++ package.json | 6 +++++- 5 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc.json diff --git a/.eslintrc.js b/.eslintrc.js index 8e646e23cd0..340cd089e07 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,19 +1,18 @@ module.exports = { root: true, parser: '@typescript-eslint/parser', - plugins: [ - '@typescript-eslint', - ], + plugins: ['@typescript-eslint'], extends: [ 'eslint:recommended', 'plugin:@typescript-eslint/recommended', + 'prettier', ], overrides: [ { files: ['**/*.ts'], - } + }, ], rules: { '@typescript-eslint/ban-ts-comment': 1, - } + }, }; diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000000..c532f1d1a75 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,17 @@ +.DS_Store +*.iml +change-output.md +/.nyc_output/ +/.vscode/ +/node_modules/ +/npm-debug.log +before_commit +/coverage/ +.idea/ +/dist/fabric.require.js +/dist/fabric.min.js.gz +/cli_output/ +/scripts/cli_cache.json +/dist/ +/lib/ +/test/ diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 00000000000..1fb73bc2e2b --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,4 @@ +{ + "tabWidth": 2, + "singleQuote": true +} diff --git a/package-lock.json b/package-lock.json index 836f2b1e354..a083ebb229e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "commander": "^9.1.0", "deep-object-diff": "^1.1.7", "eslint": "^8.21.0", + "eslint-config-prettier": "^8.5.0", "fireworm": "^0.7.2", "fs-extra": "^10.0.1", "fuzzy": "^0.1.3", @@ -31,6 +32,7 @@ "moment": "^2.29.1", "nyc": "^15.1.0", "pixelmatch": "^4.0.2", + "prettier": "2.7.1", "qunit": "^2.17.2", "rollup": "^2.75.6", "rollup-plugin-terser": "^7.0.2", @@ -2548,6 +2550,18 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-config-prettier": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", + "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -5825,6 +5839,21 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/printf": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/printf/-/printf-0.6.1.tgz", @@ -9560,6 +9589,13 @@ } } }, + "eslint-config-prettier": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", + "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "dev": true, + "requires": {} + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -11845,6 +11881,12 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "optional": true }, + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true + }, "printf": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/printf/-/printf-0.6.1.tgz", diff --git a/package.json b/package.json index c9ede7fe97e..06ba5e24a83 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,9 @@ "coverage:report": "nyc report --reporter=lcov --reporter=text", "lint": "eslint --config .eslintrc.js src/**/*.ts", "lint_tests": "eslint test/unit --config .eslintrc_tests && eslint test/visual --config .eslintrc_tests", - "all": "npm run build && npm run test -- --all && npm run lint && npm run lint_tests && npm run export" + "all": "npm run build && npm run test -- --all && npm run lint && npm run lint_tests && npm run export", + "prettier:check": "prettier --check", + "prettier:write": "prettier --write ." }, "optionalDependencies": { "canvas": "^2.8.0", @@ -87,6 +89,7 @@ "commander": "^9.1.0", "deep-object-diff": "^1.1.7", "eslint": "^8.21.0", + "eslint-config-prettier": "^8.5.0", "fireworm": "^0.7.2", "fs-extra": "^10.0.1", "fuzzy": "^0.1.3", @@ -96,6 +99,7 @@ "moment": "^2.29.1", "nyc": "^15.1.0", "pixelmatch": "^4.0.2", + "prettier": "2.7.1", "qunit": "^2.17.2", "rollup": "^2.75.6", "rollup-plugin-terser": "^7.0.2", From 5461e8657a062c8462e07d562216b0fb6018081e Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Sat, 3 Sep 2022 08:01:02 +0200 Subject: [PATCH 2/2] renamed config --- .prettierrc.json => .prettierrc | 0 src/color/color_map.ts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .prettierrc.json => .prettierrc (100%) diff --git a/.prettierrc.json b/.prettierrc similarity index 100% rename from .prettierrc.json rename to .prettierrc diff --git a/src/color/color_map.ts b/src/color/color_map.ts index c9d988f3f80..b22c87c07be 100644 --- a/src/color/color_map.ts +++ b/src/color/color_map.ts @@ -151,4 +151,4 @@ export const ColorNameMap = { whitesmoke: '#F5F5F5', yellow: '#FFFF00', yellowgreen: '#9ACD32' -}; \ No newline at end of file +};