Merge pull request #269 from ral-facilities/renovate/prettier-3.x

Update dependency prettier to v3
ral-facilities · Nov 10, 2023 · 5076a8a · 5076a8a
2 parents 8586712 + ca9ddfd
commit 5076a8a
Show file tree

Hide file tree

Showing 28 changed files with 376 additions and 41 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@pkgr-utils-npm-2.4.2-5333ff17f3-24e04c1212.zip b/.yarn/cache/@pkgr-utils-npm-2.4.2-5333ff17f3-24e04c1212.zip
diff --git a/.yarn/cache/big-integer-npm-1.6.51-1a244d8e1f-3d444173d1.zip b/.yarn/cache/big-integer-npm-1.6.51-1a244d8e1f-3d444173d1.zip
diff --git a/.yarn/cache/bplist-parser-npm-0.2.0-91a681e495-d5339dd16a.zip b/.yarn/cache/bplist-parser-npm-0.2.0-91a681e495-d5339dd16a.zip
diff --git a/.yarn/cache/bundle-name-npm-3.0.0-d7e52ba2a3-edf2b1fbe6.zip b/.yarn/cache/bundle-name-npm-3.0.0-d7e52ba2a3-edf2b1fbe6.zip
diff --git a/.yarn/cache/default-browser-id-npm-3.0.0-f65ceaa214-279c7ad492.zip b/.yarn/cache/default-browser-id-npm-3.0.0-f65ceaa214-279c7ad492.zip
diff --git a/.yarn/cache/default-browser-npm-4.0.0-e9e9c8aba0-40c5af9847.zip b/.yarn/cache/default-browser-npm-4.0.0-e9e9c8aba0-40c5af9847.zip
diff --git a/.yarn/cache/define-lazy-prop-npm-3.0.0-6bb0fc1510-54884f94ca.zip b/.yarn/cache/define-lazy-prop-npm-3.0.0-6bb0fc1510-54884f94ca.zip
diff --git a/.yarn/cache/eslint-plugin-prettier-npm-4.2.1-ba8e1240f1-b9e839d233.zip b/.yarn/cache/eslint-plugin-prettier-npm-4.2.1-ba8e1240f1-b9e839d233.zip
diff --git a/.yarn/cache/eslint-plugin-prettier-npm-5.0.0-2f21113cba-84e88744b9.zip b/.yarn/cache/eslint-plugin-prettier-npm-5.0.0-2f21113cba-84e88744b9.zip
diff --git a/.yarn/cache/execa-npm-7.2.0-7797cafb24-14fd17ba0c.zip b/.yarn/cache/execa-npm-7.2.0-7797cafb24-14fd17ba0c.zip
diff --git a/.yarn/cache/fast-glob-npm-3.3.1-8045ff8f4d-b6f3add640.zip b/.yarn/cache/fast-glob-npm-3.3.1-8045ff8f4d-b6f3add640.zip
diff --git a/.yarn/cache/is-docker-npm-3.0.0-1570e32177-b698118f04.zip b/.yarn/cache/is-docker-npm-3.0.0-1570e32177-b698118f04.zip
diff --git a/.yarn/cache/is-inside-container-npm-1.0.0-f2c9e9bb96-c50b75a2ab.zip b/.yarn/cache/is-inside-container-npm-1.0.0-f2c9e9bb96-c50b75a2ab.zip
diff --git a/.yarn/cache/open-npm-9.1.0-d104a17ec5-3993c0f61d.zip b/.yarn/cache/open-npm-9.1.0-d104a17ec5-3993c0f61d.zip
diff --git a/.yarn/cache/prettier-npm-2.8.0-746e3df53e-72004ce0cc.zip b/.yarn/cache/prettier-npm-2.8.0-746e3df53e-72004ce0cc.zip
diff --git a/.yarn/cache/prettier-npm-3.0.1-d00deab00c-e1f3f16c7f.zip b/.yarn/cache/prettier-npm-3.0.1-d00deab00c-e1f3f16c7f.zip
diff --git a/.yarn/cache/run-applescript-npm-5.0.0-ea4b8840dd-d00c2dbfa5.zip b/.yarn/cache/run-applescript-npm-5.0.0-ea4b8840dd-d00c2dbfa5.zip
diff --git a/.yarn/cache/synckit-npm-0.8.5-40a594eb38-8a9560e5d8.zip b/.yarn/cache/synckit-npm-0.8.5-40a594eb38-8a9560e5d8.zip
diff --git a/.yarn/cache/titleize-npm-3.0.0-7deac2f3a3-71fbbeabbf.zip b/.yarn/cache/titleize-npm-3.0.0-7deac2f3a3-71fbbeabbf.zip
diff --git a/.yarn/cache/tslib-npm-2.6.1-de28eba753-b0d176d176.zip b/.yarn/cache/tslib-npm-2.6.1-de28eba753-b0d176d176.zip
diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.8.0-sdk",
-  "main": "./index.js",
+  "version": "3.0.1-sdk",
+  "main": "./index.cjs",
   "type": "commonjs"
 }
