fix: remove monorepo

Author: samdenty

.github/workflows/ci.yaml

@@ -45,7 +45,6 @@ jobs:
         with:
           wranglerVersion: '* -w'
           packageManager: pnpm
-          workingDirectory: 'packages/bolt'
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: pages deploy

README.md

@@ -4,7 +4,6 @@ import { useChat } from 'ai/react';
 import { useAnimate } from 'framer-motion';
 import { memo, useEffect, useRef, useState } from 'react';
 import { cssTransition, toast, ToastContainer } from 'react-toastify';
-import { AnalyticsAction, AnalyticsTrackEvent, sendAnalyticsEvent } from '~/lib/analytics';
 import { useMessageParser, usePromptEnhancer, useShortcuts, useSnapScroll } from '~/lib/hooks';
 import { useChatHistory } from '~/lib/persistence';
 import { chatStore } from '~/lib/stores/chat';
@@ -195,18 +194,6 @@ export const ChatImpl = memo(({ initialMessages, storeMessageHistory }: ChatProp
     resetEnhancer();
 
     textareaRef.current?.blur();
-
-    const event = messages.length === 0 ? AnalyticsTrackEvent.ChatCreated : AnalyticsTrackEvent.MessageSent;
-
-    sendAnalyticsEvent({
-      action: AnalyticsAction.Track,
-      payload: {
-        event,
-        properties: {
-          message: _input,
-        },
-      },
-    });
   };
 
   const [messageRef, scrollRef] = useSnapScroll();

packages/bolt/app/components/chat/Artifact.tsx app/components/chat/Artifact.tsx

@@ -2,7 +2,6 @@ import { useStore } from '@nanostores/react';
 import { chatStore } from '~/lib/stores/chat';
 import { workbenchStore } from '~/lib/stores/workbench';
 import { classNames } from '~/utils/classNames';
-import { OpenStackBlitz } from './OpenStackBlitz.client';
 
 interface HeaderActionButtonsProps {}
 
@@ -40,9 +39,6 @@ export function HeaderActionButtons({}: HeaderActionButtonsProps) {
           <div className="i-ph:code-bold" />
         </Button>
       </div>
-      <div className="flex ml-2">
-        <OpenStackBlitz />
-      </div>
     </div>
   );
 }

packages/bolt/app/components/chat/AssistantMessage.tsx app/components/chat/AssistantMessage.tsx

@@ -0,0 +1,38 @@
+import { CLIENT_ORIGIN } from '~/lib/constants';
+import { request as doRequest } from '~/lib/fetch';
+
+export interface Identity {
+  userId?: string | null;
+  guestId?: string | null;
+  segmentWriteKey?: string | null;
+  avatar?: string;
+}
+
+const MESSAGE_PREFIX = 'Bolt';
+
+export enum AnalyticsTrackEvent {
+  MessageSent = `${MESSAGE_PREFIX} Message Sent`,
+  MessageComplete = `${MESSAGE_PREFIX} Message Complete`,
+  ChatCreated = `${MESSAGE_PREFIX} Chat Created`,
+}
+
+export async function identifyUser(access: string): Promise<Identity | undefined> {
+  const response = await doRequest(`${CLIENT_ORIGIN}/api/identify`, {
+    method: 'GET',
+    headers: { authorization: `Bearer ${access}` },
+  });
+
+  const body = await response.json();
+
+  if (!response.ok) {
+    return undefined;
+  }
+
+  // convert numerical identity values to strings
+  const stringified = Object.entries(body).map(([key, value]) => [
+    key,
+    typeof value === 'number' ? value.toString() : value,
+  ]);
+
+  return Object.fromEntries(stringified) as Identity;
+}

packages/bolt/app/components/chat/BaseChat.module.scss app/components/chat/BaseChat.module.scss

@@ -3,7 +3,6 @@ import { useState, useEffect } from 'react';
 import { atom } from 'nanostores';
 import type { Message } from 'ai';
 import { toast } from 'react-toastify';
