Merge branch 'PrettierConfig2' into v3-reformat

uzh-bf · Aug 27, 2024 · 3fcadc7 · 3fcadc7
2 parents d6beef8 + f8f5411
commit 3fcadc7
Show file tree

Hide file tree

Showing 50 changed files with 292 additions and 1,145 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1 +1,18 @@
-cypress/e2e/
+cypress/e2e/
+node_modules/
+.next/
+.turbo/
+.vercel/
+dist/
+out/
+build/
+email/
+
+ops.schema.json
+ops.ts
+schema.graphql
+nexus-typegen.ts
+client.json
+server.json
+
+*.sql
diff --git a/.prettierrc.js → .prettierrc.mjs b/.prettierrc.js → .prettierrc.mjs
@@ -1,6 +1,8 @@
-module.exports = {
+export default {
   semi: false,
   singleQuote: true,
   trailingComma: 'es5',
+  // tabWidth: 2,
+  // printWidth: 120,
   plugins: ['prettier-plugin-organize-imports', 'prettier-plugin-tailwindcss'],
 }
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -25,6 +25,7 @@
     "prisma.prisma",
     "stivo.tailwind-fold",
     "wix.vscode-import-cost",
-    "yzhang.markdown-all-in-one"
+    "yzhang.markdown-all-in-one",
+    "folke.vscode-monorepo-workspace"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -19,8 +19,28 @@
   "files.associations": {
     "plyconfig.json": "jsonc"
   },
-  "prettier.configPath": ".prettierrc.js",
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "notebook.defaultFormatter": "esbenp.prettier-vscode",
-  "prettier.prettierPath": "./node_modules/prettier"
+  "prettier.requireConfig": true,
+  "prettier.useEditorConfig": false,
+  "prettier.configPath": "${workspaceFolder}/.prettierrc.js",
+  "prettier.resolveGlobalModules": true,
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "eslint.workingDirectories": [
+    {
+      "pattern": "apps/*/"
+    },
+    {
+      "pattern": "packages/*/"
+    }
+  ]
 }
diff --git a/apps/auth/.prettierignore b/apps/auth/.prettierignore
diff --git a/apps/auth/.prettierrc.js b/apps/auth/.prettierrc.js
diff --git a/apps/auth/package.json b/apps/auth/package.json
@@ -37,9 +37,6 @@
     "eslint-config-next": "14.1.0",
     "postcss": "8.4.41",
     "postcss-import": "16.1.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
-    "prettier-plugin-tailwindcss": "0.4.1",
     "prisma": "5.18.0",
     "tailwindcss": "3.4.9",
     "typescript": "5.4.5"

diff --git a/apps/backend-docker/.prettierignore b/apps/backend-docker/.prettierignore
diff --git a/apps/backend-docker/.prettierrc.cjs b/apps/backend-docker/.prettierrc.cjs
diff --git a/apps/frontend-control/.prettierignore b/apps/frontend-control/.prettierignore
diff --git a/apps/frontend-control/.prettierrc.js b/apps/frontend-control/.prettierrc.js
diff --git a/apps/frontend-control/package.json b/apps/frontend-control/package.json
@@ -60,9 +60,6 @@
     "eslint-config-next": "14.1.0",
     "postcss": "8.4.41",
     "postcss-import": "16.1.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
-    "prettier-plugin-tailwindcss": "0.4.1",
     "tailwindcss": "3.4.9",
     "tailwindcss-radix": "3.0.3",
     "ts-node": "10.9.1",

diff --git a/apps/frontend-manage/.prettierignore b/apps/frontend-manage/.prettierignore
diff --git a/apps/frontend-manage/.prettierrc.js b/apps/frontend-manage/.prettierrc.js
diff --git a/apps/frontend-manage/package.json b/apps/frontend-manage/package.json
@@ -80,9 +80,6 @@
     "eslint-config-next": "14.1.0",
     "postcss": "8.4.41",
     "postcss-import": "16.1.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
-    "prettier-plugin-tailwindcss": "0.4.1",
     "tailwindcss": "3.4.9",
     "tailwindcss-radix": "3.0.3",
     "typescript": "5.4.5"

diff --git a/apps/frontend-pwa/.prettierignore b/apps/frontend-pwa/.prettierignore
diff --git a/apps/frontend-pwa/.prettierrc.js b/apps/frontend-pwa/.prettierrc.js
diff --git a/apps/frontend-pwa/package.json b/apps/frontend-pwa/package.json
@@ -72,9 +72,6 @@
     "eslint-config-next": "14.1.0",
     "postcss": "8.4.41",
     "postcss-import": "16.1.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
-    "prettier-plugin-tailwindcss": "0.4.1",
     "tailwindcss": "3.4.9",
     "tailwindcss-radix": "3.0.3",
     "ts-node": "10.9.1",

diff --git a/apps/func-incoming-responses/.prettierrc.js b/apps/func-incoming-responses/.prettierrc.js
diff --git a/apps/func-incoming-responses/package.json b/apps/func-incoming-responses/package.json
@@ -24,8 +24,6 @@
     "dotenv": "16.4.5",
     "eslint": "8.45.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "tsup": "7.2.0",
     "typescript": "5.4.5"
   },

