chore(prettier): upgrade prettier to v3

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npx pretty-quick --staged
+npx lint-staged

.lintstagedrc.json

@@ -0,0 +1,3 @@
+{
+  "*": "prettier --write"
+}

.nvmrc

@@ -1 +1 @@
-v16
+v18

.prettierignore

@@ -1,14 +1,26 @@
-cache
-.cache
+# Ignore everything.
+/*
+
+# Don't ignore some files in the root directory.
+!/*.js
+!/*.ts
+!/*.md
+!/*.json
+
+# Don't ignore these nested directories.
+!/examples
+!/modules
+!/packages
+!/scripts
+!/starters
+!/test
+!/www
+
+# In any nested folder, ignore these paths:
+.next
+CHANGELOG.md
+composer.json
+dist
 package.json
 package-lock.json
 public
-CHANGELOG.md
-.yarn
-packages/codemod/transforms/__testfixtures__/**/*
-packages/codemod/transforms/__tests__/**/*
-packages/codemod/**/*.js
-packages/codemod/**/*.d.ts
-dist
-.next
-/drupal

.prettierrc.json

@@ -1,5 +1,6 @@
 {
   "semi": false,
+  "trailingComma": "es5",
   "overrides": [
     {
       "files": "modules/**/*",

examples/example-query/types/drupal/field.ts

@@ -8,7 +8,7 @@ export interface FieldTextFormatted {
 
 export type FieldEntityReference<
   Types,
-  Cardinality extends FieldCardinality = "limited"
+  Cardinality extends FieldCardinality = "limited",
 > = Cardinality extends "unlimited" ? Array<Partial<Types>> : Partial<Types>
 
 export type FieldList<List> = keyof List

package.json

@@ -53,27 +53,24 @@
     "@typescript-eslint/parser": "^5.62.0",
     "cypress": "^9.7.0",
     "eslint": "^8.51.0",
-    "eslint-config-prettier": "^8.10.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-cypress": "^2.15.1",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react": "^7.33.2",
     "faker": "^6.6.6",
     "husky": "^8.0.3",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^27.5.1",
     "lerna": "^4.0.0",
+    "lint-staged": "^15.0.2",
     "microbundle": "^0.15.1",
-    "prettier": "^2.8.8",
-    "pretty-quick": "^3.1.3",
+    "prettier": "^3.0.3",
     "start-server-and-test": "^1.15.5",
     "ts-jest": "^27.1.5",
     "ts-node": "^10.9.1",
     "turbo": "^1.10.15",
     "typescript": "^4.9.5",
     "uuid": "^9.0.1",
     "yaml": "^2.3.3"
-  },
-  "engines": {
-    "node": ">=16.19.0"
   }
 }

packages/next-drupal-query/src/index.ts

@@ -185,7 +185,7 @@ type Queries<Q> = Record<
 type QueryTypeOf<
   Q extends Queries<Q>,
   T extends keyof Q,
-  F extends "params" | "data" | "formatter" | "placeholder"
+  F extends "params" | "data" | "formatter" | "placeholder",
 > = Q[T][F]
 
 // type QueryId<Q = null> = keyof Q
@@ -200,7 +200,7 @@ type QueryDataOpts<Q extends Queries<Q>, T extends keyof Q> = Parameters<
 
 type QueryPlaceholderDataOpts<
   Q extends Queries<Q>,
-  T extends keyof Q
+  T extends keyof Q,
 > = Parameters<Q[T]["placeholder"]>[0]
 
 type QueryFormatterInput<Q extends Queries<Q>, T extends keyof Q> = Parameters<
@@ -213,7 +213,7 @@ type QueryDataReturn<Q extends Queries<Q>, T extends keyof Q> = ReturnType<
 
 type QueryPlaceholderDataReturn<
   Q extends Queries<Q>,
-  T extends keyof Q
+  T extends keyof Q,
 > = ReturnType<QueryTypeOf<Q, T, "placeholder">>
 
 type QueryFormatterReturn<Q extends Queries<Q>, T extends keyof Q> = ReturnType<
@@ -268,7 +268,7 @@ export function massageRouteQuery(query) {
 export function createQueries<Q extends Readonly<Queries<Q>>>(queries: Q) {
   const getRawData = async <
     T extends ConditionalKeys<Q, { data }>,
-    O extends QueryDataOpts<Q, T>
+    O extends QueryDataOpts<Q, T>,
   >(
     id: T,
     opts: O = null
@@ -305,7 +305,7 @@ export function createQueries<Q extends Readonly<Queries<Q>>>(queries: Q) {
 
   const getPlaceholderData = async <
     T extends ConditionalKeys<Q, { data }>,
-    O extends QueryPlaceholderDataOpts<Q, T>
+    O extends QueryPlaceholderDataOpts<Q, T>,
   >(
     id: T,
     opts: O = null
@@ -328,7 +328,7 @@ export function createQueries<Q extends Readonly<Queries<Q>>>(queries: Q) {
 
   const formatData = <
     T extends ConditionalKeys<Q, { formatter }>,
-    Input extends QueryFormatterInput<Q, T>
+    Input extends QueryFormatterInput<Q, T>,
   >(
     id: T,
     input: Input
@@ -357,17 +357,17 @@ export function createQueries<Q extends Readonly<Queries<Q>>>(queries: Q) {
 
   async function getData<
     T extends ConditionalKeys<Q, { formatter; data }>,
-    O extends QueryDataOpts<Q, T>
+    O extends QueryDataOpts<Q, T>,
   >(id: T, opts?: O): Promise<QueryFormatterReturn<Q, T>>
 
   async function getData<
     T extends ConditionalKeys<Q, { data }>,
-    O extends QueryDataOpts<Q, T>
+    O extends QueryDataOpts<Q, T>,
   >(id: T, opts?: O): Promise<QueryDataReturn<Q, T>>
 
   async function getData<
     T extends ConditionalKeys<Q, { placeholder }>,
-    O extends QueryPlaceholderDataOpts<Q, T>
+    O extends QueryPlaceholderDataOpts<Q, T>,
   >(id: T, opts?: O): Promise<QueryPlaceholderDataReturn<Q, T>>
 
   async function getData(id, opts = null) {
@@ -412,7 +412,7 @@ export function createQueries<Q extends Readonly<Queries<Q>>>(queries: Q) {
     },
     getParams: <
       T extends ConditionalKeys<Q, { params }>,
-      O extends QueryParamsOpts<Q, T>
+      O extends QueryParamsOpts<Q, T>,
     >(
       id: T = null,
       opts: O = null

www/content/features/typescript.mdx

@@ -21,7 +21,6 @@ const tags = await drupal.getResourceCollection<DrupalTaxonomyTerm[]>(
 
 ```ts
 // Any resource type.
-const resources = await drupal.getResourceCollection<JsonApiResource[]>(
-  "entity--bundle"
-)
+const resources =
+  await drupal.getResourceCollection<JsonApiResource[]>("entity--bundle")
 ```