move api files

apps/tlon-mobile/package.json

@@ -65,6 +65,7 @@
     "@shopify/react-native-skia": "1.5.0",
     "@tamagui/react-native-media-driver": "~1.126.12",
     "@tanstack/react-query": "~5.32.1",
+    "@tloncorp/api": "workspace:*",
     "@tloncorp/app": "workspace:*",
     "@tloncorp/editor": "workspace:*",
     "@tloncorp/shared": "workspace:*",
@@ -165,4 +166,4 @@
     "tailwindcss": "^3.3.3",
     "vitest": "^1.0.4"
   }
-}
+}

apps/tlon-mobile/src/hooks/analytics.ts

@@ -1,6 +1,6 @@
 import { useLureMetadata } from '@tloncorp/app/contexts/branch';
 import { AnalyticsEvent, createDevLogger } from '@tloncorp/shared';
-import * as api from '@tloncorp/shared/api';
+import * as api from '@tloncorp/api';
 import * as db from '@tloncorp/shared/db';
 import * as Contacts from 'expo-contacts';
 import * as Notifications from 'expo-notifications';

apps/tlon-mobile/src/hooks/useBackgroundData.ts

@@ -1,5 +1,5 @@
 import { createDevLogger } from '@tloncorp/shared';
-import * as api from '@tloncorp/shared/api';
+import * as api from '@tloncorp/api';
 import {
   CHANGES_SYNCED_AT_KEY,
   registerStorageItemListener,

apps/tlon-mobile/src/hooks/useNotificationListener.ts

@@ -14,11 +14,11 @@ import {
   syncDms,
   syncGroups,
 } from '@tloncorp/shared';
-import * as api from '@tloncorp/shared/api';
+import * as api from '@tloncorp/api';
 import * as db from '@tloncorp/shared/db';
 import * as logic from '@tloncorp/shared/logic';
-import * as ub from '@tloncorp/shared/urbit';
-import { ActivityIncomingEvent } from '@tloncorp/shared/urbit';
+import * as ub from '@tloncorp/api/urbit';
+import { ActivityIncomingEvent } from '@tloncorp/api/urbit';
 import { Notification, useLastNotificationResponse } from 'expo-notifications';
 import { useEffect, useState } from 'react';
 import { Platform } from 'react-native';

apps/tlon-mobile/src/hooks/useOnboardingHelpers.ts

@@ -10,7 +10,7 @@ import {
   scaffoldPersonalGroup,
   withRetry,
 } from '@tloncorp/shared';
-import * as api from '@tloncorp/shared/api';
+import * as api from '@tloncorp/api';
 import { storage } from '@tloncorp/shared/db';
 import * as db from '@tloncorp/shared/db';
 import { useCallback } from 'react';

apps/tlon-mobile/src/hooks/useReviveSavedOnboarding.ts

@@ -2,7 +2,7 @@ import { NavigationProp, useNavigation } from '@react-navigation/native';
 import { useLureMetadata } from '@tloncorp/app/contexts/branch';
 import { useShip } from '@tloncorp/app/contexts/ship';
 import { AnalyticsEvent, createDevLogger } from '@tloncorp/shared';
-import * as api from '@tloncorp/shared/api';
+import * as api from '@tloncorp/api';
 import { signupData } from '@tloncorp/shared/db';
 import * as db from '@tloncorp/shared/db';
 import { SignupParams } from '@tloncorp/shared/domain';

apps/tlon-mobile/src/lib/OnboardingContext.tsx

@@ -3,8 +3,8 @@ import {
   execute,
   initClient,
 } from '@google-cloud/recaptcha-enterprise-react-native';
-import * as hostingApi from '@tloncorp/shared/api';
-import { getLandscapeAuthCookie } from '@tloncorp/shared/api';
+import * as hostingApi from '@tloncorp/api';
+import { getLandscapeAuthCookie } from '@tloncorp/api';
 import { createContext, useContext } from 'react';
 
 interface OnboardingContextValue {

apps/tlon-mobile/src/lib/hostingAuth.ts

@@ -1,7 +1,7 @@
 import NetInfo from '@react-native-community/netinfo';
 import CookieManager from '@react-native-cookies/cookies';
 import { createDevLogger } from '@tloncorp/shared';
-import { getHostingHeartBeat } from '@tloncorp/shared/api';
+import { getHostingHeartBeat } from '@tloncorp/api';
 import * as db from '@tloncorp/shared/db';
 import { getConstants } from '@tloncorp/shared/domain';
 import { Platform } from 'react-native';

apps/tlon-mobile/src/lib/signupContext.tsx

@@ -3,7 +3,7 @@
 import { useBootSequence } from '@tloncorp/app/hooks/useBootSequence';
 import { connectNotifyProvider } from '@tloncorp/app/lib/notificationsApi';
 import { createDevLogger } from '@tloncorp/shared';
-import * as api from '@tloncorp/shared/api';
+import * as api from '@tloncorp/api';
 import { didSignUp, signupData } from '@tloncorp/shared/db';
 import {
   AnalyticsEvent,

apps/tlon-mobile/src/screens/Onboarding/CheckOTPScreen.tsx

@@ -16,7 +16,7 @@ import {
   AnalyticsSeverity,
   createDevLogger,
 } from '@tloncorp/shared';
-import { HostingError } from '@tloncorp/shared/api';
+import { HostingError } from '@tloncorp/api';
 import { storage } from '@tloncorp/shared/db';
 import { useCallback, useMemo, useState } from 'react';
 import { Platform } from 'react-native';

apps/tlon-mobile/src/screens/Onboarding/JoinWaitListScreen.tsx

@@ -10,7 +10,7 @@ import {
 } from '@tloncorp/app/ui';
 import { trackOnboardingAction } from '@tloncorp/app/utils/posthog';
 import { createDevLogger } from '@tloncorp/shared';
-import { addUserToWaitlist } from '@tloncorp/shared/api';
+import { addUserToWaitlist } from '@tloncorp/api';
 import { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { Alert } from 'react-native';

apps/tlon-mobile/src/screens/Onboarding/ResetPasswordScreen.tsx

@@ -10,7 +10,7 @@ import {
   YStack,
 } from '@tloncorp/app/ui';
 import { createDevLogger } from '@tloncorp/shared';
-import { requestPasswordReset } from '@tloncorp/shared/api';
+import { requestPasswordReset } from '@tloncorp/api';
 import { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 

apps/tlon-mobile/src/screens/Onboarding/SetNotificationsScreen.tsx

@@ -7,7 +7,7 @@ import {
   View,
   YStack,
 } from '@tloncorp/app/ui';
-import * as ub from '@tloncorp/shared/urbit';
+import * as ub from '@tloncorp/api/urbit';
 import { useCallback, useEffect, useState } from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 

apps/tlon-mobile/src/screens/Onboarding/ShipLoginScreen.tsx

@@ -18,7 +18,7 @@ import {
 import { getShipFromCookie } from '@tloncorp/app/utils/ship';
 import { transformShipURL } from '@tloncorp/app/utils/string';
 import { AnalyticsEvent, createDevLogger } from '@tloncorp/shared';
-import { getLandscapeAuthCookie } from '@tloncorp/shared/api';
+import { getLandscapeAuthCookie } from '@tloncorp/api';
 import { storage } from '@tloncorp/shared/db';
 import { useCallback, useEffect, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';

apps/tlon-mobile/src/screens/Onboarding/SignupScreen.tsx

@@ -26,7 +26,7 @@ import {
   AnalyticsSeverity,
   createDevLogger,
 } from '@tloncorp/shared';
-import { HostingError } from '@tloncorp/shared/api';
+import { HostingError } from '@tloncorp/api';
 import { useCallback, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { Platform } from 'react-native';

apps/tlon-mobile/src/screens/Onboarding/TlonLogin.tsx

@@ -18,7 +18,7 @@ import {
 } from '@tloncorp/app/ui';
 import { Button } from '@tloncorp/ui';
 import { createDevLogger } from '@tloncorp/shared';
-import { HostingError } from '@tloncorp/shared/api';
+import { HostingError } from '@tloncorp/api';
 import { useCallback, useEffect, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 

apps/tlon-mobile/src/screens/Onboarding/TlonLoginLegacy.tsx

@@ -15,7 +15,7 @@ import {
   YStack,
 } from '@tloncorp/app/ui';
 import { AnalyticsEvent, createDevLogger } from '@tloncorp/shared';
-import { HostingError } from '@tloncorp/shared/api';
+import { HostingError } from '@tloncorp/api';
 import { storage } from '@tloncorp/shared/db';
 import { useCallback, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';

apps/tlon-web/package.json

@@ -94,6 +94,7 @@
     "@tiptap/pm": "^2.6.6",
     "@tiptap/react": "^2.6.6",
     "@tiptap/suggestion": "^2.6.6",
+    "@tloncorp/api": "workspace:*",
     "@tloncorp/app": "workspace:*",
     "@tloncorp/mock-http-api": "^1.2.0",
     "@tloncorp/shared": "workspace:*",

apps/tlon-web/rube/Dockerfile

@@ -37,13 +37,14 @@ COPY ../../../.nvmrc /workspace/
 COPY ../../../tsconfig* /workspace/
 
 # Create directory structure for packages
-RUN mkdir -p /workspace/packages/shared /workspace/packages/ui /workspace/packages/app /workspace/packages/editor
+RUN mkdir -p /workspace/packages/shared /workspace/packages/ui /workspace/packages/app /workspace/packages/editor /workspace/packages/api
 
 # Copy package.json files for all workspaces (more specific paths)
 COPY ../../../packages/shared/package.json /workspace/packages/shared/
 COPY ../../../packages/ui/package.json /workspace/packages/ui/
 COPY ../../../packages/app/package.json /workspace/packages/app/
 COPY ../../../packages/editor/package.json /workspace/packages/editor/
+COPY ../../../packages/api/package.json /workspace/packages/api/
 COPY ../../../apps/tlon-web/package.json /workspace/apps/tlon-web/
 COPY ../../../apps/tlon-mobile/package.json /workspace/apps/tlon-mobile/
 COPY ../../../apps/tlon-desktop/package.json /workspace/apps/tlon-desktop/
@@ -54,9 +55,11 @@ COPY ../../../patches/ /workspace/patches/
 # Copy .npmrc if it exists (for npm configurations)
 COPY ../../../.npmrc* /workspace/
 
-# Install dependencies (with cache mount for faster rebuilds)
+# Install dependencies (with cache mount for faster rebuilds).
+# Ignore lifecycle scripts in this dependency-only layer to avoid running
+# desktop postinstall hooks (electron native rebuilds) during web E2E image build.
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store \
-    pnpm install --frozen-lockfile
+    pnpm install --frozen-lockfile --ignore-scripts
 
 # Install Playwright browsers and dependencies (before source copy for better caching)
 WORKDIR /workspace/apps/tlon-web
@@ -125,4 +128,4 @@ RUN echo "Final check - rube scripts:" && ls -la ./rube/dist/*.js 2>/dev/null ||
 
 # Entry point for running tests with sharding
 ENTRYPOINT ["/bin/bash", "-c"]
-CMD ["pnpm e2e"]
+CMD ["pnpm e2e"]

apps/tlon-web/src/logic/utils.ts

@@ -5,15 +5,15 @@ import {
   Verse,
   VerseBlock,
   VerseInline,
-} from '@tloncorp/shared/urbit/channel';
+} from '@tloncorp/api/urbit/channel';
 import {
   Bold,
   Cite,
   Inline,
   Italics,
   Listing,
   Strikethrough,
-} from '@tloncorp/shared/urbit/content';
+} from '@tloncorp/api/urbit/content';
 import {
   Cabals,
   ChannelPrivacyType,
@@ -25,7 +25,7 @@ import {
   PrivacyType,
   Rank,
   Saga,
-} from '@tloncorp/shared/urbit/groups';
+} from '@tloncorp/api/urbit/groups';
 import {
   BigIntOrderedMap,
   Docket,

apps/tlon-web/src/main.tsx

@@ -13,7 +13,7 @@ import { RootErrorBoundary } from '@tloncorp/app/RootErrorBoundary';
 import { ENABLED_LOGGERS } from '@tloncorp/app/constants';
 import { loadConstants } from '@tloncorp/app/lib/constants';
 import { addCustomEnabledLoggers, createDevLogger } from '@tloncorp/shared';
-import { QueryClientProvider, queryClient } from '@tloncorp/shared/api';
+import { QueryClientProvider, queryClient } from '@tloncorp/api';
 import { PostHogProvider } from 'posthog-js/react';
 import { createRoot } from 'react-dom/client';
 

apps/tlon-web/src/mocks/chat.ts

@@ -1,11 +1,11 @@
 import { faker } from '@faker-js/faker';
-import { Activity } from '@tloncorp/shared/urbit/activity';
+import { Activity } from '@tloncorp/api/urbit/activity';
 import {
   Post,
   Posts,
   Story,
   storyFromChatStory,
-} from '@tloncorp/shared/urbit/channel';
+} from '@tloncorp/api/urbit/channel';
 import { decToUd, unixToDa } from '@urbit/api';
 import { subDays, subMinutes } from 'date-fns';
 import _ from 'lodash';

apps/tlon-web/src/mocks/groups.ts

@@ -8,7 +8,7 @@ import {
   GroupPreview,
   PrivacyType,
   Vessel,
-} from '@tloncorp/shared/urbit/groups';
+} from '@tloncorp/api/urbit/groups';
 
 import { AUTHORS } from '@/constants';
 import { randomElement } from '@/logic/utils';

apps/tlon-web/src/mocks/handlers.ts

@@ -16,8 +16,8 @@ import {
   DMWhom,
   DmRsvp,
   WritDiff,
-} from '@tloncorp/shared/urbit/dms';
-import { GroupActionV4 } from '@tloncorp/shared/urbit/groups';
+} from '@tloncorp/api/urbit/dms';
+import { GroupActionV4 } from '@tloncorp/api/urbit/groups';
 import { decToUd, udToDec, unixToDa } from '@urbit/api';
 import bigInt from 'big-integer';
 import _ from 'lodash';

apps/tlon-web/src/mocks/heaps.ts

@@ -4,7 +4,7 @@ import {
   SubscriptionHandler,
 } from '@tloncorp/mock-http-api';
 import { DraftInputId, PostContentRendererId } from '@tloncorp/shared';
-import { Channels, Perm, Posts } from '@tloncorp/shared/urbit/channel';
+import { Channels, Perm, Posts } from '@tloncorp/api/urbit/channel';
 import { subMinutes } from 'date-fns';
 
 const unixTime = subMinutes(new Date(), 1).getTime();

apps/tlon-web/src/state/settings.ts

@@ -1,5 +1,5 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { DisplayMode, SortMode } from '@tloncorp/shared/urbit/channel';
+import { DisplayMode, SortMode } from '@tloncorp/api/urbit/channel';
 import { DelBucket, DelEntry, PutBucket, Value } from '@urbit/api';
 import cookies from 'browser-cookies';
 import produce from 'immer';

apps/tlon-web/src/window.ts

@@ -1,5 +1,5 @@
 import type { NativeWebViewOptions } from '@tloncorp/shared';
-import { Rope } from '@tloncorp/shared/urbit/hark';
+import { Rope } from '@tloncorp/api/urbit/hark';
 
 declare global {
   interface Window {

packages/api/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@tloncorp/api",
+  "version": "0.0.1",
+  "type": "module",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts",
+    "./api": "./src/client/index.ts",
+    "./api/*": "./src/client/*.ts",
+    "./client": "./src/client/index.ts",
+    "./client/*": "./src/client/*.ts",
+    "./lib/utilityTypes": "./src/lib/utilityTypes.d.ts",
+    "./lib/*": "./src/lib/*.ts",
+    "./urbit": "./src/urbit/index.ts",
+    "./urbit/*": "./src/urbit/*.ts",
+    "./http-api": "./src/http-api/index.ts",
+    "./http-api/*": "./src/http-api/*.ts",
+    "./types/*": "./src/types/*.ts",
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "tsc": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@tloncorp/shared": "workspace:*"
+  }
+}

packages/shared/src/api/activity.test.ts → packages/api/src/__tests__/activity.test.ts

@@ -1,19 +1,17 @@
 import { expect, test } from 'vitest';
 
-import * as db from '../db';
-import dmFeed from '../test/activityDmFeed.json';
-import dmReplyFeed from '../test/activityDmReplyFeed.json';
-import initActivityFeeds from '../test/activityInitFeeds.json';
-import channelPostFeed from '../test/activityPostFeed.json';
-import replyPostFeed from '../test/activityReplyPostFeed.json';
+import type { ActivityEvent } from '@tloncorp/shared/db/types';
+import dmFeed from './fixtures/activityDmFeed.json';
+import dmReplyFeed from './fixtures/activityDmReplyFeed.json';
+import initActivityFeeds from './fixtures/activityInitFeeds.json';
+import channelPostFeed from './fixtures/activityPostFeed.json';
+import replyPostFeed from './fixtures/activityReplyPostFeed.json';
 import {
   fromFeedToActivityEvents,
   fromInitFeedToBucketedActivityEvents,
-} from './activityApi';
+} from '../client/activityApi';
 
-// const dmFeed: ub.ActivityFeed = await import('../test/activityDmFeed.json');
-
-const expectedDmEvent: db.ActivityEvent = {
+const expectedDmEvent: ActivityEvent = {
   id: '170.141.184.506.853.323.579.606.989.072.752.443.392',
   sourceId: 'ship/~lisfed-hobtex-tinres-walmyr--donsut-toprep-fanfep-samzod',
   channelId: '~lisfed-hobtex-tinres-walmyr--donsut-toprep-fanfep-samzod',
@@ -42,7 +40,7 @@ test('converts a DM activity event feed from server to client format', () => {
   expect(events[0]).toStrictEqual(expectedDmEvent);
 });
 
-const expectedPostEvent: db.ActivityEvent = {
+const expectedPostEvent: ActivityEvent = {
   id: '170.141.184.506.853.155.647.879.036.981.225.717.760',
   sourceId:
     'channel/chat/~lishul-marbyl-nisdeb-nalhec--motfed-lodmyn-tinfed-binzod/welcome-5870',
@@ -75,7 +73,7 @@ test('converts a post activity event feed from server to client format', () => {
   expect(events[0]).toStrictEqual(expectedPostEvent);
 });
 
-const expectedReplyEvent: db.ActivityEvent = {
+const expectedReplyEvent: ActivityEvent = {
   id: '170.141.184.506.852.591.480.642.042.887.720.140.800',
   sourceId:
     'thread/chat/~lishul-marbyl-nisdeb-nalhec--motfed-lodmyn-tinfed-binzod/welcome-5870/170.141.184.506.852.591.089.314.701.116.289.581.056',
@@ -110,7 +108,7 @@ test('converts a reply activity event feed from server to client format', () =>
   expect(events[0]).toStrictEqual(expectedReplyEvent);
 });
 
-const expectedDmReplyEvent: db.ActivityEvent = {
+const expectedDmReplyEvent: ActivityEvent = {
   id: '170.141.184.506.854.078.982.999.616.565.792.473.088',
   sourceId:
     'dm-thread/~pondus-watbel/~lishul-marbyl-nisdeb-nalhec--motfed-lodmyn-tinfed-binzod/170.141.184.506.854.078.840.401.191.304.839.083.065',

packages/shared/src/api/contactsApi.test.ts → packages/api/src/__tests__/contactsApi.test.ts

@@ -1,6 +1,9 @@
 import { expect, test } from 'vitest';
 
-import { v0PeerToClientProfile, v0PeersToClientProfiles } from './contactsApi';
+import {
+  v0PeerToClientProfile,
+  v0PeersToClientProfiles,
+} from '../client/contactsApi';
 
 const inputContact: [string, any] = [
   'test',