meta: deprecated old pkgs; add new

- remove @urbit/api - remove @urbit/http-api - remove urbit-ob - add @urbit/aura - add urbit/js-http-api (via github repo) - remove all references to @urbit/api - replace with references to @/gear for most types, @urbit/aura for helpers, and js-http-api for network types (via the github repo; replace with npm package when published)
tloncorp · May 25, 2023 · 34bd8e8 · 34bd8e8
1 parent 46f223d
commit 34bd8e8
Show file tree

Hide file tree

Showing 54 changed files with 404 additions and 138 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -33,7 +33,8 @@
     "@tlon/sigil-js": "^1.4.4",
     "@tloncorp/mock-http-api": "^1.2.0",
     "@types/lodash": "^4.14.172",
-    "@urbit/http-api": "^2.4.5-debug",
+    "@urbit/aura": "^1.0.0",
+    "@urbit/js-http-api": "git+https://github.com/urbit/js-http-api",
     "big-integer": "^1.6.48",
     "browser-cookies": "^1.2.0",
     "classnames": "^2.3.1",
@@ -58,7 +59,6 @@
     "react-hook-form": "^7.38.0",
     "react-router-dom": "^5.2.0",
     "slugify": "^1.6.0",
-    "urbit-ob": "^5.0.1",
     "zustand": "^3.7.2"
   },
   "devDependencies": {

diff --git a/ui/src/api.ts b/ui/src/api.ts
@@ -6,7 +6,7 @@ import Urbit, {
   Thread,
   UrbitHttpApiEvent,
   UrbitHttpApiEventType,
-} from '@urbit/http-api';
+} from '@urbit/js-http-api';
 import _ from 'lodash';
 import { useLocalState } from '@/state/local';
 import useSchedulerStore from './state/scheduler';

diff --git a/ui/src/components/AppInfo.tsx b/ui/src/components/AppInfo.tsx
@@ -1,4 +1,4 @@
-import { chadIsRunning, Pike, Treaty } from '@urbit/api';
+import { chadIsRunning, Pike, Treaty } from '@/gear';
 import clipboardCopy from 'clipboard-copy';
 import React, { FC, useCallback, useState } from 'react';
 import cn from 'classnames';

diff --git a/ui/src/components/Avatar.tsx b/ui/src/components/Avatar.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import React, { useMemo } from 'react';
 import { sigil, reactRenderer } from '@tlon/sigil-js';
-import { deSig } from '@urbit/api';
+import { deSig } from '@urbit/aura';
 import { darken, lighten, parseToHsla } from 'color2k';
 import { useCurrentTheme } from '../state/local';
 import { normalizeUrbitColor } from '@/logic/utils';

diff --git a/ui/src/components/DocketImage.tsx b/ui/src/components/DocketImage.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Docket } from '@urbit/api';
+import { Docket } from '@/gear';
 import cn from 'classnames';
 import { useTileColor } from '../tiles/useTileColor';
 

diff --git a/ui/src/components/PikeMeta.tsx b/ui/src/components/PikeMeta.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Pike } from '@urbit/api';
+import { Pike } from '@/gear';
 
 import { Attribute } from './Attribute';
 

diff --git a/ui/src/components/ProviderLink.tsx b/ui/src/components/ProviderLink.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import React from 'react';
 import { Link, LinkProps } from 'react-router-dom';
-import { Provider } from '@urbit/api';
+import { Provider } from '@/gear';
 import { ShipName } from './ShipName';
 import { Avatar, AvatarSizes } from './Avatar';
 import { Contact } from '@/types/contact';

diff --git a/ui/src/components/ProviderList.tsx b/ui/src/components/ProviderList.tsx
@@ -1,5 +1,5 @@
 import React, { MouseEvent, useCallback } from 'react';
-import { Provider } from '@urbit/api';
+import { Provider } from '@/gear';
 import classNames from 'classnames';
 import { MatchItem } from '../nav/Nav';
 import { useRecentsStore } from '../nav/search/Home';

