Merge remote-tracking branches 'origin/jt/janeway-v0.15.4' and 'origin/lf/lerna' into release/next-userspace

.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  ignorePatterns: ["**/*"]
+};

.github/actions/glob/Dockerfile

@@ -1,4 +1,4 @@
-FROM jaredtobin/janeway:v0.15.3.1
+FROM tloncorp/janeway:v0.15.4
 COPY entrypoint.sh /entrypoint.sh
 EXPOSE 22/tcp
 ENTRYPOINT ["/entrypoint.sh"]

.github/workflows/chromatic.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - run: cd 'pkg/interface' && npm i
+      - run: npm i && npm run bootstrap
       - name: Publish to Chromatic
         uses: chromaui/action@v1
         with:

.github/workflows/frontend-test.yml

@@ -0,0 +1,24 @@
+name: frontend-test
+
+on:
+  pull_request:
+    paths:
+      - 'pkg/interface/**'
+      - 'pkg/btc-wallet/**'
+      - 'pkg/npm/**'
+
+jobs:
+  frontend-test:
+    runs-on: ubuntu-latest
+    name: "Test changed frontend packages"
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - run: git fetch --prune
+      - name: 'Setup root deps'
+        run: npm ci
+      - name: 'Setup dependencies'
+        run: npm run bootstrap
+      - name: 'Run tests'
+        run: npm run test -- --since origin/$GITHUB_BASE_REF  --include-dependents

.github/workflows/typescript-check.yml

@@ -1,14 +0,0 @@
-name: typescript-check
-
-on:
-  pull_request:
-    paths:
-      - 'pkg/interface/**'
-
-jobs:
-  typescript-check:
-    runs-on: ubuntu-latest
-    name: "Check pkg/interface types"
-    steps:
-      - uses: actions/checkout@v2
-      - run: cd 'pkg/interface' && npm i && npm run tsc

.gitignore

@@ -33,6 +33,7 @@ result-*
 
 # NodeJS
 node_modules
+.eslintcache
 
 # Haskell
 .stack-work

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -1,10 +1,8 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-cd pkg/interface
-
 command -v npx > /dev/null || {
   exit 0
 }
 
-npx lint-staged
+npx lint-staged

lerna.json

@@ -0,0 +1,8 @@
+{
+  "packages": [
+    "pkg/npm/*",
+    "pkg/btc-wallet",
+    "pkg/interface"
+  ],
+  "version": "independent"
+}

package.json

@@ -0,0 +1,21 @@
+{
+  "name": "root",
+  "private": true,
+  "devDependencies": {
+    "eslint": "^7.29.0",
+    "husky": "^6.0.0",
+    "lerna": "^4.0.0",
+    "lint-staged": "^11.0.0"
+  },
+  "scripts": {
+    "watch-libs": "lerna run watch --no-private --parallel",
+    "build-libs": "lerna run build --no-private",
+    "test": "lerna run test",
+    "prepare": "husky install .husky",
+    "bootstrap": "lerna bootstrap",
+    "build:prod": "lerna run build:prod"
+  },
+  "lint-staged": {
+    "*.{js,ts,tsx}": "eslint --cache --fix"
+  }
+}

pkg/btc-wallet/package-lock.json

@@ -8583,13 +8583,14 @@
       "dev": true
     },
     "urbit-key-generation": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/urbit-key-generation/-/urbit-key-generation-0.18.0.tgz",