diff --git a/apps/func-migration-v2-export/.prettierrc.js b/apps/func-migration-v2-export/.prettierrc.js
diff --git a/apps/func-migration-v2-export/package.json b/apps/func-migration-v2-export/package.json
@@ -23,8 +23,6 @@
     "cross-env": "7.0.3",
     "eslint": "8.45.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "tsup": "7.2.0",
     "typescript": "5.4.5"
   },

diff --git a/apps/func-migration-v3-import/.prettierrc.js b/apps/func-migration-v3-import/.prettierrc.js
diff --git a/apps/func-migration-v3-import/package.json b/apps/func-migration-v3-import/package.json
@@ -25,8 +25,6 @@
     "cross-env": "7.0.3",
     "eslint": "8.45.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "prisma": "5.18.0",
     "ts-node": "10.9.1",
     "tsup": "7.2.0",

diff --git a/apps/func-response-processor/.prettierrc.js b/apps/func-response-processor/.prettierrc.js
diff --git a/apps/func-response-processor/package.json b/apps/func-response-processor/package.json
@@ -27,8 +27,6 @@
     "dotenv": "16.4.5",
     "eslint": "8.45.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "tsup": "7.2.0",
     "typescript": "5.4.5"
   },

diff --git a/apps/office-addin/.prettierignore b/apps/office-addin/.prettierignore
diff --git a/apps/office-addin/.prettierrc.js b/apps/office-addin/.prettierrc.js
diff --git a/apps/office-addin/package.json b/apps/office-addin/package.json
@@ -44,8 +44,6 @@
     "office-addin-prettier-config": "1.2.0",
     "os-browserify": "0.3.0",
     "postcss": "8.4.41",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "process": "0.11.10",
     "source-map-loader": "4.0.1",
     "tailwindcss": "3.4.9",

diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
   "devDependencies": {
     "@prisma/nextjs-monorepo-workaround-plugin": "5.18.0",
     "cross-env": "7.0.3",
+    "eslint-config-prettier": "9.1.0",
     "husky": "8.0.3",
     "prettier": "3.3.3",
     "prettier-plugin-organize-imports": "4.0.0",

diff --git a/packages/grading/.prettierignore b/packages/grading/.prettierignore
diff --git a/packages/grading/.prettierrc.cjs b/packages/grading/.prettierrc.cjs
diff --git a/packages/grading/package.json b/packages/grading/package.json
@@ -19,8 +19,6 @@
     "cross-env": "7.0.3",
     "eslint": "8.45.0",
     "jest": "29.5.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "size-limit": "8.2.4",
     "ts-jest": "29.1.0",
     "tsup": "7.2.0",

diff --git a/packages/graphql/.prettierignore b/packages/graphql/.prettierignore
diff --git a/packages/graphql/.prettierrc.cjs b/packages/graphql/.prettierrc.cjs
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -69,8 +69,6 @@
     "jest": "29.5.0",
     "npm-run-all": "4.1.5",
     "nyc": "15.1.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "size-limit": "8.2.4",
     "source-map-support": "0.5.21",
     "ts-node": "10.9.1",

diff --git a/packages/i18n/.prettierrc.cjs b/packages/i18n/.prettierrc.cjs
diff --git a/packages/markdown/.prettierignore b/packages/markdown/.prettierignore
diff --git a/packages/markdown/.prettierrc.cjs b/packages/markdown/.prettierrc.cjs
diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -29,9 +29,6 @@
     "eslint": "8.45.0",
     "npm-run-all": "4.1.5",
     "postcss-import": "16.1.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
-    "prettier-plugin-tailwindcss": "0.4.1",
     "size-limit": "8.2.4",
     "tailwindcss": "3.4.9",
     "tailwindcss-radix": "3.0.3",

diff --git a/packages/prisma/.prettierrc.cjs b/packages/prisma/.prettierrc.cjs
diff --git a/packages/prisma/package.json b/packages/prisma/package.json
@@ -32,8 +32,6 @@
     "fs-extra": "11.1.1",
     "npm-run-all": "4.1.5",
     "p-map": "7.0.2",
-    "prettier": "2.8.8",
-    "prettier-plugin-organize-imports": "3.2.3",
     "prisma": "5.18.0",
     "prisma-json-types-generator": "3.0.4",
     "ramda": "0.29.0",

diff --git a/packages/shared-components/.prettierignore b/packages/shared-components/.prettierignore
diff --git a/packages/shared-components/.prettierrc.cjs b/packages/shared-components/.prettierrc.cjs
diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
@@ -20,8 +20,6 @@
     "lodash": "4.17.21",
     "npm-run-all": "4.1.5",
     "postcss-import": "16.1.0",
-    "prettier": "2.8.8",
-    "prettier-plugin-tailwindcss": "0.4.1",
     "recharts": "2.7.2",
     "remark-parse": "10.0.2",
     "remark-slate": "1.8.6",