diff --git a/package.json b/package.json
@@ -126,13 +126,13 @@
     "eslint-config-react-app": "7.0.1",
     "eslint-plugin-cypress": "2.13.3",
     "eslint-plugin-no-only-tests": "3.1.0",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-prettier": "5.0.0",
     "express": "4.18.1",
     "husky": "8.0.1",
     "jest-canvas-mock": "2.5.0",
     "lint-staged": "13.2.2",
     "msw": "1.2.1",
-    "prettier": "2.8.0",
+    "prettier": "3.0.1",
     "react-beautiful-dnd-test-utils": "4.1.1",
     "serve": "14.2.0",
     "serve-static": "1.15.0",

diff --git a/src/api/records.tsx b/src/api/records.tsx
@@ -271,7 +271,7 @@ export const useRecordsPaginated = (): UseQueryResult<
         searchParams: SearchParams;
         filters: string[];
         projection: string[];
-      }
+      },
     ]
   >(
     [
@@ -405,7 +405,7 @@ export const usePlotRecords = (
         searchParams: SearchParams;
         filters: string[];
         projection: string[];
-      }
+      },
     ]
   >(
     [
@@ -493,7 +493,7 @@ export const useThumbnails = (
         sort: SortType;
         searchParams: SearchParams;
         filters: string[];
-      }
+      },
     ]
   >(
     [

diff --git a/src/filtering/filterDialogue.component.tsx b/src/filtering/filterDialogue.component.tsx
@@ -76,7 +76,7 @@ const FilterDialogue = (props: FilterDialogueProps) => {
               type: 'channel',
               value: channel.systemName,
               label: channel?.name ?? channel.systemName,
-            } as Token)
+            }) as Token
         );
     },
   });

diff --git a/src/filtering/filterParser.ts b/src/filtering/filterParser.ts
@@ -181,9 +181,8 @@ class TokenInput {
           return this.tokens[this.pos++];
         } else {
           throw new ParserError(
-            `Expected token from types [${types}] at token ${
-              this.peek(0)?.value
-            }` // TODO: better error message?
+            `Expected token from types [${types}] at token ${this.peek(0)
+              ?.value}` // TODO: better error message?
           );
         }
       } else {

diff --git a/src/images/falseColourPanel.component.tsx b/src/images/falseColourPanel.component.tsx
@@ -205,8 +205,8 @@ const FalseColourPanel = (props: FalseColourPanelProps) => {
     ?.filter((colourmap) => colourmap.endsWith('_r'))
     .map((colourmap) => colourmap.replace('_r', ''));
 
-  const colourMapsWithReverse = colourMapsNames?.filter((value) =>
-    colourMapsReverseNames?.includes(value)
+  const colourMapsWithReverse = colourMapsNames?.filter(
+    (value) => colourMapsReverseNames?.includes(value)
   );
 
   return (