-      "integrity": "sha512-L5yjwfj30sQmJ7KsdtYvQI03A4pluZPf1TumQdrT1MccQYGWB0aedfwTPZnrsXHHqvzGCCQgHBagdMmFBgSddg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/urbit-key-generation/-/urbit-key-generation-0.19.0.tgz",
+      "integrity": "sha512-lWthsvbVUXfvMFdVewxeP6kAoObQ3+nYh+mZN7+oPVWPjjC94elBnDr4R+WcCfCdWkjzwYk+2hrw2y75ncsVyw==",
       "requires": {
         "argon2-wasm": "^0.9.0",
         "bip32": "^1.0.2",
         "bip39": "^2.5.0",
+        "bs58check": "^2.1.2",
         "js-sha256": "^0.9.0",
         "keccak": "^1.4.0",
         "secp256k1": "^3.5.2",

pkg/interface/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-  extends: '@urbit',
+  extends: '@urbit/eslint-config',
   env: {
     'jest': true
   }

pkg/interface/CONTRIBUTING.md

@@ -28,12 +28,13 @@ module.exports = {
 ```
 
 Change the URL to your livenet ship (if making front-end changes) or keep it the
-same (if [developing on a local development ship][local]). Then, from
-'pkg/interface':
+same (if [developing on a local development ship][local]). Then, from the root
+of the repository
 
-```
-npm ci
-npm run start
+```bash
+npm i
+npm run bootstrp
+cd pkg/interface && npm run start
 ```
 
 The dev server will start at `http://localhost:9000`. Sign in as you would

pkg/interface/package.json

@@ -13,8 +13,8 @@
     "@tlon/indigo-light": "^1.0.7",
     "@tlon/indigo-react": "^1.2.23",
     "@tlon/sigil-js": "^1.4.3",
-    "@urbit/api": "file:../npm/api",
-    "@urbit/http-api": "file:../npm/http-api",
+    "@urbit/api": "^1.1.1",
+    "@urbit/http-api": "^1.2.1",
     "any-ascii": "^0.1.7",
     "aws-sdk": "^2.830.0",
     "big-integer": "^1.6.48",
@@ -81,7 +81,7 @@
     "@types/yup": "^0.29.11",
     "@typescript-eslint/eslint-plugin": "^4.15.0",
     "@typescript-eslint/parser": "^4.24.0",
-    "@urbit/eslint-config": "file:../npm/eslint-config",
+    "@urbit/eslint-config": "^1.0.0",
     "@welldone-software/why-did-you-render": "^6.1.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
@@ -115,15 +115,15 @@
     "lint-file": "eslint",
     "tsc": "tsc",
     "tsc:watch": "tsc --watch",
-    "preinstall": "./preinstall.sh",
     "build:dev": "cross-env NODE_ENV=development webpack --config config/webpack.dev.js",
-    "build:prod": "cd ../npm/api && npm ci && cd ../../interface && cross-env NODE_ENV=production webpack --config config/webpack.prod.js",
+    "build:prod": "cross-env NODE_ENV=production webpack --config config/webpack.prod.js",
     "start": "webpack-dev-server --config config/webpack.dev.js",
-    "test": "jest",
-    "prepare": "cd ../.. && husky install pkg/interface/.husky",
+    "test": "tsc && jest",
+    "jest": "jest",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
-    "chromatic": "chromatic --exit-zero-on-changes"
+    "chromatic": "chromatic --exit-zero-on-changes",
+    "hook-lint": "eslint --cache --fix"
   },
   "author": "",
   "license": "MIT",

pkg/npm/api/contacts/types.ts

@@ -1,4 +1,4 @@
-import { Path, Patp } from "..";
+import { Path, Patp } from "../lib";
 import { Resource } from "../groups";
 
 export type ContactUpdate =

pkg/npm/api/graph/types.ts

@@ -1,4 +1,4 @@
-import { Patp } from "..";
+import { Patp } from "../lib";
 import BigIntOrderedMap from "../lib/BigIntOrderedMap";
 import BigIntArrayOrderedMap from "../lib/BigIntArrayOrderedMap";
 

pkg/npm/api/groups/update.ts

@@ -1,4 +1,4 @@
-import { PatpNoSig, Path, Jug, ShipRank, Enc } from '..';
+import { PatpNoSig, Path, Jug, ShipRank, Enc } from '../lib';
 import { roleTags } from './index';
 
 export type RoleTags = typeof roleTags[number];

pkg/npm/api/invite/lib.ts

@@ -1,4 +1,4 @@
-import { Poke, Serial } from "..";
+import { Poke, Serial } from "../lib";
 import { InviteUpdate, InviteUpdateAccept, InviteUpdateDecline } from "./types";
 
 export const inviteAction = <T extends InviteUpdate>(data: T): Poke<T> => ({

pkg/npm/api/invite/types.ts

@@ -1,4 +1,4 @@
-import { Serial, PatpNoSig, Path } from '..';
+import { Serial, PatpNoSig, Path } from '../lib';
 import { Resource } from "../groups";
 
 export type InviteUpdate =

pkg/npm/api/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@urbit/api",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -29,10 +29,11 @@
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.169.tgz",
       "integrity": "sha512-DvmZHoHTFJ8zhVYwCLWbQ7uAbYQEk52Ev2/ZiQ7Y7gQGeV9pjBqjnQpECMHfKS1rCYAhMI7LHVxwyZLZinJgdw=="
     },
-    "@urbit/eslint-config": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@urbit/eslint-config/-/eslint-config-1.0.0.tgz",
-      "integrity": "sha512-Xmzb6MvM7KorlPJEq/hURZZ4BHSVy/7CoQXWogsBSTv5MOZnMqwNKw6yt24k2AO/2UpHwjGptimaNLqFfesJbw=="
+    "@types/node": {
+      "version": "15.12.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.5.tgz",
+      "integrity": "sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg==",
+      "dev": true
     },
     "anymatch": {
       "version": "3.1.2",

pkg/npm/api/package.json

@@ -10,12 +10,11 @@
   "main": "dist/index.js",
   "types": "dist/index.d",
   "scripts": {
-    "prepublish": "npm run build",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "watch": "onchange './**/*.ts' -e './dist/**' -- npm run build",
-    "build": "npm run clean && npm run tsc",
-    "tsc": "tsc -p tsconfig.json",
-    "clean": "rm -rf dist/*"
+    "test": "echo \"No test specified\" && exit 0",
+    "watch": "tsc -p tsconfig.json --watch",
+    "build": "tsc -p tsconfig.json",
+    "clean": "rm -rf dist/*",
+    "prepare": "npm run build"
   },
   "author": "",
   "license": "MIT",
@@ -29,6 +28,7 @@
     "urbit-ob": "^5.0.1"
   },
   "devDependencies": {
+    "@types/node": "^15.12.5",
     "onchange": "^7.1.0",
     "typescript": "^4.3.2"
   }

pkg/npm/api/tsconfig.json

@@ -1,7 +1,6 @@
 {
-  "include": ["*.ts"],
-  "exclude": ["node_modules", "dist", "@types"],
   "compilerOptions": {
+    "baseUrl": ".",
 	  "outDir": "./dist",
     "module": "ES2020",
     "noImplicitAny": true,
@@ -13,7 +12,8 @@
     "declaration": true,
     "sourceMap": true,
     "strict": false,
-    "noErrorTruncation": true,
-    "allowJs": true
-  }
-}
+    "noErrorTruncation": true
+  },
+  "exclude": ["node_modules", "./dist/**/*", "@types"],
+  "include": ["./*.ts"]
+}

