add prettier, format script and apply it

tom-james-watson · Jan 29, 2022 · a00af2d · a00af2d
1 parent 9259e71
commit a00af2d
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 22 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,2 @@
+# Build files
+.next
diff --git a/components/board.tsx b/components/board.tsx
@@ -54,9 +54,12 @@ export default function Board(props: Props) {
         ...state.next,
         played: { correct },
       });
-      
+
       const newNext = state.nextButOne;
-      const newNextButOne = getRandomItem(newDeck, newNext ? [...newPlayed, newNext] : newPlayed);
+      const newNextButOne = getRandomItem(
+        newDeck,
+        newNext ? [...newPlayed, newNext] : newPlayed
+      );
       const newImageCache = [preloadImage(newNextButOne.image)];
 
       setState({

diff --git a/lib/items.ts b/lib/items.ts
@@ -14,9 +14,8 @@ export function getRandomItem(deck: Item[], played: Item[]): Item {
     [1850, 1930],
     [1930, 2020],
   ];
-  const [fromYear, toYear] = periods[
-    Math.floor(Math.random() * periods.length)
-  ];
+  const [fromYear, toYear] =
+    periods[Math.floor(Math.random() * periods.length)];
   const avoidPeople = Math.random() > 0.5;
 
   while (item === undefined) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "build": "next build",
     "dev": "next dev",
+    "format": "prettier --write \"**/*.{js,jsx,ts,tsx,css,scss,json,yml}\"",
     "lint": "eslint --max-warnings=0 --cache --ext .js,.ts,.tsx .",
     "lint-fix": "eslint --fix --cache --ext .js,.ts,.tsx .",
     "start": "next start"
@@ -32,6 +33,7 @@
     "eslint": "^7.24.0",
     "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^4.2.0",
+    "prettier": "^2.5.1",
     "sass": "^1.32.10",
     "typescript": "^4.4.4"
   }

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,15 +1,8 @@
 {
   "compilerOptions": {
-    "typeRoots": [
-      "@types",
-      "node_modules/@types"
-    ],
+    "typeRoots": ["@types", "node_modules/@types"],
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -23,12 +16,6 @@
     "jsx": "preserve",
     "incremental": true
   },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"]
 }