Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ayushmanchhabra committed Oct 16, 2023
2 parents 34e5e27 + f05b386 commit e12a52a
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 161 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [4.4.2] - 2023-10-16

### Changed

- Fix FFmpeg decompression.
- Auto generate docs from JSDoc comments.
- Improve TypeScript type definitions.
- Fix get mode.
Expand Down
156 changes: 82 additions & 74 deletions package-lock.json

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

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nw-builder",
"version": "4.4.1",
"version": "4.4.2",
"description": "Build NW.js desktop applications for MacOS, Windows and Linux.",
"keywords": [
"NW.js",
Expand Down Expand Up @@ -52,26 +52,26 @@
},
"devDependencies": {
"concurrently": "^8.2.1",
"eslint": "^8.50.0",
"eslint": "^8.51.0",
"eslint-config-tjw-jsdoc": "^1.0.4",
"gh-pages": "^6.0.0",
"jsdoc": "^4.0.2",
"jsdoc-to-markdown": "^8.0.0",
"prettier": "^3.0.3",
"selenium-webdriver": "^4.13.0",
"vitepress": "^1.0.0-rc.20"
"selenium-webdriver": "^4.14.0",
"vitepress": "^1.0.0-rc.21"
},
"dependencies": {
"cli-progress": "^3.12.0",
"compressing": "^1.10.0",
"glob": "^10.3.10",
"plist": "^3.1.0",
"rcedit": "^4.0.0",
"winston": "^3.10.0",
"winston": "^3.11.0",
"yargs": "^17.7.2"
},
"packageManager": "[email protected]",
"engines": {
"node": ">= v16.20.1 || >= v18.18.0 || >= v20.7.0"
"node": "^16.20.1 || ^18.18.2 || >= 20.8.1"
}
}
Loading

0 comments on commit e12a52a

Please sign in to comment.