Skip to content

Commit

Permalink
Merge branch 'master' into hipsterbrown/1654-npm-registry-log
Browse files Browse the repository at this point in the history
* master: (26 commits)
  Package-lock.json: committing its own self updates
  build(deps): bump node-rsa from 1.0.5 to 1.0.7
  build(deps): bump mdns-js from 1.0.1 to 1.0.3
  build(deps): bump url-join from 2.0.2 to 4.0.1
  build(deps): bump block-stream2 from 1.1.0 to 2.0.0
  build(deps): bump uglify-js from 3.1.3 to 3.7.2
  build(deps): bump glob from 5.0.15 to 7.1.6
  build(deps): bump inquirer from 0.12.0 to 7.0.1
  build(deps): [security] bump npm from 6.11.2 to 6.13.4
  build(deps-dev): bump sinon from 3.1.0 to 7.5.0
  build(deps): bump colors from 1.3.0 to 1.4.0
  build(deps-dev): bump coveralls from 3.0.2 to 3.0.9
  build(deps-dev): bump concat-stream from 1.6.2 to 2.0.0
  build(deps): bump usb from 1.5.0 to 1.6.2
  build(deps-dev): bump nyc from 11.9.0 to 14.1.1
  build(deps): bump async from 2.6.1 to 3.1.0
  build(deps): bump tar-stream from 1.5.4 to 2.1.0
  build(deps): bump node-rsa from 0.3.4 to 1.0.5
  Typo fix
  build(deps): [security] bump mixin-deep from 1.3.1 to 1.3.2
  ...

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
rwaldron committed Jan 7, 2020
2 parents ca21cec + 23b0db8 commit 73cb3ba
Show file tree
Hide file tree
Showing 3 changed files with 1,490 additions and 1,105 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Just run `t2 update` to make sure you are running the most recent build of OpenW
## Testing

### Overview
In order to maintain a reliable code base, there is extensive code coverage and style checking involved with adding to or editting this repo. [Grunt](http://gruntjs.com) is used as the task runner, along with plugins for the following tools:
In order to maintain a reliable code base, there is extensive code coverage and style checking involved with adding to or editing this repo. [Grunt](http://gruntjs.com) is used as the task runner, along with plugins for the following tools:

- [jshint](http://jshint.com/docs/): used to verify our best practices and prevents us from making mistakes that could lead to hard-to-find bugs, see [`.jshintrc`](https://github.com/tessel/t2-cli/blob/master/.jshintrc) for our configuration
- [jscs](http://jscs.info): used to maintain the project's preferred code style, see [`.jscsrc`](https://github.com/tessel/t2-cli/blob/master/.jscsrc) for our configuration
Expand Down
Loading

0 comments on commit 73cb3ba

Please sign in to comment.