-import { AnalyticsAction, sendAnalyticsEvent } from '~/lib/analytics';
 import { workbenchStore } from '~/lib/stores/workbench';
 import { getMessages, getNextId, getUrlId, openDatabase, setMessages } from './db';
 
@@ -107,14 +106,4 @@ function navigateChat(nextId: string) {
   url.pathname = `/chat/${nextId}`;
 
   window.history.replaceState({}, '', url);
-
-  // since the `replaceState` call doesn't trigger a page reload, we need to manually log this event
-  sendAnalyticsEvent({
-    action: AnalyticsAction.Page,
-    payload: {
-      properties: {
-        url: url.href,
-      },
-    },
-  });
 }

packages/bolt/app/components/chat/BaseChat.tsx app/components/chat/BaseChat.tsx

@@ -1,9 +1,7 @@
 import { useStore } from '@nanostores/react';
 import type { LinksFunction } from '@remix-run/cloudflare';
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLocation } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from '@remix-run/react';
 import tailwindReset from '@unocss/reset/tailwind-compat.css?url';
-import { useEffect } from 'react';
-import { sendAnalyticsEvent, AnalyticsAction } from './lib/analytics';
 import { themeStore } from './lib/stores/theme';
 import { stripIndents } from './utils/stripIndent';
 
@@ -55,20 +53,6 @@ const inlineThemeCode = stripIndents`
 export function Layout({ children }: { children: React.ReactNode }) {
   const theme = useStore(themeStore);
 
-  const { pathname } = useLocation();
-
-  // log page events when the window location changes
-  useEffect(() => {
-    sendAnalyticsEvent({
-      action: AnalyticsAction.Page,
-      payload: {
-        properties: {
-          url: window.location.href,
-        },
-      },
-    });
-  }, [pathname]);
-
   return (
     <html lang="en" data-theme={theme}>
       <head>

packages/bolt/app/components/chat/Chat.client.tsx app/components/chat/Chat.client.tsx

@@ -4,34 +4,21 @@ import { MAX_RESPONSE_SEGMENTS, MAX_TOKENS } from '~/lib/.server/llm/constants';
 import { CONTINUE_PROMPT } from '~/lib/.server/llm/prompts';
 import { streamText, type Messages, type StreamingOptions } from '~/lib/.server/llm/stream-text';
 import SwitchableStream from '~/lib/.server/llm/switchable-stream';
-import type { Session } from '~/lib/.server/sessions';
-import { AnalyticsAction, AnalyticsTrackEvent, sendEventInternal } from '~/lib/analytics';
 
 export async function action(args: ActionFunctionArgs) {
   return actionWithAuth(args, chatAction);
 }
 
-async function chatAction({ context, request }: ActionFunctionArgs, session: Session) {
+async function chatAction({ context, request }: ActionFunctionArgs) {
   const { messages } = await request.json<{ messages: Messages }>();
 
   const stream = new SwitchableStream();
 
   try {
     const options: StreamingOptions = {
       toolChoice: 'none',
-      onFinish: async ({ text: content, finishReason, usage }) => {
+      onFinish: async ({ text: content, finishReason }) => {
         if (finishReason !== 'length') {
-          await sendEventInternal(session, {
-            action: AnalyticsAction.Track,
-            payload: {
-              event: AnalyticsTrackEvent.MessageComplete,
-              properties: {
-                usage,
-                finishReason,
-              },
-            },
-          });
-
           return stream.close();
         }
 

packages/bolt/app/components/chat/CodeBlock.module.scss app/components/chat/CodeBlock.module.scss

@@ -28,7 +28,7 @@ export default [
   },
   {
     files: [...tsFileExtensions, ...jsFileExtensions, '**/*.tsx'],
-    ignores: ['packages/bolt/functions/*'],
+    ignores: ['functions/*'],
     rules: {
       'no-restricted-imports': [
         'error',