npm: removing intermediate ts files from pkg, fixing more bad references

pkg/grid/package.json

@@ -22,8 +22,8 @@
     "@radix-ui/react-toggle": "^0.0.10",
     "@tlon/sigil-js": "^1.4.4",
     "@types/lodash": "^4.14.172",
-    "@urbit/api": "^2.0.0",
-    "@urbit/http-api": "^2.0.0",
+    "@urbit/api": "2.1.0-dev.4",
+    "@urbit/http-api": "2.1.0-dev.4",
     "big-integer": "^1.6.48",
     "classnames": "^2.3.1",
     "clipboard-copy": "^4.0.1",

pkg/grid/src/components/AppInfo.tsx

@@ -1,8 +1,7 @@
-import { chadIsRunning, Treaty } from '@urbit/api';
+import { chadIsRunning, Treaty, Vat } from '@urbit/api';
 import clipboardCopy from 'clipboard-copy';
 import React, { FC, useCallback, useState } from 'react';
 import cn from 'classnames';
-import { Vat } from '@urbit/api/hood';
 import { Button, PillButton } from './Button';
 import { Dialog, DialogClose, DialogContent, DialogTrigger } from './Dialog';
 import { DocketHeader } from './DocketHeader';
@@ -137,19 +136,19 @@ export const AppInfo: FC<AppInfoProps> = ({ docket, vat, className }) => {
         </div>
       </DocketHeader>
       <div className="space-y-6">
-      {vat ? (
-        <>
-          <hr className="-mx-5 sm:-mx-8 border-gray-50" />
-          <VatMeta vat={vat} />
-        </>
-      ) : null}
-      {!treaty ? null : (
-        <>
-          <hr className="-mx-5 sm:-mx-8 border-gray-50" />
-          <TreatyMeta treaty={treaty} />
-        </>
-      )}
-    </div>
+        {vat ? (
+          <>
+            <hr className="-mx-5 sm:-mx-8 border-gray-50" />
+            <VatMeta vat={vat} />
+          </>
+        ) : null}
+        {!treaty ? null : (
+          <>
+            <hr className="-mx-5 sm:-mx-8 border-gray-50" />
+            <TreatyMeta treaty={treaty} />
+          </>
+        )}
+      </div>
     </div>
   );
 };

pkg/grid/src/components/DocketImage.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Docket } from '@urbit/api/docket';
+import { Docket } from '@urbit/api';
 import cn from 'classnames';
 import { useTileColor } from '../tiles/useTileColor';
 

pkg/grid/src/components/VatMeta.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Vat } from '@urbit/api/hood';
+import { Vat } from '@urbit/api';
 
 import { Attribute } from './Attribute';
 

pkg/grid/src/nav/SystemMenu.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import clipboardCopy from 'clipboard-copy';
 import React, { HTMLAttributes, useCallback, useState } from 'react';
 import { Link, Route, useHistory } from 'react-router-dom';
-import { Vat } from '@urbit/api/hood';
+import { Vat } from '@urbit/api';
 import { Adjust } from '../components/icons/Adjust';
 import { useVat } from '../state/kiln';
 import { disableDefault, handleDropdownLink } from '../state/util';

pkg/grid/src/nav/notifications/SystemNotification.tsx

@@ -1,6 +1,6 @@
 import { pick } from 'lodash';
 import React, { useCallback } from 'react';
-import { kilnBump } from '@urbit/api/hood';
+import { kilnBump } from '@urbit/api';
 import { AppList } from '../../components/AppList';
 import { Button } from '../../components/Button';
 import { Dialog, DialogClose, DialogContent, DialogTrigger } from '../../components/Dialog';

pkg/grid/src/nav/preferences/NotificationPrefs.tsx

@@ -1,4 +1,4 @@
-import { setMentions } from '@urbit/api/dist';
+import { setMentions } from '@urbit/api';
 import React from 'react';
 import { Setting } from '../../components/Setting';
 import { pokeOptimisticallyN } from '../../state/base';

pkg/grid/src/state/hark.ts

