From 4e6430be669971912c725e541fa5021cfc965c07 Mon Sep 17 00:00:00 2001
From: Jon Vivian <2586037+4leite@users.noreply.github.com>
Date: Fri, 10 May 2024 02:24:32 +1200
Subject: [PATCH] Relative imports (#63)

* revert to relative paths for libraries rather than introduce more build steps https://github.com/Microsoft/TypeScript/issues/15479

* clean up packages
---
 .changeset/twelve-pumpkins-shake.md           | 13 +++++++
 .../adapter-turso/src/db/next-auth-adapter.ts |  4 +-
 oberoncms/adapter-turso/src/index.ts          |  6 +--
 oberoncms/adapter-turso/tsconfig.json         |  6 +--
 .../adapter-vercel-postgres/drizzle.config.ts |  2 +-
 .../adapter-vercel-postgres/src/db/client.ts  |  2 +-
 .../src/db/next-auth-adapter.ts               |  2 +-
 .../adapter-vercel-postgres/src/index.ts      |  8 ++--
 .../adapter-vercel-postgres/tsconfig.json     |  6 +--
 oberoncms/core/src/adapter.tsx                |  2 +-
 oberoncms/core/src/app/schema.ts              |  7 +++-
 oberoncms/core/src/auth/next-auth.ts          | 13 +++----
 oberoncms/core/src/components/all-pages.tsx   |  4 +-
 oberoncms/core/src/components/editor.tsx      |  6 +--
 oberoncms/core/src/components/images.tsx      | 14 ++++---
 oberoncms/core/src/components/preview.tsx     |  2 +-
 oberoncms/core/src/components/puck-menu.tsx   |  2 +-
 oberoncms/core/src/components/users.tsx       |  4 +-
 oberoncms/core/src/editor.tsx                 | 12 +++---
 oberoncms/core/src/hooks/use-oberon-images.ts | 17 +++++----
 oberoncms/core/src/hooks/use-oberon.ts        |  2 +-
 oberoncms/core/tsconfig.json                  |  6 +--
 .../upload-thing/src/blocks/image-field.tsx   |  8 ++--
 oberoncms/upload-thing/tsconfig.json          |  6 +--
 package.json                                  |  5 ++-
 packages/dev/package.json                     |  3 +-
 packages/dev/src/vite.config.ts               | 19 ++++++++--
 packages/dev/tsconfig.json                    |  6 +--
 packages/ui/package.json                      |  1 +
 packages/ui/src/components/date.tsx           | 11 ++++++
 packages/ui/src/date.ts                       |  1 +
 packages/ui/src/theme/mode-toggle.tsx         |  4 +-
 packages/ui/src/theme/theme-editor-menu.tsx   | 14 +++----
 packages/ui/tsconfig.json                     |  6 +--
 packages/utils/src/index.ts                   |  4 --
 packages/utils/tsconfig.json                  |  6 +--
 pnpm-lock.yaml                                | 37 -------------------
 puck/blocks/tsconfig.json                     |  6 +--
 .../toolbar-plugin/block-format-dropdown.tsx  |  6 +--
 .../element-format-dropdown.tsx               |  2 +-
 .../lexical/plugins/toolbar-plugin/index.tsx  | 10 ++---
 .../lexical/ui/button/index.tsx               |  2 +-
 .../lexical/ui/dropdown-menu/index.tsx        |  2 +-
 puck/rich-text/tsconfig.json                  |  6 +--
 scripts/clean-package.mjs                     | 29 +++++++++------
 turbo.json                                    |  4 +-
 46 files changed, 155 insertions(+), 183 deletions(-)
 create mode 100644 .changeset/twelve-pumpkins-shake.md
 create mode 100644 packages/ui/src/components/date.tsx
 create mode 100644 packages/ui/src/date.ts

diff --git a/.changeset/twelve-pumpkins-shake.md b/.changeset/twelve-pumpkins-shake.md
new file mode 100644
index 00000000..b0b5594f
--- /dev/null
+++ b/.changeset/twelve-pumpkins-shake.md
@@ -0,0 +1,13 @@
+---
+"@oberoncms/adapter-vercel-postgres": minor
+"@oberoncms/adapter-turso": minor
+"@oberoncms/upload-thing": minor
+"@oberoncms/core": minor
+"@tohuhono/utils": minor
+"@tohuhono/puck-rich-text": minor
+"@tohuhono/dev": minor
+"@tohuhono/ui": minor
+"@tohuhono/puck-blocks": minor
+---
+
+Reverted to relative imports because typescript team refuses to transpile declaration files
diff --git a/oberoncms/adapter-turso/src/db/next-auth-adapter.ts b/oberoncms/adapter-turso/src/db/next-auth-adapter.ts
index a5114316..136d5c3a 100644
--- a/oberoncms/adapter-turso/src/db/next-auth-adapter.ts
+++ b/oberoncms/adapter-turso/src/db/next-auth-adapter.ts
@@ -1,13 +1,13 @@
 import { randomUUID } from "crypto"
 import { eq, and } from "drizzle-orm"
 import type { Adapter } from "@auth/core/adapters"
+import { db } from "../db/client"
 import {
   users,
   accounts,
   sessions,
   verificationTokens,
-} from "src/db/schema/next-auth-schema"
-import { db } from "src/db/client"
+} from "../db/schema/next-auth-schema"
 
 function LibsqlDrizzleAdapter(client: typeof db) {
   return {
diff --git a/oberoncms/adapter-turso/src/index.ts b/oberoncms/adapter-turso/src/index.ts
index d583b064..633f9eab 100644
--- a/oberoncms/adapter-turso/src/index.ts
+++ b/oberoncms/adapter-turso/src/index.ts
@@ -3,10 +3,10 @@ import "server-only"
 import { eq } from "drizzle-orm"
 import { type OberonDatabaseAdapter } from "@oberoncms/core"
 
-import { db } from "src/db/client"
-import { images, pages, users } from "src/db/schema"
+import { images, pages, users } from "./db/schema"
+import { db } from "./db/client"
 
-import { authAdapter } from "@/db/next-auth-adapter"
+import { authAdapter } from "./db/next-auth-adapter"
 
 export const oberonAdapter: OberonDatabaseAdapter = {
   ...authAdapter,
diff --git a/oberoncms/adapter-turso/tsconfig.json b/oberoncms/adapter-turso/tsconfig.json
index 25c2108c..a04efbfa 100644
--- a/oberoncms/adapter-turso/tsconfig.json
+++ b/oberoncms/adapter-turso/tsconfig.json
@@ -1,13 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
-    "jsx": "react-jsx",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "jsx": "react-jsx"
   },
   "include": ["src", "scripts"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/oberoncms/adapter-vercel-postgres/drizzle.config.ts b/oberoncms/adapter-vercel-postgres/drizzle.config.ts
index 71d49f40..43dd54af 100644
--- a/oberoncms/adapter-vercel-postgres/drizzle.config.ts
+++ b/oberoncms/adapter-vercel-postgres/drizzle.config.ts
@@ -1,4 +1,4 @@
-import "@/db/env-config"
+import "./src/db/env-config"
 
 import type { Config } from "drizzle-kit"
 
diff --git a/oberoncms/adapter-vercel-postgres/src/db/client.ts b/oberoncms/adapter-vercel-postgres/src/db/client.ts
index 112c3db1..bba94f35 100644
--- a/oberoncms/adapter-vercel-postgres/src/db/client.ts
+++ b/oberoncms/adapter-vercel-postgres/src/db/client.ts
@@ -1,4 +1,4 @@
-import "@/db/env-config"
+import "./env-config"
 import { drizzle } from "drizzle-orm/vercel-postgres"
 import { sql } from "@vercel/postgres"
 import * as schema from "./schema"
diff --git a/oberoncms/adapter-vercel-postgres/src/db/next-auth-adapter.ts b/oberoncms/adapter-vercel-postgres/src/db/next-auth-adapter.ts
index 65a3c423..8f612994 100644
--- a/oberoncms/adapter-vercel-postgres/src/db/next-auth-adapter.ts
+++ b/oberoncms/adapter-vercel-postgres/src/db/next-auth-adapter.ts
@@ -1,5 +1,5 @@
-import { db } from "src/db/client"
 import { type Adapter } from "@auth/core/adapters"
 import { DrizzleAdapter } from "@auth/drizzle-adapter"
+import { db } from "../db/client"
 
 export const adapter = DrizzleAdapter(db) satisfies Adapter
diff --git a/oberoncms/adapter-vercel-postgres/src/index.ts b/oberoncms/adapter-vercel-postgres/src/index.ts
index 48439d0d..e320e012 100644
--- a/oberoncms/adapter-vercel-postgres/src/index.ts
+++ b/oberoncms/adapter-vercel-postgres/src/index.ts
@@ -3,11 +3,9 @@ import "server-only"
 import { eq } from "drizzle-orm"
 import { type OberonDatabaseAdapter } from "@oberoncms/core"
 
-// import { ourUploadthing } from "src/puck/uploadthing/api" // TODO uploadthing
-import { db } from "src/db/client"
-import { images, pages, users } from "src/db/schema"
-
-import { adapter } from "@/db/next-auth-adapter"
+import { db } from "./db/client"
+import { images, pages, users } from "./db/schema"
+import { adapter } from "./db/next-auth-adapter"
 
 export const databaseAdapter: OberonDatabaseAdapter = {
   ...adapter,
diff --git a/oberoncms/adapter-vercel-postgres/tsconfig.json b/oberoncms/adapter-vercel-postgres/tsconfig.json
index 25c2108c..a04efbfa 100644
--- a/oberoncms/adapter-vercel-postgres/tsconfig.json
+++ b/oberoncms/adapter-vercel-postgres/tsconfig.json
@@ -1,13 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
-    "jsx": "react-jsx",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "jsx": "react-jsx"
   },
   "include": ["src", "scripts"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/oberoncms/core/src/adapter.tsx b/oberoncms/core/src/adapter.tsx
index ed4d9692..0fe9cdb0 100644
--- a/oberoncms/core/src/adapter.tsx
+++ b/oberoncms/core/src/adapter.tsx
@@ -17,7 +17,7 @@ import {
   type OberonDatabaseAdapter,
   type OberonAdapter,
   type OberonPlugin,
-} from "@/app/schema"
+} from "./app/schema"
 
 export function initAdapter({
   databaseAdapter,
diff --git a/oberoncms/core/src/app/schema.ts b/oberoncms/core/src/app/schema.ts
index 056196df..f54ef13f 100644
--- a/oberoncms/core/src/app/schema.ts
+++ b/oberoncms/core/src/app/schema.ts
@@ -3,6 +3,7 @@ import { Data } from "@measured/puck"
 import { Route } from "next"
 import type { Config } from "@measured/puck"
 import type { Adapter as AuthAdapter } from "@auth/core/adapters"
+import type { NextAuthResult } from "next-auth"
 
 export type OberonConfig = {
   blocks: Config["components"]
@@ -12,6 +13,10 @@ export type ClientAction = "edit" | "preview" | "users" | "images" | "pages"
 export type AdapterActionGroup = "cms" | "users" | "images" | "pages"
 export type AdapterPermission = "read" | "write"
 
+export type OberonAuth = NextAuthResult & {
+  getRole: () => Promise<"user" | "admin" | null>
+}
+
 export const INITIAL_DATA = {
   content: [],
   root: { props: { title: "" } },
@@ -127,7 +132,7 @@ export type OberonActions = {
   ) => Promise<Pick<OberonUser, "role" | "id"> | null>
   getAllUsers: () => Promise<OberonUser[]>
   getAllImages: () => Promise<OberonImage[]>
-  addImage: (data: z.infer<typeof AddImageSchema>) => Promise<OberonImage[]>
+  addImage: (data: OberonImage) => Promise<OberonImage[]>
   deleteImage: (key: OberonImage["key"]) => Promise<void> // TODO uploadthing
   addPage: (page: OberonPage) => Promise<void>
   deletePage: (data: z.infer<typeof DeletePageSchema>) => Promise<void>
diff --git a/oberoncms/core/src/auth/next-auth.ts b/oberoncms/core/src/auth/next-auth.ts
index 5fa3e602..93d6f795 100644
--- a/oberoncms/core/src/auth/next-auth.ts
+++ b/oberoncms/core/src/auth/next-auth.ts
@@ -5,6 +5,7 @@ import NextAuth from "next-auth"
 import { NextRequest } from "next/server"
 import { redirect } from "next/navigation"
 import type { Adapter } from "@auth/core/adapters"
+import type { OberonAuth } from ".."
 
 const masterEmail = process.env.MASTER_EMAIL || null
 
@@ -36,7 +37,7 @@ export function initAuth({
     token: string
     url: string
   }) => Promise<void>
-}) {
+}): OberonAuth {
   const config = {
     pages: {
       verifyRequest: "/api/auth/verify",
@@ -131,9 +132,7 @@ export function initAuth({
     return session?.user?.role || null
   }
 
-  const POST = nextAuth.handlers.POST
-
-  const GET = (req: NextRequest) => {
+  const GET = async (req: NextRequest) => {
     // safe links bot workaround https://github.com/nextauthjs/next-auth/issues/4965
     if (
       req.method === "GET" &&
@@ -153,11 +152,11 @@ export function initAuth({
   }
 
   return {
-    getRole,
-    auth,
+    ...nextAuth,
     handlers: {
-      POST,
+      ...nextAuth.handlers,
       GET,
     },
+    getRole,
   }
 }
diff --git a/oberoncms/core/src/components/all-pages.tsx b/oberoncms/core/src/components/all-pages.tsx
index abb54849..7ea0378f 100644
--- a/oberoncms/core/src/components/all-pages.tsx
+++ b/oberoncms/core/src/components/all-pages.tsx
@@ -13,8 +13,8 @@ import {
   FormItem,
   FormMessage,
 } from "@tohuhono/ui/form"
-import { useOberonActions } from "@/hooks/use-oberon"
-import { PageSchema, type OberonPage } from "@/app/schema"
+import { useOberonActions } from "../hooks/use-oberon"
+import { PageSchema, type OberonPage } from "../app/schema"
 
 const useOberonPages = (pages: OberonPage[]) => {
   const { deletePage, addPage } = useOberonActions()
diff --git a/oberoncms/core/src/components/editor.tsx b/oberoncms/core/src/components/editor.tsx
index 3a832aeb..3b8d3524 100644
--- a/oberoncms/core/src/components/editor.tsx
+++ b/oberoncms/core/src/components/editor.tsx
@@ -5,10 +5,10 @@ import "@measured/puck/dist/index.css"
 import { Config, Data, Puck, usePuck } from "@measured/puck"
 import { Button } from "@tohuhono/ui/button"
 import { useState } from "react"
+import { useLocalData } from "../hooks/use-local-data"
+import { INITIAL_DATA } from "../app/schema"
+import { useOberonActions } from "../hooks/use-oberon"
 import { PuckMenu } from "./puck-menu"
-import { useOberonActions } from "@/hooks/use-oberon"
-import { useLocalData } from "@/hooks/use-local-data"
-import { INITIAL_DATA } from "@/app/schema"
 
 const Header = ({
   path,
diff --git a/oberoncms/core/src/components/images.tsx b/oberoncms/core/src/components/images.tsx
index 086f7cc7..09cb0aa4 100644
--- a/oberoncms/core/src/components/images.tsx
+++ b/oberoncms/core/src/components/images.tsx
@@ -11,10 +11,11 @@ import { filesize } from "filesize"
 import Link from "next/link"
 import { Route } from "next"
 import { Button } from "@tohuhono/ui/button"
+import { LocalDate } from "@tohuhono/ui/date"
 import Image from "next/image"
-import { format } from "@tohuhono/utils"
-import { useOberonActions } from "@/hooks/use-oberon"
-import type { OberonImage } from "@/app/schema"
+
+import { useOberonActions } from "../hooks/use-oberon"
+import type { OberonImage } from "../app/schema"
 
 const useOberonImages = (images: OberonImage[]) => {
   const { deleteImage } = useOberonActions()
@@ -51,7 +52,8 @@ export function Images({ images: initialImages }: { images: OberonImage[] }) {
       <ColumnHeading>By</ColumnHeading>
       <ColumnHeading />
 
-      {images.map(({ key, alt, size, updatedAt, updatedBy, url, pending }) => {
+      {images.map(({ key, alt, size, updatedAt, updatedBy, url }) => {
+        const pending = false
         return (
           <Fragment key={key}>
             <Link href={url as Route} prefetch={false} target="_blank">
@@ -59,7 +61,9 @@ export function Images({ images: initialImages }: { images: OberonImage[] }) {
             </Link>
             <div className="flex flex-row gap-2">{alt}</div>
             <div>{filesize(size)}</div>
-            <div>{format(updatedAt)}</div>
+            <div>
+              <LocalDate date={updatedAt} />
+            </div>
             <div>{updatedBy}</div>
             <Button
               variant="destructive"
diff --git a/oberoncms/core/src/components/preview.tsx b/oberoncms/core/src/components/preview.tsx
index db212e35..ef6a64be 100644
--- a/oberoncms/core/src/components/preview.tsx
+++ b/oberoncms/core/src/components/preview.tsx
@@ -1,5 +1,5 @@
 import { Render, type Config, type Data } from "@measured/puck"
-import { useLocalData } from "@/hooks/use-local-data"
+import { useLocalData } from "../hooks/use-local-data"
 
 export function Preview({
   path,
diff --git a/oberoncms/core/src/components/puck-menu.tsx b/oberoncms/core/src/components/puck-menu.tsx
index d264670b..89013c7f 100644
--- a/oberoncms/core/src/components/puck-menu.tsx
+++ b/oberoncms/core/src/components/puck-menu.tsx
@@ -5,7 +5,7 @@ import { signOut } from "next-auth/react"
 import { Button, buttonVariants } from "@tohuhono/ui/button"
 import { ThemeEditorMenu } from "@tohuhono/ui/theme"
 import useSWR from "swr"
-import { useOberonActions } from "@/hooks/use-oberon"
+import { useOberonActions } from "../hooks/use-oberon"
 
 export const PuckMenu = ({
   title,
diff --git a/oberoncms/core/src/components/users.tsx b/oberoncms/core/src/components/users.tsx
index 91b7966c..afc62791 100644
--- a/oberoncms/core/src/components/users.tsx
+++ b/oberoncms/core/src/components/users.tsx
@@ -22,8 +22,8 @@ import {
   FormMessage,
 } from "@tohuhono/ui/form"
 
-import { useOberonActions } from "@/hooks/use-oberon"
-import { AddUserSchema, OberonUser, roles } from "@/app/schema"
+import { AddUserSchema, OberonUser, roles } from "../app/schema"
+import { useOberonActions } from "../hooks/use-oberon"
 
 type OptimisticUser = OberonUser & { pending?: boolean }
 
diff --git a/oberoncms/core/src/editor.tsx b/oberoncms/core/src/editor.tsx
index 283f4184..79b11752 100644
--- a/oberoncms/core/src/editor.tsx
+++ b/oberoncms/core/src/editor.tsx
@@ -3,12 +3,12 @@ import { DynamicTailwind, PreviewFrameTailwind } from "@tohuhono/ui/theme"
 import type { OberonConfig } from "./app/schema"
 import { getTitle } from "./app/utils"
 import { useOberonClientContext } from "./hooks/use-oberon"
-import { Editor } from "@/components/editor"
-import { Preview } from "@/components/preview"
-import { PuckMenu } from "@/components/puck-menu"
-import { AllPages } from "@/components/all-pages"
-import { Images } from "@/components/images"
-import { Users } from "@/components/users"
+import { Editor } from "./components/editor"
+import { Preview } from "./components/preview"
+import { PuckMenu } from "./components/puck-menu"
+import { AllPages } from "./components/all-pages"
+import { Images } from "./components/images"
+import { Users } from "./components/users"
 
 export { useOberonImages } from "./hooks/use-oberon-images"
 
diff --git a/oberoncms/core/src/hooks/use-oberon-images.ts b/oberoncms/core/src/hooks/use-oberon-images.ts
index 14a0f719..3091e892 100644
--- a/oberoncms/core/src/hooks/use-oberon-images.ts
+++ b/oberoncms/core/src/hooks/use-oberon-images.ts
@@ -1,6 +1,6 @@
 import useSWR from "swr"
+import { OberonImage } from "../app/schema"
 import { useOberonActions } from "./use-oberon"
-import type { OberonImage } from "@/app/schema"
 
 export const useOberonImages = () => {
   const { getAllImages, addImage } = useOberonActions()
@@ -11,10 +11,13 @@ export const useOberonImages = () => {
     isLoading: loading,
   } = useSWR("/oberon/images", () => getAllImages())
 
-  const add = (image: OberonImage) =>
-    mutate(async () => await addImage(image), {
-      optimisticData: (currentData) => [...(currentData || []), image],
-    })
-
-  return { images, loading, add }
+  return {
+    images,
+    loading,
+    addImage: (image: OberonImage) => {
+      mutate(async () => await addImage(image), {
+        optimisticData: (currentData) => [...(currentData || []), image],
+      })
+    },
+  }
 }
diff --git a/oberoncms/core/src/hooks/use-oberon.ts b/oberoncms/core/src/hooks/use-oberon.ts
index 736778c9..7515b6b3 100644
--- a/oberoncms/core/src/hooks/use-oberon.ts
+++ b/oberoncms/core/src/hooks/use-oberon.ts
@@ -1,5 +1,5 @@
 import { useContext } from "react"
-import { ActionsContext, ClientContext } from "@/components/provider"
+import { ActionsContext, ClientContext } from "../components/provider"
 
 export const useOberonActions = () => {
   const context = useContext(ActionsContext)
diff --git a/oberoncms/core/tsconfig.json b/oberoncms/core/tsconfig.json
index 08018fb4..b3f328f8 100644
--- a/oberoncms/core/tsconfig.json
+++ b/oberoncms/core/tsconfig.json
@@ -1,13 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
-    "jsx": "react-jsx",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "jsx": "react-jsx"
   },
   "include": ["src"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/oberoncms/upload-thing/src/blocks/image-field.tsx b/oberoncms/upload-thing/src/blocks/image-field.tsx
index 9f7e707b..be027a89 100644
--- a/oberoncms/upload-thing/src/blocks/image-field.tsx
+++ b/oberoncms/upload-thing/src/blocks/image-field.tsx
@@ -2,7 +2,7 @@ import { FieldLabel } from "@measured/puck"
 import { useEffect, useState } from "react"
 import { useOberonImages } from "@oberoncms/core/editor"
 import type { OberonImage } from "@oberoncms/core"
-import { UploadDropzone } from "@/uploadthing/components"
+import { UploadDropzone } from "../uploadthing/components"
 
 export const ImageField = ({
   value,
@@ -11,7 +11,7 @@ export const ImageField = ({
   value: OberonImage | null
   onChange: (value: { image: OberonImage | null }) => void
 }) => {
-  const { images, loading, add } = useOberonImages()
+  const { images, loading, addImage } = useOberonImages()
 
   const [imageKey, setImageKey] = useState<OberonImage["key"] | "">(
     value?.key || "",
@@ -49,11 +49,10 @@ export const ImageField = ({
             name,
             size,
             url,
-
             serverData: { width, height },
           } = res[0]
 
-          add({
+          addImage({
             key,
             url,
             alt: name,
@@ -62,7 +61,6 @@ export const ImageField = ({
             height,
             updatedAt: new Date(),
             updatedBy: "unknown",
-            blarg: "ddd",
           })
           setImageKey?.(key || "")
         }}
diff --git a/oberoncms/upload-thing/tsconfig.json b/oberoncms/upload-thing/tsconfig.json
index 1671749a..5269e40b 100644
--- a/oberoncms/upload-thing/tsconfig.json
+++ b/oberoncms/upload-thing/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
     "jsx": "react-jsx",
@@ -9,10 +8,7 @@
       {
         "name": "next"
       }
-    ],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    ]
   },
   "include": ["src", "next-env.d.ts"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/package.json b/package.json
index d409dce4..20fc9127 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,9 @@
     "build:packages": "turbo build --filter={./oberoncms/*}... --filter={./puck/*}...",
     "build:nextjs-recipe": "turbo build --filter oberon-cms-example...",
     "change": "changeset",
-    "clean": "turbo clean --filter=!dev --continue && rimraf ./dist ./.turbo",
-    "clean:node": "turbo clean --filter=!dev --continue -- --node_modules && npx odt-clean --node_modules",
+    "clean": "turbo clean --filter=!dev --continue && rimraf ./dist ./.turbo ./vercel",
+    "clean:next": "turbo clean --filter=!dev --continue -- --only ./.next",
+    "clean:node": "turbo clean --filter=!dev --continue -- --with ./node_modules && npx odt-clean --node_modules",
     "generate:migrations": "turbo generate:migrations",
     "start:oberon": "turbo start --filter=oberon-cms-example",
     "tsc": "turbo tsc",
diff --git a/packages/dev/package.json b/packages/dev/package.json
index 88b6a71c..e8ed666e 100644
--- a/packages/dev/package.json
+++ b/packages/dev/package.json
@@ -46,8 +46,7 @@
     "uploadthing": "^6.10.1",
     "vite": "^5.1.6",
     "vite-plugin-dts": "^3.7.3",
-    "vite-plugin-externalize-deps": "^0.8.0",
-    "vite-tsconfig-paths": "^4.3.2"
+    "vite-plugin-externalize-deps": "^0.8.0"
   },
   "devDependencies": {
     "@types/eslint-config-prettier": "^6.11.3",
diff --git a/packages/dev/src/vite.config.ts b/packages/dev/src/vite.config.ts
index 07ebfd11..ce9e7e21 100644
--- a/packages/dev/src/vite.config.ts
+++ b/packages/dev/src/vite.config.ts
@@ -2,11 +2,10 @@
 // vite.config.js
 import { writeFile, mkdir } from "fs/promises"
 import { exec } from "child_process"
-import { defineConfig, type Plugin as VitePlugin } from "vite"
+import { createLogger, defineConfig, type Plugin as VitePlugin } from "vite"
 import preserveDirectives from "rollup-preserve-directives"
 import fg from "fast-glob"
 import { externalizeDeps } from "vite-plugin-externalize-deps"
-import tsconfigPaths from "vite-tsconfig-paths"
 
 function dts(): VitePlugin {
   return {
@@ -34,6 +33,7 @@ function dts(): VitePlugin {
   }
 }
 
+// Tells turbo in dev mode that the first build has finished
 function watchFile(): VitePlugin {
   return {
     name: "watch-version",
@@ -70,11 +70,22 @@ function parseEntryPoints(entryPoints: string[] = ["src/*.ts"]) {
 }
 
 export function initConfig(entryPoints: string[] = ["src/*.ts", "src/*.tsx"]) {
+  const logger = createLogger()
+
   return defineConfig({
-    logLevel: "warn",
+    logLevel: "info",
+    customLogger: {
+      ...logger,
+      info: (msg, options) => {
+        // Clean gzip output
+        if (msg.includes("dist/") && msg.includes(" gzip: ")) {
+          return
+        }
+        logger.info(msg, options)
+      },
+    },
     plugins: [
       externalizeDeps(),
-      tsconfigPaths(),
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error
       // @ts-ignore sometimes fails so can't use expect error
       preserveDirectives(),
diff --git a/packages/dev/tsconfig.json b/packages/dev/tsconfig.json
index e2541b3b..97135f98 100644
--- a/packages/dev/tsconfig.json
+++ b/packages/dev/tsconfig.json
@@ -1,12 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
-    "outDir": "./dist",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "outDir": "./dist"
   },
   "include": ["src"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 620e363f..c1e4cd05 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -12,6 +12,7 @@
   "type": "module",
   "exports": {
     "./button": "./dist/button.js",
+    "./date": "./dist/date.js",
     "./form": "./dist/form.js",
     "./input": "./dist/input.js",
     "./label": "./dist/label.js",
diff --git a/packages/ui/src/components/date.tsx b/packages/ui/src/components/date.tsx
new file mode 100644
index 00000000..dd9f2160
--- /dev/null
+++ b/packages/ui/src/components/date.tsx
@@ -0,0 +1,11 @@
+"use client"
+
+import { useEffect, useState } from "react"
+
+export function LocalDate({ date }: { date: Date | string }) {
+  const [localDate, setLocalDate] = useState<string>()
+  useEffect(() => {
+    setLocalDate(new Date(date).toLocaleDateString(navigator.languages))
+  }, [date])
+  return localDate
+}
diff --git a/packages/ui/src/date.ts b/packages/ui/src/date.ts
new file mode 100644
index 00000000..d9a705c4
--- /dev/null
+++ b/packages/ui/src/date.ts
@@ -0,0 +1 @@
+export * from "./components/date"
diff --git a/packages/ui/src/theme/mode-toggle.tsx b/packages/ui/src/theme/mode-toggle.tsx
index 71451507..1f3f4377 100644
--- a/packages/ui/src/theme/mode-toggle.tsx
+++ b/packages/ui/src/theme/mode-toggle.tsx
@@ -6,8 +6,8 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from "@/components/dropdown-menu"
-import { Button } from "@/components/button"
+} from "../dropdown-menu"
+import { Button } from "../button"
 
 export const setMode = (theme: "light" | "dark" | "system") => {
   if (theme === "system") {
diff --git a/packages/ui/src/theme/theme-editor-menu.tsx b/packages/ui/src/theme/theme-editor-menu.tsx
index 802f3008..43f87c77 100644
--- a/packages/ui/src/theme/theme-editor-menu.tsx
+++ b/packages/ui/src/theme/theme-editor-menu.tsx
@@ -3,17 +3,17 @@
 import { ClipboardCopyIcon, MoonIcon, SunIcon } from "@radix-ui/react-icons"
 import { useState, ChangeEvent, Fragment } from "react"
 import { cn } from "@tohuhono/utils"
-import { ApplyTheme, copyToClipboard } from "./theme-editor"
-import { defaultTheme } from "./default-theme"
-import { getMode, setMode } from "./mode-toggle"
-import { Button } from "@/components/button"
+import { Input } from "../input"
+import { Label } from "../label"
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuTrigger,
-} from "@/components/dropdown-menu"
-import { Label } from "@/components/label"
-import { Input } from "@/components/input"
+} from "../dropdown-menu"
+import { Button } from "../button"
+import { ApplyTheme, copyToClipboard } from "./theme-editor"
+import { defaultTheme } from "./default-theme"
+import { getMode, setMode } from "./mode-toggle"
 
 export const ThemeEditorMenu = ({ className }: { className?: string }) => {
   const [theme, setTheme] = useState(defaultTheme)
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index 08018fb4..b3f328f8 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -1,13 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
-    "jsx": "react-jsx",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "jsx": "react-jsx"
   },
   "include": ["src"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 2f36abbd..64dddc1f 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -5,7 +5,3 @@ export type CNProps<T = unknown> = PropsWithChildren<T & { className?: string }>
 export function cn(...inputs: ClassNameValue[]) {
   return twMerge(inputs)
 }
-
-export function format(date: Date | string) {
-  return new Date(date).toLocaleDateString(navigator.languages)
-}
diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
index 08018fb4..b3f328f8 100644
--- a/packages/utils/tsconfig.json
+++ b/packages/utils/tsconfig.json
@@ -1,13 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
-    "jsx": "react-jsx",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "jsx": "react-jsx"
   },
   "include": ["src"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dbf70a4..2dcfbc43 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -443,9 +443,6 @@ importers:
       vite-plugin-externalize-deps:
         specifier: ^0.8.0
         version: 0.8.0(vite@5.2.8)
-      vite-tsconfig-paths:
-        specifier: ^4.3.2
-        version: 4.3.2(typescript@5.4.2)(vite@5.2.8)
     devDependencies:
       '@types/eslint-config-prettier':
         specifier: ^6.11.3
@@ -6747,10 +6744,6 @@ packages:
       merge2: 1.4.1
       slash: 3.0.0
 
-  /globrex@0.1.2:
-    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
-    dev: false
-
   /gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
@@ -9535,19 +9528,6 @@ packages:
   /ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
-  /tsconfck@3.0.3(typescript@5.4.2):
-    resolution: {integrity: sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA==}
-    engines: {node: ^18 || >=20}
-    hasBin: true
-    peerDependencies:
-      typescript: ^5.0.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      typescript: 5.4.2
-    dev: false
-
   /tsconfig-paths@3.15.0:
     resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
     dependencies:
@@ -9951,23 +9931,6 @@ packages:
       vite: 5.2.8(@types/node@20.11.30)
     dev: false
 
-  /vite-tsconfig-paths@4.3.2(typescript@5.4.2)(vite@5.2.8):
-    resolution: {integrity: sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==}
-    peerDependencies:
-      vite: '*'
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      debug: 4.3.4
-      globrex: 0.1.2
-      tsconfck: 3.0.3(typescript@5.4.2)
-      vite: 5.2.8(@types/node@20.11.30)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: false
-
   /vite@5.2.8(@types/node@20.11.26):
     resolution: {integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==}
     engines: {node: ^18.0.0 || >=20.0.0}
diff --git a/puck/blocks/tsconfig.json b/puck/blocks/tsconfig.json
index 1671749a..5269e40b 100644
--- a/puck/blocks/tsconfig.json
+++ b/puck/blocks/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
     "jsx": "react-jsx",
@@ -9,10 +8,7 @@
       {
         "name": "next"
       }
-    ],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    ]
   },
   "include": ["src", "next-env.d.ts"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/block-format-dropdown.tsx b/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/block-format-dropdown.tsx
index f2bf3fdb..b86191c7 100644
--- a/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/block-format-dropdown.tsx
+++ b/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/block-format-dropdown.tsx
@@ -8,6 +8,7 @@ import {
   HeadingTagType,
 } from "@lexical/rich-text"
 import { $setBlocksType } from "@lexical/selection"
+import { DropdownMenu } from "@radix-ui/react-dropdown-menu"
 import { $createParagraphNode, $getSelection, LexicalEditor } from "lexical"
 import {
   Pilcrow,
@@ -23,11 +24,10 @@ import {
   TextQuote,
 } from "lucide-react"
 import {
+  DropdownTrigger,
   DropdownContent,
   DropdownItem,
-  DropdownMenu,
-  DropdownTrigger,
-} from "../../ui/dropdown-menu"
+} from "../../../../rich-text-editor/lexical/ui/dropdown-menu"
 
 export const blockFormats = {
   paragraph: { label: "Paragaph", Icon: Pilcrow },
diff --git a/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/element-format-dropdown.tsx b/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/element-format-dropdown.tsx
index debda418..62cf7423 100644
--- a/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/element-format-dropdown.tsx
+++ b/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/element-format-dropdown.tsx
@@ -16,7 +16,7 @@ import {
   DropdownItem,
   DropdownMenu,
   DropdownTrigger,
-} from "../../ui/dropdown-menu"
+} from "../../../../rich-text-editor/lexical/ui/dropdown-menu"
 
 const ELEMENT_FORMAT_OPTIONS: {
   [key in Exclude<ElementFormatType, "">]: {
diff --git a/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/index.tsx b/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/index.tsx
index 70facb9d..99fd5448 100644
--- a/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/index.tsx
+++ b/puck/rich-text/src/rich-text-editor/lexical/plugins/toolbar-plugin/index.tsx
@@ -36,12 +36,12 @@ import { Dispatch, useCallback, useEffect, useState } from "react"
 
 import { createPortal } from "react-dom"
 import { Bold, Italic, RemoveFormatting } from "lucide-react"
-import { getSelectedNode } from "../../utils/get-selected-node"
-import { sanitizeUrl } from "../../utils/url"
-import { Button } from "../../ui/button"
-import { getToolbarPortal } from "../../utils/get-toolbar-portal"
+import { getSelectedNode } from "../../../../rich-text-editor/lexical/utils/get-selected-node"
+import { sanitizeUrl } from "../../../../rich-text-editor/lexical/utils/url"
+import { Button } from "../../../../rich-text-editor/lexical/ui/button"
+import { getToolbarPortal } from "../../../../rich-text-editor/lexical/utils/get-toolbar-portal"
 
-import { isApple } from "../../utils/is-apple"
+import { isApple } from "../../../../rich-text-editor/lexical/utils/is-apple"
 import { BlockFormatDropDown, blockFormats } from "./block-format-dropdown"
 import { ElementFormatDropdown } from "./element-format-dropdown"
 
diff --git a/puck/rich-text/src/rich-text-editor/lexical/ui/button/index.tsx b/puck/rich-text/src/rich-text-editor/lexical/ui/button/index.tsx
index 1a78b577..70d4582e 100644
--- a/puck/rich-text/src/rich-text-editor/lexical/ui/button/index.tsx
+++ b/puck/rich-text/src/rich-text-editor/lexical/ui/button/index.tsx
@@ -1,7 +1,7 @@
 import { ComponentProps } from "react"
 
+import { getClassNameFactory } from "../../../../compat/get-class-name-factory"
 import styles from "./styles.module.css"
-import { getClassNameFactory } from "@/compat/get-class-name-factory"
 
 const getClassName = getClassNameFactory("ToolbarButton", styles)
 
diff --git a/puck/rich-text/src/rich-text-editor/lexical/ui/dropdown-menu/index.tsx b/puck/rich-text/src/rich-text-editor/lexical/ui/dropdown-menu/index.tsx
index 034669b4..9ae35c0c 100644
--- a/puck/rich-text/src/rich-text-editor/lexical/ui/dropdown-menu/index.tsx
+++ b/puck/rich-text/src/rich-text-editor/lexical/ui/dropdown-menu/index.tsx
@@ -1,7 +1,7 @@
 import * as Menu from "@radix-ui/react-dropdown-menu"
 import { ComponentProps, PropsWithChildren } from "react"
+import { getClassNameFactory } from "../../../../compat/get-class-name-factory"
 import styles from "./styles.module.css"
-import { getClassNameFactory } from "@/compat/get-class-name-factory"
 
 const getClassName = getClassNameFactory("DropdownMenu", styles)
 
diff --git a/puck/rich-text/tsconfig.json b/puck/rich-text/tsconfig.json
index 1671749a..5269e40b 100644
--- a/puck/rich-text/tsconfig.json
+++ b/puck/rich-text/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "./src",
     "outDir": "./dist",
     "jsx": "react-jsx",
@@ -9,10 +8,7 @@
       {
         "name": "next"
       }
-    ],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    ]
   },
   "include": ["src", "next-env.d.ts"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"]
diff --git a/scripts/clean-package.mjs b/scripts/clean-package.mjs
index 159481af..bd071158 100644
--- a/scripts/clean-package.mjs
+++ b/scripts/clean-package.mjs
@@ -2,18 +2,23 @@
 import path from "path"
 import { rimraf } from "rimraf"
 
-const dirs = [
-  "./dist",
-  "./.next",
-  "./.oberon",
-  "./.turbo",
-  "./.rollup.cache",
-  "./.vercel",
-  "./tsconfig.tsbuildinfo",
-  ...(globalThis.process.argv[2] === "--node_modules"
-    ? ["./node_modules"]
-    : []),
-]
+const filter = globalThis.process.argv[2]
+const value = globalThis.process.argv[3]
+const WITH = filter === "--with" && value
+const ONLY = filter === "--only" && value
+
+const dirs = ONLY
+  ? [ONLY]
+  : [
+      "./dist",
+      "./.next",
+      "./.oberon",
+      "./.turbo",
+      "./.rollup.cache",
+      "./.vercel",
+      "./tsconfig.tsbuildinfo",
+      ...(WITH ? [WITH] : []),
+    ]
 
 globalThis.console.warn(`rm [${dirs}] in ${path.resolve()}`)
 
diff --git a/turbo.json b/turbo.json
index 4428bdba..a2fec1fd 100644
--- a/turbo.json
+++ b/turbo.json
@@ -10,7 +10,7 @@
   "pipeline": {
     "build": {
       "dotEnv": [".env.local", ".env"],
-      "dependsOn": ["^build", "prebuild"],
+      "dependsOn": ["wait:clean", "^build", "prebuild"],
       "outputs": [".next/**", "!.next/cache/**", "dist/**"]
     },
     "clean": { "cache": false },
@@ -22,7 +22,7 @@
     "generate:migrations": {},
     "prebuild": {
       "cache": false,
-      "dependsOn": ["^build"]
+      "dependsOn": ["^wait"]
     },
     "jest": {},
     "lint": {},