diff --git a/.eslintrc.json b/.eslintrc.json
index a0111a63221..79f7e567129 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -59,7 +59,8 @@
     ],
     "import/no-relative-packages": "error",
     "import/export": "error",
-    "import/no-duplicates": "error"
+    "import/no-duplicates": "error",
+    "import/newline-after-import": "error"
   },
   "globals": {
     "GeolocationPositionError": true
diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 0100a2d0e23..e31bc81eed1 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -1,5 +1,6 @@
 const _passport = require("koa-passport")
 const LocalStrategy = require("passport-local").Strategy
+
 import { getGlobalDB } from "../context"
 import { Cookie } from "../constants"
 import { getSessionsForUser, invalidateSessions } from "../security/sessions"
@@ -26,6 +27,7 @@ import { clearCookie, getCookie } from "../utils"
 import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"
 
 const refresh = require("passport-oauth2-refresh")
+
 export {
   auditLog,
   authError,
diff --git a/packages/backend-core/src/constants/db.ts b/packages/backend-core/src/constants/db.ts
index bb944556af5..ac00483021f 100644
--- a/packages/backend-core/src/constants/db.ts
+++ b/packages/backend-core/src/constants/db.ts
@@ -1,4 +1,5 @@
 import { prefixed, DocumentType } from "@budibase/types"
+
 export {
   SEPARATOR,
   UNICODE_MAX,
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index d7a4b8224ac..906a95e1db3 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -6,6 +6,7 @@ import { AppState, DeletedApp, getAppMetadata } from "../cache/appMetadata"
 import { isDevApp, isDevAppID, getProdAppID } from "../docIds/conversions"
 import { App, Database } from "@budibase/types"
 import { getStartEndKeyURL } from "../docIds"
+
 export * from "../docIds"
 
 /**
diff --git a/packages/backend-core/src/docIds/conversions.ts b/packages/backend-core/src/docIds/conversions.ts
index b168b74e161..ec43d013894 100644
--- a/packages/backend-core/src/docIds/conversions.ts
+++ b/packages/backend-core/src/docIds/conversions.ts
@@ -1,5 +1,6 @@
 import { APP_DEV_PREFIX, APP_PREFIX } from "../constants"
 import { App } from "@budibase/types"
+
 const NO_APP_ERROR = "No app provided"
 
 export function isDevAppID(appId?: string) {
diff --git a/packages/backend-core/src/events/processors/posthog/index.ts b/packages/backend-core/src/events/processors/posthog/index.ts
index dceb10d2cd4..5a2b1afc9f3 100644
--- a/packages/backend-core/src/events/processors/posthog/index.ts
+++ b/packages/backend-core/src/events/processors/posthog/index.ts
@@ -1,2 +1,3 @@
 import PosthogProcessor from "./PosthogProcessor"
+
 export default PosthogProcessor
diff --git a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
index 0722fc32935..d9a5504073a 100644
--- a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
+++ b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
@@ -1,7 +1,9 @@
 import { testEnv } from "../../../../../tests/extra"
 import PosthogProcessor from "../PosthogProcessor"
 import { Event, IdentityType, Hosting } from "@budibase/types"
+
 const tk = require("timekeeper")
+
 import * as cache from "../../../../cache/generic"
 import { CacheKey } from "../../../../cache/generic"
 import * as context from "../../../../context"
diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts
index 8f5c903e051..ad517082de8 100644
--- a/packages/backend-core/src/features/index.ts
+++ b/packages/backend-core/src/features/index.ts
@@ -1,5 +1,6 @@
 import env from "../environment"
 import * as context from "../context"
+
 export * from "./installation"
 
 /**
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index 2cfd5179414..d04f48e5fcd 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -38,6 +38,7 @@ export * as docIds from "./docIds"
 // circular dependencies
 import * as context from "./context"
 import * as _tenancy from "./tenancy"
+
 export const tenancy = {
   ..._tenancy,
   ...context,
diff --git a/packages/backend-core/src/logging/correlation/correlation.ts b/packages/backend-core/src/logging/correlation/correlation.ts
index b5b47df9c66..0498bd43d5f 100644
--- a/packages/backend-core/src/logging/correlation/correlation.ts
+++ b/packages/backend-core/src/logging/correlation/correlation.ts
@@ -1,4 +1,5 @@
 import { Header } from "../../constants"
+
 const correlator = require("correlation-id")
 
 export const setHeader = (headers: any) => {
diff --git a/packages/backend-core/src/logging/correlation/middleware.ts b/packages/backend-core/src/logging/correlation/middleware.ts
index f77714a5aea..45baee1fb13 100644
--- a/packages/backend-core/src/logging/correlation/middleware.ts
+++ b/packages/backend-core/src/logging/correlation/middleware.ts
@@ -1,5 +1,6 @@
 import { Header } from "../../constants"
 import { v4 as uuid } from "uuid"
+
 const correlator = require("correlation-id")
 
 const correlation = (ctx: any, next: any) => {
diff --git a/packages/backend-core/src/logging/pino/middleware.ts b/packages/backend-core/src/logging/pino/middleware.ts
index 569420c5f23..df18a35eb1f 100644
--- a/packages/backend-core/src/logging/pino/middleware.ts
+++ b/packages/backend-core/src/logging/pino/middleware.ts
@@ -1,9 +1,12 @@
 import env from "../../environment"
 import { logger } from "./logger"
 import { IncomingMessage } from "http"
+
 const pino = require("koa-pino-logger")
+
 import { Options } from "pino-http"
 import { Ctx } from "@budibase/types"
+
 const correlator = require("correlation-id")
 
 export function pinoSettings(): Options {
diff --git a/packages/backend-core/src/middleware/index.ts b/packages/backend-core/src/middleware/index.ts
index 980bf06b00e..e1eb7f1d261 100644
--- a/packages/backend-core/src/middleware/index.ts
+++ b/packages/backend-core/src/middleware/index.ts
@@ -2,6 +2,7 @@ export * as local from "./passport/local"
 export * as google from "./passport/sso/google"
 export * as oidc from "./passport/sso/oidc"
 import * as datasourceGoogle from "./passport/datasource/google"
+
 export const datasource = {
   google: datasourceGoogle,
 }
diff --git a/packages/backend-core/src/middleware/passport/sso/google.ts b/packages/backend-core/src/middleware/passport/sso/google.ts
index ad7593e63dc..2a08ad76659 100644
--- a/packages/backend-core/src/middleware/passport/sso/google.ts
+++ b/packages/backend-core/src/middleware/passport/sso/google.ts
@@ -8,6 +8,7 @@ import {
   SaveSSOUserFunction,
   GoogleInnerConfig,
 } from "@budibase/types"
+
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
 
 export function buildVerifyFn(saveUserFn: SaveSSOUserFunction) {
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
index d0689a1f0a5..9bf855b3c54 100644
--- a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
+++ b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
@@ -6,6 +6,7 @@ const mockStrategy = require("passport-google-oauth").OAuth2Strategy
 
 jest.mock("../sso")
 import * as _sso from "../sso"
+
 const sso = jest.mocked(_sso)
 
 const mockSaveUserFn = jest.fn()
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
index c3ddf220e67..d3486a5b148 100644
--- a/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
+++ b/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
@@ -11,6 +11,7 @@ const mockSaveUser = jest.fn()
 
 jest.mock("../../../../users")
 import * as _users from "../../../../users"
+
 const users = jest.mocked(_users)
 
 const getErrorMessage = () => {
diff --git a/packages/backend-core/src/middleware/tests/builder.spec.ts b/packages/backend-core/src/middleware/tests/builder.spec.ts
index d350eff4f67..0514dc13f0a 100644
--- a/packages/backend-core/src/middleware/tests/builder.spec.ts
+++ b/packages/backend-core/src/middleware/tests/builder.spec.ts
@@ -5,6 +5,7 @@ import { structures } from "../../../tests"
 import { ContextUser, ServiceType } from "@budibase/types"
 import { doInAppContext } from "../../context"
 import env from "../../environment"
+
 env._set("SERVICE_TYPE", ServiceType.APPS)
 
 const appId = "app_aaa"
diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index 76d2dd66890..cdaf19fa559 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -1,4 +1,5 @@
 const sanitize = require("sanitize-s3-objectkey")
+
 import AWS from "aws-sdk"
 import stream, { Readable } from "stream"
 import fetch from "node-fetch"
diff --git a/packages/backend-core/src/security/sessions.ts b/packages/backend-core/src/security/sessions.ts
index 5a535c0c46c..a86a829b178 100644
--- a/packages/backend-core/src/security/sessions.ts
+++ b/packages/backend-core/src/security/sessions.ts
@@ -1,6 +1,7 @@
 const redis = require("../redis/init")
 const { v4: uuidv4 } = require("uuid")
 const { logWarn } = require("../logging")
+
 import env from "../environment"
 import {
   Session,
diff --git a/packages/backend-core/src/utils/hashing.ts b/packages/backend-core/src/utils/hashing.ts
index aba11f38e6f..54d7de4aba0 100644
--- a/packages/backend-core/src/utils/hashing.ts
+++ b/packages/backend-core/src/utils/hashing.ts
@@ -1,4 +1,5 @@
 import env from "../environment"
+
 export * from "../docIds/newid"
 const bcrypt = env.JS_BCRYPT ? require("bcryptjs") : require("bcrypt")
 
diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts
index 1c1ca8473b0..b10d9ebdc0d 100644
--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@@ -11,6 +11,7 @@ import {
   TenantResolutionStrategy,
 } from "@budibase/types"
 import type { SetOption } from "cookies"
+
 const jwt = require("jsonwebtoken")
 
 const APP_PREFIX = DocumentType.APP + SEPARATOR
diff --git a/packages/backend-core/tests/core/utilities/mocks/alerts.ts b/packages/backend-core/tests/core/utilities/mocks/alerts.ts
index 90c9759c92f..0b26e98363a 100644
--- a/packages/backend-core/tests/core/utilities/mocks/alerts.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/alerts.ts
@@ -1,3 +1,4 @@
 jest.mock("../../../../src/logging/alerts")
 import * as _alerts from "../../../../src/logging/alerts"
+
 export const alerts = jest.mocked(_alerts)
diff --git a/packages/backend-core/tests/core/utilities/mocks/index.ts b/packages/backend-core/tests/core/utilities/mocks/index.ts
index 9a72b38ef50..8705e563cb1 100644
--- a/packages/backend-core/tests/core/utilities/mocks/index.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/index.ts
@@ -1,5 +1,6 @@
 jest.mock("../../../../src/accounts")
 import * as _accounts from "../../../../src/accounts"
+
 export const accounts = jest.mocked(_accounts)
 
 export * as date from "./date"
diff --git a/packages/backend-core/tests/core/utilities/structures/generator.ts b/packages/backend-core/tests/core/utilities/structures/generator.ts
index ed4dac82550..64eb5ecc97a 100644
--- a/packages/backend-core/tests/core/utilities/structures/generator.ts
+++ b/packages/backend-core/tests/core/utilities/structures/generator.ts
@@ -1,2 +1,3 @@
 import Chance from "./Chance"
+
 export const generator = new Chance()
diff --git a/packages/backend-core/tests/jestSetup.ts b/packages/backend-core/tests/jestSetup.ts
index 42a24ce7336..e5d144290b6 100644
--- a/packages/backend-core/tests/jestSetup.ts
+++ b/packages/backend-core/tests/jestSetup.ts
@@ -9,6 +9,7 @@ mocks.fetch.enable()
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
 import tk from "timekeeper"
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.DEBUG) {
diff --git a/packages/bbui/src/ActionGroup/ActionGroup.svelte b/packages/bbui/src/ActionGroup/ActionGroup.svelte
index 43d8cd8de52..978e920c42c 100644
--- a/packages/bbui/src/ActionGroup/ActionGroup.svelte
+++ b/packages/bbui/src/ActionGroup/ActionGroup.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/actiongroup/dist/index-vars.css"
+
   export let vertical = false
   export let justified = false
   export let quiet = false
diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte
index 0faf50f55a7..e1d912ffa44 100644
--- a/packages/bbui/src/Avatar/Avatar.svelte
+++ b/packages/bbui/src/Avatar/Avatar.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/avatar/dist/index-vars.css"
+
   let sizes = new Map([
     ["XXS", "--spectrum-alias-avatar-size-50"],
     ["XS", "--spectrum-alias-avatar-size-75"],
diff --git a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
index 50d0073a253..3768fc19549 100644
--- a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/buttongroup/dist/index-vars.css"
+
   export let vertical = false
   export let gap = ""
 
diff --git a/packages/bbui/src/Divider/Divider.svelte b/packages/bbui/src/Divider/Divider.svelte
index e4f0f2fb61f..f6837ca97cc 100644
--- a/packages/bbui/src/Divider/Divider.svelte
+++ b/packages/bbui/src/Divider/Divider.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/divider/dist/index-vars.css"
+
   export let size = "M"
 
   export let vertical = false
diff --git a/packages/bbui/src/Modal/Content.svelte b/packages/bbui/src/Modal/Content.svelte
index 550994ef7ca..485229acd61 100644
--- a/packages/bbui/src/Modal/Content.svelte
+++ b/packages/bbui/src/Modal/Content.svelte
@@ -1,5 +1,6 @@
 <script>
   import Input from "../Form/Input.svelte"
+
   let value = ""
 </script>
 
diff --git a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
index 8b13135b33f..d4ecda246dc 100644
--- a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
+++ b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
@@ -4,6 +4,7 @@
   import Icon from "../Icon/Icon.svelte"
   import Popover from "../Popover/Popover.svelte"
   import { onMount } from "svelte"
+
   const flipDurationMs = 150
 
   export let constraints
diff --git a/packages/bbui/src/SideNavigation/Item.svelte b/packages/bbui/src/SideNavigation/Item.svelte
index dab88b05bc4..40d0af0d6e1 100644
--- a/packages/bbui/src/SideNavigation/Item.svelte
+++ b/packages/bbui/src/SideNavigation/Item.svelte
@@ -1,7 +1,9 @@
 <script>
   import { getContext } from "svelte"
+
   const multilevel = getContext("sidenav-type")
   import Badge from "../Badge/Badge.svelte"
+
   export let href = ""
   export let external = false
   export let heading = ""
diff --git a/packages/bbui/src/SideNavigation/Navigation.svelte b/packages/bbui/src/SideNavigation/Navigation.svelte
index d4d090ec1f6..c13b6b56c8c 100644
--- a/packages/bbui/src/SideNavigation/Navigation.svelte
+++ b/packages/bbui/src/SideNavigation/Navigation.svelte
@@ -1,6 +1,7 @@
 <script>
   import { setContext } from "svelte"
   import "@spectrum-css/sidenav/dist/index-vars.css"
+
   export let multilevel = false
   setContext("sidenav-type", multilevel)
 </script>
diff --git a/packages/bbui/src/Table/ArrayRenderer.svelte b/packages/bbui/src/Table/ArrayRenderer.svelte
index 637454dbca4..303397054ae 100644
--- a/packages/bbui/src/Table/ArrayRenderer.svelte
+++ b/packages/bbui/src/Table/ArrayRenderer.svelte
@@ -1,6 +1,7 @@
 <script>
   import "@spectrum-css/label/dist/index-vars.css"
   import Badge from "../Badge/Badge.svelte"
+
   export let value
 
   const displayLimit = 5
diff --git a/packages/bbui/src/Tabs/Tab.svelte b/packages/bbui/src/Tabs/Tab.svelte
index 0e6752afae0..44bc2cfe2a8 100644
--- a/packages/bbui/src/Tabs/Tab.svelte
+++ b/packages/bbui/src/Tabs/Tab.svelte
@@ -1,6 +1,7 @@
 <script>
   import { getContext, onMount, createEventDispatcher } from "svelte"
   import Portal from "svelte-portal"
+
   export let title
   export let icon = ""
   export let id
diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.js
index 32030322d93..abb7c9a8aab 100644
--- a/packages/bbui/src/helpers.js
+++ b/packages/bbui/src/helpers.js
@@ -1,4 +1,5 @@
 import { helpers } from "@budibase/shared-core"
+
 export const deepGet = helpers.deepGet
 
 /**
diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index 162285fd737..ee9eed51e9b 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -2,6 +2,7 @@
   import { Button, Select, Input, Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
   import { flags } from "stores/backend"
+
   const dispatch = createEventDispatcher()
 
   export let value
diff --git a/packages/builder/src/components/common/CustomSVG.svelte b/packages/builder/src/components/common/CustomSVG.svelte
index 3cd73a8d7a8..d028bcd86e7 100644
--- a/packages/builder/src/components/common/CustomSVG.svelte
+++ b/packages/builder/src/components/common/CustomSVG.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Helpers } from "@budibase/bbui"
+
   export let size
   export let svgHtml
 
diff --git a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
index ea065d217c9..b5155fc044b 100644
--- a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { capitalise } from "helpers"
+
   export let value
 </script>
 
diff --git a/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte b/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
index 8bf9499b98b..c0fb251dc01 100644
--- a/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import dayjs from "dayjs"
+
   export let value
 </script>
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
index f284e24645e..91b70e0c457 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
@@ -2,6 +2,7 @@
   import { Select, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+
   export let parameters
   export let bindings
 
diff --git a/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
index 5221ae4ef4e..a1903695f42 100644
--- a/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
+++ b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
@@ -1,2 +1,3 @@
 import FlatButtonGroup from "./FlatButtonGroup.svelte"
+
 export default FlatButtonGroup
diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
index 3d74e3f6b6b..f8a14a6dd14 100644
--- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
@@ -1,6 +1,7 @@
 <script>
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import { getUserBindings } from "builderStore/dataBinding"
+
   export let bindable = true
   export let queryBindings = []
   export let hideHeading = false
diff --git a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
index e41ec8f7450..5c69b151a66 100644
--- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
+++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
@@ -11,6 +11,7 @@
   import { environment } from "stores/portal"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { getContext } from "svelte"
+
   const modalContext = getContext(Context.Modal)
 
   export let save
diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte
index 23d8ddc2f3e..897a7da3ddc 100644
--- a/packages/builder/src/components/usage/Usage.svelte
+++ b/packages/builder/src/components/usage/Usage.svelte
@@ -2,6 +2,7 @@
   import { Body, ProgressBar, Heading, Icon, Link } from "@budibase/bbui"
   import { admin, auth } from "../../stores/portal"
   import { onMount } from "svelte"
+
   export let usage
   export let warnWhenFull = false
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
index 06b739e8584..f93c32e7504 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
@@ -2,6 +2,7 @@
   import { Body } from "@budibase/bbui"
   import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
   import { IntegrationTypes } from "constants/backend"
+
   export let datasource
   const getSubtitle = datasource => {
     if (datasource.source === IntegrationTypes.REST) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
index 1db607ccc19..348ed0b5bf4 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
@@ -1,5 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("../../")
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
index f0baf88ffe8..cecec0ab532 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
@@ -1,5 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("../")
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
index e73e6d78414..169dfa79349 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
@@ -1,6 +1,7 @@
 <script>
   import { DetailSummary } from "@budibase/bbui"
   import InfoDisplay from "./InfoDisplay.svelte"
+
   export let componentDefinition
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
index dac0aaed6ed..0db89cfe74e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
+
   export let datasource
   export let selected = false
 
diff --git a/packages/builder/src/pages/builder/app/[application]/index.svelte b/packages/builder/src/pages/builder/app/[application]/index.svelte
index 0143f38324d..561f6c6478c 100644
--- a/packages/builder/src/pages/builder/app/[application]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./data")
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
index fd289163b4a..7dd42ad6a6b 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Badge } from "@budibase/bbui"
+
   export let value
 
   $: isError = !value || value.toLowerCase() === "error"
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
index 86ad0f3d4e6..9fd15c22dfc 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { BackupTrigger } from "constants/backend/backups"
+
   export let row
 
   $: trigger = row?.trigger || "manual"
diff --git a/packages/builder/src/pages/builder/app/index.svelte b/packages/builder/src/pages/builder/app/index.svelte
index 05a71911d25..cc00116ba08 100644
--- a/packages/builder/src/pages/builder/app/index.svelte
+++ b/packages/builder/src/pages/builder/app/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("../portal")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
index b6c0262b478..e1867092c0b 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
@@ -1,6 +1,7 @@
 <script>
   import dayjs from "dayjs"
   import relativeTime from "dayjs/plugin/relativeTime"
+
   dayjs.extend(relativeTime)
 
   export let row
diff --git a/packages/builder/src/pages/builder/portal/account/index.svelte b/packages/builder/src/pages/builder/portal/account/index.svelte
index 141cf2a73ed..49730d71495 100644
--- a/packages/builder/src/pages/builder/portal/account/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./usage")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/index.svelte b/packages/builder/src/pages/builder/portal/index.svelte
index 5426d52faea..8651ae5e08c 100644
--- a/packages/builder/src/pages/builder/portal/index.svelte
+++ b/packages/builder/src/pages/builder/portal/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./apps")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte
index 842fe01be8e..09ead3e4108 100644
--- a/packages/builder/src/pages/builder/portal/settings/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./auth")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte
index 2adc0c82ae3..c701f582a2b 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
+
   export let value
 </script>
 
diff --git a/packages/builder/src/pages/builder/portal/users/index.svelte b/packages/builder/src/pages/builder/portal/users/index.svelte
index 4dbb81f7c6c..b876b2866c7 100644
--- a/packages/builder/src/pages/builder/portal/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./users")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte
index 7e63045edd6..402344dedd3 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import TagsTableRenderer from "./TagsTableRenderer.svelte"
+
   export let value
 
   $: roles = value?.filter(role => role != null).map(role => role.name) ?? []
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte
index d2b56bbf336..8b2fd3c522f 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Tag, Tags } from "@budibase/bbui"
+
   export let value
 
   const displayLimit = 5
diff --git a/packages/cli/src/backups/index.ts b/packages/cli/src/backups/index.ts
index 2b148f34afc..bc84c9ffc30 100644
--- a/packages/cli/src/backups/index.ts
+++ b/packages/cli/src/backups/index.ts
@@ -13,6 +13,7 @@ import {
   getPouches,
 } from "./utils"
 import { exportObjects, importObjects } from "./objectStore"
+
 const tar = require("tar")
 
 type BackupOpts = { env?: string; import?: string; export?: string }
diff --git a/packages/cli/src/backups/objectStore.ts b/packages/cli/src/backups/objectStore.ts
index d801f6e4531..32fc07c05b5 100644
--- a/packages/cli/src/backups/objectStore.ts
+++ b/packages/cli/src/backups/objectStore.ts
@@ -3,6 +3,7 @@ import fs from "fs"
 import { join } from "path"
 import { TEMP_DIR, MINIO_DIR } from "./utils"
 import { progressBar } from "../utils"
+
 const {
   ObjectStoreBuckets,
   ObjectStore,
diff --git a/packages/cli/src/exec.ts b/packages/cli/src/exec.ts
index fb84d4fd0fa..df35e6681f4 100644
--- a/packages/cli/src/exec.ts
+++ b/packages/cli/src/exec.ts
@@ -1,5 +1,6 @@
 import util from "util"
 import childProcess from "child_process"
+
 const runCommand = util.promisify(childProcess.exec)
 
 export async function exec(command: string, dir = "./") {
diff --git a/packages/cli/src/hosting/genUser.ts b/packages/cli/src/hosting/genUser.ts
index e02bb20e1f5..3d433272a28 100644
--- a/packages/cli/src/hosting/genUser.ts
+++ b/packages/cli/src/hosting/genUser.ts
@@ -2,6 +2,7 @@ const { success } = require("../utils")
 const { updateDockerComposeService } = require("./utils")
 const randomString = require("randomstring")
 const { GENERATED_USER_EMAIL } = require("../constants")
+
 import { DockerCompose } from "./types"
 
 export async function generateUser(password: string | null, silent: boolean) {
diff --git a/packages/cli/src/hosting/makeFiles.ts b/packages/cli/src/hosting/makeFiles.ts
index b11a07c1075..42cc704adf8 100644
--- a/packages/cli/src/hosting/makeFiles.ts
+++ b/packages/cli/src/hosting/makeFiles.ts
@@ -4,6 +4,7 @@ import fs from "fs"
 import path from "path"
 import yaml from "yaml"
 import { getAppService } from "./utils"
+
 const randomString = require("randomstring")
 
 const SINGLE_IMAGE = "budibase/budibase:latest"
diff --git a/packages/cli/src/plugins/index.ts b/packages/cli/src/plugins/index.ts
index 85147113a87..a18f78a20c5 100644
--- a/packages/cli/src/plugins/index.ts
+++ b/packages/cli/src/plugins/index.ts
@@ -16,6 +16,7 @@ import { success, error, info, moveDirectory } from "../utils"
 import { captureEvent } from "../events"
 import { init as hostingInit } from "../hosting/init"
 import { start as hostingStart } from "../hosting/start"
+
 const fp = require("find-free-port")
 
 type PluginOpts = {
diff --git a/packages/cli/src/plugins/skeleton.ts b/packages/cli/src/plugins/skeleton.ts
index 0146588b38a..8618af07bf2 100644
--- a/packages/cli/src/plugins/skeleton.ts
+++ b/packages/cli/src/plugins/skeleton.ts
@@ -3,6 +3,7 @@ import fs from "fs"
 import os from "os"
 import { join } from "path"
 import { processStringSync } from "@budibase/string-templates"
+
 const download = require("download")
 const tar = require("tar")
 
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index 01ccbcd2b32..07baafd0203 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -2,6 +2,7 @@ import chalk from "chalk"
 import fs from "fs"
 import path, { join } from "path"
 import fetch from "node-fetch"
+
 const progress = require("cli-progress")
 
 export function downloadFile(url: string, filePath: string) {
diff --git a/packages/client/src/components/app/forms/MultiFieldSelect.svelte b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
index 5504ce8f382..c43f52eba8c 100644
--- a/packages/client/src/components/app/forms/MultiFieldSelect.svelte
+++ b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
@@ -2,6 +2,7 @@
   import { CoreMultiselect, CoreCheckboxGroup } from "@budibase/bbui"
   import Field from "./Field.svelte"
   import { getOptions } from "./optionsParser"
+
   export let field
   export let label
   export let placeholder
diff --git a/packages/client/src/components/app/forms/OptionsField.svelte b/packages/client/src/components/app/forms/OptionsField.svelte
index d82a8127af9..5afeeb707ce 100644
--- a/packages/client/src/components/app/forms/OptionsField.svelte
+++ b/packages/client/src/components/app/forms/OptionsField.svelte
@@ -2,6 +2,7 @@
   import { CoreSelect, CoreRadioGroup } from "@budibase/bbui"
   import Field from "./Field.svelte"
   import { getOptions } from "./optionsParser"
+
   export let field
   export let label
   export let placeholder
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index 1550ba4d7be..415d9fa5f2d 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -15,6 +15,7 @@ import { initWebsocket } from "./websocket.js"
 // Provide svelte and svelte/internal as globals for custom components
 import * as svelte from "svelte"
 import * as internal from "svelte/internal"
+
 window.svelte_internal = internal
 window.svelte = svelte
 
diff --git a/packages/pro b/packages/pro
index 0fcc284eaad..9c58e23fee4 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 0fcc284eaad4020be4a1410452b31a2966cf1989
+Subproject commit 9c58e23fee4c013dbf2df55ba82b5f717fda83ba
diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts
index acf0294e76a..53aa76e0c6a 100644
--- a/packages/server/__mocks__/node-fetch.ts
+++ b/packages/server/__mocks__/node-fetch.ts
@@ -1,5 +1,6 @@
 // @ts-ignore
 import fs from "fs"
+
 module FetchMock {
   // @ts-ignore
   const fetch = jest.requireActual("node-fetch")
diff --git a/packages/server/specs/generate.ts b/packages/server/specs/generate.ts
index 39d8a50ade8..ade667ea661 100644
--- a/packages/server/specs/generate.ts
+++ b/packages/server/specs/generate.ts
@@ -3,6 +3,7 @@ import { writeFileSync } from "fs"
 import { examples, schemas } from "./resources"
 import * as parameters from "./parameters"
 import * as security from "./security"
+
 const swaggerJsdoc = require("swagger-jsdoc")
 
 const VARIABLES = {}
diff --git a/packages/server/src/api/controllers/query/import/sources/base/openapi.ts b/packages/server/src/api/controllers/query/import/sources/base/openapi.ts
index 56c2f0c3e9d..c0ff027111e 100644
--- a/packages/server/src/api/controllers/query/import/sources/base/openapi.ts
+++ b/packages/server/src/api/controllers/query/import/sources/base/openapi.ts
@@ -1,6 +1,7 @@
 import { ImportSource } from "."
 import SwaggerParser from "@apidevtools/swagger-parser"
 import { OpenAPI } from "openapi-types"
+
 const yaml = require("js-yaml")
 
 export abstract class OpenAPISource extends ImportSource {
diff --git a/packages/server/src/api/controllers/query/import/sources/curl.ts b/packages/server/src/api/controllers/query/import/sources/curl.ts
index 223b9ed98c1..ba85d82be0a 100644
--- a/packages/server/src/api/controllers/query/import/sources/curl.ts
+++ b/packages/server/src/api/controllers/query/import/sources/curl.ts
@@ -1,6 +1,7 @@
 import { ImportSource, ImportInfo } from "./base"
 import { Query } from "../../../../../definitions/common"
 import { URL } from "url"
+
 const curlconverter = require("curlconverter")
 
 const parseCurl = (data: string): any => {
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 018283c8c5e..38731a87e11 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -27,6 +27,7 @@ import sdk from "../../../sdk"
 import * as exporters from "../view/exporters"
 import { apiFileReturn } from "../../../utilities/fileSystem"
 import { Format } from "../view/exporters"
+
 export * as views from "./views"
 
 function pickApi(tableId: any) {
diff --git a/packages/server/src/api/controllers/view/views.ts b/packages/server/src/api/controllers/view/views.ts
index d3115655241..36b89e084df 100644
--- a/packages/server/src/api/controllers/view/views.ts
+++ b/packages/server/src/api/controllers/view/views.ts
@@ -18,6 +18,7 @@ import {
 import { builderSocket } from "../../../websockets"
 
 const cloneDeep = require("lodash/cloneDeep")
+
 import isEqual from "lodash/isEqual"
 
 export async function fetch(ctx: Ctx) {
diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts
index b4ee0faa7d8..62219093472 100644
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -4,6 +4,7 @@ import currentApp from "../middleware/currentapp"
 import zlib from "zlib"
 import { mainRoutes, staticRoutes, publicRoutes } from "./routes"
 import { middleware as pro } from "@budibase/pro"
+
 export { shutdown } from "./routes/public"
 const compress = require("koa-compress")
 
diff --git a/packages/server/src/api/routes/query.ts b/packages/server/src/api/routes/query.ts
index e7fe5c5c9b3..fd9c51da4dd 100644
--- a/packages/server/src/api/routes/query.ts
+++ b/packages/server/src/api/routes/query.ts
@@ -11,6 +11,7 @@ import {
   generateQueryPreviewValidation,
   generateQueryValidation,
 } from "../controllers/query/validation"
+
 const { BUILDER, PermissionType, PermissionLevel } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/api/routes/static.ts b/packages/server/src/api/routes/static.ts
index bd3f1aba2e2..4e9e10fd56f 100644
--- a/packages/server/src/api/routes/static.ts
+++ b/packages/server/src/api/routes/static.ts
@@ -6,6 +6,7 @@ import { permissions } from "@budibase/backend-core"
 import env from "../../environment"
 import { paramResource } from "../../middleware/resourceId"
 import { devClientLibPath } from "../../utilities/fileSystem"
+
 const { BUILDER, PermissionType, PermissionLevel } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/api/routes/table.ts b/packages/server/src/api/routes/table.ts
index b947fa5e0b9..fd2587fa86f 100644
--- a/packages/server/src/api/routes/table.ts
+++ b/packages/server/src/api/routes/table.ts
@@ -4,6 +4,7 @@ import authorized from "../../middleware/authorized"
 import { paramResource, bodyResource } from "../../middleware/resourceId"
 import { permissions } from "@budibase/backend-core"
 import { tableValidator } from "./utils/validators"
+
 const { BUILDER, PermissionLevel, PermissionType } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index 3c1d7839e86..445c49c0263 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -7,6 +7,7 @@ import sdk from "../../../sdk"
 
 import tk from "timekeeper"
 import { mocks } from "@budibase/backend-core/tests"
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 let { basicDatasource } = setup.structures
diff --git a/packages/server/src/api/routes/tests/debug.spec.ts b/packages/server/src/api/routes/tests/debug.spec.ts
index 26e98d93f94..53e1f67823a 100644
--- a/packages/server/src/api/routes/tests/debug.spec.ts
+++ b/packages/server/src/api/routes/tests/debug.spec.ts
@@ -1,5 +1,6 @@
 const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
+
 import os from "os"
 
 jest.mock("process", () => ({
diff --git a/packages/server/src/api/routes/tests/environmentVariables.spec.ts b/packages/server/src/api/routes/tests/environmentVariables.spec.ts
index 3f32ded8163..aacf89ea6da 100644
--- a/packages/server/src/api/routes/tests/environmentVariables.spec.ts
+++ b/packages/server/src/api/routes/tests/environmentVariables.spec.ts
@@ -1,4 +1,5 @@
 const pg = require("pg")
+
 jest.mock("pg", () => {
   return {
     Client: jest.fn().mockImplementation(() => ({
@@ -13,6 +14,7 @@ jest.mock("pg", () => {
 import * as setup from "./utilities"
 import { mocks } from "@budibase/backend-core/tests"
 import { env, events } from "@budibase/backend-core"
+
 const structures = setup.structures
 
 env._set("ENCRYPTION_KEY", "budibase")
diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.ts b/packages/server/src/api/routes/tests/internalSearch.spec.ts
index fdae513cb61..9e1c3e3340f 100644
--- a/packages/server/src/api/routes/tests/internalSearch.spec.ts
+++ b/packages/server/src/api/routes/tests/internalSearch.spec.ts
@@ -1,4 +1,5 @@
 const nodeFetch = require("node-fetch")
+
 nodeFetch.mockSearch()
 import { SearchParams } from "@budibase/backend-core"
 import * as search from "../../../sdk/app/rows/search/internalSearch"
diff --git a/packages/server/src/api/routes/tests/utilities/index.ts b/packages/server/src/api/routes/tests/utilities/index.ts
index bf69b91e3bc..33d371a3766 100644
--- a/packages/server/src/api/routes/tests/utilities/index.ts
+++ b/packages/server/src/api/routes/tests/utilities/index.ts
@@ -1,6 +1,7 @@
 import TestConfig from "../../../../tests/utilities/TestConfiguration"
 import env from "../../../../environment"
 import supertest from "supertest"
+
 export * as structures from "../../../../tests/utilities/structures"
 
 function user() {
diff --git a/packages/server/src/api/routes/tests/webhook.spec.ts b/packages/server/src/api/routes/tests/webhook.spec.ts
index 118bfca95fd..38f84852b4a 100644
--- a/packages/server/src/api/routes/tests/webhook.spec.ts
+++ b/packages/server/src/api/routes/tests/webhook.spec.ts
@@ -2,6 +2,7 @@ import { Webhook } from "@budibase/types"
 import * as setup from "./utilities"
 import { checkBuilderEndpoint } from "./utilities/TestFunctions"
 import { mocks } from "@budibase/backend-core/tests"
+
 const { basicWebhook, basicAutomation, collectAutomation } = setup.structures
 
 describe("/webhooks", () => {
diff --git a/packages/server/src/api/routes/user.ts b/packages/server/src/api/routes/user.ts
index 24f33140a6b..a43ebcbf357 100644
--- a/packages/server/src/api/routes/user.ts
+++ b/packages/server/src/api/routes/user.ts
@@ -2,6 +2,7 @@ import Router from "@koa/router"
 import * as controller from "../controllers/user"
 import authorized from "../../middleware/authorized"
 import { permissions } from "@budibase/backend-core"
+
 const { PermissionType, PermissionLevel } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 66172b7bd02..4c0068be893 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -3,9 +3,11 @@ if (process.env.DD_APM_ENABLED) {
 }
 
 import * as db from "./db"
+
 db.init()
 import { ServiceType } from "@budibase/types"
 import { env as coreEnv } from "@budibase/backend-core"
+
 coreEnv._set("SERVICE_TYPE", ServiceType.APPS)
 import { apiEnabled } from "./features"
 import createKoaApp from "./koa"
diff --git a/packages/server/src/automations/tests/openai.spec.ts b/packages/server/src/automations/tests/openai.spec.ts
index 88cb63b95bd..bd73827cce3 100644
--- a/packages/server/src/automations/tests/openai.spec.ts
+++ b/packages/server/src/automations/tests/openai.spec.ts
@@ -1,4 +1,5 @@
 const setup = require("./utilities")
+
 import environment from "../../environment"
 import openai from "openai"
 
diff --git a/packages/server/src/db/inMemoryView.ts b/packages/server/src/db/inMemoryView.ts
index 724bc725ce9..73e5c622eb4 100644
--- a/packages/server/src/db/inMemoryView.ts
+++ b/packages/server/src/db/inMemoryView.ts
@@ -4,6 +4,7 @@ import { Row, Document, DBView } from "@budibase/types"
 // bypass the main application db config
 // use in memory pouchdb directly
 import { db as dbCore } from "@budibase/backend-core"
+
 const Pouch = dbCore.getPouch({ inMemory: true })
 
 export async function runView(
diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts
index a5569f8166c..1712563085a 100644
--- a/packages/server/src/db/utils.ts
+++ b/packages/server/src/db/utils.ts
@@ -9,6 +9,7 @@ import {
   DatabaseQueryOpts,
 } from "@budibase/types"
 import { FieldTypes } from "../constants"
+
 export { DocumentType, VirtualDocumentType } from "@budibase/types"
 
 type Optional = string | null
diff --git a/packages/server/src/db/views/staticViews.ts b/packages/server/src/db/views/staticViews.ts
index 126198f9dcc..5b1b66d8e3b 100644
--- a/packages/server/src/db/views/staticViews.ts
+++ b/packages/server/src/db/views/staticViews.ts
@@ -1,6 +1,7 @@
 import { context } from "@budibase/backend-core"
 import { DocumentType, SEPARATOR, ViewName } from "../utils"
 import { LinkDocument, Row, SearchIndex } from "@budibase/types"
+
 const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR
 
 /**************************************************
diff --git a/packages/server/src/definitions/common.ts b/packages/server/src/definitions/common.ts
index 33eefefdc89..56c6af49c9e 100644
--- a/packages/server/src/definitions/common.ts
+++ b/packages/server/src/definitions/common.ts
@@ -1,4 +1,5 @@
 import { Document } from "@budibase/types"
+
 export {
   Query,
   Datasource,
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index c126a61c22c..254b5947c83 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -1,5 +1,6 @@
 import { env as coreEnv } from "@budibase/backend-core"
 import { ServiceType } from "@budibase/types"
+
 coreEnv._set("SERVICE_TYPE", ServiceType.APPS)
 import { join } from "path"
 
diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts
index c615e5ba487..7f25df5ed45 100644
--- a/packages/server/src/integrations/microsoftSqlServer.ts
+++ b/packages/server/src/integrations/microsoftSqlServer.ts
@@ -26,6 +26,7 @@ import Sql from "./base/sql"
 import { MSSQLTablesResponse, MSSQLColumn } from "./base/types"
 import { getReadableErrorMessage } from "./base/errorMapping"
 import sqlServer from "mssql"
+
 const DEFAULT_SCHEMA = "dbo"
 
 import { ConfidentialClientApplication } from "@azure/msal-node"
diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts
index c6a871e41f4..846aadc2422 100644
--- a/packages/server/src/integrations/oracle.ts
+++ b/packages/server/src/integrations/oracle.ts
@@ -30,6 +30,7 @@ import {
   Result,
 } from "oracledb"
 import { OracleTable, OracleColumn, OracleColumnsResponse } from "./base/types"
+
 let oracledb: any
 try {
   oracledb = require("oracledb")
diff --git a/packages/server/src/integrations/tests/airtable.spec.ts b/packages/server/src/integrations/tests/airtable.spec.ts
index 26a389456f8..eeb3d650468 100644
--- a/packages/server/src/integrations/tests/airtable.spec.ts
+++ b/packages/server/src/integrations/tests/airtable.spec.ts
@@ -1,4 +1,5 @@
 import { default as AirtableIntegration } from "../airtable"
+
 jest.mock("airtable")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/arangodb.spec.ts b/packages/server/src/integrations/tests/arangodb.spec.ts
index 401b2ec707e..c7339299dd0 100644
--- a/packages/server/src/integrations/tests/arangodb.spec.ts
+++ b/packages/server/src/integrations/tests/arangodb.spec.ts
@@ -1,4 +1,5 @@
 import { default as ArangoDBIntegration } from "../arangodb"
+
 jest.mock("arangojs")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/dynamodb.spec.ts b/packages/server/src/integrations/tests/dynamodb.spec.ts
index d245875173e..a7a2767469e 100644
--- a/packages/server/src/integrations/tests/dynamodb.spec.ts
+++ b/packages/server/src/integrations/tests/dynamodb.spec.ts
@@ -1,4 +1,5 @@
 import { default as DynamoDBIntegration } from "../dynamodb"
+
 jest.mock("aws-sdk")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/elasticsearch.spec.ts b/packages/server/src/integrations/tests/elasticsearch.spec.ts
index c839b9b2d42..e21e8dec692 100644
--- a/packages/server/src/integrations/tests/elasticsearch.spec.ts
+++ b/packages/server/src/integrations/tests/elasticsearch.spec.ts
@@ -1,4 +1,5 @@
 import { default as ElasticSearchIntegration } from "../elasticsearch"
+
 jest.mock("@elastic/elasticsearch")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/firebase.spec.ts b/packages/server/src/integrations/tests/firebase.spec.ts
index befbb80ccb6..f2cea8898f3 100644
--- a/packages/server/src/integrations/tests/firebase.spec.ts
+++ b/packages/server/src/integrations/tests/firebase.spec.ts
@@ -1,4 +1,5 @@
 import { default as FirebaseIntegration } from "../firebase"
+
 jest.mock("@google-cloud/firestore")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts b/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts
index 8484e759a9d..eaaa79f7c90 100644
--- a/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts
+++ b/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts
@@ -1,4 +1,5 @@
 import { default as MSSQLIntegration } from "../microsoftSqlServer"
+
 jest.mock("mssql")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/mongo.spec.ts b/packages/server/src/integrations/tests/mongo.spec.ts
index b941d7ae66e..51ec839db27 100644
--- a/packages/server/src/integrations/tests/mongo.spec.ts
+++ b/packages/server/src/integrations/tests/mongo.spec.ts
@@ -1,5 +1,7 @@
 const mongo = require("mongodb")
+
 import { default as MongoDBIntegration } from "../mongodb"
+
 jest.mock("mongodb")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/mysql.spec.ts b/packages/server/src/integrations/tests/mysql.spec.ts
index c3c3b8343ec..7d45a06735a 100644
--- a/packages/server/src/integrations/tests/mysql.spec.ts
+++ b/packages/server/src/integrations/tests/mysql.spec.ts
@@ -1,4 +1,5 @@
 import { default as MySQLIntegration, bindingTypeCoerce } from "../mysql"
+
 jest.mock("mysql2")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/oracle.spec.ts b/packages/server/src/integrations/tests/oracle.spec.ts
index 57dad48820d..8c05a881d4e 100644
--- a/packages/server/src/integrations/tests/oracle.spec.ts
+++ b/packages/server/src/integrations/tests/oracle.spec.ts
@@ -1,5 +1,7 @@
 const oracledb = require("oracledb")
+
 import { default as OracleIntegration } from "../oracle"
+
 jest.mock("oracledb")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/postgres.spec.ts b/packages/server/src/integrations/tests/postgres.spec.ts
index a6be3aa6235..1acdff6bcfd 100644
--- a/packages/server/src/integrations/tests/postgres.spec.ts
+++ b/packages/server/src/integrations/tests/postgres.spec.ts
@@ -1,5 +1,7 @@
 const pg = require("pg")
+
 import { default as PostgresIntegration } from "../postgres"
+
 jest.mock("pg")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/redis.spec.ts b/packages/server/src/integrations/tests/redis.spec.ts
index 942da99530a..bec0e53bc35 100644
--- a/packages/server/src/integrations/tests/redis.spec.ts
+++ b/packages/server/src/integrations/tests/redis.spec.ts
@@ -1,4 +1,5 @@
 const Redis = require("ioredis-mock")
+
 import { default as RedisIntegration } from "../redis"
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/rest.spec.ts b/packages/server/src/integrations/tests/rest.spec.ts
index 3295405ce24..98c57580a3a 100644
--- a/packages/server/src/integrations/tests/rest.spec.ts
+++ b/packages/server/src/integrations/tests/rest.spec.ts
@@ -16,6 +16,7 @@ jest.mock("node-fetch", () => {
 import fetch from "node-fetch"
 import { default as RestIntegration } from "../rest"
 import { RestAuthType } from "@budibase/types"
+
 const FormData = require("form-data")
 const { URLSearchParams } = require("url")
 
diff --git a/packages/server/src/integrations/tests/s3.spec.ts b/packages/server/src/integrations/tests/s3.spec.ts
index 35107adefe3..b4b2ad76e75 100644
--- a/packages/server/src/integrations/tests/s3.spec.ts
+++ b/packages/server/src/integrations/tests/s3.spec.ts
@@ -1,5 +1,7 @@
 const AWS = require("aws-sdk")
+
 import { default as S3Integration } from "../s3"
+
 jest.mock("aws-sdk")
 
 class TestConfiguration {
diff --git a/packages/server/src/migrations/tests/index.spec.ts b/packages/server/src/migrations/tests/index.spec.ts
index d83e3cf31ee..c01040593aa 100644
--- a/packages/server/src/migrations/tests/index.spec.ts
+++ b/packages/server/src/migrations/tests/index.spec.ts
@@ -12,6 +12,7 @@ import * as helpers from "./helpers"
 
 import tk from "timekeeper"
 import { View } from "@budibase/types"
+
 const timestamp = new Date().toISOString()
 tk.freeze(timestamp)
 
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index c349dcb9270..65708e6ba29 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -14,6 +14,7 @@ import { join } from "path"
 import env from "../../../environment"
 
 const uuid = require("uuid/v4")
+
 import tar from "tar"
 
 const MemoryStream = require("memorystream")
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 7b293b987bb..1e229d283a4 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -14,6 +14,7 @@ import { ObjectStoreBuckets } from "../../../constants"
 import { join } from "path"
 import fs from "fs"
 import sdk from "../../"
+
 const uuid = require("uuid/v4")
 const tar = require("tar")
 
diff --git a/packages/server/src/sdk/app/rows/search.ts b/packages/server/src/sdk/app/rows/search.ts
index 36ef538d8b4..4b711798390 100644
--- a/packages/server/src/sdk/app/rows/search.ts
+++ b/packages/server/src/sdk/app/rows/search.ts
@@ -9,6 +9,7 @@ import { isExternalTableID } from "../../../integrations/utils"
 import * as internal from "./search/internal"
 import * as external from "./search/external"
 import { Format } from "../../../api/controllers/view/exporters"
+
 export { isValidFilter, removeEmptyFilters } from "../../../integrations/utils"
 
 export interface ViewParams {
diff --git a/packages/server/src/sdk/app/tables/update.ts b/packages/server/src/sdk/app/tables/update.ts
index 5c762e628b7..cfbf7e1e1d1 100644
--- a/packages/server/src/sdk/app/tables/update.ts
+++ b/packages/server/src/sdk/app/tables/update.ts
@@ -8,6 +8,7 @@ import { DocumentInsertResponse } from "@budibase/nano"
 import * as external from "./external"
 import * as internal from "./internal"
 import { cloneDeep } from "lodash"
+
 export * as external from "./external"
 export * as internal from "./internal"
 
diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts
index b680c6ff191..83be8b6d58a 100644
--- a/packages/server/src/tests/utilities/structures.ts
+++ b/packages/server/src/tests/utilities/structures.ts
@@ -22,6 +22,7 @@ import {
   INTERNAL_TABLE_SOURCE_ID,
   TableSourceType,
 } from "@budibase/types"
+
 const { BUILTIN_ROLE_IDS } = roles
 
 export function basicTable(): Table {
diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts
index b18e67a78c8..fe85015b416 100644
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@@ -1,4 +1,5 @@
 import { default as threadUtils } from "./utils"
+
 threadUtils.threadSetup()
 import { WorkerCallback, QueryEvent, QueryVariable } from "./definitions"
 import ScriptRunner from "../utilities/scriptRunner"
diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts
index 4c677a0cf62..be656f54d19 100644
--- a/packages/server/src/utilities/fileSystem/filesystem.ts
+++ b/packages/server/src/utilities/fileSystem/filesystem.ts
@@ -3,6 +3,7 @@ import { budibaseTempDir } from "../budibaseDir"
 import { resolve, join } from "path"
 import env from "../../environment"
 import tar from "tar"
+
 const uuid = require("uuid/v4")
 
 export const TOP_LEVEL_PATH =
diff --git a/packages/server/src/utilities/index.ts b/packages/server/src/utilities/index.ts
index 551299a88e0..ce6f2345ca0 100644
--- a/packages/server/src/utilities/index.ts
+++ b/packages/server/src/utilities/index.ts
@@ -3,6 +3,7 @@ import { context } from "@budibase/backend-core"
 import { generateMetadataID } from "../db/utils"
 import { Document } from "@budibase/types"
 import stream from "stream"
+
 const Readable = stream.Readable
 
 export function wait(ms: number) {
diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts
index 5e9fc140c19..293e74312e7 100644
--- a/packages/server/src/utilities/rowProcessor/index.ts
+++ b/packages/server/src/utilities/rowProcessor/index.ts
@@ -20,6 +20,7 @@ import {
   processOutputBBReferences,
 } from "./bbReferenceProcessor"
 import { isExternalTableID } from "../../integrations/utils"
+
 export * from "./utils"
 
 type AutoColumnProcessingOpts = {
diff --git a/packages/server/src/utilities/scriptRunner.ts b/packages/server/src/utilities/scriptRunner.ts
index a39641ec99f..fee0215d2e6 100644
--- a/packages/server/src/utilities/scriptRunner.ts
+++ b/packages/server/src/utilities/scriptRunner.ts
@@ -1,5 +1,6 @@
 import fetch from "node-fetch"
 import { VM, VMScript } from "vm2"
+
 const JS_TIMEOUT_MS = 1000
 
 class ScriptRunner {
diff --git a/packages/string-templates/scripts/gen-collection-info.js b/packages/string-templates/scripts/gen-collection-info.js
index 1dbb20e5cfa..91cb79e05d7 100644
--- a/packages/string-templates/scripts/gen-collection-info.js
+++ b/packages/string-templates/scripts/gen-collection-info.js
@@ -10,6 +10,7 @@ const marked = require("marked")
  * https://github.com/budibase/handlebars-helpers
  */
 const { join } = require("path")
+
 const DIRECTORY = join(__dirname, "..", "..", "..")
 const COLLECTIONS = [
   "math",
diff --git a/packages/worker/__mocks__/node-fetch.ts b/packages/worker/__mocks__/node-fetch.ts
index 113833a0b69..27c9b507a4d 100644
--- a/packages/worker/__mocks__/node-fetch.ts
+++ b/packages/worker/__mocks__/node-fetch.ts
@@ -1,4 +1,5 @@
 import fs from "fs"
+
 module FetchMock {
   const fetch = jest.requireActual("node-fetch")
 
diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts
index 47dbef964e6..d14aecd1a7a 100644
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@@ -10,6 +10,7 @@ import {
 import env from "../../../environment"
 import { groups } from "@budibase/pro"
 import { UpdateSelfRequest, UpdateSelfResponse, UserCtx } from "@budibase/types"
+
 const { newid } = utils
 
 function newTestApiKey() {
diff --git a/packages/worker/src/api/index.ts b/packages/worker/src/api/index.ts
index 2a3133af3fe..d7aef0b274a 100644
--- a/packages/worker/src/api/index.ts
+++ b/packages/worker/src/api/index.ts
@@ -1,5 +1,7 @@
 import Router from "@koa/router"
+
 const compress = require("koa-compress")
+
 import zlib from "zlib"
 import { routes } from "./routes"
 import { middleware as pro } from "@budibase/pro"
diff --git a/packages/worker/src/api/routes/global/templates.ts b/packages/worker/src/api/routes/global/templates.ts
index 051ee5d7021..477758c717b 100644
--- a/packages/worker/src/api/routes/global/templates.ts
+++ b/packages/worker/src/api/routes/global/templates.ts
@@ -3,6 +3,7 @@ import * as controller from "../../controllers/global/templates"
 import { TemplatePurpose, TemplateType } from "../../../constants"
 import { auth as authCore } from "@budibase/backend-core"
 import Joi from "joi"
+
 const { adminOnly, joiValidator } = authCore
 
 const router: Router = new Router()
diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index d40b82e7424..59b6fe58693 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -7,6 +7,7 @@ import {
   structures,
   generator,
 } from "../../../../tests"
+
 const sendMailMock = mocks.email.mock()
 import { events, constants } from "@budibase/backend-core"
 import { Response } from "superagent"
diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts
index 0a2073598a7..4d9f28d2cba 100644
--- a/packages/worker/src/api/routes/global/tests/configs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts
@@ -1,6 +1,7 @@
 // mock the email system
 jest.mock("nodemailer")
 import { TestConfiguration, structures, mocks } from "../../../../tests"
+
 mocks.email.mock()
 import { events } from "@budibase/backend-core"
 import { GetPublicSettingsResponse, Config, ConfigType } from "@budibase/types"
diff --git a/packages/worker/src/api/routes/global/tests/email.spec.ts b/packages/worker/src/api/routes/global/tests/email.spec.ts
index 9e65cda3c50..49d7c3bbeb0 100644
--- a/packages/worker/src/api/routes/global/tests/email.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/email.spec.ts
@@ -1,5 +1,6 @@
 jest.mock("nodemailer")
 import { TestConfiguration, mocks } from "../../../../tests"
+
 const sendMailMock = mocks.email.mock()
 import { EmailTemplatePurpose } from "../../../../constants"
 
diff --git a/packages/worker/src/api/routes/global/tests/license.spec.ts b/packages/worker/src/api/routes/global/tests/license.spec.ts
index 26e3b3dfb50..e08292c0611 100644
--- a/packages/worker/src/api/routes/global/tests/license.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/license.spec.ts
@@ -1,4 +1,5 @@
 import { TestConfiguration, mocks, structures } from "../../../../tests"
+
 const licensing = mocks.pro.licensing
 const quotas = mocks.pro.quotas
 
diff --git a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
index 8ad7363c853..544c2651dc3 100644
--- a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
@@ -1,6 +1,7 @@
 jest.unmock("node-fetch")
 import { TestConfiguration } from "../../../../tests"
 import { EmailTemplatePurpose } from "../../../../constants"
+
 const nodemailer = require("nodemailer")
 const fetch = require("node-fetch")
 
diff --git a/packages/worker/src/api/routes/system/tests/status.spec.ts b/packages/worker/src/api/routes/system/tests/status.spec.ts
index 48a0fc005d8..e2011dc79a6 100644
--- a/packages/worker/src/api/routes/system/tests/status.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/status.spec.ts
@@ -1,6 +1,7 @@
 import { HealthStatusResponse } from "@budibase/types"
 import { TestConfiguration } from "../../../../tests"
 import { accounts as _accounts } from "@budibase/backend-core"
+
 const accounts = jest.mocked(_accounts)
 
 describe("/api/system/status", () => {
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 07f7b64c71d..3da9a420650 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -18,12 +18,14 @@ import {
   timers,
   redis,
 } from "@budibase/backend-core"
+
 db.init()
 import koaBody from "koa-body"
 import http from "http"
 import api from "./api"
 
 const koaSession = require("koa-session")
+
 import { userAgent } from "koa-useragent"
 
 import destroyable from "server-destroy"
diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts
index d4fcbeebd6e..289f31079ae 100644
--- a/packages/worker/src/tests/TestConfiguration.ts
+++ b/packages/worker/src/tests/TestConfiguration.ts
@@ -7,10 +7,13 @@ mocks.licenses.init(mocks.pro)
 mocks.licenses.useUnlimited()
 
 import * as dbConfig from "../db"
+
 dbConfig.init()
 import env from "../environment"
 import * as controllers from "./controllers"
+
 const supertest = require("supertest")
+
 import { Config } from "../constants"
 import {
   users,
diff --git a/packages/worker/src/tests/jestSetup.ts b/packages/worker/src/tests/jestSetup.ts
index 17bcb7dfb44..0f933bd562c 100644
--- a/packages/worker/src/tests/jestSetup.ts
+++ b/packages/worker/src/tests/jestSetup.ts
@@ -8,6 +8,7 @@ mocks.fetch.enable()
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
 const tk = require("timekeeper")
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.CI) {
diff --git a/packages/worker/src/tests/mocks/index.ts b/packages/worker/src/tests/mocks/index.ts
index 917e5f9ffcd..977b83c8a4c 100644
--- a/packages/worker/src/tests/mocks/index.ts
+++ b/packages/worker/src/tests/mocks/index.ts
@@ -2,6 +2,7 @@ import * as email from "./email"
 import { mocks } from "@budibase/backend-core/tests"
 
 import * as _pro from "@budibase/pro"
+
 const pro = jest.mocked(_pro, { shallow: false })
 
 export default {
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index e57a17a0f4c..27f2876eda4 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -6,6 +6,7 @@ import { processString } from "@budibase/string-templates"
 import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
 import { configs, cache } from "@budibase/backend-core"
 import ical from "ical-generator"
+
 const nodemailer = require("nodemailer")
 
 const TEST_MODE = env.ENABLE_EMAIL_TEST_MODE && env.isDev()
diff --git a/qa-core/src/account-api/api/apis/LicenseAPI.ts b/qa-core/src/account-api/api/apis/LicenseAPI.ts
index a9b0a352695..8f6e705e5ff 100644
--- a/qa-core/src/account-api/api/apis/LicenseAPI.ts
+++ b/qa-core/src/account-api/api/apis/LicenseAPI.ts
@@ -9,6 +9,7 @@ import {
 import { Response } from "node-fetch"
 import BaseAPI from "./BaseAPI"
 import { APIRequestOpts } from "../../../types"
+
 export default class LicenseAPI extends BaseAPI {
   client: AccountInternalAPIClient
   constructor(client: AccountInternalAPIClient) {
diff --git a/qa-core/src/account-api/tests/licensing/license.manage.spec.ts b/qa-core/src/account-api/tests/licensing/license.manage.spec.ts
index 9cad980038a..bda0476c2b4 100644
--- a/qa-core/src/account-api/tests/licensing/license.manage.spec.ts
+++ b/qa-core/src/account-api/tests/licensing/license.manage.spec.ts
@@ -1,6 +1,7 @@
 import TestConfiguration from "../../config/TestConfiguration"
 import * as fixtures from "../../fixtures"
 import { Hosting, PlanType } from "@budibase/types"
+
 const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY)
 
 describe("license management", () => {
diff --git a/qa-core/src/internal-api/fixtures/screens.ts b/qa-core/src/internal-api/fixtures/screens.ts
index d07b3bd3ba0..c28a5ed86fd 100644
--- a/qa-core/src/internal-api/fixtures/screens.ts
+++ b/qa-core/src/internal-api/fixtures/screens.ts
@@ -1,5 +1,6 @@
 import { generator } from "../../shared"
 import { ScreenRequest } from "../../types"
+
 const randomId = generator.guid()
 
 export const generateScreen = (roleId: string): ScreenRequest => ({