@@ -1,5 +1,6 @@
 /* eslint-disable no-param-reassign */
 import {
+  BigIntOrderedMap,
   makePatDa,
   decToUd,
   unixToDa,
@@ -13,7 +14,6 @@ import {
   NotificationGraphConfig,
   archiveAll
 } from '@urbit/api';
-import BigIntOrderedMap from '@urbit/api/lib/BigIntOrderedMap';
 /* eslint-disable-next-line camelcase */
 import { unstable_batchedUpdates } from 'react-dom';
 import produce from 'immer';

pkg/grid/src/state/kiln.ts

@@ -1,5 +1,13 @@
-import { getVats, Vats, scryLag, getBlockers, Vat, kilnInstall } from '@urbit/api';
-import { kilnPause, kilnResume } from '@urbit/api/hood';
+import {
+  getVats,
+  Vats,
+  scryLag,
+  getBlockers,
+  Vat,
+  kilnInstall,
+  kilnPause,
+  kilnResume
+} from '@urbit/api';
 import create from 'zustand';
 import produce from 'immer';
 import { useCallback } from 'react';

pkg/grid/src/state/settings.ts

@@ -5,7 +5,7 @@ import {
   putEntry as doPutEntry,
   getDeskSettings,
   DeskData
-} from '@urbit/api/settings';
+} from '@urbit/api';
 import _ from 'lodash';
 import {
   BaseState,

pkg/grid/src/state/util.ts

@@ -1,4 +1,4 @@
-import { Docket, DocketHref, Treaty } from '@urbit/api/docket';
+import { Docket, DocketHref, Treaty } from '@urbit/api';
 import { hsla, parseToHsla } from 'color2k';
 import _ from 'lodash';
 

pkg/interface/package.json

@@ -15,8 +15,8 @@
     "@tlon/indigo-light": "^1.0.7",
     "@tlon/indigo-react": "^1.2.23",
     "@tlon/sigil-js": "^1.4.3",
-    "@urbit/api": "2.1.0-dev.2",
-    "@urbit/http-api": "2.1.0-dev.2",
+    "@urbit/api": "2.1.0-dev.4",
+    "@urbit/http-api": "2.1.0-dev.4",
     "any-ascii": "^0.1.7",
     "aws-sdk": "^2.830.0",
     "big-integer": "^1.6.48",

pkg/interface/src/views/apps/notifications/NewBox.tsx

@@ -1,7 +1,7 @@
 import { Box, Center, Col, Text } from '@tlon/indigo-react';
 import React from 'react';
 import useHarkState, { HarkState } from '~/logic/state/hark';
-import { harkBinToId, HarkLid, Timebox } from '../../../../../npm/api/dist';
+import { harkBinToId, HarkLid, Timebox } from '@urbit/api';
 import { Notification } from './notification';
 
 const unseenLid = { unseen: null };

pkg/npm/api/.gitignore

@@ -0,0 +1 @@
+tmp

pkg/npm/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urbit/api",
-  "version": "2.1.0",
+  "version": "2.1.0-dev.4",
   "description": "A library that provides bindings and types for Urbit's various userspace desks",
   "repository": {
     "type": "git",

pkg/npm/api/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-	  "outDir": "./dist",
+	  "outDir": "./tmp",
     "module": "ESNext",
     "noImplicitAny": true,
     "target": "ESNext",
@@ -14,6 +14,11 @@
     "strict": false,
     "noErrorTruncation": true
   },
-  "exclude": ["node_modules", "./dist/**/*", "@types", "rollup.config.ts"],
+  "exclude": [
+    "node_modules", 
+    "./dist/**/*", 
+    "./tmp/**/*", 
+    "rollup.config.ts"
+  ],
   "include": ["./*.ts"]
 }

pkg/npm/http-api/.gitignore

@@ -1,3 +1,4 @@
 dist
 node_modules
-coverage
+coverage
+tmp

pkg/npm/http-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urbit/http-api",
-  "version": "2.1.0",
+  "version": "2.1.0-dev.4",
   "license": "MIT",
   "description": "Library to interact with an Urbit ship over HTTP",
   "repository": {

pkg/npm/http-api/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist", "@types"],
+  "exclude": ["node_modules", "dist", "tmp"],
   "compilerOptions": {
-    "outDir": "./dist",
+    "outDir": "./tmp",
     "module": "ESNext",
     "target": "ESNext",
     "lib": ["ESNext", "DOM"],