diff --git a/package.json b/package.json index 74571f4..e36581f 100644 --- a/package.json +++ b/package.json @@ -4,15 +4,19 @@ "main": "index.js", "scripts": { "lerna": "lerna", - "start": "lerna run start", + "start": "node packages/roleypoly-server/dist/index.js", "dev": "babel-node packages/roleypoly-server/index.js", "build": "lerna run build", "flow:install": "flow-mono install-types", + "flow": "flow", "remotedebug": "remotedebug_ios_webkit_adapter --port=9000 > /dev/null", "test": "jest --color --coverage", + "lint": "run-p lint:*", "lint:css": "stylelint 'packages/roleypoly-ui/**/*.js'", + "lint:js": "standard", "rpcrepl": "babel-node packages/roleypoly-server/util/rpcrepl.js", - "dev:up": "docker-compose up -d" + "dev:up": "docker-compose up -d", + "precommit": "yarn lint && yarn test" }, "private": true, "workspaces": [ @@ -43,6 +47,7 @@ "flow-bin": "^0.96.0", "flow-mono-cli": "^1.5.0", "flow-typed": "^2.5.1", + "husky": "^1.3.1", "jest": "^24.7.0", "jest-styled-components": "^6.3.1", "lerna": "^3.13.1", @@ -66,6 +71,9 @@ "globals": [ "$Shape", "$Call" + ], + "ignore": [ + "flow-typed/*" ] } } diff --git a/packages/roleypoly-server/api/index.js b/packages/roleypoly-server/api/index.js index 6bae630..eff2a9c 100644 --- a/packages/roleypoly-server/api/index.js +++ b/packages/roleypoly-server/api/index.js @@ -1,7 +1,6 @@ // @flow import glob from 'glob' import type { Router, AppContext } from '../Roleypoly' -import path from 'path' import logger from '../logger' const log = logger(__filename) diff --git a/packages/roleypoly-server/rpc/index.js b/packages/roleypoly-server/rpc/index.js index b4f65f6..b5a5a97 100644 --- a/packages/roleypoly-server/rpc/index.js +++ b/packages/roleypoly-server/rpc/index.js @@ -1,11 +1,11 @@ // @flow -import logger from '../logger' import fnv from 'fnv-plus' import autoloader from './_autoloader' import RPCError from './_error' import type Roleypoly, { Router } from '../Roleypoly' import type { Context } from 'koa' -const log = logger(__filename) +// import logger from '../logger' +// const log = logger(__filename) export type RPCIncoming = { fn: string, diff --git a/packages/roleypoly-server/rpc/user.js b/packages/roleypoly-server/rpc/user.js index 3d79b17..467d870 100644 --- a/packages/roleypoly-server/rpc/user.js +++ b/packages/roleypoly-server/rpc/user.js @@ -6,7 +6,7 @@ import * as secureAs from './_security' export default ($: AppContext) => ({ getCurrentUser: secureAs.authed($, async (ctx: Context) => { - return await $.discord.getUserPartial(ctx.session.userId) + return $.discord.getUserPartial(ctx.session.userId) }), isRoot: secureAs.root($, () => { diff --git a/yarn.lock b/yarn.lock index 24a90a6..b42a51f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3834,7 +3834,7 @@ cosmiconfig@5.1.0: lodash.get "^4.4.2" parse-json "^4.0.0" -cosmiconfig@^5.0.0, cosmiconfig@^5.1.0: +cosmiconfig@^5.0.0, cosmiconfig@^5.0.7, cosmiconfig@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8" integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g== @@ -5935,6 +5935,22 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" +husky@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0" + integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg== + dependencies: + cosmiconfig "^5.0.7" + execa "^1.0.0" + find-up "^3.0.0" + get-stdin "^6.0.0" + is-ci "^2.0.0" + pkg-dir "^3.0.0" + please-upgrade-node "^3.1.1" + read-pkg "^4.0.1" + run-node "^1.0.0" + slash "^2.0.0" + iconv-lite@0.4.23: version "0.4.23" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" @@ -9172,6 +9188,13 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" +please-upgrade-node@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac" + integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ== + dependencies: + semver-compare "^1.0.0" + pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" @@ -9782,6 +9805,15 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" +read-pkg@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237" + integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc= + dependencies: + normalize-package-data "^2.3.2" + parse-json "^4.0.0" + pify "^3.0.0" + read@1, read@~1.0.1: version "1.0.7" resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" @@ -10222,6 +10254,11 @@ run-async@^2.2.0: dependencies: is-promise "^2.1.0" +run-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" + integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== + run-parallel@^1.1.2: version "1.1.9" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" @@ -10310,6 +10347,11 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"