Skip to content

Commit

Permalink
Merge pull request #135 from Rich-Harris/cleanup
Browse files Browse the repository at this point in the history
Various formatting/syntax cleanup
  • Loading branch information
Rich-Harris committed Mar 15, 2018
2 parents 7b03eae + 5134fc0 commit aedc0e1
Show file tree
Hide file tree
Showing 17 changed files with 623 additions and 615 deletions.
1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"semi": [ 2, "always" ],
"keyword-spacing": [ 2, { "before": true, "after": true } ],
"space-before-blocks": [ 2, "always" ],
"space-before-function-paren": [ 2, "always" ],
"no-mixed-spaces-and-tabs": [ 2, "smart-tabs" ],
"object-shorthand": [2, "always" ],
"no-const-assign": 2,
Expand Down
8 changes: 7 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"eslint": "^4.5.0",
"istanbul": "^0.4.5",
"mocha": "^3.5.0",
"prettier": "^1.11.1",
"remap-istanbul": "^0.9.5",
"resolve": "^1.4.0",
"rollup": "^0.48.0",
Expand All @@ -37,7 +38,8 @@
],
"scripts": {
"test": "mocha",
"pretest": "npm run build",
"pretest": "npm run lint && npm run build",
"format": "prettier --single-quote --print-width 100 --use-tabs --write src/*.js src/**/*.js",
"pretest-coverage": "npm run build",
"test-coverage": "rm -rf coverage/* && istanbul cover --report json node_modules/.bin/_mocha -- -u exports -R spec test/*.js",
"posttest-coverage": "remap-istanbul -i coverage/coverage-final.json -o coverage/coverage-remapped.json -b dist && remap-istanbul -i coverage/coverage-final.json -o coverage/coverage-remapped.lcov -t lcovonly -b dist && remap-istanbul -i coverage/coverage-final.json -o coverage/coverage-remapped -t html -b dist",
Expand Down

0 comments on commit aedc0e1

Please sign in to comment.