From 502b0378dac79009695907fffb6162f03e6174c2 Mon Sep 17 00:00:00 2001 From: LFades Date: Thu, 13 Jan 2022 05:19:30 -0500 Subject: [PATCH] Updated prettier config --- .prettierignore | 5 +++-- .prettierrc | 10 +--------- package-lock.json | 2 ++ package.json | 6 ++++++ site/.prettierignore | 3 +++ site/.prettierrc | 6 ++++++ site/package.json | 1 + 7 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 site/.prettierignore create mode 100644 site/.prettierrc diff --git a/.prettierignore b/.prettierignore index 105738ca9..c5d909d2f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ +# Every package defines its prettier config node_modules -.next -public \ No newline at end of file +packages +site diff --git a/.prettierrc b/.prettierrc index 91990a859..e1076edfa 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,13 +2,5 @@ "semi": false, "singleQuote": true, "tabWidth": 2, - "useTabs": false, - "overrides": [ - { - "files": ["framework/saleor/**/*"], - "options": { - "printWidth": 120 - } - } - ] + "useTabs": false } diff --git a/package-lock.json b/package-lock.json index 6d7020f22..6b9ecac75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9296,6 +9296,7 @@ "lint-staged": "^12.1.7", "postcss-flexbugs-fixes": "^5.0.2", "postcss-preset-env": "^6.7.0", + "prettier": "^2.5.1", "typescript": "4.3.4" }, "engines": { @@ -13345,6 +13346,7 @@ "postcss-flexbugs-fixes": "^5.0.2", "postcss-nesting": "^8.0.1", "postcss-preset-env": "^6.7.0", + "prettier": "*", "react": "^17.0.2", "react-dom": "^17.0.2", "react-fast-marquee": "^1.1.4", diff --git a/package.json b/package.json index 040d74e9c..ac6ec11aa 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,9 @@ "site", "packages/*" ], + "scripts": { + "prettier-fix": "prettier --write ." + }, "turbo": { "baseBranch": "origin/main", "pipeline": { @@ -26,6 +29,9 @@ "lint": { "outputs": [] }, + "prettier-fix": { + "outputs": [] + }, "dev": { "cache": false }, diff --git a/site/.prettierignore b/site/.prettierignore new file mode 100644 index 000000000..105738ca9 --- /dev/null +++ b/site/.prettierignore @@ -0,0 +1,3 @@ +node_modules +.next +public \ No newline at end of file diff --git a/site/.prettierrc b/site/.prettierrc new file mode 100644 index 000000000..e1076edfa --- /dev/null +++ b/site/.prettierrc @@ -0,0 +1,6 @@ +{ + "semi": false, + "singleQuote": true, + "tabWidth": 2, + "useTabs": false +} diff --git a/site/package.json b/site/package.json index 6eff5a54f..79def1dcd 100644 --- a/site/package.json +++ b/site/package.json @@ -54,6 +54,7 @@ "lint-staged": "^12.1.7", "postcss-flexbugs-fixes": "^5.0.2", "postcss-preset-env": "^6.7.0", + "prettier": "^2.5.1", "typescript": "4.3.4" }, "lint-staged": {