diff --git a/ui/src/components/ShipName.tsx b/ui/src/components/ShipName.tsx
@@ -1,4 +1,4 @@
-import { cite } from '@urbit/api';
+import { cite } from '@urbit/aura';
 import React, { HTMLAttributes } from 'react';
 import { useCalm } from '../state/settings';
 import { useContact } from '../state/contact';

diff --git a/ui/src/components/TreatyMeta.tsx b/ui/src/components/TreatyMeta.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { daToDate, Treaty } from '@urbit/api';
+import { daToUnix, parseDa } from '@urbit/aura'
+import { Treaty } from '@/gear';
 
 import moment from 'moment';
 import { Attribute } from './Attribute';
@@ -15,7 +16,7 @@ export function TreatyMeta(props: { treaty: Treaty }) {
         {ship}/{desk}
       </Attribute>
       <Attribute title="Last Software Update" attr="case">
-        {moment(daToDate(cass.da)).format('YYYY.MM.DD')}
+        {moment(daToUnix(parseDa(cass.da))).format('YYYY.MM.DD')}
       </Attribute>
       {meta.map((d) => (
         <Attribute key={d} attr={d}>

diff --git a/ui/src/gear/contacts/lib.ts b/ui/src/gear/contacts/lib.ts
@@ -1,5 +1,5 @@
 
-import { Patp, Poke, Scry } from '../lib';
+import { Patp, Poke, Scry } from '@urbit/js-http-api';
 import {
   Contact,
   ContactUpdateAdd,

diff --git a/ui/src/gear/contacts/types.ts b/ui/src/gear/contacts/types.ts
@@ -1,4 +1,4 @@
-import { Path, Patp } from '../lib';
+import { Path, Patp } from '@urbit/js-http-api';
 import { Resource } from '../groups';
 
 export type ContactUpdate =

diff --git a/ui/src/gear/deps.d.ts b/ui/src/gear/deps.d.ts
@@ -1,8 +0,0 @@
-
-declare module 'urbit-ob' {
-
-  /**
-   * Convert a @p-encoded string to a decimal-encoded string.
-   */
-  function patp2dec(name: string): string
-}

diff --git a/ui/src/gear/docket/lib.ts b/ui/src/gear/docket/lib.ts
@@ -1,4 +1,4 @@
-import { Poke, Scry } from '../lib';
+import { Poke, Scry } from '@urbit/js-http-api';
 import { Chad } from './types';
 
 export function chadIsRunning(chad: Chad) {

diff --git a/ui/src/gear/groups/lib.ts b/ui/src/gear/groups/lib.ts
@@ -1,5 +1,6 @@
-import { deSig } from '../index';
-import { Enc, Path, Patp, PatpNoSig, Poke, Thread } from '../lib/types';
+import { deSig } from '@urbit/aura';
+import { Path, Patp, PatpNoSig, Poke, Thread } from '@urbit/js-http-api';
+import { Enc } from '@/gear';
 import { Group, GroupPolicy, GroupPolicyDiff, GroupUpdateAddMembers, GroupUpdateAddTag, GroupUpdateChangePolicy, GroupUpdateRemoveGroup, GroupUpdateRemoveMembers, GroupUpdateRemoveTag, Resource, RoleTags, Tag } from './types';
 import { GroupUpdate } from './update';
 

diff --git a/ui/src/gear/groups/update.ts b/ui/src/gear/groups/update.ts
@@ -1,4 +1,5 @@
-import { PatpNoSig, Path, ShipRank, Enc } from '../lib';
+import { PatpNoSig, Path } from '@urbit/js-http-api';
+import { ShipRank, Enc } from '@/gear';
 import { roleTags } from './index';
 
 export type RoleTags = typeof roleTags[number];

diff --git a/ui/src/gear/groups/view.ts b/ui/src/gear/groups/view.ts
@@ -1,5 +1,5 @@
 import { joinError, joinProgress, joinResult } from ".";
-import {Patp} from "../lib";
+import { Patp } from '@urbit/js-http-api';
 
 export type JoinError = typeof joinError[number];
 

diff --git a/ui/src/gear/hark/lib.ts b/ui/src/gear/hark/lib.ts
@@ -1,14 +1,14 @@
 import { BigInteger } from 'big-integer';
 
-import { Poke } from '../lib/types';
+import { Poke } from '@urbit/js-http-api';
 import {
   HarkBin,
   HarkBinId,
   HarkBody,
   HarkLid,
   HarkPlace
 } from './types';
-import { decToUd } from '../lib';
+import { parseUd } from '@urbit/aura';
 
 export const harkAction = <T>(data: T): Poke<T> => ({
   app: 'hark-store',
@@ -39,7 +39,7 @@ export const actOnNotification = (
 ): Poke<unknown> =>
   harkAction({
     [frond]: {
-      time: decToUd(intTime.toString()),
+      time: parseUd(intTime.toString()),
       bin
     }
   });

diff --git a/ui/src/gear/hood/lib.ts b/ui/src/gear/hood/lib.ts
@@ -1,4 +1,4 @@
-import { Poke, Scry } from '../lib';
+import { Poke, Scry } from '@urbit/js-http-api';
 import { Pike } from './types';
 
 export const getPikes: Scry = {

diff --git a/ui/src/gear/index.ts b/ui/src/gear/index.ts
@@ -17,6 +17,8 @@ export * as hood from './hood';
 export * from './hood';
 export * as docket from './docket';
 export * from './docket';
+export * as utils from './utils';
+export * from './utils';
 
 // TODO: Userspace Permissions
 // export * from './permissions';

diff --git a/ui/src/gear/invite/lib.ts b/ui/src/gear/invite/lib.ts
@@ -1,4 +1,5 @@
-import { Poke, Serial } from "../lib";
+import { Poke } from '@urbit/js-http-api';
+import { Serial } from '@/gear';
 import { InviteUpdate, InviteUpdateAccept, InviteUpdateDecline } from "./types";
 
 export const inviteAction = <T extends InviteUpdate>(data: T): Poke<T> => ({

diff --git a/ui/src/gear/invite/types.ts b/ui/src/gear/invite/types.ts
@@ -1,4 +1,5 @@
-import { Serial, PatpNoSig, Path } from '../lib';
+import { PatpNoSig, Path } from '@urbit/js-http-api';
+import { Serial } from '@/gear';
 import { Resource } from "../groups";
 
 export type InviteUpdate =

diff --git a/ui/src/gear/metadata/lib.ts b/ui/src/gear/metadata/lib.ts
@@ -1,4 +1,5 @@
-import { Path, Poke, uxToHex, PatpNoSig } from '../lib';
+import { parseUx } from '@urbit/aura';
+import { Path, Poke, PatpNoSig } from '@urbit/js-http-api';
 import { MdAppName, Association, Metadata, MetadataUpdate, MetadataUpdateAdd, MetadataUpdateRemove, MetadataEditField, MetadataUpdateEdit } from './types';
 
 export const METADATA_UPDATE_VERSION = 2;
@@ -83,7 +84,7 @@ export const update = (
   newMetadata: Partial<Metadata>
 ): Poke<MetadataUpdateAdd> => {
   const metadata = { ...association.metadata, ...newMetadata };
-    metadata.color = uxToHex(metadata.color);
+    metadata.color = parseUx(metadata.color);
     return metadataAction<MetadataUpdateAdd>({
       add: {
         group: association.group,

diff --git a/ui/src/gear/metadata/types.ts b/ui/src/gear/metadata/types.ts
@@ -1,4 +1,4 @@
-import { Path, Patp } from '../lib';
+import { Path, Patp } from '@urbit/js-http-api';
 
 export type MdAppName = 'groups' | 'graph';