Merge pull request #103 from Four-Lights-NL/chore/update-biome

trijpstra-fourlights · web-flow · commit 20a57d5ed851 · 2025-11-19T09:44:53.000+01:00
chore: update biome and apply linting fixes
diff --git a/.release-it.json b/.release-it.json
@@ -15,4 +15,4 @@
   "npm": {
     "publish": true
   }
-}
+}
diff --git a/biome.json b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.0.5/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.5/schema.json",
   "vcs": {
     "enabled": false,
     "clientKind": "git",
@@ -22,7 +22,33 @@
     "formatWithErrors": true,
     "lineWidth": 120
   },
-  "assist": { "actions": { "source": { "organizeImports": "on" } } },
+  "assist": {
+    "actions": {
+      "source": {
+        "organizeImports": {
+          "level": "on",
+          "options": {
+            "groups": [
+              { "source": [":BUN:", ":NODE:"], "type": true },
+              ":BLANK_LINE:",
+              { "source": [":BUN:", ":NODE:"], "type": false },
+              ":BLANK_LINE:",
+              { "source": [":PACKAGE:", ":BLANK_LINE:"], "type": true },
+              ":BLANK_LINE:",
+              { "source": [":PACKAGE:", ":BLANK_LINE:"], "type": false },
+              ":BLANK_LINE:",
+              { "source": [":ALIAS:", ":PATH:"], "type": true },
+              ":BLANK_LINE:",
+              { "source": [":ALIAS:", ":PATH:"], "type": false }
+            ]
+          }
+        },
+        "useSortedAttributes": "on",
+        "useSortedKeys": "off"
+      }
+    },
+    "enabled": true
+  },
   "linter": {
     "enabled": true,
     "rules": {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.2.4",
+    "@biomejs/biome": "^2.3.6",
     "@strapi/database": "^5.14.0",
     "@strapi/sdk-plugin": "^5.3.2",
     "@strapi/strapi": "^5.24.1",
diff --git a/playground/__tests__/helpers/files.ts b/playground/__tests__/helpers/files.ts
@@ -1,7 +1,9 @@
 import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
+
 import type { Core } from "@strapi/strapi"
+
 import { File } from "formidable"
 
 const createFormidableFile = async (base64Image: string): Promise<File> => {
diff --git a/playground/__tests__/helpers/strapi.ts b/playground/__tests__/helpers/strapi.ts
@@ -2,7 +2,9 @@ import { existsSync } from "node:fs"
 import fs from "node:fs/promises"
 import { tmpdir } from "node:os"
 import path from "node:path"
+
 import type { Config } from "@fourlights/strapi-plugin-deep-populate/dist/server/src/config/index"
+
 import { type Core, compileStrapi, createStrapi } from "@strapi/strapi"
 import { isEmpty, merge } from "lodash"
 import { vi } from "vitest"
diff --git a/playground/__tests__/memory-usage.test.ts b/playground/__tests__/memory-usage.test.ts
@@ -1,8 +1,10 @@
 import { afterAll, beforeAll, describe, it } from "vitest"
+
+import type { UnwrapPromise } from "./helpers/unwrapPromise"
+
 import * as MemoryTracker from "./helpers/memoryTracker"
 import { setupDocuments } from "./helpers/setupDocuments"
 import { setupStrapi, strapi, teardownStrapi } from "./helpers/strapi"
-import type { UnwrapPromise } from "./helpers/unwrapPromise"
 
 describe.sequential("Memory Usage Tests", () => {
   let context: UnwrapPromise<ReturnType<typeof setupDocuments>>
diff --git a/playground/__tests__/services/populate/api.test.ts b/playground/__tests__/services/populate/api.test.ts
@@ -1,8 +1,11 @@
 import type { Modules } from "@strapi/strapi"
+
 import supertest from "supertest"
+
+import type { UnwrapPromise } from "../../helpers/unwrapPromise"
+
 import { setupDocuments } from "../../helpers/setupDocuments"
 import { setupStrapi, strapi, teardownStrapi } from "../../helpers/strapi"
-import type { UnwrapPromise } from "../../helpers/unwrapPromise"
 
 describe("api", () => {
   let context: UnwrapPromise<ReturnType<typeof setupDocuments>>
diff --git a/playground/__tests__/services/populate/cache-invalidation.test.ts b/playground/__tests__/services/populate/cache-invalidation.test.ts
@@ -1,7 +1,9 @@
 import type { UID } from "@strapi/strapi"
+
+import type { UnwrapPromise } from "../../helpers/unwrapPromise"
+
 import { setupDocuments } from "../../helpers/setupDocuments"
 import { setupStrapi, strapi, teardownStrapi } from "../../helpers/strapi"
-import type { UnwrapPromise } from "../../helpers/unwrapPromise"
 
 describe("cache invalidation", () => {
   const contentType = "api::page.page" as const
diff --git a/playground/__tests__/services/populate/config.test.ts b/playground/__tests__/services/populate/config.test.ts
@@ -1,7 +1,9 @@
 import type { Core, Data, Modules, UID } from "@strapi/strapi"
+
+import type { UnwrapPromise } from "../../helpers/unwrapPromise"
+
 import { setupDocuments } from "../../helpers/setupDocuments"
 import { setupStrapi, strapi, teardownStrapi } from "../../helpers/strapi"
-import type { UnwrapPromise } from "../../helpers/unwrapPromise"
 
 describe("config", () => {
   let context: UnwrapPromise<ReturnType<typeof setupDocuments>> & {
diff --git a/playground/__tests__/services/populate/documents.test.ts b/playground/__tests__/services/populate/documents.test.ts
@@ -1,7 +1,9 @@
 import get from "lodash/get"
+
+import type { UnwrapPromise } from "../../helpers/unwrapPromise"
+
 import { setupDocuments } from "../../helpers/setupDocuments"
 import { setupStrapi, strapi, teardownStrapi } from "../../helpers/strapi"
-import type { UnwrapPromise } from "../../helpers/unwrapPromise"
 
 describe("documents", () => {
   let context: UnwrapPromise<ReturnType<typeof setupDocuments>>
diff --git a/playground/__tests__/services/populate/get.test.ts b/playground/__tests__/services/populate/get.test.ts
@@ -1,4 +1,5 @@
 import type { Core, Modules } from "@strapi/strapi"
+
 import { cleanImages, uploadImage } from "../../helpers/files"
 import { setupStrapi, strapi, teardownStrapi } from "../../helpers/strapi"
 
diff --git a/playground/__tests__/services/populate/middleware.test.ts b/playground/__tests__/services/populate/middleware.test.ts
@@ -1,4 +1,5 @@
 import type { Core, Data, Modules } from "@strapi/strapi"
+
 import { setupStrapi, strapi, teardownStrapi } from "../../helpers/strapi"
 
 const mockDate = "2025-01-01T12:00:00.000Z"
@@ -235,7 +236,9 @@ describe("lifecycle", () => {
       await strapi.documents(contentType).findOne({ documentId: parentSection.documentId, populate: "*" })
       expect(setCacheSpy).toHaveBeenCalledTimes(0)
 
-      await strapi.documents(contentType).findOne({ documentId: parentSection.documentId, populate: "*", bustCache: true })
+      await strapi
+        .documents(contentType)
+        .findOne({ documentId: parentSection.documentId, populate: "*", bustCache: true })
 
       expect(setCacheSpy).toHaveBeenCalledTimes(1)
     })
diff --git a/scripts/extract-changelog.mjs b/scripts/extract-changelog.mjs
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 import fs from "node:fs"
 
 const version = process.argv[2]
diff --git a/server/src/config/index.ts b/server/src/config/index.ts
@@ -1,4 +1,5 @@
 import type { UID } from "@strapi/strapi"
+
 import isEmpty from "lodash/isEmpty"
 import isObject from "lodash/isObject"
 
diff --git a/server/src/register.ts b/server/src/register.ts
@@ -1,6 +1,6 @@
 import type { Core, Schema, UID } from "@strapi/strapi"
-import { sanitize } from "@strapi/utils"
 
+import { sanitize } from "@strapi/utils"
 import cloneDeep from "lodash/cloneDeep"
 import has from "lodash/has"
 import isEmpty from "lodash/isEmpty"
diff --git a/server/src/services/cache.ts b/server/src/services/cache.ts
@@ -1,10 +1,13 @@
 import type { Core, Modules } from "@strapi/strapi"
+
 import get from "lodash/get"
 import isEmpty from "lodash/isEmpty"
 import isEqual from "lodash/isEqual"
+
+import type { PopulateParams } from "./populate"
+
 import { version } from "../../../package.json"
 import { getConfig } from "./deep-populate/utils"
-import type { PopulateParams } from "./populate"
 
 type SetPopulateParams = PopulateParams &
   Modules.Documents.Params.Pick<PopulateParams["contentType"], "populate"> & { dependencies: string[] }
diff --git a/server/src/services/deep-populate/index.ts b/server/src/services/deep-populate/index.ts
@@ -1,16 +1,17 @@
 import type { Data, Schema, UID } from "@strapi/strapi"
-import { contentTypes } from "@strapi/utils"
 
+import { contentTypes } from "@strapi/utils"
 import cloneDeep from "lodash/cloneDeep"
 import get from "lodash/get"
 import merge from "lodash/merge"
 import mergeWith from "lodash/mergeWith"
 import set from "lodash/set"
 
 import type { ContentTypeConfigAllow } from "../../config"
-import { sanitizeObject } from "../../utils/sanitizeObject"
 import type { PopulateParams } from "../populate"
 import type { PopulateComponentProps, PopulateDynamicZoneProps, PopulateProps, PopulateRelationProps } from "./types"
+
+import { sanitizeObject } from "../../utils/sanitizeObject"
 import { getConfig, getRelations, hasValue, isEmpty } from "./utils"
 
 async function _populateComponent<TContentType extends UID.ContentType, TSchema extends UID.Schema>({
diff --git a/server/src/services/deep-populate/utils.ts b/server/src/services/deep-populate/utils.ts
@@ -1,10 +1,13 @@
 import type { Schema, UID } from "@strapi/strapi"
+
 import { contentTypes } from "@strapi/utils"
 import { get, has, mergeWith } from "lodash"
+
 import type { Config } from "../../config"
-import { sanitizeObject } from "../../utils/sanitizeObject"
 import type { PopulateParams } from "../populate"
 
+import { sanitizeObject } from "../../utils/sanitizeObject"
+
 type PluginOptions = {
   i18n?: {
     localized: boolean
diff --git a/server/src/services/populate.ts b/server/src/services/populate.ts
@@ -1,6 +1,7 @@
 import type { Core, Modules, UID } from "@strapi/strapi"
 
 import type { Config } from "../config"
+
 import populate from "./deep-populate"
 
 export type PopulateParams<TContentType extends UID.ContentType = UID.ContentType> = Modules.Documents.Params.Pick<

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`"npm": {`
`16`	`16`	`"publish": true`
`17`	`17`	`}`
`18`		`-}`
	`18`	`+}`