From d0918cd9befbddf4c9c25ca8eab7765daf20fee0 Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Tue, 19 Apr 2022 11:31:14 -0600
Subject: [PATCH] WIP

---
 apps/admin                         |  2 +-
 package.json                       |  2 +-
 packages/config/prettier-preset.js |  9 ++++++++-
 yarn.lock                          | 12 ------------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/admin b/apps/admin
index 9173fd714a..0e9186e4d8 160000
--- a/apps/admin
+++ b/apps/admin
@@ -1 +1 @@
-Subproject commit 9173fd714a8212a6140d7af97838479784f709fe
+Subproject commit 0e9186e4d8d3af2b6682d4b6e3a2a3abfe9658b5
diff --git a/package.json b/package.json
index 9289adc446..ebc00ff9f4 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "deploy": "turbo run deploy",
     "dev": "turbo run dev --scope=\"@calcom/web\"",
     "dev:website": "yarn predev && turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\"",
-    "dev:admin": "yarn predev && turbo run dev --scope=\"@calcom/admin\"",
+    "dev:admin": "yarn predev && turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/admin\"",
     "docs-dev": "yarn predev && turbo run dev --scope=\"@calcom/docs\"",
     "docs-build": "turbo run build --scope=\"@calcom/docs\" --include-dependencies",
     "docs-start": "turbo run start --scope=\"@calcom/docs\"",
diff --git a/packages/config/prettier-preset.js b/packages/config/prettier-preset.js
index b1047eaf11..69d151a318 100644
--- a/packages/config/prettier-preset.js
+++ b/packages/config/prettier-preset.js
@@ -7,7 +7,14 @@ module.exports = {
   semi: true,
   printWidth: 110,
   arrowParens: "always",
-  importOrder: ["^@(calcom|ee)/(.*)$", "^@lib/(.*)$", "^@components/(.*)$", "^@(server|trpc)/(.*)$", "^[./]"],
+  importOrder: [
+    "^@(calcom|ee)/(.*)$",
+    "^@lib/(.*)$",
+    "^@components/(.*)$",
+    "^@(server|trpc)/(.*)$",
+    "^~/(.*)$",
+    "^[./]",
+  ],
   importOrderSeparation: true,
   plugins: [require("./merged-prettier-plugin")],
 };
diff --git a/yarn.lock b/yarn.lock
index ac03f9247c..79dddd4ebc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2739,13 +2739,6 @@
   dependencies:
     "@prisma/engines-version" "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"
 
-"@prisma/client@^3.10.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.12.0.tgz#a0eb49ffea5c128dd11dffb896d7139a60073d12"
-  integrity sha512-4NEQjUcWja/NVBvfuDFscWSk1/rXg3+wj+TSkqXCb1tKlx/bsUE00rxsvOvGg7VZ6lw1JFpGkwjwmsOIc4zvQw==
-  dependencies:
-    "@prisma/engines-version" "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980"
-
 "@prisma/debug@3.8.1":
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-3.8.1.tgz#3c6717d6e0501651709714774ea6d90127c6a2d3"
@@ -2760,11 +2753,6 @@
   resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz#82750856fa637dd89b8f095d2dcc6ac0631231c6"
   integrity sha512-cVYs5gyQH/qyut24hUvDznCfPrWiNMKNfPb9WmEoiU6ihlkscIbCfkmuKTtspVLWRdl0LqjYEC7vfnPv17HWhw==
 
-"@prisma/engines-version@3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980":
-  version "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz#829ca3d9d0d92555f44644606d4edfd45b2f5886"
-  integrity sha512-o+jo8d7ZEiVpcpNWUDh3fj2uPQpBxl79XE9ih9nkogJbhw6P33274SHnqheedZ7PyvPIK/mvU8MLNYgetgXPYw==
-
 "@prisma/engines@3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86":
   version "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"
   resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz#2964113729a78b8b21e186b5592affd1fde73c16"