Skip to content

Commit

Permalink
Merge pull request #10 from OstlerDev/bcoin-1.0.2
Browse files Browse the repository at this point in the history
Merge upstream changes from `bcoin:master`
  • Loading branch information
OstlerDev authored Jul 25, 2019
2 parents cf52e95 + a065661 commit 6d27eb0
Show file tree
Hide file tree
Showing 387 changed files with 68,998 additions and 97,970 deletions.
17 changes: 0 additions & 17 deletions .babelrc

This file was deleted.

59 changes: 59 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
defaults: &defaults
working_directory: ~/repo
docker:
- image: circleci/node:10.2

version: 2.0
jobs:
install:
<<: *defaults
working_directory: ~/repo
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package-lock.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-
- run: npm install
- run: npm install bslint nyc codecov
- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package-lock.json" }}
- persist_to_workspace:
root: .
paths: .

test:
<<: *defaults
steps:
- attach_workspace:
at: .
- run:
name: Tests with coverage
command: npm run test-ci
- run:
name: Submit coverage
command: ./node_modules/.bin/codecov

lint:
<<: *defaults
steps:
- attach_workspace:
at: .
- run:
name: Lint
command: npm run lint-ci

workflows:
version: 2
test_and_lint:
jobs:
- install
- lint:
requires:
- install
- test:
requires:
- install
7 changes: 2 additions & 5 deletions .eslintfiles
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ bin/spvnode
bin/wallet
browser/server.js
browser/wsproxy.js
examples/
browser/src/app.js
lib/
migrate/
scripts/
test/
webpack/
webpack.browser.js
webpack.compat.js
webpack.node.js
docs/examples
58 changes: 56 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,53 @@
"node": true
},
"extends": "eslint:recommended",
"globals": {
"Atomics": "readable",
"BigInt": "readable",
"BigInt64Array": "readable",
"BigUint64Array": "readable",
"queueMicrotask": "readable",
"SharedArrayBuffer": "readable",
"TextEncoder": "readable",
"TextDecoder": "readable"
},
"overrides": [
{
"files": ["*.mjs"],
"parserOptions": {
"sourceType": "module"
}
},
{
"files": ["*.cjs"],
"parserOptions": {
"sourceType": "script"
}
},
{
"files": [
"test/{,**/}*.{mjs,cjs,js}"
],
"env": {
"mocha": true
},
"globals": {
"register": "readable"
},
"rules": {
"max-len": "off",
"prefer-arrow-callback": "off"
}
}
],
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 8
"ecmaVersion": 10,
"ecmaFeatures": {
"globalReturn": true
},
"requireConfigFile": false,
"sourceType": "script"
},
"root": true,
"rules": {
Expand All @@ -27,11 +72,20 @@
}],
"func-name-matching": "error",
"indent": ["off", 2, {
"ArrayExpression": "off",
"SwitchCase": 1,
"CallExpression": {
"arguments": "off"
},
"ArrayExpression": "off"
"FunctionDeclaration": {
"parameters": "off"
},
"FunctionExpression": {
"parameters": "off"
},
"MemberExpression": "off",
"ObjectExpression": "off",
"ImportDeclaration": "off"
}],
"handle-callback-err": "off",
"linebreak-style": ["error", "unix"],
Expand Down
17 changes: 11 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
node_modules/
docs/reference/
docker_data/
browser/bcoin*
npm-debug.log
.DS_Store
node_modules/
.nyc_output
docs/reference/
docker_data/
browser/bcoin*
npm-debug.log
coverage/
yarn.lock
webpack.*.js
.DS_Store
tmp
19 changes: 14 additions & 5 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
.babel*
.bmocharc*
.bpkgignore
.editorconfig
.eslint*
.git*
bench/
docs/
docker_data/
test/
.mocharc*
.yarnignore
yarn.lock
node_modules/
browser/bcoin*
package-lock.json
npm-debug.log
webpack.*.js
browser/bcoin*
bench/
build/
docs/
test/
Loading

0 comments on commit 6d27eb0

Please sign in to comment.