Skip to content

Commit

Permalink
Merge pull request #23 from langri-sha/release
Browse files Browse the repository at this point in the history
Release 1.2.0
  • Loading branch information
langri-sha authored Apr 8, 2017
2 parents fc5a9ee + e544d81 commit 020c6e0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# Change Log
## [1.2.0] - 2017-04-08
### Added
- Note for `serverPassword` option

### Changed
- Updated development dependencies

## [1.1.0] - 2016-11-18
### Changed
Expand All @@ -8,5 +14,7 @@
### Added
- Support for pushing modules on build

[1.0.1]: https://github.com/langri-sha/screeps-webpack-plugin/compare/107769c...v1.0.1
[Unreleased]: https://github.com/langri-sha/screeps-webpack-plugin/commits/master
[1.2.0]: https://github.com/langri-sha/screeps-webpack-plugin/compare/1.1.0...v1.2.0
[1.1.0]: https://github.com/langri-sha/screeps-webpack-plugin/compare/1.0.1...v1.1.0
[1.0.1]: https://github.com/langri-sha/screeps-webpack-plugin/compare/107769c...v1.0.1
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ new ScreepsWebpackPlugin({
password: 'PASSWORD',
token: 'TOKEN',
serverUrl: 'https://screeps.com',
serverPassword: 'SERVER_PASS',
gzip: false
})
```
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "screeps-webpack-plugin",
"version": "1.1.0",
"version": "1.2.0",
"description": "Compile your AI against a Screeps server",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -44,14 +44,14 @@
"screeps-modules": "^1.1.1"
},
"devDependencies": {
"ava": "^0.17.0",
"codecov": "^1.0.1",
"ava": "^0.19.0",
"codecov": "^2.1.0",
"commitizen": "^2.9.3",
"cz-conventional-changelog": "^1.2.0",
"cz-conventional-changelog": "^2.0.0",
"debug": "^2.6.0",
"nyc": "^9.0.1",
"snazzy": "^5.0.0",
"standard": "^8.5.0",
"nyc": "^10.2.0",
"snazzy": "^7.0.0",
"standard": "^10.0.1",
"webpack": "^2.1.0-beta.26"
}
}
2 changes: 1 addition & 1 deletion test.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function compile (options) {
compiler.run((err, stats) => {
debug(stats.toJson())

if (err) return reject([err])
if (err) return reject(err)

if (stats.hasErrors() || stats.hasWarnings()) {
return reject(stats.compilation.errors)
Expand Down

0 comments on commit 020c6e0

Please sign in to comment.