fix prettier setup

.github/workflows/repo.yaml

@@ -14,4 +14,4 @@ jobs:
         with:
           node-version: 18.x
       - run: yarn
-      - run: yarn global:prettier
+      - run: yarn :prettier

.prettierignore

@@ -1,9 +1,5 @@
 # this also checks .gitignore
 
-# let packages and apps handle pretter themselves for now
-apps
-packages
-
 # Yarn
 .yarn
 yarn.lock

.prettierrc.json

@@ -1,5 +1,6 @@
 {
   "semi": false,
   "singleQuote": true,
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "plugins": ["prettier-plugin-packagejson"]
 }

apps/web/.prettierrc.json

@@ -1,7 +1,7 @@
 {
   "semi": false,
   "singleQuote": true,
-  "plugins": ["prettier-plugin-tailwindcss"],
   "tailwindFunctions": ["cn"],
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "plugins": ["prettier-plugin-tailwindcss", "prettier-plugin-packagejson"]
 }

apps/web/package.json

@@ -173,15 +173,15 @@
     "minimumChangeThreshold": 0,
     "showDetails": true
   },
-  "svgr": {
-    "svgo": false
-  },
   "postcss": {
     "plugins": {
       "tailwindcss/nesting": {},
       "tailwindcss": {},
       "postcss-flexbugs-fixes": {},
       "autoprefixer": {}
     }
+  },
+  "svgr": {
+    "svgo": false
   }
 }

apps/web/src/helper/feature-i18n.ts

@@ -73,7 +73,7 @@ export function getInstanceDataByLang(lang: Instance) {
               ? hiInstanceData
               : enInstanceData
 
-  return mergeDeepRight(enData, data) as typeof enInstanceData
+  return mergeDeepRight(enData, data)
 }
 
 export function getServerSideStrings(lang: string) {
@@ -92,7 +92,7 @@ export function getServerSideStrings(lang: string) {
               ? hiServerSideStrings
               : enServerSideStrings
 
-  return mergeDeepRight(enData, data) as typeof enServerSideStrings
+  return mergeDeepRight(enData, data)
 }
 
 export function getLandingData(lang: string) {
@@ -111,7 +111,7 @@ export function getLandingData(lang: string) {
               ? hiInstanceLandingData
               : enInstanceLandingData
 
-  return mergeDeepRight(enData, data) as typeof enInstanceLandingData
+  return mergeDeepRight(enData, data)
 }
 
 export function getLoggedInData(lang: string) {
@@ -130,7 +130,7 @@ export function getLoggedInData(lang: string) {
               ? hiLoggedInData
               : enLoggedInData
 
-  return mergeDeepRight(enData, data) as typeof enLoggedInData
+  return mergeDeepRight(enData, data)
 }
 
 export function getKratosMailStrings(lang: string) {
@@ -149,7 +149,7 @@ export function getKratosMailStrings(lang: string) {
               ? hiKratosMailStrings
               : enKratosMailStrings
 
-  return mergeDeepRight(enData, data) as typeof enKratosMailStrings
+  return mergeDeepRight(enData, data)
 }
 
 export function getEntityStringByTypename(

package.json

@@ -2,17 +2,19 @@
   "name": "@serlo/monorepo",
   "version": "0.0.1",
   "private": true,
-  "repository": "serlo/frontend",
   "bugs": {
     "url": "https://github.com/serlo/frontend/issues"
   },
+  "repository": "serlo/frontend",
   "license": "Apache-2.0",
   "author": "Serlo Education e.V.",
   "workspaces": [
     "apps/*",
     "packages/*"
   ],
   "scripts": {
+    ":format:prettier": "yarn prettier . '!{apps,packages}/**/*' --write",
+    ":prettier": "yarn prettier . '!{apps,packages}/**/*' --check",
     "build": "yarn workspace @serlo/frontend build",
     "build:next": "yarn workspace @serlo/frontend build:next",
     "build:prisma": "yarn workspace @serlo/frontend build:prisma",
@@ -29,15 +31,14 @@
     "lint:prettier": "yarn workspace @serlo/frontend lint:prettier",
     "lint:tsc": "yarn workspace @serlo/frontend lint:tsc",
     "start": "yarn workspace @serlo/frontend start",
-    "test": "yarn workspace @serlo/frontend test",
-    "global:prettier": "yarn prettier . --check",
-    "global:format:prettier": "yarn prettier . --write"
+    "test": "yarn workspace @serlo/frontend test"
+  },
+  "devDependencies": {
+    "prettier": "^3.1.0",
+    "prettier-plugin-packagejson": "^2.4.6"
   },
   "packageManager": "[email protected]",
   "engines": {
     "node": "^18.0.0"
-  },
-  "devDependencies": {
-    "prettier": "^3.1.0"
   }
 }

yarn.lock

@@ -4240,6 +4240,7 @@ __metadata:
   resolution: "@serlo/monorepo@workspace:."
   dependencies:
     prettier: ^3.1.0
+    prettier-plugin-packagejson: ^2.4.6
   languageName: unknown
   linkType: soft