Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: merge CLI and Server into a single application #93

Merged
merged 1 commit into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/__support__/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Server } from "@hapi/hapi";
import { startServer } from "../../packages/server/src/server";
import { startServer } from "../../src/app/server";

jest.setTimeout(10000);

Expand Down
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
testEnvironment: "node",
bail: true,
verbose: true,
transform: {
"^.+\\.tsx?$": "ts-jest",
},
testMatch: ["**/*.test.ts"],
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
watchman: false,
setupFilesAfterEnv: ["jest-extended"],
};
156 changes: 106 additions & 50 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,120 @@
{
"private": true,
"name": "multisig-server",
"description": "A server for helping building multi-signatures transactions.",
"description": "A JSON-RPC 2.0 specification compliant server for Exchanges to interact with the ARK Blockchain.",
"license": "MIT",
"author": "Brian Faust <brian@ark.io>",
"files": [
"/dist"
],
"main": "dist/index",
"types": "dist/index",
"bin": {
"multisig-server": "./bin/run"
},
"scripts": {
"lerna": "./node_modules/lerna/cli.js",
"setup": "yarn && yarn bootstrap && yarn build",
"setup:clean": "yarn && yarn clean && yarn bootstrap && yarn build",
"bootstrap": "yarn lerna bootstrap",
"clean": "yarn lerna clean --yes",
"build": "yarn lerna run build",
"lint": "./node_modules/tslint/bin/tslint -c ./tslint.json -p ./tslint-config.json './packages/**/*/src/**/*.ts' --fix",
"build": "yarn clean && yarn compile",
"build:watch": "yarn clean && yarn compile -w",
"clean": "del dist",
"compile": "./node_modules/typescript/bin/tsc",
"multisig-server": "./bin/run",
"format": "yarn lint && yarn prettier",
"prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\" \"./__tests__/**/*.{ts,js,json,md}\"",
"test": "jest",
"version": "cross-env-shell ./scripts/version.sh"
"lint": "../../node_modules/tslint/bin/tslint -c ../../tslint.json -p ../../tslint-config.json './src/**/*.ts' --fix",
"prepublishOnly": "yarn build",
"prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./src/**/*.{ts,js,json,md}\" \"./__tests__/**/*.{ts,js,json,md}\"",
"test": "jest --forceExit --runInBand"
},
"dependencies": {
"@arkecosystem/core-magistrate-crypto": "^2.6.52",
"@arkecosystem/crypto": "^2.6.52",
"@hapi/boom": "^9.1.0",
"@hapi/hapi": "^20.0.0",
"@hapi/joi": "17.1.1",
"@kodekeep/foreman": "^1.0.0",
"@oclif/command": "^1.8.0",
"@oclif/config": "^1.17.0",
"@oclif/plugin-autocomplete": "^0.2.0",
"@oclif/plugin-commands": "^1.3.0",
"@oclif/plugin-help": "^3.2.0",
"@oclif/plugin-not-found": "^1.2.4",
"@oclif/plugin-plugins": "^1.9.0",
"better-sqlite3": "^7.1.0",
"chalk": "^4.1.0",
"clear": "^0.1.0",
"cli-table3": "^0.6.0",
"cli-ux": "^5.4.10",
"dayjs": "^1.8.34",
"env-paths": "^2.2.0",
"execa": "^4.0.3",
"fast-levenshtein": "^3.0.0",
"fs-extra": "^9.0.1",
"got": "^11.5.2",
"latest-version": "^5.1.0",
"lodash.minby": "^4.6.0",
"nodejs-tail": "^1.1.0",
"pino-pretty": "^4.1.0",
"pino": "^6.5.1",
"pretty-bytes": "^5.3.0",
"pretty-ms": "^7.0.0",
"prompts": "^2.3.2",
"read-last-lines": "^1.7.2",
"semver": "^7.3.2",
"uuid": "^8.3.0",
"wif": "^2.0.6"
},
"devDependencies": {
"@oclif/dev-cli": "^1.22.2",
"@sindresorhus/tsconfig": "^0.7.0",
"@types/hapi__boom": "^7.4.0",
"@types/jest": "^26.0.0",
"@types/node": "^12.6.2",
"@types/prettier": "^2.0.0",
"@types/rimraf": "^2.0.2",
"codecov": "^3.5.0",
"cross-env": "^7.0.0",
"del-cli": "^3.0.0",
"jest": "^26.0.0",
"jest-extended": "^0.11.2",
"lerna": "^3.20.2",
"prettier": "^2.0.0",
"rimraf": "^3.0.0",
"ts-jest": "^26.0.0",
"tslint": "^5.18.0",
"@types/execa": "^2.0.0",
"@types/fast-levenshtein": "^0.0.1",
"@types/fs-extra": "^9.0.1",
"@types/got": "^9.6.11",
"@types/hapi__boom": "^9.0.1",
"@types/hapi__hapi": "^20.0.0",
"@types/jest": "^26.0.10",
"@types/lodash.minby": "^4.6.6",
"@types/lodash.sample": "^4.2.6",
"@types/node": "^14.6.0",
"@types/pino": "^6.3.0",
"@types/prettier": "^2.0.2",
"@types/pretty-bytes": "^5.2.0",
"@types/pretty-ms": "^5.0.1",
"@types/prompts": "^2.4.0",
"@types/rimraf": "^3.0.0",
"@types/semver": "^7.3.3",
"@types/uuid": "^8.3.0",
"@types/wif": "^2.0.1",
"codecov": "^3.7.2",
"cross-env": "^7.0.2",
"del-cli": "^3.0.1",
"jest-extended": "^0.11.5",
"jest": "^26.4.2",
"lerna": "^3.22.1",
"prettier": "^2.1.1",
"rimraf": "^3.0.2",
"ts-jest": "^26.3.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.5.3"
"tslint": "^6.1.3",
"typescript": "^4.0.2"
},
"workspaces": [
"packages/*"
],
"jest": {
"testEnvironment": "node",
"bail": true,
"verbose": true,
"transform": {
"^.+\\.tsx?$": "ts-jest"
"publishConfig": {
"access": "public"
},
"oclif": {
"commands": "./dist/commands",
"hooks": {
"init": [
"./dist/hooks/init/update"
],
"command_not_found": [
"./dist/hooks/command_not_found/suggest"
]
},
"testMatch": [
"**/*.test.ts"
],
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"jsx",
"json",
"node"
],
"watchman": false,
"setupFilesAfterEnv": [
"jest-extended"
"bin": "multisig-server",
"plugins": [
"@oclif/plugin-autocomplete",
"@oclif/plugin-commands",
"@oclif/plugin-help"
]
}
}
8 changes: 0 additions & 8 deletions packages/cli/CHANGELOG.md

This file was deleted.

129 changes: 0 additions & 129 deletions packages/cli/package.json

This file was deleted.

7 changes: 0 additions & 7 deletions packages/cli/tsconfig.json

This file was deleted.

8 changes: 0 additions & 8 deletions packages/server/CHANGELOG.md

This file was deleted.