use one prettier file

orionzone · Dec 13, 2022 · ce9c90d · ce9c90d
1 parent 2938758
commit ce9c90d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 21 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,4 @@
 *.html
 voxel51-website.js
 **/__generated__
-dist
+**/dist
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,8 +1,10 @@
-/**
- * This is a prettier config at the root of the monorepo,
- * there's yet another prettier config inside `app` directory that extends this config for the webapp.
- */
 module.exports = {
+  trailingComma: "es5",
+  tabWidth: 2,
+  semi: true,
+  useTabs: false,
+  singleQuote: false,
+  printWidth: 80,
   overrides: [
     {
       files: "*.md",

diff --git a/app/.prettierignore b/app/.prettierignore
diff --git a/app/.prettierrc.js b/app/.prettierrc.js
diff --git a/app/package.json b/app/package.json
@@ -10,7 +10,7 @@
         "dev": "yarn workspace @fiftyone/app dev",
         "dev:py": "python ../fiftyone/server/main.py",
         "dev:wpy": "concurrently -k yarn:dev yarn:dev:py",
-        "lint:prettify": "prettier --write \"packages/**/*.(ts|js|jsx|tsx|json|css|scss)\"",
+        "lint:prettify": "prettier --config ../.prettierrc.js --ignore-path ../.prettierignore  --write \"packages/**/*.(ts|js|jsx|tsx|json|css|scss)\"",
         "postinstall": "patch-package",
         "start": "yarn workspace @fiftyone/app start",
         "start-desktop": "yarn workspace FiftyOne start-desktop",