Code cleanup, remove unused modules

apps/browser-extension/package.json

@@ -3,6 +3,7 @@
   "version": "0.2.0",
   "type": "module",
   "scripts": {
+    "check": "tsc --noEmit",
     "build": "pnpm run \"/build:.*/\"",
     "build:chrome": "use-env -p VITE -P -- vite build --config vite.config.chrome.ts",
     "build:firefox": "use-env -p VITE -P -- vite build --config vite.config.firefox.ts",
@@ -18,10 +19,11 @@
     "@evaluate/style": "workspace:^",
     "@t3-oss/env-core": "^0.11.1",
     "lucide-react": "^0.475.0",
-    "posthog-js": "^1.217.4",
+    "posthog-js": "^1.218.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "sonner": "^1.7.2",
+    "sonner": "^1.7.4",
+    "tailwind-merge": "^2.6.0",
     "webext-bridge": "^6.0.1",
     "webextension-polyfill": "^0.12.0",
     "zod": "3.22.4"
@@ -34,7 +36,7 @@
     "@crxjs/vite-plugin": "2.0.0-beta.30",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.6",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5",
     "@types/webextension-polyfill": "^0.12.1",
     "@vitejs/plugin-react": "^4.3.4",

apps/browser-extension/src/content-script/execution/result.tsx

@@ -1,10 +1,10 @@
 import { Button } from '@evaluate/components/button';
 import { Label } from '@evaluate/components/label';
 import { Textarea } from '@evaluate/components/textarea';
-import { cn } from '@evaluate/helpers/class';
 import type { ExecuteResult, PartialRuntime } from '@evaluate/shapes';
 import { ExternalLinkIcon } from 'lucide-react';
 import { useMemo } from 'react';
+import { twMerge as cn } from 'tailwind-merge';
 import { makeEditCodeUrl, makePickRuntimeUrl } from '~/helpers/make-url';
 
 export function ResultDialog({

apps/browser-extension/src/env.ts

@@ -1,4 +1,3 @@
-import URL2 from '@evaluate/helpers/url';
 import { createEnv } from '@t3-oss/env-core';
 import { z } from 'zod';
 
@@ -8,7 +7,7 @@ export default createEnv({
     VITE_PUBLIC_WEBSITE_URL: z
       .string()
       .url()
-      .transform((v) => new URL2(v)),
+      .transform((v) => new URL(v)),
     VITE_PUBLIC_POSTHOG_KEY: z.string().min(1).optional(),
   },
 

apps/browser-extension/src/helpers/make-url.ts

@@ -1,5 +1,5 @@
+import { compress } from '@evaluate/engine/compress';
 import { getRuntimeDefaultFileName } from '@evaluate/engine/runtimes';
-import { compress } from '@evaluate/helpers/compress';
 import type { PartialRuntime } from '@evaluate/shapes';
 import env from '~/env';
 
@@ -10,7 +10,7 @@ export function makeEditCodeUrl(runtime: PartialRuntime, code: string) {
     entry: fileName,
     focused: fileName,
   });
-  return `${env.VITE_PUBLIC_WEBSITE_URL}/playgrounds/${runtime.id}#${state}`;
+  return `${env.VITE_PUBLIC_WEBSITE_URL}playgrounds/${runtime.id}#${state}`;
 }
 
 export function makePickRuntimeUrl(code: string) {
@@ -19,5 +19,5 @@ export function makePickRuntimeUrl(code: string) {
     entry: 'file.code',
     focused: 'file.code',
   });
-  return `${env.VITE_PUBLIC_WEBSITE_URL}/playgrounds#${state}`;
+  return `${env.VITE_PUBLIC_WEBSITE_URL}playgrounds#${state}`;
 }

apps/browser-extension/src/services/posthog.ts

@@ -1,9 +1,15 @@
-import { createLogger } from '@evaluate/helpers/logger';
+import { createLogger } from '@evaluate/helpers/create-logger';
 import posthog from 'posthog-js';
 import env from '~/env';
 
-export const captureLog = createLogger('posthog capture', '#eb9d2a');
-export const sessionLog = createLogger('posthog session', '#eb9d2a');
+export const captureLog = createLogger({
+  badge: 'posthog capture',
+  hex: '#eb9d2a',
+});
+export const sessionLog = createLogger({
+  badge: 'posthog session',
+  hex: '#eb9d2a',
+});
 
 export function isAvailable() {
   return Boolean(
@@ -15,7 +21,7 @@ export function initPostHog() {
   if (!isAvailable()) return;
 
   posthog.init(env.VITE_PUBLIC_POSTHOG_KEY!, {
-    api_host: `${env.VITE_PUBLIC_WEBSITE_URL}/api/ingest`,
+    api_host: `${env.VITE_PUBLIC_WEBSITE_URL}api/ingest`,
     ui_host: 'https://us.posthog.com/',
 
     // Minimal tracking, only sessions, never people

apps/discord-bot/package.json

@@ -23,8 +23,7 @@
     "@evaluate/helpers": "workspace:^",
     "@evaluate/shapes": "workspace:^",
     "@t3-oss/env-core": "^0.11.1",
-    "@vercel/functions": "^1.5.1",
-    "atomic-fns": "^1.1.6",
+    "es-toolkit": "^1.32.0",
     "date-fns": "^4.1.0",
     "posthog-node": "^4.6.0",
     "zod": "3.22.4"

apps/discord-bot/src/env.ts

@@ -1,4 +1,3 @@
-import URL2 from '@evaluate/helpers/url';
 import { createEnv } from '@t3-oss/env-core';
 import { z } from 'zod';
 
@@ -7,7 +6,7 @@ export default createEnv({
     WEBSITE_URL: z
       .string()
       .url()
-      .transform((v) => new URL2(v)),
+      .transform((v) => new URL(v)),
     POSTHOG_KEY: z.string().optional(),
     DISCORD_TOKEN: z.string().min(1).optional(),
     DISCORD_PUBLIC_KEY: z.string().min(1).optional(),

apps/discord-bot/src/handlers/evaluate.ts

@@ -5,12 +5,12 @@ import {
   Row,
   type User,
 } from '@buape/carbon';
+import { compress } from '@evaluate/engine/compress';
 import { executeCode } from '@evaluate/engine/execute';
 import {
   getRuntimeDefaultFileName,
   searchRuntimes,
 } from '@evaluate/engine/runtimes';
-import { compress } from '@evaluate/helpers/compress';
 import type { ExecuteResult, PartialRuntime } from '@evaluate/shapes';
 import { EditEvaluationButton } from '~/components/edit-evaluation-button';
 import { OpenEvaluationButton } from '~/components/open-evaluation-button';
@@ -193,7 +193,7 @@ export function createEvaluationPayload(
       new Row([
         new EditEvaluationButton(),
         new OpenEvaluationButton(
-          `${env.WEBSITE_URL}/playgrounds/${options.runtime.id}#${compressOptions(options)}`,
+          `${env.WEBSITE_URL}playgrounds/${options.runtime.id}#${compressOptions(options)}`,
         ),
       ]),
     ],

apps/discord-bot/src/services/posthog.ts

@@ -1,9 +1,12 @@
-import { createLogger } from '@evaluate/helpers/logger';
-import { merge } from 'atomic-fns';
+import { createLogger } from '@evaluate/helpers/create-logger';
+import { merge } from 'es-toolkit/object';
 import { PostHog } from 'posthog-node';
 import env from '~/env';
 
-export const captureLog = createLogger('posthog capture', '#eb9d2a');
+export const captureLog = createLogger({
+  badge: 'posthog capture',
+  hex: '#eb9d2a',
+});
 
 export function isAvailable() {
   return Boolean(

apps/website/package.json

@@ -17,46 +17,46 @@
     "@evaluate/hooks": "workspace:^",
     "@evaluate/shapes": "workspace:^",
     "@evaluate/style": "workspace:^",
-    "@hookform/resolvers": "^3.9.1",
+    "@hookform/resolvers": "^3.10.0",
     "@t3-oss/env-nextjs": "^0.11.1",
-    "@tanstack/react-query": "^5.62.0",
-    "@tanstack/react-query-devtools": "^5.62.0",
+    "@tanstack/react-query": "^5.66.0",
+    "@tanstack/react-query-devtools": "^5.66.0",
     "@uiw/codemirror-extensions-langs": "^4.23.6",
     "@uiw/codemirror-theme-vscode": "^4.23.6",
     "@uiw/react-codemirror": "^4.23.6",
-    "@vercel/speed-insights": "^1.1.0",
+    "@vercel/speed-insights": "^1.2.0",
+    "date-fns": "^4.1.0",
     "discord-bot": "workspace:^",
-    "dompurify": "^3.2.2",
-    "embla-carousel-autoplay": "^8.5.1",
+    "dompurify": "^3.2.4",
+    "embla-carousel-autoplay": "^8.5.2",
+    "es-toolkit": "^1.32.0",
     "file-saver": "^2.0.5",
-    "fuse.js": "^7.0.0",
+    "fuse.js": "^7.1.0",
     "is-mobile": "^5.0.0",
     "jszip": "^3.10.1",
-    "lodash": "^4.17.21",
-    "lucide-react": "^0.338.0",
-    "material-icon-theme": "^5.14.1",
-    "next": "^14.2.18",
+    "lucide-react": "^0.475.0",
+    "material-icon-theme": "^5.19.0",
+    "next": "^14.2.24",
     "next-themes": "npm:@wits/next-themes@^0.2.16",
-    "posthog-js": "^1.217.4",
+    "posthog-js": "^1.218.1",
     "react": "^18.3.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.3.1",
-    "react-hook-form": "^7.53.2",
+    "react-hook-form": "^7.54.2",
     "react-hotkeys-hook": "^4.6.1",
     "sharp": "^0.33.5",
-    "superjson": "^2.2.1",
+    "tailwind-merge": "^2.6.0",
     "virtual-file-explorer-backend": "^0.0.4",
     "vscode-icons-js": "^11.6.1",
     "zod": "3.22.4"
   },
   "devDependencies": {
-    "@next/bundle-analyzer": "^14.2.18",
+    "@next/bundle-analyzer": "^14.2.24",
     "@types/dompurify": "^3.2.0",
     "@types/file-saver": "^2.0.7",
-    "@types/lodash": "^4.17.13",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.18",
     "autoprefixer": "^10.4.20",
-    "tailwindcss": "^3.4.15"
+    "tailwindcss": "^3.4.17"
   }
 }

apps/website/src/app/(playgrounds)/playgrounds/_components/playground-card.tsx

@@ -10,8 +10,11 @@ import type { PartialRuntime } from '@evaluate/shapes';
 import { CodeIcon } from 'lucide-react';
 import Link from 'next/link';
 import { useRef, useState } from 'react';
+import {
+  type RGB,
+  getDominantColour,
+} from '~/app/(playgrounds)/playgrounds/_components/get-colour';
 import { ImageWithFallback } from '~/components/image-fallback';
-import { type RGB, getDominantColour } from '~/utilities/get-colour';
 
 declare module 'react' {
   namespace CSS {

apps/website/src/app/(policies)/policies/privacy-policy/page.tsx

@@ -1,4 +1,4 @@
-import { formatDate } from '~/utilities/format-helpers';
+import { format } from 'date-fns';
 
 export default function PrivacyPolicyPage() {
   const updatedAt = new Date('2024-02-02');
@@ -10,7 +10,7 @@ export default function PrivacyPolicyPage() {
           dateTime={updatedAt.toISOString()}
           className="block text-muted-foreground text-sm"
         >
-          Updated on {formatDate(updatedAt, 'full')}
+          Updated on {format(updatedAt, 'yyyy-MM-dd')}
         </time>
 
         <h1 className="font-bold text-4xl leading-tight lg:text-5xl">

apps/website/src/app/(policies)/policies/terms-of-service/page.tsx

@@ -1,4 +1,4 @@
-import { formatDate } from '~/utilities/format-helpers';
+import { format } from 'date-fns';
 
 export default function TermsOfServicePage() {
   const updatedAt = new Date('2024-02-02');
@@ -10,7 +10,7 @@ export default function TermsOfServicePage() {
           dateTime={updatedAt.toISOString()}
           className="block text-muted-foreground text-sm"
         >
-          Updated on {formatDate(updatedAt, 'full')}
+          Updated on {format(updatedAt, 'yyyy-MM-dd')}
         </time>
 
         <h1 className="font-bold text-4xl leading-tight lg:text-5xl">

apps/website/src/app/layout.tsx

@@ -11,7 +11,7 @@ import { Inter } from 'next/font/google';
 const inter = Inter({ subsets: ['latin'] });
 import { Toaster } from '@evaluate/components/toast';
 import '@evaluate/style/css';
-import { cn } from '@evaluate/helpers/class';
+import { twMerge as cn } from 'tailwind-merge';
 import { Footer } from '~/components/footer';
 import './layout.css';
 

apps/website/src/app/metadata.ts

@@ -1,12 +1,12 @@
-import _ from 'lodash';
+import { merge } from 'es-toolkit/object';
 import type { Metadata } from 'next/types';
 import env from '~/env';
 
 export function generateBaseMetadata(
   pathname: string,
   overrides: Metadata = {},
 ) {
-  const metadata = _.merge(
+  const metadata = merge(
     {
       metadataBase: new URL(env.WEBSITE_URL),
       title: 'Evaluate',

apps/website/src/components/editor/execute-bar/index.tsx

@@ -11,7 +11,6 @@ import {
 } from '@evaluate/components/select';
 import { toast } from '@evaluate/components/toast';
 import { executeCode } from '@evaluate/engine/execute';
-import { cn } from '@evaluate/helpers/class';
 import { useEventListener } from '@evaluate/hooks/event-listener';
 import { useMediaQuery } from '@evaluate/hooks/media-query';
 import { ExecuteOptions, type PartialRuntime } from '@evaluate/shapes';
@@ -20,6 +19,7 @@ import { useMutation } from '@tanstack/react-query';
 import { Loader2Icon, PlayIcon } from 'lucide-react';
 import { useCallback, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
+import { twMerge as cn } from 'tailwind-merge';
 import type { File } from 'virtual-file-explorer-backend';
 import { useExplorer, useWatch } from '~/components/explorer/use';
 import { useTerminal } from '~/components/terminal/use';

apps/website/src/components/editor/index.tsx

@@ -2,11 +2,11 @@
 
 import { Button } from '@evaluate/components/button';
 import { ScrollArea, ScrollBar } from '@evaluate/components/scroll-area';
-import { cn } from '@evaluate/helpers/class';
 import { useEventListener } from '@evaluate/hooks/event-listener';
 import type { PartialRuntime } from '@evaluate/shapes';
 import { FilesIcon, Share2Icon, TerminalIcon } from 'lucide-react';
 import { useCallback, useEffect, useRef } from 'react';
+import { twMerge as cn } from 'tailwind-merge';
 import { ExecuteBar } from './execute-bar';
 import { useEditor } from './hooks';
 import { OpenedFiles } from './opened-files';

apps/website/src/components/explorer/file/item.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { Button } from '@evaluate/components/button';
-import { cn } from '@evaluate/helpers/class';
 import { TextCursorInputIcon, Trash2Icon } from 'lucide-react';
+import { twMerge as cn } from 'tailwind-merge';
 import type { File } from 'virtual-file-explorer-backend';
 import { MaterialIcon } from '~/components/material-icon';
 import { useIsMobile } from '~/hooks/use-is-mobile';

apps/website/src/components/explorer/folder/item.tsx

@@ -7,8 +7,8 @@ import {
   AccordionTrigger,
 } from '@evaluate/components/accordion';
 import { Button } from '@evaluate/components/button';
-import { cn } from '@evaluate/helpers/class';
 import { TextCursorInputIcon, Trash2Icon } from 'lucide-react';
+import { twMerge as cn } from 'tailwind-merge';
 import type { Folder } from 'virtual-file-explorer-backend';
 import { MaterialIcon } from '~/components/material-icon';
 import { useIsMobile } from '~/hooks/use-is-mobile';

apps/website/src/components/explorer/index.tsx

@@ -3,12 +3,12 @@
 import { Button } from '@evaluate/components/button';
 import { ScrollArea } from '@evaluate/components/scroll-area';
 import { Separator } from '@evaluate/components/separator';
-import { cn } from '@evaluate/helpers/class';
 import {
   FilePlusIcon,
   FolderPlusIcon,
   HardDriveDownloadIcon,
 } from 'lucide-react';
+import { twMerge as cn } from 'tailwind-merge';
 import type { File } from 'virtual-file-explorer-backend';
 import { ExplorerFileItem } from './file/item';
 import { ExplorerFolderChildren } from './folder/children';

apps/website/src/components/explorer/name.tsx

@@ -6,8 +6,8 @@ import {
   PopoverAnchor,
   PopoverContent,
 } from '@evaluate/components/popover';
-import { cn } from '@evaluate/helpers/class';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { twMerge as cn } from 'tailwind-merge';
 import type { File, Folder } from 'virtual-file-explorer-backend';
 
 const InvalidNameRegex = /(^\s|\s$|^\.\.|\.$|[\\/:*?"<>|])/;

apps/website/src/components/explorer/use.tsx

@@ -1,10 +1,9 @@
 'use client';
 
 import { toast } from '@evaluate/components/toast';
-import { compress, decompress } from '@evaluate/helpers/compress';
+import { compress, decompress } from '@evaluate/engine/compress';
 import { useEventListener } from '@evaluate/hooks/event-listener';
 import type { Runtime } from '@evaluate/shapes';
-import _ from 'lodash';
 import {
   createContext,
   useCallback,

apps/website/src/components/footer/index.tsx

@@ -1,8 +1,8 @@
 'use client';
 
-import { cn } from '@evaluate/helpers/class';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
+import { twMerge as cn } from 'tailwind-merge';
 
 export function Footer(p: { className?: string }) {
   const pathname = usePathname();