Merge pull request #1800 from ever-co/enhance/prettier-configuration-…

…in-package-json Enhance/prettier configuration in package json
ever-co · Nov 16, 2023 · d21a907 · d21a907
2 parents 76d75a7 + cfe1368
commit d21a907
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 4 deletions.
diff --git a/apps/extensions/package.json b/apps/extensions/package.json
@@ -29,6 +29,32 @@
 		"postcss": "^8.4.19",
 		"prettier": "^2.8.0",
 		"typescript": "4.8.4"
+	},"prettier": {
+		"printWidth": 120,
+		"singleQuote": true,
+		"semi": true,
+		"useTabs": true,
+		"tabWidth": 4,
+		"arrowParens": "always",
+		"trailingComma": "none",
+		"quoteProps": "as-needed",
+		"trimTrailingWhitespace": true,
+		"overrides": [
+			{
+				"files": "*.scss",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			},
+			{
+				"files": "*.yml",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			}
+		]
 	},
 	"manifest": {
 		"host_permissions": [

diff --git a/apps/mobile/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/apps/mobile/android/app/src/main/res/drawable-mdpi/splashscreen_image.png
diff --git a/apps/mobile/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/apps/mobile/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png
diff --git a/apps/mobile/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/apps/mobile/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png
diff --git a/apps/mobile/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/apps/mobile/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png
diff --git a/...mobile/assets/images/gauzy-teams-logo.png → .../mobile/assets/images/ever-teams-logo.png b/...mobile/assets/images/gauzy-teams-logo.png → .../mobile/assets/images/ever-teams-logo.png
diff --git a/apps/mobile/ios/GauzyTeams/Images.xcassets/SplashScreen.imageset/image.png b/apps/mobile/ios/GauzyTeams/Images.xcassets/SplashScreen.imageset/image.png
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -169,10 +169,31 @@
 		"@types/react-native": "0.69.6"
 	},
 	"prettier": {
-		"printWidth": 100,
-		"semi": false,
-		"singleQuote": false,
-		"trailingComma": "all"
+		"printWidth": 120,
+		"singleQuote": true,
+		"semi": true,
+		"useTabs": true,
+		"tabWidth": 4,
+		"arrowParens": "always",
+		"trailingComma": "none",
+		"quoteProps": "as-needed",
+		"trimTrailingWhitespace": true,
+		"overrides": [
+			{
+				"files": "*.scss",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			},
+			{
+				"files": "*.yml",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			}
+		]
 	},
 	"detox": {
 		"test-runner": "jest",

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -102,6 +102,33 @@
 		"eslint-config-next": "^13.1.6",
 		"typescript": "^4.9.4"
 	},
+	"prettier": {
+		"printWidth": 120,
+		"singleQuote": true,
+		"semi": true,
+		"useTabs": true,
+		"tabWidth": 4,
+		"arrowParens": "always",
+		"trailingComma": "none",
+		"quoteProps": "as-needed",
+		"trimTrailingWhitespace": true,
+		"overrides": [
+			{
+				"files": "*.scss",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			},
+			{
+				"files": "*.yml",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			}
+		]
+	},
 	"engines": {
 		"node": ">=16.0.0",
 		"yarn": ">=1.13.0"