pkg/npm/eslint-config/package.json

@@ -8,9 +8,7 @@
     "directory": "pkg/npm/eslint-config"
   },
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
+  "scripts": {},
   "author": "",
   "license": "MIT",
   "devDependencies": {

pkg/npm/http-api/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@urbit/http-api",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -479,11 +479,6 @@
       "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
       "dev": true
     },
-    "@types/lodash": {
-      "version": "4.14.170",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz",
-      "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q=="
-    },
     "@types/minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz",
@@ -694,24 +689,6 @@
         "eslint-visitor-keys": "^2.0.0"
       }
     },
-    "@urbit/api": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@urbit/api/-/api-1.1.0.tgz",
-      "integrity": "sha512-oflDguSpB6u9VmlmbX23Z+aSjMCFj7QbmQEG6YjhZvuz2ok711/F5+B4NvGKOl0NfdG2ao2wK7m+z4AyH4pZjQ==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@types/lodash": "^4.14.168",
-        "@urbit/eslint-config": "^1.0.0",
-        "big-integer": "^1.6.48",
-        "immer": "^9.0.1",
-        "lodash": "^4.17.20"
-      }
-    },
-    "@urbit/eslint-config": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@urbit/eslint-config/-/eslint-config-1.0.0.tgz",
-      "integrity": "sha512-Xmzb6MvM7KorlPJEq/hURZZ4BHSVy/7CoQXWogsBSTv5MOZnMqwNKw6yt24k2AO/2UpHwjGptimaNLqFfesJbw=="
-    },
     "@webassemblyjs/ast": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
@@ -1127,11 +1104,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "big-integer": {
-      "version": "1.6.48",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
-      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="
-    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -3036,11 +3008,6 @@
       "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
       "dev": true
     },
-    "immer": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.2.tgz",
-      "integrity": "sha512-mkcmzLtIfSp40vAqteRr1MbWNSoI7JE+/PB36FNPoSfJ9RQRmNKuTYCjKkyXyuq3Dgn07HuJBrwJd4ZSk2yUbw=="
-    },
     "import-local": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
@@ -3544,7 +3511,8 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
     },
     "loglevel": {
       "version": "1.7.1",

pkg/npm/http-api/package.json

@@ -15,10 +15,10 @@
     "src"
   ],
   "scripts": {
-    "prepublish": "npm run build",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "watch": "onchange './*.ts' -- npm run build",
-    "build": "npm run clean && tsc -p tsconfig.json",
+    "test": "echo \"No test specified\" && exit 0",
+    "build": "tsc -p tsconfig.json",
+    "prepare": "npm run build",
+    "watch": "tsc -p tsconfig.json --watch",
     "clean": "rm -rf dist/*"
   },
   "peerDependencies": {},
@@ -53,15 +53,11 @@
   "dependencies": {
     "@babel/runtime": "^7.12.5",
     "@microsoft/fetch-event-source": "^2.0.0",
-    "@urbit/api": "^1.1.0",
     "browser-or-node": "^1.3.0",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "node-fetch": "^2.6.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.1"
-  },
-  "bundledDependencies": [
-    "@urbit/api"
-  ]
+  }
 }